Bump version

Fixes #6

.eslintignore

@@ -1,6 +1,5 @@
 node_modules/
 dist/
-.eslintrc.cjs
 .prettierrc.cjs
-src-web/postcss.config.cjs
-src-web/vite.config.ts
+.eslintrc.cjs
+env.d.ts

.eslintrc.cjs

@@ -1,49 +1,37 @@
 module.exports = {
   extends: [
-    'eslint:recommended',
-    'plugin:react/recommended',
-    'plugin:react-hooks/recommended',
-    'plugin:import/recommended',
-    'plugin:jsx-a11y/recommended',
-    'plugin:@typescript-eslint/recommended',
-    'eslint-config-prettier',
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:react-hooks/recommended",
+    "plugin:import/recommended",
+    "plugin:jsx-a11y/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "eslint-config-prettier"
   ],
-  plugins: ['react-refresh'],
-  parser: '@typescript-eslint/parser',
+  parser: "@typescript-eslint/parser",
   parserOptions: {
-    project: ['./tsconfig.json'],
+    project: ["./tsconfig.json"]
   },
-  ignorePatterns: [
-    'scripts/**/*',
-    'packages/plugin-runtime/**/*',
-    'packages/plugin-runtime-types/**/*',
-    'src-tauri/**/*',
-    'src-web/tailwind.config.cjs',
-    'src-web/vite.config.ts',
-  ],
+  ignorePatterns: ["src-tauri/**/*", "plugins/**/*"],
   settings: {
     react: {
-      version: 'detect',
+      version: "detect"
     },
-    'import/resolver': {
+    "import/resolver": {
       node: {
-        paths: ['src-web'],
-        extensions: ['.ts', '.tsx'],
-      },
-    },
+        paths: ["src-web"],
+        extensions: [".ts", ".tsx"]
+      }
+    }
   },
   rules: {
-    'react-refresh/only-export-components': 'error',
-    'jsx-a11y/no-autofocus': 'off',
-    'react/react-in-jsx-scope': 'off',
-    'import/no-unresolved': 'off',
-    '@typescript-eslint/consistent-type-imports': [
-      'error',
-      {
-        prefer: 'type-imports',
-        disallowTypeAnnotations: true,
-        fixStyle: 'separate-type-imports',
-      },
-    ],
-  },
+    "jsx-a11y/no-autofocus": "off",
+    "react/react-in-jsx-scope": "off",
+    "import/no-unresolved": "off",
+    "@typescript-eslint/consistent-type-imports": ["error", {
+      prefer: "type-imports",
+      disallowTypeAnnotations: true,
+      fixStyle: "separate-type-imports"
+    }]
+  }
 };

.gitattributes

@@ -1,2 +0,0 @@
-src-tauri/vendored/**/* linguist-generated=true
-src-tauri/gen/schemas/**/* linguist-generated=true

.github/FUNDING.yml

@@ -1,15 +0,0 @@
-# These are supported funding model platforms
-
-github: gschier
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-polar: # Replace with a single Polar username
-buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
-thanks_dev: # Replace with a single thanks.dev username
-custom: https://yaak.app/pricing

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Bugs, Feedback, Feature Requests, and Questions
-    url: https://feedback.yaak.app
-    about: "Please report to Yaak's public feedback board. Issues will be created and linked here when applicable."

.github/workflows/artifacts.yml

@@ -0,0 +1,72 @@
+name: Generate Artifacts
+on:
+  push:
+    tags: [ v* ]
+
+permissions: write-all
+
+jobs:
+  build-artifacts:
+    name: Build
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: macos-latest
+            target: aarch64-apple-darwin
+          - os: macos-latest
+            target: x86_64-apple-darwin
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+          - os: ubuntu-20.04
+            target: x86_64-unknown-linux-gnu
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+      - name: Cache Rust
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ./src-tauri/target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('src-tauri/Cargo.lock') }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: 'npm'
+      - name: install dependencies (ubuntu only)
+        if: matrix.os == 'ubuntu-20.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - name: Install dependencies
+        run: npm ci
+      - name: Run tests
+        run: npm test
+      # Pin dev version to get non-default targets
+      # https://github.com/tauri-apps/tauri-action/issues/356
+      - uses: tauri-apps/tauri-action@dev
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+        with:
+          tagName: 'v__VERSION__'
+          releaseName: 'Release __VERSION__'
+          releaseBody: 'https://yaak.app/changelog/__VERSION__'
+          releaseDraft: true
+          prerelease: false
+          args: '--target ${{ matrix.target }}'

.github/workflows/ci-js.yml

@@ -1,18 +0,0 @@
-on:
-  pull_request:
-    branches: [develop]
-
-name: CI (JS)
-
-jobs:
-  test:
-    name: Lint/Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - run: npm ci
-      - run: npm run lint
-      - run: npm test

.github/workflows/ci-rust.yml

@@ -1,36 +0,0 @@
-on:
-  pull_request:
-    branches: [develop]
-    paths:
-      - src-tauri/**
-      - .github/workflows/**
-
-name: CI (Rust)
-
-defaults:
-  run:
-    working-directory: src-tauri
-
-jobs:
-  test:
-    name: Check/Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
-      - run: cargo check --all
-      - run: cargo test --all

.github/workflows/release.yml

@@ -1,113 +0,0 @@
-name: Generate Artifacts
-on:
-  push:
-    tags: [ v* ]
-
-jobs:
-  build-artifacts:
-    permissions:
-      contents: write
-
-    name: Build
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: 'macos-latest' # for Arm-based Macs (M1 and above).
-            args: '--target aarch64-apple-darwin'
-            yaak_arch: 'arm64'
-          - platform: 'macos-latest' # for Intel-based Macs.
-            args: '--target x86_64-apple-darwin'
-            yaak_arch: 'x64'
-          - platform: 'ubuntu-22.04'
-            args: ''
-            yaak_arch: 'x64'
-          - platform: 'windows-latest'
-            args: ''
-            yaak_arch: 'x64'
-    runs-on: ${{ matrix.platform }}
-    timeout-minutes: 40
-    steps:
-      - name: Checkout yaakapp/app
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
-
-      - uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            src-tauri/target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
-
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
-
-      - name: install dependencies (windows only)
-        if: matrix.platform == 'windows-latest'
-        run: cargo install --force trusted-signing-cli --version 0.5.0
-
-      - name: Install NPM Dependencies
-        run: npm ci
-
-      - name: Install Protoc for plugin-runtime
-        uses: arduino/setup-protoc@v3
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run JS build
-        run: npm run build
-
-      - name: Run lint
-        run: npm run lint
-
-      - name: Set version
-        run: npm run replace-version
-        env:
-          YAAK_VERSION: ${{ github.ref_name }}
-
-      - uses: tauri-apps/tauri-action@v0
-        env:
-          YAAK_TARGET_ARCH: ${{ matrix.yaak_arch }}
-
-          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
-          TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-
-          # Apple signing stuff
-          APPLE_CERTIFICATE: ${{ matrix.platform == 'macos-latest' && secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ matrix.platform == 'macos-latest' && secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_ID: ${{ matrix.platform == 'macos-latest' && secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ matrix.platform == 'macos-latest' && secrets.APPLE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ matrix.platform == 'macos-latest' && secrets.APPLE_SIGNING_IDENTITY }}
-          APPLE_TEAM_ID: ${{ matrix.platform == 'macos-latest' && secrets.APPLE_TEAM_ID }}
-
-          # Windows signing stuff
-          AZURE_CLIENT_ID: ${{ matrix.platform == 'windows-latest' && secrets.AZURE_CLIENT_ID }}
-          AZURE_CLIENT_SECRET: ${{ matrix.platform == 'windows-latest' && secrets.AZURE_CLIENT_SECRET }}
-          AZURE_TENANT_ID: ${{ matrix.platform == 'windows-latest' && secrets.AZURE_TENANT_ID }}
-        with:
-          tagName: 'v__VERSION__'
-          releaseName: 'Release __VERSION__'
-          releaseBody: '[Changelog __VERSION__](https://yaak.app/blog/__VERSION__)'
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}

.gitignore

@@ -26,8 +26,3 @@ dist-ssr
 
 *.sqlite
 *.sqlite-*
-
-.cargo
-
-.tmp
-tmp

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.prettierrc.cjs

@@ -0,0 +1,8 @@
+module.exports = {
+    "trailingComma": "all",
+    "tabWidth": 2,
+    "semi": true,
+    "singleQuote": true,
+    "printWidth": 100,
+    "bracketSpacing": true
+}

.prettierrc.js

@@ -1,8 +0,0 @@
-export default {
-  "trailingComma": "all",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "printWidth": 100,
-  "bracketSpacing": true
-}

.run/Build Desktop.run.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build Desktop" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="npm run tauri build -- --target universal-apple-darwin" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs>
+      <env name="TAURI_KEY_PASSWORD" value="fishhook-upstream-wash-assured" />
+      <env name="TAURI_PRIVATE_KEY" value="dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5OGxWaytTa3dIa2xXVUltQzRGUXIzd2lYQ2NpV0ZhQURSbWJWZ1NrK0tnY0FBQkFBQUFBQUFBQUFBQUlBQUFBQUV2M1VKdVRyVHpHSzhQdGc2ZVFtOVNsMU5tNEVSN280cFNrbXhncW9tdjNXaFJZUTJqUzQ5Q01zWTJWRVhaY1pGNHNjR1NFR3JmcWFRN09NdWdGMXpZVXhzejR4V3lDV1JpZHlnbW5LNS9vMFFtRlZjbUl4YjZSNzhlMmk3ait5SExYcG5QZUkxOFE9Cg==" />
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>

.run/Dev Desktop.run.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Desktop" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs>
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>

.sqllsrc.json

@@ -0,0 +1,5 @@
+{
+  "name": "yaak-dev",
+  "adapter": "sqlite3",
+  "filename": "src-tauri/db.sqlite"
+}

.tauriignore

@@ -0,0 +1 @@
+plugins

DEVELOPMENT.md

@@ -1,62 +0,0 @@
-# Developer Setup
-
-Yaak is a combined Node.js and Rust monorepo. It is a [Tauri](https://tauri.app) project, so 
-uses Rust and HTML/CSS/JS for the main application but there is also a plugin system powered
-by a Node.js sidecar that communicates to the app over gRPC.
-
-Because of the moving parts, there are a few setup steps required before development can 
-begin.
-
-## Prerequisites
-
-Make sure you have the following tools installed:
-
-- [Node.js](https://nodejs.org/en/download/package-manager)
-- [Rust](https://www.rust-lang.org/tools/install)
-
-Check the installations with the following commands:
-
-```shell
-node -v
-npm -v
-rustc --version
-```
-
-Install the NPM dependencies:
-
-```shell
-npm install
-```
-
-Run the `bootstrap` command to do some initial setup:
-
-```shell
-npm run bootstrap
-```
-
-## Run the App
-
-After bootstrapping, start the app in development mode:
-
-```shell
-npm start
-```
-
-## SQLite Migrations
-
-New migrations can be created from the `src-tauri/` directory:
-   
-```shell
-npm run migration
-```
-
-Rerun the app to apply the migrations. 
-
-_Note: For safety, development builds use a separate database location from production builds._
-
-## Lezer Grammer Generation
-
-```sh
-# Example
-lezer-generator components/core/Editor/<LANG>/<LANG>.grammar > components/core/Editor/<LANG>/<LANG>.ts
-```

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 Yaak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

Makefile

@@ -0,0 +1,13 @@
+.PHONY: sqlx-prepare, dev, migrate, build
+
+sqlx-prepare:
+	cd src-tauri && cargo sqlx prepare --database-url 'sqlite://db.sqlite'
+
+dev:
+	npm run tauri-dev
+
+migrate:
+	cd src-tauri && cargo sqlx migrate run --database-url 'sqlite://db.sqlite?mode=rw'
+
+build:
+	./node_modules/.bin/tauri build

README.md

@@ -1,34 +1,16 @@
-# Yaak API Client
+# Yaak Network Toolkit
 
-Yaak is a desktop API client for interacting with REST, GraphQL, Server Sent Events (SSE), WebSocket, and gRPC
-APIs. It's built using [Tauri](https://tauri.app), Rust, and ReactJS.
+The most fun you'll ever have working with APIs.
 
-![366149288-f18e963f-0b68-4ecb-b8b8-cb71aa9aec02](https://github.com/user-attachments/assets/ca83b7ad-5708-411b-8faf-e36b365841a4)
+## Common Commands
 
-## Contribution Policy
+```sh
+# Start dev app
+npm run tauri-dev
 
-Yaak is open source, but only accepting contributions for bug fixes. To get started, 
-visit [`DEVELOPMENT.md`](DEVELOPMENT.md) for tips on setting up your environment.
-
-## Feature Overview
-
-- 🪂 Import data from Postman, Insomnia, OpenAPI, Swagger, or Curl.<br/>
-- 📤 Send requests via REST, GraphQL, Server Sent Events (SSE), WebSockets, or gRPC.<br/>
-- 🔐 Automatically authorize requests with OAuth 2.0, JWT tokens, Basic Auth, and more.<br/>
-- 🔎 Filter response bodies using JSONPath or XPath queries.<br/>
-- ⛓️ Chain together multiple requests to dynamically reference values.<br/>
-- 📂 Organize requests into workspaces and nested folders.<br/>
-- 🧮 Use environment variables to easily switch between Prod and Dev.<br/>
-- 🛡️ Secure arbitrary text values with end-to-end encryption<br/>
-- 🏷️ Send dynamic values like UUIDs or timestamps using template tags.<br/>
-- 🎨 Choose from many of the included themes, or make your own.<br/>
-- 💽 Mirror workspace data to a directory for integration with Git or Dropbox.<br/>
-- 📜 View response history for each request.<br/>
-- 🔌 Create your own plugins for authentication, template tags, and more!<br/>
-- 🛜 Configure a proxy to access firewall-blocked APIs
-
-## Useful Resources
-
-- [Feedback and Bug Reports](https://feedback.yaak.app)
-- [Documentation](https://feedback.yaak.app/help)
-- [Yaak vs Postman](https://yaak.app/blog/postman-alternative)
+# Migration commands
+cd src-tauri
+cargo sqlx migrate add ${MIGRATION_NAME}
+cargo sqlx migrate run --database-url 'sqlite://db.sqlite?mode=rw'
+cargo sqlx prepare --database-url 'sqlite://db.sqlite'
+```

index.html

@@ -1,34 +1,31 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Yaak App</title>
-<!--  <script src="http://localhost:8097"></script>-->
+  <!-- <script src="http://localhost:8097"></script>-->
 
   <!-- Certain elements like webview (and maybe <select>?) will use background
   color depending on document background color-->
   <style>
-    html, body {
-      background-color: white;
-    }
-
-    @media (prefers-color-scheme: dark) {
       html, body {
-        background-color: #1b1a29;
+          background-color: white;
+      }
+
+      @media (prefers-color-scheme: dark) {
+          html, body {
+              background-color: black;
+          }
       }
-    }
   </style>
 </head>
 
-<body class="text-base">
+<body>
 <div id="root"></div>
 <div id="cm-portal" class="cm-portal"></div>
 <div id="react-portal"></div>
 <div id="radix-portal" class="cm-portal"></div>
-<script type="module" src="/theme.ts"></script>
-<script type="module" src="/font-size.ts"></script>
-<script type="module" src="/font.ts"></script>
-<script type="module" src="/main.tsx"></script>
+<script type="module" src="/src-web/main.tsx"></script>
 </body>
 </html>

package.json

@@ -2,85 +2,105 @@
   "name": "yaak-app",
   "private": true,
   "version": "0.0.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mountain-loop/yaak.git"
-  },
-  "workspaces": [
-    "packages/plugin-runtime",
-    "packages/plugin-runtime-types",
-    "packages/common-lib",
-    "plugins/auth-basic",
-    "plugins/auth-bearer",
-    "plugins/auth-jwt",
-    "plugins/auth-oauth2",
-    "plugins/exporter-curl",
-    "plugins/filter-jsonpath",
-    "plugins/filter-xpath",
-    "plugins/importer-curl",
-    "plugins/importer-insomnia",
-    "plugins/importer-openapi",
-    "plugins/importer-postman",
-    "plugins/importer-yaak",
-    "plugins/template-function-cookie",
-    "plugins/template-function-encode",
-    "plugins/template-function-fs",
-    "plugins/template-function-hash",
-    "plugins/template-function-json",
-    "plugins/template-function-prompt",
-    "plugins/template-function-regex",
-    "plugins/template-function-request",
-    "plugins/template-function-response",
-    "plugins/template-function-uuid",
-    "plugins/template-function-xml",
-    "src-tauri/yaak-crypto",
-    "src-tauri/yaak-git",
-    "src-tauri/yaak-fonts",
-    "src-tauri/yaak-license",
-    "src-tauri/yaak-mac-window",
-    "src-tauri/yaak-models",
-    "src-tauri/yaak-plugins",
-    "src-tauri/yaak-sse",
-    "src-tauri/yaak-sync",
-    "src-tauri/yaak-templates",
-    "src-tauri/yaak-ws",
-    "src-web"
-  ],
+  "type": "module",
   "scripts": {
-    "start": "npm run app-dev",
-    "app-build": "tauri build",
-    "app-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
-    "migration": "node scripts/create-migration.cjs",
-    "build": "npm run --workspaces --if-present build",
-    "build-plugins": "npm run --workspaces --if-present build",
-    "bootstrap": "run-p bootstrap:* && npm run --workspaces --if-present bootstrap",
-    "bootstrap:vendor-node": "node scripts/vendor-node.cjs",
-    "bootstrap:vendor-plugins": "node scripts/vendor-plugins.cjs",
-    "bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",
-    "lint": "npm run --workspaces --if-present lint",
-    "replace-version": "node scripts/replace-version.cjs",
+    "start": "npm run build:plugins && npm run tauri-dev",
+    "tauri-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
+    "tauri-build": "tauri build",
     "tauri": "tauri",
-    "tauri-before-build": "npm run bootstrap && npm run --workspaces --if-present build",
-    "tauri-before-dev": "workspaces-run --parallel -- npm run --workspaces --if-present dev"
+    "build": "npm run build:frontend",
+    "dev": "vite dev",
+    "lint": "tsc && eslint . --ext .ts,.tsx",
+    "build:icon:release": "tauri icon design/icon.png --output ./src-tauri/icons/release",
+    "build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev",
+    "build:frontend": "vite build",
+    "build:plugins": "run-p build:plugin:*",
+    "build:plugin:importer-insomnia": "cd plugins/importer-insomnia && vite build --emptyOutDir",
+    "build:plugin:importer-postman": "cd plugins/importer-postman && vite build --emptyOutDir",
+    "build:plugin:importer-yaak": "cd plugins/importer-yaak && vite build --emptyOutDir",
+    "build:plugin:filter-jsonpath": "cd plugins/filter-jsonpath && vite build --emptyOutDir",
+    "build:plugin:filter-xpath": "cd plugins/filter-xpath && vite build --emptyOutDir",
+    "test": "vitest",
+    "coverage": "vitest run --coverage",
+    "prepare": "husky install"
   },
   "dependencies": {
-    "jotai": "^2.12.2"
+    "@codemirror/commands": "^6.2.1",
+    "@codemirror/lang-javascript": "^6.1.4",
+    "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-xml": "^6.0.2",
+    "@codemirror/language": "^6.6.0",
+    "@codemirror/search": "^6.2.3",
+    "@lezer/generator": "^1.2.2",
+    "@lezer/highlight": "^1.1.3",
+    "@lezer/lr": "^1.3.3",
+    "@react-hook/resize-observer": "^1.2.6",
+    "@tailwindcss/container-queries": "^0.1.0",
+    "@tanstack/query-sync-storage-persister": "^4.27.1",
+    "@tanstack/react-query": "^4.28.0",
+    "@tanstack/react-query-devtools": "^4.28.0",
+    "@tanstack/react-query-persist-client": "^4.28.0",
+    "@tauri-apps/api": "^1.5.3",
+    "buffer": "^6.0.3",
+    "classnames": "^2.3.2",
+    "cm6-graphql": "^0.0.9",
+    "codemirror": "^6.0.1",
+    "codemirror-json-schema": "^0.6.1",
+    "date-fns": "^3.3.1",
+    "focus-trap-react": "^10.1.1",
+    "format-graphql": "^1.4.0",
+    "framer-motion": "^9.0.4",
+    "lucide-react": "^0.309.0",
+    "papaparse": "^5.4.1",
+    "parse-color": "^1.0.0",
+    "react": "^18.2.0",
+    "react-dnd": "^16.0.1",
+    "react-dnd-html5-backend": "^16.0.1",
+    "react-dom": "^18.2.0",
+    "react-helmet-async": "^1.3.0",
+    "react-router-dom": "^6.8.1",
+    "react-use": "^17.4.0",
+    "slugify": "^1.6.6",
+    "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1",
+    "uuid": "^9.0.0",
+    "xml-formatter": "^3.6.2"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.4.1",
-    "@typescript-eslint/eslint-plugin": "^8.27.0",
-    "@typescript-eslint/parser": "^8.27.0",
-    "@yaakapp/cli": "^0.1.5",
-    "eslint": "^8",
-    "eslint-config-prettier": "^8",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.1.0",
-    "nodejs-file-downloader": "^4.13.0",
+    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
+    "@tauri-apps/cli": "^1.5.10",
+    "@types/node": "^18.7.10",
+    "@types/papaparse": "^5.3.7",
+    "@types/parse-color": "^1.0.1",
+    "@types/parse-json": "^4.0.0",
+    "@types/react": "^18.0.31",
+    "@types/react-dom": "^18.0.11",
+    "@types/uuid": "^9.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
+    "@vitejs/plugin-react": "^4.2.1",
+    "autoprefixer": "^10.4.13",
+    "eslint": "^8.34.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "husky": "^8.0.3",
+    "lint-staged": "^15.0.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.4.2",
-    "typescript": "^5.8.3",
-    "workspaces-run": "^1.0.2"
+    "postcss": "^8.4.21",
+    "postcss-nesting": "^11.2.1",
+    "prettier": "^2.8.4",
+    "react-devtools": "^4.27.2",
+    "tailwindcss": "^3.2.7",
+    "typescript": "^5.3.3",
+    "vite": "^5.1.1",
+    "vite-plugin-svgr": "^4.2.0",
+    "vite-plugin-top-level-await": "^1.4.1",
+    "vitest": "^1.3.0"
+  },
+  "lint-staged": {
+    "*.{ts,tsx}": "eslint --cache --fix",
+    "*.{js,css,md}": "prettier --write"
   }
 }

packages/common-lib/formatSize.ts

@@ -1,20 +0,0 @@
-export function formatSize(bytes: number): string {
-    let num;
-    let unit;
-
-    if (bytes > 1000 * 1000 * 1000) {
-        num = bytes / 1000 / 1000 / 1000;
-        unit = 'GB';
-    } else if (bytes > 1000 * 1000) {
-        num = bytes / 1000 / 1000;
-        unit = 'MB';
-    } else if (bytes > 1000) {
-        num = bytes / 1000;
-        unit = 'KB';
-    } else {
-        num = bytes;
-        unit = 'B';
-    }
-
-    return `${Math.round(num * 10) / 10} ${unit}`;
-}

packages/common-lib/index.ts

@@ -1 +0,0 @@
-export * from './debounce';

packages/common-lib/package.json

@@ -1,6 +0,0 @@
-{
-  "name": "@yaakapp-internal/lib",
-  "private": true,
-  "version": "1.0.0",
-  "main": "index.ts"
-}

packages/plugin-runtime-types/.gitignore

@@ -1,2 +0,0 @@
-lib
-node_modules

packages/plugin-runtime-types/README.md

@@ -1,28 +0,0 @@
-# Yaak Plugin API
-
-Yaak is a desktop [API client](https://yaak.app/blog/yet-another-api-client) for
-interacting with REST, GraphQL, Server Sent Events (SSE), WebSocket, and gRPC APIs. It's
-built using Tauri, Rust, and ReactJS.
-
-Plugins can be created in TypeScript, which are executed alongside Yaak in a NodeJS
-runtime. This package contains the TypeScript type definitions required to make building
-Yaak plugins a breeze.
-
-## Quick Start
-
-The easiest way to get started is by generating a plugin with the Yaak CLI:
-
-```shell
-npx @yaakapp/cli generate
-```
-
-For more details on creating plugins, check out
-the [Quick Start Guide](https://feedback.yaak.app/help/articles/6911763-plugins-quick-start)
-
-## Installation
-
-If you prefer starting from scratch, manually install the types package:
-
-```shell
-npm install @yaakapp/api
-```

packages/plugin-runtime-types/package-lock.json

@@ -1,47 +0,0 @@
-{
-  "name": "@yaakapp/api",
-  "version": "0.1.17",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@yaakapp/api",
-      "version": "0.1.17",
-      "dependencies": {
-        "@types/node": "^22.5.4"
-      },
-      "devDependencies": {
-        "typescript": "^5.6.2"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "22.5.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
-      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.19.2"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "license": "MIT"
-    }
-  }
-}

packages/plugin-runtime-types/package.json

@@ -1,39 +0,0 @@
-{
-  "name": "@yaakapp/api",
-  "version": "0.6.4",
-  "keywords": [
-    "api-client",
-    "insomnia-alternative",
-    "bruno-alternative",
-    "postman-alternative"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mountain-loop/yaak"
-  },
-  "bugs": {
-    "url": "https://feedback.yaak.app"
-  },
-  "homepage": "https://yaak.app",
-  "main": "lib/index.js",
-  "typings": "./lib/index.d.ts",
-  "files": [
-    "lib/**/*"
-  ],
-  "scripts": {
-    "bootstrap": "npm run build",
-    "build": "run-s build:copy-types build:tsc",
-    "build:tsc": "tsc",
-    "build:copy-types": "run-p build:copy-types:*",
-    "build:copy-types:root": "cpy --flat ../../src-tauri/yaak-plugins/bindings/*.ts ./src/bindings",
-    "build:copy-types:next": "cpy --flat ../../src-tauri/yaak-plugins/bindings/serde_json/*.ts ./src/bindings/serde_json",
-    "publish": "npm publish",
-    "prepublishOnly": "npm run build"
-  },
-  "dependencies": {
-    "@types/node": "^22.5.4"
-  },
-  "devDependencies": {
-    "cpy-cli": "^5.0.0"
-  }
-}

packages/plugin-runtime-types/src/bindings/gen_events.ts

@@ -1,441 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Environment, Folder, GrpcRequest, HttpRequest, HttpResponse, WebsocketRequest, Workspace } from "./gen_models.js";
-import type { JsonValue } from "./serde_json/JsonValue.js";
-
-export type BootRequest = { dir: string, watch: boolean, };
-
-export type BootResponse = { name: string, version: string, };
-
-export type CallHttpAuthenticationActionArgs = { contextId: string, values: { [key in string]?: JsonPrimitive }, };
-
-export type CallHttpAuthenticationActionRequest = { index: number, pluginRefId: string, args: CallHttpAuthenticationActionArgs, };
-
-export type CallHttpAuthenticationRequest = { contextId: string, values: { [key in string]?: JsonPrimitive }, method: string, url: string, headers: Array<HttpHeader>, };
-
-export type CallHttpAuthenticationResponse = { 
-/**
- * HTTP headers to add to the request. Existing headers will be replaced, while
- * new headers will be added.
- */
-setHeaders: Array<HttpHeader>, };
-
-export type CallHttpRequestActionArgs = { httpRequest: HttpRequest, };
-
-export type CallHttpRequestActionRequest = { index: number, pluginRefId: string, args: CallHttpRequestActionArgs, };
-
-export type CallTemplateFunctionArgs = { purpose: RenderPurpose, values: { [key in string]?: JsonValue }, };
-
-export type CallTemplateFunctionRequest = { name: string, args: CallTemplateFunctionArgs, };
-
-export type CallTemplateFunctionResponse = { value: string | null, };
-
-export type CloseWindowRequest = { label: string, };
-
-export type Color = "primary" | "secondary" | "info" | "success" | "notice" | "warning" | "danger";
-
-export type CompletionOptionType = "constant" | "variable";
-
-export type Content = { "type": "text", content: string, } | { "type": "markdown", content: string, };
-
-export type CopyTextRequest = { text: string, };
-
-export type DeleteKeyValueRequest = { key: string, };
-
-export type DeleteKeyValueResponse = { deleted: boolean, };
-
-export type EditorLanguage = "text" | "javascript" | "json" | "html" | "xml" | "graphql" | "markdown";
-
-export type EmptyPayload = {};
-
-export type ErrorResponse = { error: string, };
-
-export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };
-
-export type ExportHttpRequestResponse = { content: string, };
-
-export type FileFilter = { name: string, 
-/**
- * File extensions to require
- */
-extensions: Array<string>, };
-
-export type FilterRequest = { content: string, filter: string, };
-
-export type FilterResponse = { content: string, };
-
-export type FindHttpResponsesRequest = { requestId: string, limit?: number, };
-
-export type FindHttpResponsesResponse = { httpResponses: Array<HttpResponse>, };
-
-export type FormInput = { "type": "text" } & FormInputText | { "type": "editor" } & FormInputEditor | { "type": "select" } & FormInputSelect | { "type": "checkbox" } & FormInputCheckbox | { "type": "file" } & FormInputFile | { "type": "http_request" } & FormInputHttpRequest | { "type": "accordion" } & FormInputAccordion | { "type": "banner" } & FormInputBanner | { "type": "markdown" } & FormInputMarkdown;
-
-export type FormInputAccordion = { label: string, inputs?: Array<FormInput>, hidden?: boolean, };
-
-export type FormInputBanner = { inputs?: Array<FormInput>, hidden?: boolean, color?: Color, };
-
-export type FormInputBase = { 
-/**
- * The name of the input. The value will be stored at this object attribute in the resulting data
- */
-name: string, 
-/**
- * Whether this input is visible for the given configuration. Use this to
- * make branching forms.
- */
-hidden?: boolean, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, disabled?: boolean, 
-/**
- * Longer description of the input, likely shown in a tooltip
- */
-description?: string, };
-
-export type FormInputCheckbox = { 
-/**
- * The name of the input. The value will be stored at this object attribute in the resulting data
- */
-name: string, 
-/**
- * Whether this input is visible for the given configuration. Use this to
- * make branching forms.
- */
-hidden?: boolean, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, disabled?: boolean, 
-/**
- * Longer description of the input, likely shown in a tooltip
- */
-description?: string, };
-
-export type FormInputEditor = { 
-/**
- * Placeholder for the text input
- */
-placeholder?: string | null, 
-/**
- * Don't show the editor gutter (line numbers, folds, etc.)
- */
-hideGutter?: boolean, 
-/**
- * Language for syntax highlighting
- */
-language?: EditorLanguage, readOnly?: boolean, completionOptions?: Array<GenericCompletionOption>, 
-/**
- * The name of the input. The value will be stored at this object attribute in the resulting data
- */
-name: string, 
-/**
- * Whether this input is visible for the given configuration. Use this to
- * make branching forms.
- */
-hidden?: boolean, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, disabled?: boolean, 
-/**
- * Longer description of the input, likely shown in a tooltip
- */
-description?: string, };
-
-export type FormInputFile = { 
-/**
- * The title of the file selection window
- */
-title: string, 
-/**
- * Allow selecting multiple files
- */
-multiple?: boolean, directory?: boolean, defaultPath?: string, filters?: Array<FileFilter>, 
-/**
- * The name of the input. The value will be stored at this object attribute in the resulting data
- */
-name: string, 
-/**
- * Whether this input is visible for the given configuration. Use this to
- * make branching forms.
- */
-hidden?: boolean, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, disabled?: boolean, 
-/**
- * Longer description of the input, likely shown in a tooltip
- */
-description?: string, };
-
-export type FormInputHttpRequest = { 
-/**
- * The name of the input. The value will be stored at this object attribute in the resulting data
- */
-name: string, 
-/**
- * Whether this input is visible for the given configuration. Use this to
- * make branching forms.
- */
-hidden?: boolean, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, disabled?: boolean, 
-/**
- * Longer description of the input, likely shown in a tooltip
- */
-description?: string, };
-
-export type FormInputMarkdown = { content: string, hidden?: boolean, };
-
-export type FormInputSelect = { 
-/**
- * The options that will be available in the select input
- */
-options: Array<FormInputSelectOption>, 
-/**
- * The name of the input. The value will be stored at this object attribute in the resulting data
- */
-name: string, 
-/**
- * Whether this input is visible for the given configuration. Use this to
- * make branching forms.
- */
-hidden?: boolean, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, disabled?: boolean, 
-/**
- * Longer description of the input, likely shown in a tooltip
- */
-description?: string, };
-
-export type FormInputSelectOption = { label: string, value: string, };
-
-export type FormInputText = { 
-/**
- * Placeholder for the text input
- */
-placeholder?: string | null, 
-/**
- * Placeholder for the text input
- */
-password?: boolean, 
-/**
- * Whether to allow newlines in the input, like a <textarea/>
- */
-multiLine?: boolean, completionOptions?: Array<GenericCompletionOption>, 
-/**
- * The name of the input. The value will be stored at this object attribute in the resulting data
- */
-name: string, 
-/**
- * Whether this input is visible for the given configuration. Use this to
- * make branching forms.
- */
-hidden?: boolean, 
-/**
- * Whether the user must fill in the argument
- */
-optional?: boolean, 
-/**
- * The label of the input
- */
-label?: string, 
-/**
- * Visually hide the label of the input
- */
-hideLabel?: boolean, 
-/**
- * The default value
- */
-defaultValue?: string, disabled?: boolean, 
-/**
- * Longer description of the input, likely shown in a tooltip
- */
-description?: string, };
-
-export type GenericCompletionOption = { label: string, detail?: string, info?: string, type?: CompletionOptionType, boost?: number, };
-
-export type GetCookieValueRequest = { name: string, };
-
-export type GetCookieValueResponse = { value: string | null, };
-
-export type GetHttpAuthenticationConfigRequest = { contextId: string, values: { [key in string]?: JsonPrimitive }, };
-
-export type GetHttpAuthenticationConfigResponse = { args: Array<FormInput>, pluginRefId: string, actions?: Array<HttpAuthenticationAction>, };
-
-export type GetHttpAuthenticationSummaryResponse = { name: string, label: string, shortLabel: string, };
-
-export type GetHttpRequestActionsRequest = Record<string, never>;
-
-export type GetHttpRequestActionsResponse = { actions: Array<HttpRequestAction>, pluginRefId: string, };
-
-export type GetHttpRequestByIdRequest = { id: string, };
-
-export type GetHttpRequestByIdResponse = { httpRequest: HttpRequest | null, };
-
-export type GetKeyValueRequest = { key: string, };
-
-export type GetKeyValueResponse = { value?: string, };
-
-export type GetTemplateFunctionsResponse = { functions: Array<TemplateFunction>, pluginRefId: string, };
-
-export type HttpAuthenticationAction = { label: string, icon?: Icon, };
-
-export type HttpHeader = { name: string, value: string, };
-
-export type HttpRequestAction = { label: string, icon?: Icon, };
-
-export type Icon = "alert_triangle" | "check" | "check_circle" | "chevron_down" | "copy" | "info" | "pin" | "search" | "trash" | "_unknown";
-
-export type ImportRequest = { content: string, };
-
-export type ImportResources = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, websocketRequests: Array<WebsocketRequest>, };
-
-export type ImportResponse = { resources: ImportResources, };
-
-export type InternalEvent = { id: string, pluginRefId: string, pluginName: string, replyId: string | null, windowContext: PluginWindowContext, payload: InternalEventPayload, };
-
-export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "type": "reload_request" } & EmptyPayload | { "type": "reload_response" } & EmptyPayload | { "type": "terminate_request" } | { "type": "terminate_response" } | { "type": "import_request" } & ImportRequest | { "type": "import_response" } & ImportResponse | { "type": "filter_request" } & FilterRequest | { "type": "filter_response" } & FilterResponse | { "type": "export_http_request_request" } & ExportHttpRequestRequest | { "type": "export_http_request_response" } & ExportHttpRequestResponse | { "type": "send_http_request_request" } & SendHttpRequestRequest | { "type": "send_http_request_response" } & SendHttpRequestResponse | { "type": "list_cookie_names_request" } & ListCookieNamesRequest | { "type": "list_cookie_names_response" } & ListCookieNamesResponse | { "type": "get_cookie_value_request" } & GetCookieValueRequest | { "type": "get_cookie_value_response" } & GetCookieValueResponse | { "type": "get_http_request_actions_request" } & EmptyPayload | { "type": "get_http_request_actions_response" } & GetHttpRequestActionsResponse | { "type": "call_http_request_action_request" } & CallHttpRequestActionRequest | { "type": "get_template_functions_request" } | { "type": "get_template_functions_response" } & GetTemplateFunctionsResponse | { "type": "call_template_function_request" } & CallTemplateFunctionRequest | { "type": "call_template_function_response" } & CallTemplateFunctionResponse | { "type": "get_http_authentication_summary_request" } & EmptyPayload | { "type": "get_http_authentication_summary_response" } & GetHttpAuthenticationSummaryResponse | { "type": "get_http_authentication_config_request" } & GetHttpAuthenticationConfigRequest | { "type": "get_http_authentication_config_response" } & GetHttpAuthenticationConfigResponse | { "type": "call_http_authentication_request" } & CallHttpAuthenticationRequest | { "type": "call_http_authentication_response" } & CallHttpAuthenticationResponse | { "type": "call_http_authentication_action_request" } & CallHttpAuthenticationActionRequest | { "type": "call_http_authentication_action_response" } & EmptyPayload | { "type": "copy_text_request" } & CopyTextRequest | { "type": "copy_text_response" } & EmptyPayload | { "type": "render_http_request_request" } & RenderHttpRequestRequest | { "type": "render_http_request_response" } & RenderHttpRequestResponse | { "type": "get_key_value_request" } & GetKeyValueRequest | { "type": "get_key_value_response" } & GetKeyValueResponse | { "type": "set_key_value_request" } & SetKeyValueRequest | { "type": "set_key_value_response" } & SetKeyValueResponse | { "type": "delete_key_value_request" } & DeleteKeyValueRequest | { "type": "delete_key_value_response" } & DeleteKeyValueResponse | { "type": "open_window_request" } & OpenWindowRequest | { "type": "window_navigate_event" } & WindowNavigateEvent | { "type": "window_close_event" } | { "type": "close_window_request" } & CloseWindowRequest | { "type": "template_render_request" } & TemplateRenderRequest | { "type": "template_render_response" } & TemplateRenderResponse | { "type": "show_toast_request" } & ShowToastRequest | { "type": "show_toast_response" } & EmptyPayload | { "type": "prompt_text_request" } & PromptTextRequest | { "type": "prompt_text_response" } & PromptTextResponse | { "type": "get_http_request_by_id_request" } & GetHttpRequestByIdRequest | { "type": "get_http_request_by_id_response" } & GetHttpRequestByIdResponse | { "type": "find_http_responses_request" } & FindHttpResponsesRequest | { "type": "find_http_responses_response" } & FindHttpResponsesResponse | { "type": "empty_response" } & EmptyPayload | { "type": "error_response" } & ErrorResponse;
-
-export type JsonPrimitive = string | number | boolean | null;
-
-export type ListCookieNamesRequest = {};
-
-export type ListCookieNamesResponse = { names: Array<string>, };
-
-export type OpenWindowRequest = { url: string, 
-/**
- * Label for the window. If not provided, a random one will be generated.
- */
-label: string, title?: string, size?: WindowSize, dataDirKey?: string, };
-
-export type PluginWindowContext = { "type": "none" } | { "type": "label", label: string, workspace_id: string | null, };
-
-export type PromptTextRequest = { id: string, title: string, label: string, description?: string, defaultValue?: string, placeholder?: string, 
-/**
- * Text to add to the confirmation button
- */
-confirmText?: string, 
-/**
- * Text to add to the cancel button
- */
-cancelText?: string, 
-/**
- * Require the user to enter a non-empty value
- */
-required?: boolean, };
-
-export type PromptTextResponse = { value: string | null, };
-
-export type RenderHttpRequestRequest = { httpRequest: HttpRequest, purpose: RenderPurpose, };
-
-export type RenderHttpRequestResponse = { httpRequest: HttpRequest, };
-
-export type RenderPurpose = "send" | "preview";
-
-export type SendHttpRequestRequest = { httpRequest: Partial<HttpRequest>, };
-
-export type SendHttpRequestResponse = { httpResponse: HttpResponse, };
-
-export type SetKeyValueRequest = { key: string, value: string, };
-
-export type SetKeyValueResponse = {};
-
-export type ShowToastRequest = { message: string, color?: Color, icon?: Icon, };
-
-export type TemplateFunction = { name: string, description?: string, 
-/**
- * Also support alternative names. This is useful for not breaking existing
- * tags when changing the `name` property
- */
-aliases?: Array<string>, args: Array<TemplateFunctionArg>, };
-
-/**
- * Similar to FormInput, but contains
- */
-export type TemplateFunctionArg = FormInput;
-
-export type TemplateRenderRequest = { data: JsonValue, purpose: RenderPurpose, };
-
-export type TemplateRenderResponse = { data: JsonValue, };
-
-export type WindowNavigateEvent = { url: string, };
-
-export type WindowSize = { width: number, height: number, };

packages/plugin-runtime-types/src/bindings/gen_models.ts

@@ -1,25 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, base: boolean, variables: Array<EnvironmentVariable>, color: string | null, };
-
-export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, };
-
-export type Folder = { model: "folder", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, sortPriority: number, };
-
-export type GrpcRequest = { model: "grpc_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authenticationType: string | null, authentication: Record<string, any>, description: string, message: string, metadata: Array<HttpRequestHeader>, method: string | null, name: string, service: string | null, sortPriority: number, url: string, };
-
-export type HttpRequest = { model: "http_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, body: Record<string, any>, bodyType: string | null, description: string, headers: Array<HttpRequestHeader>, method: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };
-
-export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, id?: string, };
-
-export type HttpResponse = { model: "http_response", id: string, createdAt: string, updatedAt: string, workspaceId: string, requestId: string, bodyPath: string | null, contentLength: number | null, elapsed: number, elapsedHeaders: number, error: string | null, headers: Array<HttpResponseHeader>, remoteAddr: string | null, status: number, statusReason: string | null, state: HttpResponseState, url: string, version: string | null, };
-
-export type HttpResponseHeader = { name: string, value: string, };
-
-export type HttpResponseState = "initialized" | "connected" | "closed";
-
-export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, id?: string, };
-
-export type WebsocketRequest = { model: "websocket_request", id: string, createdAt: string, updatedAt: string, workspaceId: string, folderId: string | null, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, message: string, name: string, sortPriority: number, url: string, urlParameters: Array<HttpUrlParameter>, };
-
-export type Workspace = { model: "workspace", id: string, createdAt: string, updatedAt: string, authentication: Record<string, any>, authenticationType: string | null, description: string, headers: Array<HttpRequestHeader>, name: string, encryptionKeyChallenge: string | null, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

packages/plugin-runtime-types/src/bindings/serde_json/JsonValue.ts

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type JsonValue = number | string | boolean | Array<JsonValue> | { [key in string]?: JsonValue } | null;

packages/plugin-runtime-types/src/helpers.ts

@@ -1,2 +0,0 @@
-export type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
-export type MaybePromise<T> = Promise<T> | T;

packages/plugin-runtime-types/src/index.ts

@@ -1,9 +0,0 @@
-export type * from './plugins';
-export type * from './themes';
-
-export * from './bindings/gen_models';
-export * from './bindings/gen_events';
-
-// Some extras for utility
-
-export type { PartialImportResources } from './plugins/ImporterPlugin';

packages/plugin-runtime-types/src/plugins/AuthenticationPlugin.ts

@@ -1,29 +0,0 @@
-import {
-  CallHttpAuthenticationActionArgs,
-  CallHttpAuthenticationRequest,
-  CallHttpAuthenticationResponse,
-  FormInput,
-  GetHttpAuthenticationConfigRequest,
-  GetHttpAuthenticationSummaryResponse,
-  HttpAuthenticationAction,
-} from '../bindings/gen_events';
-import { MaybePromise } from '../helpers';
-import { Context } from './Context';
-
-type DynamicFormInput = FormInput & {
-  dynamic(
-    ctx: Context,
-    args: GetHttpAuthenticationConfigRequest,
-  ): MaybePromise<Partial<FormInput> | undefined | null>;
-};
-
-export type AuthenticationPlugin = GetHttpAuthenticationSummaryResponse & {
-  args: (FormInput | DynamicFormInput)[];
-  onApply(
-    ctx: Context,
-    args: CallHttpAuthenticationRequest,
-  ): MaybePromise<CallHttpAuthenticationResponse>;
-  actions?: (HttpAuthenticationAction & {
-    onSelect(ctx: Context, args: CallHttpAuthenticationActionArgs): Promise<void> | void;
-  })[];
-};

packages/plugin-runtime-types/src/plugins/Context.ts

@@ -1,59 +0,0 @@
-import type {
-  FindHttpResponsesRequest,
-  FindHttpResponsesResponse,
-  GetCookieValueRequest,
-  GetCookieValueResponse,
-  GetHttpRequestByIdRequest,
-  GetHttpRequestByIdResponse,
-  ListCookieNamesResponse,
-  OpenWindowRequest,
-  PromptTextRequest,
-  PromptTextResponse,
-  RenderHttpRequestRequest,
-  RenderHttpRequestResponse,
-  SendHttpRequestRequest,
-  SendHttpRequestResponse,
-  ShowToastRequest,
-  TemplateRenderRequest,
-  TemplateRenderResponse,
-} from '../bindings/gen_events.ts';
-
-export interface Context {
-  clipboard: {
-    copyText(text: string): Promise<void>;
-  };
-  toast: {
-    show(args: ShowToastRequest): Promise<void>;
-  };
-  prompt: {
-    text(args: PromptTextRequest): Promise<PromptTextResponse['value']>;
-  };
-  store: {
-    set<T>(key: string, value: T): Promise<void>;
-    get<T>(key: string): Promise<T | undefined>;
-    delete(key: string): Promise<boolean>;
-  };
-  window: {
-    openUrl(
-      args: OpenWindowRequest & {
-        onNavigate?: (args: { url: string }) => void;
-        onClose?: () => void;
-      },
-    ): Promise<{ close: () => void }>;
-  };
-  cookies: {
-    listNames(): Promise<ListCookieNamesResponse['names']>;
-    getValue(args: GetCookieValueRequest): Promise<GetCookieValueResponse['value']>;
-  };
-  httpRequest: {
-    send(args: SendHttpRequestRequest): Promise<SendHttpRequestResponse['httpResponse']>;
-    getById(args: GetHttpRequestByIdRequest): Promise<GetHttpRequestByIdResponse['httpRequest']>;
-    render(args: RenderHttpRequestRequest): Promise<RenderHttpRequestResponse['httpRequest']>;
-  };
-  httpResponse: {
-    find(args: FindHttpResponsesRequest): Promise<FindHttpResponsesResponse['httpResponses']>;
-  };
-  templates: {
-    render(args: TemplateRenderRequest): Promise<TemplateRenderResponse['data']>;
-  };
-}

packages/plugin-runtime-types/src/plugins/FilterPlugin.ts

@@ -1,12 +0,0 @@
-import type { Context } from './Context';
-
-type FilterPluginResponse = { filtered: string };
-
-export type FilterPlugin = {
-  name: string;
-  description?: string;
-  onFilter(
-    ctx: Context,
-    args: { payload: string; filter: string; mimeType: string },
-  ): Promise<FilterPluginResponse> | FilterPluginResponse;
-};

packages/plugin-runtime-types/src/plugins/HttpRequestActionPlugin.ts

@@ -1,6 +0,0 @@
-import type { CallHttpRequestActionArgs, HttpRequestAction } from '../bindings/gen_events';
-import type { Context } from './Context';
-
-export type HttpRequestActionPlugin = HttpRequestAction & {
-  onSelect(ctx: Context, args: CallHttpRequestActionArgs): Promise<void> | void;
-};

packages/plugin-runtime-types/src/plugins/ImporterPlugin.ts

@@ -1,25 +0,0 @@
-import { ImportResources } from '../bindings/gen_events';
-import { AtLeast } from '../helpers';
-import type { Context } from './Context';
-
-type RootFields = 'name' | 'id' | 'model';
-type CommonFields = RootFields | 'workspaceId';
-
-export type PartialImportResources = {
-  workspaces: Array<AtLeast<ImportResources['workspaces'][0], RootFields>>;
-  environments: Array<AtLeast<ImportResources['environments'][0], CommonFields>>;
-  folders: Array<AtLeast<ImportResources['folders'][0], CommonFields>>;
-  httpRequests: Array<AtLeast<ImportResources['httpRequests'][0], CommonFields>>;
-  grpcRequests: Array<AtLeast<ImportResources['grpcRequests'][0], CommonFields>>;
-  websocketRequests: Array<AtLeast<ImportResources['websocketRequests'][0], CommonFields>>;
-};
-
-export type ImportPluginResponse = null | {
-  resources: PartialImportResources;
-};
-
-export type ImporterPlugin = {
-  name: string;
-  description?: string;
-  onImport(ctx: Context, args: { text: string }): Promise<ImportPluginResponse>;
-};

packages/plugin-runtime-types/src/plugins/TemplateFunctionPlugin.ts

@@ -1,12 +0,0 @@
-import {
-  CallTemplateFunctionArgs,
-  TemplateFunction,
-} from "../bindings/gen_events";
-import { Context } from "./Context";
-
-export type TemplateFunctionPlugin = TemplateFunction & {
-  onRender(
-    ctx: Context,
-    args: CallTemplateFunctionArgs,
-  ): Promise<string | null>;
-};

packages/plugin-runtime-types/src/plugins/ThemePlugin.ts

@@ -1,8 +0,0 @@
-import { Index } from "../themes";
-import { Context } from "./Context";
-
-export type ThemePlugin = {
-  name: string;
-  description?: string;
-  getTheme(ctx: Context, fileContents: string): Promise<Index>;
-};

packages/plugin-runtime-types/src/plugins/index.ts

@@ -1,20 +0,0 @@
-import { AuthenticationPlugin } from './AuthenticationPlugin';
-import type { FilterPlugin } from './FilterPlugin';
-import type { HttpRequestActionPlugin } from './HttpRequestActionPlugin';
-import type { ImporterPlugin } from './ImporterPlugin';
-import type { TemplateFunctionPlugin } from './TemplateFunctionPlugin';
-import type { ThemePlugin } from './ThemePlugin';
-
-export type { Context } from './Context';
-
-/**
- * The global structure of a Yaak plugin
- */
-export type PluginDefinition = {
-  importer?: ImporterPlugin;
-  theme?: ThemePlugin;
-  filter?: FilterPlugin;
-  authentication?: AuthenticationPlugin;
-  httpRequestActions?: HttpRequestActionPlugin[];
-  templateFunctions?: TemplateFunctionPlugin[];
-};

packages/plugin-runtime-types/src/themes/index.ts

@@ -1,44 +0,0 @@
-export type Colors = {
-  surface: string;
-  surfaceHighlight?: string;
-  surfaceActive?: string;
-
-  text: string;
-  textSubtle?: string;
-  textSubtlest?: string;
-
-  border?: string;
-  borderSubtle?: string;
-  borderFocus?: string;
-
-  shadow?: string;
-  backdrop?: string;
-  selection?: string;
-
-  primary?: string;
-  secondary?: string;
-  info?: string;
-  success?: string;
-  notice?: string;
-  warning?: string;
-  danger?: string;
-};
-
-export type Index = Colors & {
-  id: string;
-  name: string;
-  components?: Partial<{
-    dialog: Partial<Colors>;
-    menu: Partial<Colors>;
-    toast: Partial<Colors>;
-    sidebar: Partial<Colors>;
-    responsePane: Partial<Colors>;
-    appHeader: Partial<Colors>;
-    button: Partial<Colors>;
-    banner: Partial<Colors>;
-    placeholder: Partial<Colors>;
-    urlBar: Partial<Colors>;
-    editor: Partial<Colors>;
-    input: Partial<Colors>;
-  }>;
-};

packages/plugin-runtime-types/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "node16",
-    "target": "es6",
-    "lib": ["es2021"],
-    "declaration": true,
-    "declarationDir": "./lib",
-    "outDir": "./lib",
-    "strict": true,
-    "types": ["node"]
-  },
-  "files": [
-    "src/index.ts"
-  ]
-}

packages/plugin-runtime/package-lock.json

@@ -1,10 +0,0 @@
-{
-  "name": "@yaakapp-internal/plugin-runtime",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@yaakapp-internal/plugin-runtime"
-    }
-  }
-}

packages/plugin-runtime/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "@yaakapp-internal/plugin-runtime",
-  "scripts": {
-    "bootstrap": "npm run build",
-    "build": "run-p build:*",
-    "build:main": "esbuild src/index.ts --bundle --platform=node --outfile=../../src-tauri/vendored/plugin-runtime/index.cjs"
-  },
-  "dependencies": {
-    "ws": "^8.18.0"
-  },
-  "devDependencies": {
-    "@types/ws": "^8.5.13"
-  }
-}

packages/plugin-runtime/src/EventChannel.ts

@@ -1,19 +0,0 @@
-import type { InternalEvent } from '@yaakapp/api';
-
-export class EventChannel {
-  #listeners = new Set<(event: InternalEvent) => void>();
-
-  emit(e: InternalEvent) {
-    for (const l of this.#listeners) {
-      l(e);
-    }
-  }
-
-  listen(cb: (e: InternalEvent) => void) {
-    this.#listeners.add(cb);
-  }
-
-  unlisten(cb: (e: InternalEvent) => void) {
-    this.#listeners.delete(cb);
-  }
-}

packages/plugin-runtime/src/PluginHandle.ts

@@ -1,27 +0,0 @@
-import type { BootRequest, InternalEvent } from '@yaakapp/api';
-import type { EventChannel } from './EventChannel';
-import { PluginInstance, PluginWorkerData } from './PluginInstance';
-
-export class PluginHandle {
-  #instance: PluginInstance;
-
-  constructor(
-    readonly pluginRefId: string,
-    readonly bootRequest: BootRequest,
-    readonly pluginToAppEvents: EventChannel,
-  ) {
-    const workerData: PluginWorkerData = {
-      pluginRefId: this.pluginRefId,
-      bootRequest: this.bootRequest,
-    };
-    this.#instance = new PluginInstance(workerData, pluginToAppEvents);
-  }
-
-  sendToWorker(event: InternalEvent) {
-    this.#instance.postMessage(event);
-  }
-
-  terminate() {
-    this.#instance.terminate();
-  }
-}

packages/plugin-runtime/src/PluginInstance.ts

@@ -1,598 +0,0 @@
-import {
-  BootRequest,
-  DeleteKeyValueResponse,
-  FindHttpResponsesResponse,
-  FormInput,
-  GetCookieValueRequest,
-  GetCookieValueResponse,
-  GetHttpRequestByIdResponse,
-  GetKeyValueResponse,
-  HttpAuthenticationAction,
-  HttpRequestAction,
-  InternalEvent,
-  InternalEventPayload,
-  ListCookieNamesResponse,
-  PluginWindowContext,
-  PromptTextResponse,
-  RenderHttpRequestResponse,
-  SendHttpRequestResponse,
-  TemplateFunction,
-  TemplateFunctionArg,
-  TemplateRenderResponse,
-} from '@yaakapp-internal/plugins';
-import { Context, PluginDefinition } from '@yaakapp/api';
-import { JsonValue } from '@yaakapp/api/lib/bindings/serde_json/JsonValue';
-import console from 'node:console';
-import { readFileSync, type Stats, statSync, watch } from 'node:fs';
-import path from 'node:path';
-import { EventChannel } from './EventChannel';
-import { migrateTemplateFunctionSelectOptions } from './migrations';
-
-export interface PluginWorkerData {
-  bootRequest: BootRequest;
-  pluginRefId: string;
-}
-
-export class PluginInstance {
-  #workerData: PluginWorkerData;
-  #mod: PluginDefinition;
-  #pkg: { name?: string; version?: string };
-  #pluginToAppEvents: EventChannel;
-  #appToPluginEvents: EventChannel;
-
-  constructor(workerData: PluginWorkerData, pluginEvents: EventChannel) {
-    this.#workerData = workerData;
-    this.#pluginToAppEvents = pluginEvents;
-    this.#appToPluginEvents = new EventChannel();
-
-    // Forward incoming events to onMessage()
-    this.#appToPluginEvents.listen(async (event) => {
-      await this.#onMessage(event);
-    });
-
-    // Reload plugin if the JS or package.json changes
-    const windowContextNone: PluginWindowContext = { type: 'none' };
-    const fileChangeCallback = async () => {
-      this.#importModule();
-      return this.#sendPayload(windowContextNone, { type: 'reload_response' }, null);
-    };
-
-    if (this.#workerData.bootRequest.watch) {
-      watchFile(this.#pathMod(), fileChangeCallback);
-      watchFile(this.#pathPkg(), fileChangeCallback);
-    }
-
-    this.#mod = {};
-    this.#pkg = JSON.parse(readFileSync(this.#pathPkg(), 'utf8'));
-
-    // TODO: Re-implement this now that we're not using workers
-    // prefixStdout(`[plugin][${this.#pkg.name}] %s`);
-
-    this.#importModule();
-  }
-
-  postMessage(event: InternalEvent) {
-    this.#appToPluginEvents.emit(event);
-  }
-
-  terminate() {
-    this.#unimportModule();
-  }
-
-  async #onMessage(event: InternalEvent) {
-    const ctx = this.#newCtx(event);
-
-    const { windowContext, payload, id: replyId } = event;
-    try {
-      if (payload.type === 'boot_request') {
-        // console.log('Plugin initialized', pkg.name, { capabilities, enableWatch });
-        const payload: InternalEventPayload = {
-          type: 'boot_response',
-          name: this.#pkg.name ?? 'unknown',
-          version: this.#pkg.version ?? '0.0.1',
-        };
-        this.#sendPayload(windowContext, payload, replyId);
-        return;
-      }
-
-      if (payload.type === 'terminate_request') {
-        const payload: InternalEventPayload = {
-          type: 'terminate_response',
-        };
-        this.#sendPayload(windowContext, payload, replyId);
-        return;
-      }
-
-      if (
-        payload.type === 'import_request' &&
-        typeof this.#mod?.importer?.onImport === 'function'
-      ) {
-        const reply = await this.#mod.importer.onImport(ctx, {
-          text: payload.content,
-        });
-        if (reply != null) {
-          const replyPayload: InternalEventPayload = {
-            type: 'import_response',
-            // deno-lint-ignore no-explicit-any
-            resources: reply.resources as any,
-          };
-          this.#sendPayload(windowContext, replyPayload, replyId);
-          return;
-        } else {
-          // Continue, to send back an empty reply
-        }
-      }
-
-      if (payload.type === 'filter_request' && typeof this.#mod?.filter?.onFilter === 'function') {
-        const reply = await this.#mod.filter.onFilter(ctx, {
-          filter: payload.filter,
-          payload: payload.content,
-          mimeType: payload.type,
-        });
-        const replyPayload: InternalEventPayload = {
-          type: 'filter_response',
-          content: reply.filtered,
-        };
-        this.#sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (
-        payload.type === 'get_http_request_actions_request' &&
-        Array.isArray(this.#mod?.httpRequestActions)
-      ) {
-        const reply: HttpRequestAction[] = this.#mod.httpRequestActions.map((a) => ({
-          ...a,
-          // Add everything except onSelect
-          onSelect: undefined,
-        }));
-        const replyPayload: InternalEventPayload = {
-          type: 'get_http_request_actions_response',
-          pluginRefId: this.#workerData.pluginRefId,
-          actions: reply,
-        };
-        this.#sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (
-        payload.type === 'get_template_functions_request' &&
-        Array.isArray(this.#mod?.templateFunctions)
-      ) {
-        const reply: TemplateFunction[] = this.#mod.templateFunctions.map((templateFunction) => {
-          return {
-            ...migrateTemplateFunctionSelectOptions(templateFunction),
-            // Add everything except render
-            onRender: undefined,
-          };
-        });
-        const replyPayload: InternalEventPayload = {
-          type: 'get_template_functions_response',
-          pluginRefId: this.#workerData.pluginRefId,
-          functions: reply,
-        };
-        this.#sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (payload.type === 'get_http_authentication_summary_request' && this.#mod?.authentication) {
-        const { name, shortLabel, label } = this.#mod.authentication;
-        const replyPayload: InternalEventPayload = {
-          type: 'get_http_authentication_summary_response',
-          name,
-          label,
-          shortLabel,
-        };
-
-        this.#sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (payload.type === 'get_http_authentication_config_request' && this.#mod?.authentication) {
-        const { args, actions } = this.#mod.authentication;
-        const resolvedArgs: FormInput[] = [];
-        for (let i = 0; i < args.length; i++) {
-          let v = args[i];
-          if ('dynamic' in v) {
-            const dynamicAttrs = await v.dynamic(ctx, payload);
-            const { dynamic, ...other } = v;
-            resolvedArgs.push({ ...other, ...dynamicAttrs } as FormInput);
-          } else {
-            resolvedArgs.push(v);
-          }
-        }
-        const resolvedActions: HttpAuthenticationAction[] = [];
-        for (const { onSelect, ...action } of actions ?? []) {
-          resolvedActions.push(action);
-        }
-
-        const replyPayload: InternalEventPayload = {
-          type: 'get_http_authentication_config_response',
-          args: resolvedArgs,
-          actions: resolvedActions,
-          pluginRefId: this.#workerData.pluginRefId,
-        };
-
-        this.#sendPayload(windowContext, replyPayload, replyId);
-        return;
-      }
-
-      if (payload.type === 'call_http_authentication_request' && this.#mod?.authentication) {
-        const auth = this.#mod.authentication;
-        if (typeof auth?.onApply === 'function') {
-          applyFormInputDefaults(auth.args, payload.values);
-          const result = await auth.onApply(ctx, payload);
-          this.#sendPayload(
-            windowContext,
-            {
-              type: 'call_http_authentication_response',
-              setHeaders: result.setHeaders,
-            },
-            replyId,
-          );
-          return;
-        }
-      }
-
-      if (
-        payload.type === 'call_http_authentication_action_request' &&
-        this.#mod.authentication != null
-      ) {
-        const action = this.#mod.authentication.actions?.[payload.index];
-        if (typeof action?.onSelect === 'function') {
-          await action.onSelect(ctx, payload.args);
-          this.#sendEmpty(windowContext, replyId);
-          return;
-        }
-      }
-
-      if (
-        payload.type === 'call_http_request_action_request' &&
-        Array.isArray(this.#mod.httpRequestActions)
-      ) {
-        const action = this.#mod.httpRequestActions[payload.index];
-        if (typeof action?.onSelect === 'function') {
-          await action.onSelect(ctx, payload.args);
-          this.#sendEmpty(windowContext, replyId);
-          return;
-        }
-      }
-
-      if (
-        payload.type === 'call_template_function_request' &&
-        Array.isArray(this.#mod?.templateFunctions)
-      ) {
-        const fn = this.#mod.templateFunctions.find((a) => a.name === payload.name);
-        if (typeof fn?.onRender === 'function') {
-          applyFormInputDefaults(fn.args, payload.args.values);
-          const result = await fn.onRender(ctx, payload.args);
-          this.#sendPayload(
-            windowContext,
-            {
-              type: 'call_template_function_response',
-              value: result ?? null,
-            },
-            replyId,
-          );
-          return;
-        }
-      }
-
-      if (payload.type === 'reload_request') {
-        this.#importModule();
-      }
-    } catch (err) {
-      const error = `${err}`.replace(/^Error:\s*/g, '');
-      console.log('Plugin call threw exception', payload.type, '→', error);
-      this.#sendPayload(windowContext, { type: 'error_response', error }, replyId);
-      return;
-    }
-
-    // No matches, so send back an empty response so the caller doesn't block forever
-    this.#sendEmpty(windowContext, replyId);
-  }
-
-  #pathMod() {
-    return path.posix.join(this.#workerData.bootRequest.dir, 'build', 'index.js');
-  }
-
-  #pathPkg() {
-    return path.join(this.#workerData.bootRequest.dir, 'package.json');
-  }
-
-  #unimportModule() {
-    const id = require.resolve(this.#pathMod());
-    delete require.cache[id];
-  }
-
-  #importModule() {
-    const id = require.resolve(this.#pathMod());
-    delete require.cache[id];
-    this.#mod = require(id).plugin;
-  }
-
-  #buildEventToSend(
-    windowContext: PluginWindowContext,
-    payload: InternalEventPayload,
-    replyId: string | null = null,
-  ): InternalEvent {
-    return {
-      pluginRefId: this.#workerData.pluginRefId,
-      pluginName: path.basename(this.#workerData.bootRequest.dir),
-      id: genId(),
-      replyId,
-      payload,
-      windowContext,
-    };
-  }
-
-  #sendPayload(
-    windowContext: PluginWindowContext,
-    payload: InternalEventPayload,
-    replyId: string | null,
-  ): string {
-    const event = this.#buildEventToSend(windowContext, payload, replyId);
-    this.#sendEvent(event);
-    return event.id;
-  }
-
-  #sendEvent(event: InternalEvent) {
-    // if (event.payload.type !== 'empty_response') {
-    //   console.log('Sending event to app', this.#pkg.name, event.id, event.payload.type);
-    // }
-    this.#pluginToAppEvents.emit(event);
-  }
-
-  #sendEmpty(windowContext: PluginWindowContext, replyId: string | null = null): string {
-    return this.#sendPayload(windowContext, { type: 'empty_response' }, replyId);
-  }
-
-  #sendAndWaitForReply<T extends Omit<InternalEventPayload, 'type'>>(
-    windowContext: PluginWindowContext,
-    payload: InternalEventPayload,
-  ): Promise<T> {
-    // 1. Build event to send
-    const eventToSend = this.#buildEventToSend(windowContext, payload, null);
-
-    // 2. Spawn listener in background
-    const promise = new Promise<T>((resolve) => {
-      const cb = (event: InternalEvent) => {
-        if (event.replyId === eventToSend.id) {
-          this.#appToPluginEvents.unlisten(cb); // Unlisten, now that we're done
-          const { type: _, ...payload } = event.payload;
-          resolve(payload as T);
-        }
-      };
-      this.#appToPluginEvents.listen(cb);
-    });
-
-    // 3. Send the event after we start listening (to prevent race)
-    this.#sendEvent(eventToSend);
-
-    // 4. Return the listener promise
-    return promise as unknown as Promise<T>;
-  }
-
-  #sendAndListenForEvents(
-    windowContext: PluginWindowContext,
-    payload: InternalEventPayload,
-    onEvent: (event: InternalEventPayload) => void,
-  ): void {
-    // 1. Build event to send
-    const eventToSend = this.#buildEventToSend(windowContext, payload, null);
-
-    // 2. Listen for replies in the background
-    this.#appToPluginEvents.listen((event: InternalEvent) => {
-      if (event.replyId === eventToSend.id) {
-        onEvent(event.payload);
-      }
-    });
-
-    // 3. Send the event after we start listening (to prevent race)
-    this.#sendEvent(eventToSend);
-  }
-
-  #newCtx(event: InternalEvent): Context {
-    return {
-      clipboard: {
-        copyText: async (text) => {
-          await this.#sendAndWaitForReply(event.windowContext, {
-            type: 'copy_text_request',
-            text,
-          });
-        },
-      },
-      toast: {
-        show: async (args) => {
-          await this.#sendAndWaitForReply(event.windowContext, {
-            type: 'show_toast_request',
-            ...args,
-          });
-        },
-      },
-      window: {
-        openUrl: async ({ onNavigate, onClose, ...args }) => {
-          args.label = args.label || `${Math.random()}`;
-          const payload: InternalEventPayload = { type: 'open_window_request', ...args };
-          const onEvent = (event: InternalEventPayload) => {
-            if (event.type === 'window_navigate_event') {
-              onNavigate?.(event);
-            } else if (event.type === 'window_close_event') {
-              onClose?.();
-            }
-          };
-          this.#sendAndListenForEvents(event.windowContext, payload, onEvent);
-          return {
-            close: () => {
-              const closePayload: InternalEventPayload = {
-                type: 'close_window_request',
-                label: args.label,
-              };
-              this.#sendPayload(event.windowContext, closePayload, null);
-            },
-          };
-        },
-      },
-      prompt: {
-        text: async (args) => {
-          const reply: PromptTextResponse = await this.#sendAndWaitForReply(event.windowContext, {
-            type: 'prompt_text_request',
-            ...args,
-          });
-          return reply.value;
-        },
-      },
-      httpResponse: {
-        find: async (args) => {
-          const payload = {
-            type: 'find_http_responses_request',
-            ...args,
-          } as const;
-          const { httpResponses } = await this.#sendAndWaitForReply<FindHttpResponsesResponse>(
-            event.windowContext,
-            payload,
-          );
-          return httpResponses;
-        },
-      },
-      httpRequest: {
-        getById: async (args) => {
-          const payload = {
-            type: 'get_http_request_by_id_request',
-            ...args,
-          } as const;
-          const { httpRequest } = await this.#sendAndWaitForReply<GetHttpRequestByIdResponse>(
-            event.windowContext,
-            payload,
-          );
-          return httpRequest;
-        },
-        send: async (args) => {
-          const payload = {
-            type: 'send_http_request_request',
-            ...args,
-          } as const;
-          const { httpResponse } = await this.#sendAndWaitForReply<SendHttpRequestResponse>(
-            event.windowContext,
-            payload,
-          );
-          return httpResponse;
-        },
-        render: async (args) => {
-          const payload = {
-            type: 'render_http_request_request',
-            ...args,
-          } as const;
-          const { httpRequest } = await this.#sendAndWaitForReply<RenderHttpRequestResponse>(
-            event.windowContext,
-            payload,
-          );
-          return httpRequest;
-        },
-      },
-      cookies: {
-        getValue: async (args: GetCookieValueRequest) => {
-          const payload = {
-            type: 'get_cookie_value_request',
-            ...args,
-          } as const;
-          const { value } = await this.#sendAndWaitForReply<GetCookieValueResponse>(
-            event.windowContext,
-            payload,
-          );
-          return value;
-        },
-        listNames: async () => {
-          const payload = { type: 'list_cookie_names_request' } as const;
-          const { names } = await this.#sendAndWaitForReply<ListCookieNamesResponse>(
-            event.windowContext,
-            payload,
-          );
-          return names;
-        },
-      },
-      templates: {
-        /**
-         * Invoke Yaak's template engine to render a value. If the value is a nested type
-         * (eg. object), it will be recursively rendered.
-         */
-        render: async (args) => {
-          const payload = { type: 'template_render_request', ...args } as const;
-          const result = await this.#sendAndWaitForReply<TemplateRenderResponse>(
-            event.windowContext,
-            payload,
-          );
-          return result.data;
-        },
-      },
-      store: {
-        get: async <T>(key: string) => {
-          const payload = { type: 'get_key_value_request', key } as const;
-          const result = await this.#sendAndWaitForReply<GetKeyValueResponse>(
-            event.windowContext,
-            payload,
-          );
-          return result.value ? (JSON.parse(result.value) as T) : undefined;
-        },
-        set: async <T>(key: string, value: T) => {
-          const valueStr = JSON.stringify(value);
-          const payload: InternalEventPayload = {
-            type: 'set_key_value_request',
-            key,
-            value: valueStr,
-          };
-          await this.#sendAndWaitForReply<GetKeyValueResponse>(event.windowContext, payload);
-        },
-        delete: async (key: string) => {
-          const payload = { type: 'delete_key_value_request', key } as const;
-          const result = await this.#sendAndWaitForReply<DeleteKeyValueResponse>(
-            event.windowContext,
-            payload,
-          );
-          return result.deleted;
-        },
-      },
-    };
-  }
-}
-
-function genId(len = 5): string {
-  const alphabet = '01234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-  let id = '';
-  for (let i = 0; i < len; i++) {
-    id += alphabet[Math.floor(Math.random() * alphabet.length)];
-  }
-  return id;
-}
-
-/** Recursively apply form input defaults to a set of values */
-function applyFormInputDefaults(
-  inputs: TemplateFunctionArg[],
-  values: { [p: string]: JsonValue | undefined },
-) {
-  for (const input of inputs) {
-    if ('inputs' in input) {
-      applyFormInputDefaults(input.inputs ?? [], values);
-    } else if ('defaultValue' in input && values[input.name] === undefined) {
-      values[input.name] = input.defaultValue;
-    }
-  }
-}
-
-const watchedFiles: Record<string, Stats> = {};
-
-/**
- * Watch a file and trigger callback on change.
- *
- * We also track the stat for each file because fs.watch() will
- * trigger a "change" event when the access date changes
- */
-function watchFile(filepath: string, cb: (filepath: string) => void) {
-  watch(filepath, () => {
-    const stat = statSync(filepath);
-    if (stat.mtimeMs !== watchedFiles[filepath]?.mtimeMs) {
-      cb(filepath);
-    }
-    watchedFiles[filepath] = stat;
-  });
-}

packages/plugin-runtime/src/index.ts

@@ -1,55 +0,0 @@
-import type { InternalEvent } from '@yaakapp/api';
-import { EventChannel } from './EventChannel';
-import { PluginHandle } from './PluginHandle';
-import WebSocket from 'ws';
-
-const port = process.env.PORT;
-if (!port) {
-  throw new Error('Plugin runtime missing PORT')
-}
-
-const pluginToAppEvents = new EventChannel();
-const plugins: Record<string, PluginHandle> = {};
-
-const ws = new WebSocket(`ws://localhost:${port}`);
-
-ws.on('message', async (e: Buffer) => {
-  try {
-    await handleIncoming(e.toString());
-  } catch (err) {
-    console.log('Failed to handle incoming plugin event', err);
-  }
-});
-ws.on('open', () => console.log('Plugin runtime connected to websocket'));
-ws.on('error', (err: any) => console.error('Plugin runtime websocket error', err));
-ws.on('close', (code: number) => console.log('Plugin runtime websocket closed', code));
-
-// Listen for incoming events from plugins
-pluginToAppEvents.listen((e) => {
-  const eventStr = JSON.stringify(e);
-  ws.send(eventStr);
-});
-
-async function handleIncoming(msg: string) {
-  const pluginEvent: InternalEvent = JSON.parse(msg);
-  // Handle special event to bootstrap plugin
-  if (pluginEvent.payload.type === 'boot_request') {
-    const plugin = new PluginHandle(pluginEvent.pluginRefId, pluginEvent.payload, pluginToAppEvents);
-    plugins[pluginEvent.pluginRefId] = plugin;
-  }
-
-  // Once booted, forward all events to the plugin worker
-  const plugin = plugins[pluginEvent.pluginRefId];
-  if (!plugin) {
-    console.warn('Failed to get plugin for event by', pluginEvent.pluginRefId);
-    return;
-  }
-
-  if (pluginEvent.payload.type === 'terminate_request') {
-    plugin.terminate();
-    console.log('Terminated plugin worker', pluginEvent.pluginRefId);
-    delete plugins[pluginEvent.pluginRefId];
-  }
-
-  plugin.sendToWorker(pluginEvent);
-}

packages/plugin-runtime/src/interceptStdout.ts

@@ -1,37 +0,0 @@
-import process from "node:process";
-
-export function interceptStdout(
-  intercept: (text: string) => string,
-) {
-  const old_stdout_write = process.stdout.write;
-  const old_stderr_write = process.stderr.write;
-
-  process.stdout.write = (function (write) {
-    return function (text: string) {
-      arguments[0] = interceptor(text, intercept);
-      // deno-lint-ignore no-explicit-any
-      write.apply(process.stdout, arguments as any);
-      return true;
-    };
-  })(process.stdout.write);
-
-  process.stderr.write = (function (write) {
-    return function (text: string) {
-      arguments[0] = interceptor(text, intercept);
-      // deno-lint-ignore no-explicit-any
-      write.apply(process.stderr, arguments as any);
-      return true;
-    };
-  })(process.stderr.write);
-
-  // puts back to original
-  return function unhook() {
-    process.stdout.write = old_stdout_write;
-    process.stderr.write = old_stderr_write;
-  };
-}
-
-function interceptor(text: string, fn: (text: string) => string) {
-  return fn(text).replace(/\n$/, "") +
-    (fn(text) && /\n$/.test(text) ? "\n" : "");
-}

packages/plugin-runtime/src/migrations.ts

@@ -1,18 +0,0 @@
-import { TemplateFunction } from '@yaakapp/api';
-
-export function migrateTemplateFunctionSelectOptions(f: TemplateFunction): TemplateFunction {
-  const migratedArgs = f.args.map((a) => {
-    if (a.type === 'select') {
-      a.options = a.options.map((o) => ({
-        ...o,
-        label: o.label || (o as any).name,
-      }));
-    }
-    return a;
-  });
-
-  return {
-    ...f,
-    args: migratedArgs,
-  };
-}

packages/plugin-runtime/tsconfig.json

@@ -1,25 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "node16",
-    "strict": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "target": "es2021",
-    "lib": ["es2021"],
-    "noImplicitAny": false,
-    "moduleResolution": "node16",
-    "resolveJsonModule": true,
-    "sourceMap": true,
-    "outDir": "build",
-    "baseUrl": ".",
-    "paths": {
-      "*": [
-        "node_modules/*",
-        "src/types/*"
-      ]
-    }
-  },
-  "include": [
-    "src"
-  ]
-}

plugins/.gitignore

@@ -1 +0,0 @@
-*/build

plugins/auth-basic/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "@yaakapp/auth-basic",
-  "private": true,
-  "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.ts",
-    "dev": "yaakcli dev ./src/index.js"
-  }
-}

plugins/auth-basic/src/index.ts

@@ -1,26 +0,0 @@
-import { PluginDefinition } from '@yaakapp/api';
-
-export const plugin: PluginDefinition = {
-  authentication: {
-    name: 'basic',
-    label: 'Basic Auth',
-    shortLabel: 'Basic',
-    args: [{
-      type: 'text',
-      name: 'username',
-      label: 'Username',
-      optional: true,
-    }, {
-      type: 'text',
-      name: 'password',
-      label: 'Password',
-      optional: true,
-      password: true,
-    }],
-    async onApply(_ctx, { values }) {
-      const { username, password } = values;
-      const value = 'Basic ' + Buffer.from(`${username}:${password}`).toString('base64');
-      return { setHeaders: [{ name: 'Authorization', value }] };
-    },
-  },
-};

plugins/auth-bearer/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "@yaakapp/auth-bearer",
-  "private": true,
-  "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.ts",
-    "dev": "yaakcli dev ./src/index.js"
-  }
-}

plugins/auth-bearer/src/index.ts

@@ -1,21 +0,0 @@
-import { PluginDefinition } from '@yaakapp/api';
-
-export const plugin: PluginDefinition = {
-  authentication: {
-    name: 'bearer',
-    label: 'Bearer Token',
-    shortLabel: 'Bearer',
-    args: [{
-      type: 'text',
-      name: 'token',
-      label: 'Token',
-      optional: true,
-      password: true,
-    }],
-    async onApply(_ctx, { values }) {
-      const { token } = values;
-      const value = `Bearer ${token}`.trim();
-      return { setHeaders: [{ name: 'Authorization', value }] };
-    },
-  },
-};

plugins/auth-jwt/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "@yaakapp/auth-jwt",
-  "private": true,
-  "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.ts",
-    "dev": "yaakcli dev ./src/index.js"
-  },
-  "dependencies": {
-    "jsonwebtoken": "^9.0.2"
-  },
-  "devDependencies": {
-    "@types/jsonwebtoken": "^9.0.7"
-  }
-}

plugins/auth-jwt/src/index.ts

@@ -1,68 +0,0 @@
-import { PluginDefinition } from '@yaakapp/api';
-import jwt from 'jsonwebtoken';
-
-const algorithms = [
-  'HS256',
-  'HS384',
-  'HS512',
-  'RS256',
-  'RS384',
-  'RS512',
-  'PS256',
-  'PS384',
-  'PS512',
-  'ES256',
-  'ES384',
-  'ES512',
-  'none',
-] as const;
-
-const defaultAlgorithm = algorithms[0];
-
-export const plugin: PluginDefinition = {
-    authentication: {
-      name: 'jwt',
-      label: 'JWT Bearer',
-      shortLabel: 'JWT',
-      args: [
-        {
-          type: 'select',
-          name: 'algorithm',
-          label: 'Algorithm',
-          hideLabel: true,
-          defaultValue: defaultAlgorithm,
-          options: algorithms.map(value => ({ label: value === 'none' ? 'None' : value, value })),
-        },
-        {
-          type: 'text',
-          name: 'secret',
-          label: 'Secret or Private Key',
-          password: true,
-          optional: true,
-          multiLine: true,
-        },
-        {
-          type: 'checkbox',
-          name: 'secretBase64',
-          label: 'Secret is base64 encoded',
-        },
-        {
-          type: 'editor',
-          name: 'payload',
-          label: 'Payload',
-          language: 'json',
-          defaultValue: '{\n  "foo": "bar"\n}',
-          placeholder: '{ }',
-        },
-      ],
-      async onApply(_ctx, { values }) {
-        const { algorithm, secret: _secret, secretBase64, payload } = values;
-        const secret = secretBase64 ? Buffer.from(`${_secret}`, 'base64') : `${_secret}`;
-        const token = jwt.sign(`${payload}`, secret, { algorithm: algorithm as any });
-        const value = `Bearer ${token}`;
-        return { setHeaders: [{ name: 'Authorization', value }] };
-      }
-      ,
-    },
-  }
-;

plugins/auth-oauth2/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "@yaakapp/auth-oauth2",
-  "private": true,
-  "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.ts",
-    "dev": "yaakcli dev ./src/index.js"
-  }
-}

plugins/auth-oauth2/src/getAccessToken.ts

@@ -1,78 +0,0 @@
-import { Context, HttpRequest, HttpUrlParameter } from '@yaakapp/api';
-import { readFileSync } from 'node:fs';
-import { AccessTokenRawResponse } from './store';
-
-export async function getAccessToken(
-  ctx: Context,
-  {
-    accessTokenUrl,
-    scope,
-    audience,
-    params,
-    grantType,
-    credentialsInBody,
-    clientId,
-    clientSecret,
-  }: {
-    clientId: string;
-    clientSecret: string;
-    grantType: string;
-    accessTokenUrl: string;
-    scope: string | null;
-    audience: string | null;
-    credentialsInBody: boolean;
-    params: HttpUrlParameter[];
-  },
-): Promise<AccessTokenRawResponse> {
-  console.log('[oauth2] Getting access token', accessTokenUrl);
-  const httpRequest: Partial<HttpRequest> = {
-    method: 'POST',
-    url: accessTokenUrl,
-    bodyType: 'application/x-www-form-urlencoded',
-    body: {
-      form: [{ name: 'grant_type', value: grantType }, ...params],
-    },
-    headers: [
-      { name: 'User-Agent', value: 'yaak' },
-      { name: 'Accept', value: 'application/x-www-form-urlencoded, application/json' },
-      { name: 'Content-Type', value: 'application/x-www-form-urlencoded' },
-    ],
-  };
-
-  if (scope) httpRequest.body!.form.push({ name: 'scope', value: scope });
-  if (audience) httpRequest.body!.form.push({ name: 'audience', value: audience });
-
-  if (credentialsInBody) {
-    httpRequest.body!.form.push({ name: 'client_id', value: clientId });
-    httpRequest.body!.form.push({ name: 'client_secret', value: clientSecret });
-  } else {
-    const value = 'Basic ' + Buffer.from(`${clientId}:${clientSecret}`).toString('base64');
-    httpRequest.headers!.push({ name: 'Authorization', value });
-  }
-
-  httpRequest.authenticationType = 'none'; // Don't inherit workspace auth
-  const resp = await ctx.httpRequest.send({ httpRequest });
-
-  console.log('[oauth2] Got access token response', resp.status);
-
-  const body = resp.bodyPath ? readFileSync(resp.bodyPath, 'utf8') : '';
-
-  if (resp.status < 200 || resp.status >= 300) {
-    throw new Error(
-      'Failed to fetch access token with status=' + resp.status + ' and body=' + body,
-    );
-  }
-
-  let response;
-  try {
-    response = JSON.parse(body);
-  } catch {
-    response = Object.fromEntries(new URLSearchParams(body));
-  }
-
-  if (response.error) {
-    throw new Error('Failed to fetch access token with ' + response.error);
-  }
-
-  return response;
-}

plugins/auth-oauth2/src/getOrRefreshAccessToken.ts

@@ -1,103 +0,0 @@
-import { Context, HttpRequest } from '@yaakapp/api';
-import { readFileSync } from 'node:fs';
-import { AccessToken, AccessTokenRawResponse, deleteToken, getToken, storeToken } from './store';
-
-export async function getOrRefreshAccessToken(ctx: Context, contextId: string, {
-  scope,
-  accessTokenUrl,
-  credentialsInBody,
-  clientId,
-  clientSecret,
-  forceRefresh,
-}: {
-  scope: string | null;
-  accessTokenUrl: string;
-  credentialsInBody: boolean;
-  clientId: string;
-  clientSecret: string;
-  forceRefresh?: boolean;
-}): Promise<AccessToken | null> {
-  const token = await getToken(ctx, contextId);
-  if (token == null) {
-    return null;
-  }
-
-  const now = Date.now();
-  const isExpired = token.expiresAt && now > token.expiresAt;
-
-  // Return the current access token if it's still valid
-  if (!isExpired && !forceRefresh) {
-    return token;
-  }
-
-  // Token is expired, but there's no refresh token :(
-  if (!token.response.refresh_token) {
-    return null;
-  }
-
-  // Access token is expired, so get a new one
-  const httpRequest: Partial<HttpRequest> = {
-    method: 'POST',
-    url: accessTokenUrl,
-    bodyType: 'application/x-www-form-urlencoded',
-    body: {
-      form: [
-        { name: 'grant_type', value: 'refresh_token' },
-        { name: 'refresh_token', value: token.response.refresh_token },
-      ],
-    },
-    headers: [
-      { name: 'User-Agent', value: 'yaak' },
-      { name: 'Accept', value: 'application/x-www-form-urlencoded, application/json' },
-      { name: 'Content-Type', value: 'application/x-www-form-urlencoded' },
-    ],
-  };
-
-  if (scope) httpRequest.body!.form.push({ name: 'scope', value: scope });
-
-  if (credentialsInBody) {
-    httpRequest.body!.form.push({ name: 'client_id', value: clientId });
-    httpRequest.body!.form.push({ name: 'client_secret', value: clientSecret });
-  } else {
-    const value = 'Basic ' + Buffer.from(`${clientId}:${clientSecret}`).toString('base64');
-    httpRequest.headers!.push({ name: 'Authorization', value });
-  }
-
-  httpRequest.authenticationType = 'none'; // Don't inherit workspace auth
-  const resp = await ctx.httpRequest.send({ httpRequest });
-
-  if (resp.status === 401) {
-    // Bad refresh token, so we'll force it to fetch a fresh access token by deleting
-    // and returning null;
-    console.log('[oauth2] Unauthorized refresh_token request');
-    await deleteToken(ctx, contextId);
-    return null;
-  }
-
-  const body = resp.bodyPath ? readFileSync(resp.bodyPath, 'utf8') : '';
-
-  console.log('[oauth2] Got refresh token response', resp.status);
-
-  if (resp.status < 200 || resp.status >= 300) {
-    throw new Error('Failed to refresh access token with status=' + resp.status + ' and body=' + body);
-  }
-
-  let response;
-  try {
-    response = JSON.parse(body);
-  } catch {
-    response = Object.fromEntries(new URLSearchParams(body));
-  }
-
-  if (response.error) {
-    throw new Error(`Failed to fetch access token with ${response.error} -> ${response.error_description}`);
-  }
-
-  const newResponse: AccessTokenRawResponse = {
-    ...response,
-    // Assign a new one or keep the old one,
-    refresh_token: response.refresh_token ?? token.response.refresh_token,
-  };
-
-  return storeToken(ctx, contextId, newResponse);
-}

plugins/auth-oauth2/src/grants/authorizationCode.ts

@@ -1,152 +0,0 @@
-import { Context } from '@yaakapp/api';
-import { createHash, randomBytes } from 'node:crypto';
-import { getAccessToken } from '../getAccessToken';
-import { getOrRefreshAccessToken } from '../getOrRefreshAccessToken';
-import { AccessToken, getDataDirKey, storeToken } from '../store';
-
-export const PKCE_SHA256 = 'S256';
-export const PKCE_PLAIN = 'plain';
-export const DEFAULT_PKCE_METHOD = PKCE_SHA256;
-
-export async function getAuthorizationCode(
-  ctx: Context,
-  contextId: string,
-  {
-    authorizationUrl: authorizationUrlRaw,
-    accessTokenUrl,
-    clientId,
-    clientSecret,
-    redirectUri,
-    scope,
-    state,
-    audience,
-    credentialsInBody,
-    pkce,
-    tokenName,
-  }: {
-    authorizationUrl: string;
-    accessTokenUrl: string;
-    clientId: string;
-    clientSecret: string;
-    redirectUri: string | null;
-    scope: string | null;
-    state: string | null;
-    audience: string | null;
-    credentialsInBody: boolean;
-    pkce: {
-      challengeMethod: string | null;
-      codeVerifier: string | null;
-    } | null;
-    tokenName: 'access_token' | 'id_token';
-  },
-): Promise<AccessToken> {
-  const token = await getOrRefreshAccessToken(ctx, contextId, {
-    accessTokenUrl,
-    scope,
-    clientId,
-    clientSecret,
-    credentialsInBody,
-  });
-  if (token != null) {
-    return token;
-  }
-
-  const authorizationUrl = new URL(`${authorizationUrlRaw ?? ''}`);
-  authorizationUrl.searchParams.set('response_type', 'code');
-  authorizationUrl.searchParams.set('client_id', clientId);
-  if (redirectUri) authorizationUrl.searchParams.set('redirect_uri', redirectUri);
-  if (scope) authorizationUrl.searchParams.set('scope', scope);
-  if (state) authorizationUrl.searchParams.set('state', state);
-  if (audience) authorizationUrl.searchParams.set('audience', audience);
-  if (pkce) {
-    const verifier = pkce.codeVerifier || createPkceCodeVerifier();
-    const challengeMethod = pkce.challengeMethod || DEFAULT_PKCE_METHOD;
-    authorizationUrl.searchParams.set(
-      'code_challenge',
-      createPkceCodeChallenge(verifier, challengeMethod),
-    );
-    authorizationUrl.searchParams.set('code_challenge_method', challengeMethod);
-  }
-
-  return new Promise(async (resolve, reject) => {
-    const authorizationUrlStr = authorizationUrl.toString();
-    const logsEnabled = (await ctx.store.get('enable_logs')) ?? false;
-    console.log('[oauth2] Authorizing', authorizationUrlStr);
-
-    let foundCode = false;
-
-    let { close } = await ctx.window.openUrl({
-      url: authorizationUrlStr,
-      label: 'oauth-authorization-url',
-      dataDirKey: await getDataDirKey(ctx, contextId),
-      async onClose() {
-        if (!foundCode) {
-          reject(new Error('Authorization window closed'));
-        }
-      },
-      async onNavigate({ url: urlStr }) {
-        const url = new URL(urlStr);
-        if (logsEnabled) console.log('[oauth2] Navigated to', urlStr);
-
-        if (url.searchParams.has('error')) {
-          return reject(new Error(`Failed to authorize: ${url.searchParams.get('error')}`));
-        }
-
-        const code = url.searchParams.get('code');
-        if (!code) {
-          console.log('[oauth2] Code not found');
-          return; // Could be one of many redirects in a chain, so skip it
-        }
-
-        // Close the window here, because we don't need it anymore!
-        foundCode = true;
-        close();
-
-        console.log('[oauth2] Code found');
-        const response = await getAccessToken(ctx, {
-          grantType: 'authorization_code',
-          accessTokenUrl,
-          clientId,
-          clientSecret,
-          scope,
-          audience,
-          credentialsInBody,
-          params: [
-            { name: 'code', value: code },
-            ...(redirectUri ? [{ name: 'redirect_uri', value: redirectUri }] : []),
-          ],
-        });
-
-        try {
-          resolve(await storeToken(ctx, contextId, response, tokenName));
-        } catch (err) {
-          reject(err);
-        }
-      },
-    });
-  });
-}
-
-function createPkceCodeVerifier() {
-  return encodeForPkce(randomBytes(32));
-}
-
-function createPkceCodeChallenge(verifier: string, method: string) {
-  if (method === 'plain') {
-    return verifier;
-  }
-
-  const hash = encodeForPkce(createHash('sha256').update(verifier).digest());
-  return hash
-    .replace(/=/g, '') // Remove padding '='
-    .replace(/\+/g, '-') // Replace '+' with '-'
-    .replace(/\//g, '_'); // Replace '/' with '_'
-}
-
-function encodeForPkce(bytes: Buffer) {
-  return bytes
-    .toString('base64')
-    .replace(/=/g, '') // Remove padding '='
-    .replace(/\+/g, '-') // Replace '+' with '-'
-    .replace(/\//g, '_'); // Replace '/' with '_'
-}

plugins/auth-oauth2/src/grants/clientCredentials.ts

@@ -1,43 +0,0 @@
-import { Context } from '@yaakapp/api';
-import { getAccessToken } from '../getAccessToken';
-import { getToken, storeToken } from '../store';
-
-export async function getClientCredentials(
-  ctx: Context,
-  contextId: string,
-  {
-    accessTokenUrl,
-    clientId,
-    clientSecret,
-    scope,
-    audience,
-    credentialsInBody,
-  }: {
-    accessTokenUrl: string;
-    clientId: string;
-    clientSecret: string;
-    scope: string | null;
-    audience: string | null;
-    credentialsInBody: boolean;
-  },
-) {
-  const token = await getToken(ctx, contextId);
-  if (token) {
-    // resolve(token.response.access_token);
-    // TODO: Refresh token if expired
-    // return;
-  }
-
-  const response = await getAccessToken(ctx, {
-    grantType: 'client_credentials',
-    accessTokenUrl,
-    audience,
-    clientId,
-    clientSecret,
-    scope,
-    credentialsInBody,
-    params: [],
-  });
-
-  return storeToken(ctx, contextId, response);
-}

plugins/auth-oauth2/src/grants/implicit.ts

@@ -1,86 +0,0 @@
-import { Context } from '@yaakapp/api';
-import { AccessToken, AccessTokenRawResponse, getToken, storeToken } from '../store';
-
-export function getImplicit(
-  ctx: Context,
-  contextId: string,
-  {
-    authorizationUrl: authorizationUrlRaw,
-    responseType,
-    clientId,
-    redirectUri,
-    scope,
-    state,
-    audience,
-    tokenName,
-  }: {
-    authorizationUrl: string;
-    responseType: string;
-    clientId: string;
-    redirectUri: string | null;
-    scope: string | null;
-    state: string | null;
-    audience: string | null;
-    tokenName: 'access_token' | 'id_token';
-  },
-): Promise<AccessToken> {
-  return new Promise(async (resolve, reject) => {
-    const token = await getToken(ctx, contextId);
-    if (token) {
-      // resolve(token.response.access_token);
-      // TODO: Refresh token if expired
-      // return;
-    }
-
-    const authorizationUrl = new URL(`${authorizationUrlRaw ?? ''}`);
-    authorizationUrl.searchParams.set('response_type', 'token');
-    authorizationUrl.searchParams.set('client_id', clientId);
-    if (redirectUri) authorizationUrl.searchParams.set('redirect_uri', redirectUri);
-    if (scope) authorizationUrl.searchParams.set('scope', scope);
-    if (state) authorizationUrl.searchParams.set('state', state);
-    if (audience) authorizationUrl.searchParams.set('audience', audience);
-    if (responseType.includes('id_token')) {
-      authorizationUrl.searchParams.set(
-        'nonce',
-        String(Math.floor(Math.random() * 9999999999999) + 1),
-      );
-    }
-
-    const authorizationUrlStr = authorizationUrl.toString();
-    let foundAccessToken = false;
-    let { close } = await ctx.window.openUrl({
-      url: authorizationUrlStr,
-      label: 'oauth-authorization-url',
-      async onClose() {
-        if (!foundAccessToken) {
-          reject(new Error('Authorization window closed'));
-        }
-      },
-      async onNavigate({ url: urlStr }) {
-        const url = new URL(urlStr);
-        if (url.searchParams.has('error')) {
-          return reject(Error(`Failed to authorize: ${url.searchParams.get('error')}`));
-        }
-
-        const hash = url.hash.slice(1);
-        const params = new URLSearchParams(hash);
-
-        const accessToken = params.get(tokenName);
-        if (!accessToken) {
-          return;
-        }
-        foundAccessToken = true;
-
-        // Close the window here, because we don't need it anymore
-        close();
-
-        const response = Object.fromEntries(params) as unknown as AccessTokenRawResponse;
-        try {
-          resolve(await storeToken(ctx, contextId, response));
-        } catch (err) {
-          reject(err);
-        }
-      },
-    });
-  });
-}

plugins/auth-oauth2/src/grants/password.ts

@@ -1,55 +0,0 @@
-import { Context } from '@yaakapp/api';
-import { getAccessToken } from '../getAccessToken';
-import { getOrRefreshAccessToken } from '../getOrRefreshAccessToken';
-import { AccessToken, storeToken } from '../store';
-
-export async function getPassword(
-  ctx: Context,
-  contextId: string,
-  {
-    accessTokenUrl,
-    clientId,
-    clientSecret,
-    username,
-    password,
-    credentialsInBody,
-    audience,
-    scope,
-  }: {
-    accessTokenUrl: string;
-    clientId: string;
-    clientSecret: string;
-    username: string;
-    password: string;
-    scope: string | null;
-    audience: string | null;
-    credentialsInBody: boolean;
-  },
-): Promise<AccessToken> {
-  const token = await getOrRefreshAccessToken(ctx, contextId, {
-    accessTokenUrl,
-    scope,
-    clientId,
-    clientSecret,
-    credentialsInBody,
-  });
-  if (token != null) {
-    return token;
-  }
-
-  const response = await getAccessToken(ctx, {
-    accessTokenUrl,
-    clientId,
-    clientSecret,
-    scope,
-    audience,
-    grantType: 'password',
-    credentialsInBody,
-    params: [
-      { name: 'username', value: username },
-      { name: 'password', value: password },
-    ],
-  });
-
-  return storeToken(ctx, contextId, response);
-}

plugins/auth-oauth2/src/index.ts

@@ -1,404 +0,0 @@
-import {
-  Context,
-  FormInputSelectOption,
-  GetHttpAuthenticationConfigRequest,
-  JsonPrimitive,
-  PluginDefinition,
-} from '@yaakapp/api';
-import {
-  DEFAULT_PKCE_METHOD,
-  getAuthorizationCode,
-  PKCE_PLAIN,
-  PKCE_SHA256,
-} from './grants/authorizationCode';
-import { getClientCredentials } from './grants/clientCredentials';
-import { getImplicit } from './grants/implicit';
-import { getPassword } from './grants/password';
-import { AccessToken, deleteToken, getToken, resetDataDirKey } from './store';
-
-type GrantType = 'authorization_code' | 'implicit' | 'password' | 'client_credentials';
-
-const grantTypes: FormInputSelectOption[] = [
-  { label: 'Authorization Code', value: 'authorization_code' },
-  { label: 'Implicit', value: 'implicit' },
-  { label: 'Resource Owner Password Credential', value: 'password' },
-  { label: 'Client Credentials', value: 'client_credentials' },
-];
-
-const defaultGrantType = grantTypes[0]!.value;
-
-function hiddenIfNot(
-  grantTypes: GrantType[],
-  ...other: ((values: GetHttpAuthenticationConfigRequest['values']) => boolean)[]
-) {
-  return (_ctx: Context, { values }: GetHttpAuthenticationConfigRequest) => {
-    const hasGrantType = grantTypes.find((t) => t === String(values.grantType ?? defaultGrantType));
-    const hasOtherBools = other.every((t) => t(values));
-    const show = hasGrantType && hasOtherBools;
-    return { hidden: !show };
-  };
-}
-
-const authorizationUrls = [
-  'https://github.com/login/oauth/authorize',
-  'https://account.box.com/api/oauth2/authorize',
-  'https://accounts.google.com/o/oauth2/v2/auth',
-  'https://api.imgur.com/oauth2/authorize',
-  'https://bitly.com/oauth/authorize',
-  'https://gitlab.example.com/oauth/authorize',
-  'https://medium.com/m/oauth/authorize',
-  'https://public-api.wordpress.com/oauth2/authorize',
-  'https://slack.com/oauth/authorize',
-  'https://todoist.com/oauth/authorize',
-  'https://www.dropbox.com/oauth2/authorize',
-  'https://www.linkedin.com/oauth/v2/authorization',
-  'https://MY_SHOP.myshopify.com/admin/oauth/access_token',
-  'https://appcenter.intuit.com/app/connect/oauth2/authorize',
-];
-
-const accessTokenUrls = [
-  'https://github.com/login/oauth/access_token',
-  'https://api-ssl.bitly.com/oauth/access_token',
-  'https://api.box.com/oauth2/token',
-  'https://api.dropboxapi.com/oauth2/token',
-  'https://api.imgur.com/oauth2/token',
-  'https://api.medium.com/v1/tokens',
-  'https://gitlab.example.com/oauth/token',
-  'https://public-api.wordpress.com/oauth2/token',
-  'https://slack.com/api/oauth.access',
-  'https://todoist.com/oauth/access_token',
-  'https://www.googleapis.com/oauth2/v4/token',
-  'https://www.linkedin.com/oauth/v2/accessToken',
-  'https://MY_SHOP.myshopify.com/admin/oauth/authorize',
-  'https://oauth.platform.intuit.com/oauth2/v1/tokens/bearer',
-];
-
-export const plugin: PluginDefinition = {
-  authentication: {
-    name: 'oauth2',
-    label: 'OAuth 2.0',
-    shortLabel: 'OAuth 2',
-    actions: [
-      {
-        label: 'Copy Current Token',
-        async onSelect(ctx, { contextId }) {
-          const token = await getToken(ctx, contextId);
-          if (token == null) {
-            await ctx.toast.show({ message: 'No token to copy', color: 'warning' });
-          } else {
-            await ctx.clipboard.copyText(token.response.access_token);
-            await ctx.toast.show({
-              message: 'Token copied to clipboard',
-              icon: 'copy',
-              color: 'success',
-            });
-          }
-        },
-      },
-      {
-        label: 'Delete Token',
-        async onSelect(ctx, { contextId }) {
-          if (await deleteToken(ctx, contextId)) {
-            await ctx.toast.show({ message: 'Token deleted', color: 'success' });
-          } else {
-            await ctx.toast.show({ message: 'No token to delete', color: 'warning' });
-          }
-        },
-      },
-      {
-        label: 'Clear Window Session',
-        async onSelect(ctx, { contextId }) {
-          await resetDataDirKey(ctx, contextId);
-        },
-      },
-      {
-        label: 'Toggle Debug Logs',
-        async onSelect(ctx) {
-          const enableLogs = !(await ctx.store.get('enable_logs'));
-          await ctx.store.set('enable_logs', enableLogs);
-          await ctx.toast.show({
-            message: `Debug logs ${enableLogs ? 'enabled' : 'disabled'}`,
-            color: 'info',
-          });
-        },
-      },
-    ],
-    args: [
-      {
-        type: 'select',
-        name: 'grantType',
-        label: 'Grant Type',
-        hideLabel: true,
-        defaultValue: defaultGrantType,
-        options: grantTypes,
-      },
-
-      // Always-present fields
-      {
-        type: 'text',
-        name: 'clientId',
-        label: 'Client ID',
-        optional: true,
-      },
-      {
-        type: 'text',
-        name: 'clientSecret',
-        label: 'Client Secret',
-        optional: true,
-        password: true,
-        dynamic: hiddenIfNot(['authorization_code', 'password', 'client_credentials']),
-      },
-      {
-        type: 'text',
-        name: 'authorizationUrl',
-        optional: true,
-        label: 'Authorization URL',
-        dynamic: hiddenIfNot(['authorization_code', 'implicit']),
-        placeholder: authorizationUrls[0],
-        completionOptions: authorizationUrls.map((url) => ({ label: url, value: url })),
-      },
-      {
-        type: 'text',
-        name: 'accessTokenUrl',
-        optional: true,
-        label: 'Access Token URL',
-        placeholder: accessTokenUrls[0],
-        dynamic: hiddenIfNot(['authorization_code', 'password', 'client_credentials']),
-        completionOptions: accessTokenUrls.map((url) => ({ label: url, value: url })),
-      },
-      {
-        type: 'text',
-        name: 'redirectUri',
-        label: 'Redirect URI',
-        optional: true,
-        dynamic: hiddenIfNot(['authorization_code', 'implicit']),
-      },
-      {
-        type: 'text',
-        name: 'state',
-        label: 'State',
-        optional: true,
-        dynamic: hiddenIfNot(['authorization_code', 'implicit']),
-      },
-      {
-        type: 'text',
-        name: 'audience',
-        label: 'Audience',
-        optional: true,
-      },
-      {
-        type: 'select',
-        name: 'tokenName',
-        label: 'Token for authorization',
-        description:
-          'Select which token to send in the "Authorization: Bearer" header. Most APIs expect ' +
-          'access_token, but some (like OpenID Connect) require id_token.',
-        defaultValue: 'access_token',
-        options: [
-          { label: 'access_token', value: 'access_token' },
-          { label: 'id_token', value: 'id_token' },
-        ],
-        dynamic: hiddenIfNot(['authorization_code', 'implicit']),
-      },
-      {
-        type: 'checkbox',
-        name: 'usePkce',
-        label: 'Use PKCE',
-        dynamic: hiddenIfNot(['authorization_code']),
-      },
-      {
-        type: 'select',
-        name: 'pkceChallengeMethod',
-        label: 'Code Challenge Method',
-        options: [
-          { label: 'SHA-256', value: PKCE_SHA256 },
-          { label: 'Plain', value: PKCE_PLAIN },
-        ],
-        defaultValue: DEFAULT_PKCE_METHOD,
-        dynamic: hiddenIfNot(['authorization_code'], ({ usePkce }) => !!usePkce),
-      },
-      {
-        type: 'text',
-        name: 'pkceCodeVerifier',
-        label: 'Code Verifier',
-        placeholder: 'Automatically generated if not provided',
-        optional: true,
-        dynamic: hiddenIfNot(['authorization_code'], ({ usePkce }) => !!usePkce),
-      },
-      {
-        type: 'text',
-        name: 'username',
-        label: 'Username',
-        optional: true,
-        dynamic: hiddenIfNot(['password']),
-      },
-      {
-        type: 'text',
-        name: 'password',
-        label: 'Password',
-        password: true,
-        optional: true,
-        dynamic: hiddenIfNot(['password']),
-      },
-      {
-        type: 'select',
-        name: 'responseType',
-        label: 'Response Type',
-        defaultValue: 'token',
-        options: [
-          { label: 'Access Token', value: 'token' },
-          { label: 'ID Token', value: 'id_token' },
-          { label: 'ID and Access Token', value: 'id_token token' },
-        ],
-        dynamic: hiddenIfNot(['implicit']),
-      },
-      {
-        type: 'accordion',
-        label: 'Advanced',
-        inputs: [
-          { type: 'text', name: 'scope', label: 'Scope', optional: true },
-          {
-            type: 'text',
-            name: 'headerPrefix',
-            label: 'Header Prefix',
-            optional: true,
-            defaultValue: 'Bearer',
-          },
-          {
-            type: 'select',
-            name: 'credentials',
-            label: 'Send Credentials',
-            defaultValue: 'body',
-            options: [
-              { label: 'In Request Body', value: 'body' },
-              { label: 'As Basic Authentication', value: 'basic' },
-            ],
-          },
-        ],
-      },
-      {
-        type: 'accordion',
-        label: 'Access Token Response',
-        async dynamic(ctx, { contextId }) {
-          const token = await getToken(ctx, contextId);
-          if (token == null) {
-            return { hidden: true };
-          }
-          return {
-            label: 'Access Token Response',
-            inputs: [
-              {
-                type: 'editor',
-                defaultValue: JSON.stringify(token.response, null, 2),
-                hideLabel: true,
-                readOnly: true,
-                language: 'json',
-              },
-            ],
-          };
-        },
-      },
-    ],
-    async onApply(ctx, { values, contextId }) {
-      const headerPrefix = stringArg(values, 'headerPrefix');
-      const grantType = stringArg(values, 'grantType') as GrantType;
-      const credentialsInBody = values.credentials === 'body';
-      const tokenName = values.tokenName === 'id_token' ? 'id_token' : 'access_token';
-
-      let token: AccessToken;
-      if (grantType === 'authorization_code') {
-        const authorizationUrl = stringArg(values, 'authorizationUrl');
-        const accessTokenUrl = stringArg(values, 'accessTokenUrl');
-        token = await getAuthorizationCode(ctx, contextId, {
-          accessTokenUrl: accessTokenUrl.match(/^https?:\/\//)
-            ? accessTokenUrl
-            : `https://${accessTokenUrl}`,
-          authorizationUrl: authorizationUrl.match(/^https?:\/\//)
-            ? authorizationUrl
-            : `https://${authorizationUrl}`,
-          clientId: stringArg(values, 'clientId'),
-          clientSecret: stringArg(values, 'clientSecret'),
-          redirectUri: stringArgOrNull(values, 'redirectUri'),
-          scope: stringArgOrNull(values, 'scope'),
-          audience: stringArgOrNull(values, 'audience'),
-          state: stringArgOrNull(values, 'state'),
-          credentialsInBody,
-          pkce: values.usePkce
-            ? {
-                challengeMethod: stringArg(values, 'pkceChallengeMethod'),
-                codeVerifier: stringArgOrNull(values, 'pkceCodeVerifier'),
-              }
-            : null,
-          tokenName: tokenName,
-        });
-      } else if (grantType === 'implicit') {
-        const authorizationUrl = stringArg(values, 'authorizationUrl');
-        token = await getImplicit(ctx, contextId, {
-          authorizationUrl: authorizationUrl.match(/^https?:\/\//)
-            ? authorizationUrl
-            : `https://${authorizationUrl}`,
-          clientId: stringArg(values, 'clientId'),
-          redirectUri: stringArgOrNull(values, 'redirectUri'),
-          responseType: stringArg(values, 'responseType'),
-          scope: stringArgOrNull(values, 'scope'),
-          audience: stringArgOrNull(values, 'audience'),
-          state: stringArgOrNull(values, 'state'),
-          tokenName: tokenName,
-        });
-      } else if (grantType === 'client_credentials') {
-        const accessTokenUrl = stringArg(values, 'accessTokenUrl');
-        token = await getClientCredentials(ctx, contextId, {
-          accessTokenUrl: accessTokenUrl.match(/^https?:\/\//)
-            ? accessTokenUrl
-            : `https://${accessTokenUrl}`,
-          clientId: stringArg(values, 'clientId'),
-          clientSecret: stringArg(values, 'clientSecret'),
-          scope: stringArgOrNull(values, 'scope'),
-          audience: stringArgOrNull(values, 'audience'),
-          credentialsInBody,
-        });
-      } else if (grantType === 'password') {
-        const accessTokenUrl = stringArg(values, 'accessTokenUrl');
-        token = await getPassword(ctx, contextId, {
-          accessTokenUrl: accessTokenUrl.match(/^https?:\/\//)
-            ? accessTokenUrl
-            : `https://${accessTokenUrl}`,
-          clientId: stringArg(values, 'clientId'),
-          clientSecret: stringArg(values, 'clientSecret'),
-          username: stringArg(values, 'username'),
-          password: stringArg(values, 'password'),
-          scope: stringArgOrNull(values, 'scope'),
-          audience: stringArgOrNull(values, 'audience'),
-          credentialsInBody,
-        });
-      } else {
-        throw new Error('Invalid grant type ' + grantType);
-      }
-
-      const headerValue = `${headerPrefix} ${token.response[tokenName]}`.trim();
-      return {
-        setHeaders: [
-          {
-            name: 'Authorization',
-            value: headerValue,
-          },
-        ],
-      };
-    },
-  },
-};
-
-function stringArgOrNull(
-  values: Record<string, JsonPrimitive | undefined>,
-  name: string,
-): string | null {
-  const arg = values[name];
-  if (arg == null || arg == '') return null;
-  return `${arg}`;
-}
-
-function stringArg(values: Record<string, JsonPrimitive | undefined>, name: string): string {
-  const arg = stringArgOrNull(values, name);
-  if (!arg) return '';
-  return arg;
-}

plugins/auth-oauth2/src/store.ts

@@ -1,62 +0,0 @@
-import { Context } from '@yaakapp/api';
-
-export async function storeToken(
-  ctx: Context,
-  contextId: string,
-  response: AccessTokenRawResponse,
-  tokenName: 'access_token' | 'id_token' = 'access_token',
-) {
-  if (!response[tokenName]) {
-    throw new Error(`${tokenName} not found in response ${Object.keys(response).join(', ')}`);
-  }
-
-  const expiresAt = response.expires_in ? Date.now() + response.expires_in * 1000 : null;
-  const token: AccessToken = {
-    response,
-    expiresAt,
-  };
-  await ctx.store.set<AccessToken>(tokenStoreKey(contextId), token);
-  return token;
-}
-
-export async function getToken(ctx: Context, contextId: string) {
-  return ctx.store.get<AccessToken>(tokenStoreKey(contextId));
-}
-
-export async function deleteToken(ctx: Context, contextId: string) {
-  return ctx.store.delete(tokenStoreKey(contextId));
-}
-
-export async function resetDataDirKey(ctx: Context, contextId: string) {
-  const key = new Date().toISOString();
-  return ctx.store.set<string>(dataDirStoreKey(contextId), key);
-}
-
-export async function getDataDirKey(ctx: Context, contextId: string) {
-  const key = (await ctx.store.get<string>(dataDirStoreKey(contextId))) ?? 'default';
-  return `${contextId}::${key}`;
-}
-
-function tokenStoreKey(contextId: string) {
-  return ['token', contextId].join('::');
-}
-
-function dataDirStoreKey(contextId: string) {
-  return ['data_dir', contextId].join('::');
-}
-
-export interface AccessToken {
-  response: AccessTokenRawResponse;
-  expiresAt: number | null;
-}
-
-export interface AccessTokenRawResponse {
-  access_token: string;
-  id_token?: string;
-  token_type?: string;
-  expires_in?: number;
-  refresh_token?: string;
-  error?: string;
-  error_description?: string;
-  scope?: string;
-}

plugins/exporter-curl/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "@yaakapp/exporter-curl",
-  "private": true,
-  "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.js",
-    "dev": "yaakcli dev ./src/index.js"
-  }
-}

plugins/exporter-curl/src/index.ts

@@ -1,101 +0,0 @@
-import { HttpRequest, PluginDefinition } from '@yaakapp/api';
-
-const NEWLINE = '\\\n ';
-
-export const plugin: PluginDefinition = {
-  httpRequestActions: [{
-    label: 'Copy as Curl',
-    icon: 'copy',
-    async onSelect(ctx, args) {
-      const rendered_request = await ctx.httpRequest.render({ httpRequest: args.httpRequest, purpose: 'preview' });
-      const data = await convertToCurl(rendered_request);
-      await ctx.clipboard.copyText(data);
-      await ctx.toast.show({ message: 'Curl copied to clipboard', icon: 'copy', color: 'success' });
-    },
-  }],
-};
-
-export async function convertToCurl(request: Partial<HttpRequest>) {
-  const xs = ['curl'];
-
-  // Add method and URL all on first line
-  if (request.method) xs.push('-X', request.method);
-  if (request.url) xs.push(quote(request.url));
-
-
-  xs.push(NEWLINE);
-
-  // Add URL params
-  for (const p of (request.urlParameters ?? []).filter(onlyEnabled)) {
-    xs.push('--url-query', quote(`${p.name}=${p.value}`));
-    xs.push(NEWLINE);
-  }
-
-  // Add headers
-  for (const h of (request.headers ?? []).filter(onlyEnabled)) {
-    xs.push('--header', quote(`${h.name}: ${h.value}`));
-    xs.push(NEWLINE);
-  }
-
-  // Add form params
-  if (Array.isArray(request.body?.form)) {
-    const flag = request.bodyType === 'multipart/form-data' ? '--form' : '--data';
-    for (const p of (request.body?.form ?? []).filter(onlyEnabled)) {
-      if (p.file) {
-        let v = `${p.name}=@${p.file}`;
-        v += p.contentType ? `;type=${p.contentType}` : '';
-        xs.push(flag, v);
-      } else {
-        xs.push(flag, quote(`${p.name}=${p.value}`));
-      }
-      xs.push(NEWLINE);
-    }
-  } else if (typeof request.body?.query === 'string') {
-    const body = { query: request.body.query || '', variables: maybeParseJSON(request.body.variables, undefined) };
-    xs.push('--data-raw', `${quote(JSON.stringify(body))}`);
-    xs.push(NEWLINE);
-  } else if (typeof request.body?.text === 'string') {
-    xs.push('--data-raw', `${quote(request.body.text)}`);
-    xs.push(NEWLINE);
-  }
-
-  // Add basic/digest authentication
-  if (request.authenticationType === 'basic' || request.authenticationType === 'digest') {
-    if (request.authenticationType === 'digest') xs.push('--digest');
-    xs.push(
-      '--user',
-      quote(`${request.authentication?.username ?? ''}:${request.authentication?.password ?? ''}`),
-    );
-    xs.push(NEWLINE);
-  }
-
-  // Add bearer authentication
-  if (request.authenticationType === 'bearer') {
-    xs.push('--header', quote(`Authorization: Bearer ${request.authentication?.token ?? ''}`));
-    xs.push(NEWLINE);
-  }
-
-  // Remove trailing newline
-  if (xs[xs.length - 1] === NEWLINE) {
-    xs.splice(xs.length - 1, 1);
-  }
-
-  return xs.join(' ');
-}
-
-function quote(arg: string): string {
-  const escaped = arg.replace(/'/g, '\\\'');
-  return `'${escaped}'`;
-}
-
-function onlyEnabled(v: { name?: string; enabled?: boolean }): boolean {
-  return v.enabled !== false && !!v.name;
-}
-
-function maybeParseJSON(v: any, fallback: any): string {
-  try {
-    return JSON.parse(v);
-  } catch (err) {
-    return fallback;
-  }
-}

plugins/exporter-curl/tests/index.test.ts

@@ -1,206 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { convertToCurl } from '../src';
-
-describe('exporter-curl', () => {
-  test('Exports GET with params', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        urlParameters: [
-          { name: 'a', value: 'aaa' },
-          { name: 'b', value: 'bbb', enabled: true },
-          { name: 'c', value: 'ccc', enabled: false },
-        ],
-      }),
-    ).toEqual(
-      [`curl 'https://yaak.app'`, `--url-query 'a=aaa'`, `--url-query 'b=bbb'`].join(` \\\n  `),
-    );
-  });
-  test('Exports POST with url form data', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        method: 'POST',
-        bodyType: 'application/x-www-form-urlencoded',
-        body: {
-          form: [
-            { name: 'a', value: 'aaa' },
-            { name: 'b', value: 'bbb', enabled: true },
-            { name: 'c', value: 'ccc', enabled: false },
-          ],
-        },
-      }),
-    ).toEqual(
-      [`curl -X POST 'https://yaak.app'`, `--data 'a=aaa'`, `--data 'b=bbb'`].join(` \\\n  `),
-    );
-  });
-
-  test('Exports POST with GraphQL data', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        method: 'POST',
-        bodyType: 'graphql',
-        body: {
-          query: '{foo,bar}',
-          variables: '{"a": "aaa", "b": "bbb"}',
-        },
-      }),
-    ).toEqual(
-      [`curl -X POST 'https://yaak.app'`, `--data-raw '{"query":"{foo,bar}","variables":{"a":"aaa","b":"bbb"}}'`].join(` \\\n  `),
-    );
-  });
-
-  test('Exports POST with GraphQL data no variables', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        method: 'POST',
-        bodyType: 'graphql',
-        body: {
-          query: '{foo,bar}',
-        },
-      }),
-    ).toEqual(
-      [`curl -X POST 'https://yaak.app'`, `--data-raw '{"query":"{foo,bar}"}'`].join(` \\\n  `),
-    );
-  });
-
-  test('Exports PUT with multipart form', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        method: 'PUT',
-        bodyType: 'multipart/form-data',
-        body: {
-          form: [
-            { name: 'a', value: 'aaa' },
-            { name: 'b', value: 'bbb', enabled: true },
-            { name: 'c', value: 'ccc', enabled: false },
-            { name: 'f', file: '/foo/bar.png', contentType: 'image/png' },
-          ],
-        },
-      }),
-    ).toEqual(
-      [
-        `curl -X PUT 'https://yaak.app'`,
-        `--form 'a=aaa'`,
-        `--form 'b=bbb'`,
-        `--form f=@/foo/bar.png;type=image/png`,
-      ].join(` \\\n  `),
-    );
-  });
-
-  test('Exports JSON body', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        method: 'POST',
-        bodyType: 'application/json',
-        body: {
-          text: `{"foo":"bar's"}`,
-        },
-        headers: [{ name: 'Content-Type', value: 'application/json' }],
-      }),
-    ).toEqual(
-      [
-        `curl -X POST 'https://yaak.app'`,
-        `--header 'Content-Type: application/json'`,
-        `--data-raw '{"foo":"bar\\'s"}'`,
-      ].join(` \\\n  `),
-    );
-  });
-
-  test('Exports multi-line JSON body', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        method: 'POST',
-        bodyType: 'application/json',
-        body: {
-          text: `{"foo":"bar",\n"baz":"qux"}`,
-        },
-        headers: [{ name: 'Content-Type', value: 'application/json' }],
-      }),
-    ).toEqual(
-      [
-        `curl -X POST 'https://yaak.app'`,
-        `--header 'Content-Type: application/json'`,
-        `--data-raw '{"foo":"bar",\n"baz":"qux"}'`,
-      ].join(` \\\n  `),
-    );
-  });
-
-  test('Exports headers', async () => {
-    expect(
-      await convertToCurl({
-        headers: [
-          { name: 'a', value: 'aaa' },
-          { name: 'b', value: 'bbb', enabled: true },
-          { name: 'c', value: 'ccc', enabled: false },
-        ],
-      }),
-    ).toEqual([`curl`, `--header 'a: aaa'`, `--header 'b: bbb'`].join(` \\\n  `));
-  });
-
-  test('Basic auth', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        authenticationType: 'basic',
-        authentication: {
-          username: 'user',
-          password: 'pass',
-        },
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--user 'user:pass'`].join(` \\\n  `));
-  });
-
-  test('Broken basic auth', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        authenticationType: 'basic',
-        authentication: {},
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--user ':'`].join(` \\\n  `));
-  });
-
-  test('Digest auth', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        authenticationType: 'digest',
-        authentication: {
-          username: 'user',
-          password: 'pass',
-        },
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--digest --user 'user:pass'`].join(` \\\n  `));
-  });
-
-  test('Bearer auth', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        authenticationType: 'bearer',
-        authentication: {
-          token: 'tok',
-        },
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: Bearer tok'`].join(` \\\n  `));
-  });
-
-  test('Broken bearer auth', async () => {
-    expect(
-      await convertToCurl({
-        url: 'https://yaak.app',
-        authenticationType: 'bearer',
-        authentication: {
-          username: 'user',
-          password: 'pass',
-        },
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: Bearer '`].join(` \\\n  `));
-  });
-});

plugins/filter-jsonpath/package-lock.json

@@ -0,0 +1,173 @@
+{
+  "name": "filter-jsonpath",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "filter-jsonpath",
+      "version": "0.0.1",
+      "dependencies": {
+        "jsonpath": "^1.1.1"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
+    "node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz",
+      "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+    },
+    "node_modules/jsonpath": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz",
+      "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==",
+      "dependencies": {
+        "esprima": "1.2.2",
+        "static-eval": "2.0.2",
+        "underscore": "1.12.1"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-eval": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz",
+      "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==",
+      "dependencies": {
+        "escodegen": "^1.8.1"
+      }
+    },
+    "node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/underscore": {
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz",
+      "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    }
+  }
+}

plugins/filter-jsonpath/package.json

@@ -1,15 +1,7 @@
 {
-  "name": "@yaakapp/filter-jsonpath",
-  "private": true,
+  "name": "filter-jsonpath",
   "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.ts",
-    "dev": "yaakcli dev ./src/index.js"
-  },
   "dependencies": {
-    "jsonpath-plus": "^10.3.0"
-  },
-  "devDependencies": {
-    "@types/jsonpath": "^0.2.4"
+    "jsonpath": "^1.1.1"
   }
 }

plugins/filter-jsonpath/src/index.js

@@ -0,0 +1,12 @@
+import jp from 'jsonpath';
+
+export function pluginHookResponseFilter(filter, text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch (e) {
+    return;
+  }
+  const filtered = jp.query(parsed, filter);
+  return { filtered: JSON.stringify(filtered, null, 2) };
+}

plugins/filter-jsonpath/src/index.ts

@@ -1,14 +0,0 @@
-import { PluginDefinition } from '@yaakapp/api';
-import { JSONPath } from 'jsonpath-plus';
-
-export const plugin: PluginDefinition = {
-  filter: {
-    name: 'JSONPath',
-    description: 'Filter JSONPath',
-    onFilter(_ctx, args) {
-      const parsed = JSON.parse(args.payload);
-      const filtered = JSONPath({ path: args.filter, json: parsed });
-      return { filtered: JSON.stringify(filtered, null, 2) };
-    },
-  },
-};

plugins/filter-jsonpath/vite.config.js

@@ -0,0 +1,13 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.js'),
+      fileName: 'index',
+      formats: ['es'],
+    },
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-jsonpath'),
+  },
+});

plugins/filter-xpath/package-lock.json

@@ -0,0 +1,32 @@
+{
+  "name": "filter-xpath",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "filter-xpath",
+      "version": "0.0.1",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.10",
+        "xpath": "^0.0.34"
+      }
+    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/xpath": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.34.tgz",
+      "integrity": "sha512-FxF6+rkr1rNSQrhUNYrAFJpRXNzlDoMxeXN5qI84939ylEv3qqPFKa85Oxr6tDaJKqwW6KKyo2v26TSv3k6LeA==",
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    }
+  }
+}

plugins/filter-xpath/package.json

@@ -1,11 +1,6 @@
 {
-  "name": "@yaakapp/filter-xpath",
-  "private": true,
+  "name": "filter-xpath",
   "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.js",
-    "dev": "yaakcli dev ./src/index.js"
-  },
   "dependencies": {
     "@xmldom/xmldom": "^0.8.10",
     "xpath": "^0.0.34"

plugins/filter-xpath/src/index.js

@@ -0,0 +1,8 @@
+import xpath from 'xpath';
+import { DOMParser } from '@xmldom/xmldom';
+
+export function pluginHookResponseFilter(filter, text) {
+  const doc = new DOMParser().parseFromString(text, 'text/xml');
+  const filtered = `${xpath.select(filter, doc)}`;
+  return { filtered };
+}

plugins/filter-xpath/src/index.ts

@@ -1,21 +0,0 @@
-import { DOMParser } from '@xmldom/xmldom';
-import { PluginDefinition } from '@yaakapp/api';
-import xpath from 'xpath';
-
-export const plugin: PluginDefinition = {
-  filter: {
-    name: 'XPath',
-    description: 'Filter XPath',
-    onFilter(_ctx, args) {
-      const doc = new DOMParser().parseFromString(args.payload, 'text/xml');
-      const result = xpath.select(args.filter, doc, false);
-
-      if (Array.isArray(result)) {
-        return { filtered: result.map(r => String(r)).join('\n') };
-      } else {
-        // Not sure what cases this happens in (?)
-        return { filtered: String(result) };
-      }
-    },
-  },
-};

plugins/filter-xpath/vite.config.js

@@ -0,0 +1,13 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.js'),
+      fileName: 'index',
+      formats: ['es'],
+    },
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-xpath'),
+  },
+});

plugins/importer-curl/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "@yaakapp/importer-curl",
-  "private": true,
-  "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.js",
-    "dev": "yaakcli dev ./src/index.js"
-  },
-  "dependencies": {
-    "shell-quote": "^1.8.1"
-  },
-  "devDependencies": {
-    "@types/shell-quote": "^1.7.5"
-  }
-}

plugins/importer-curl/src/index.ts

@@ -1,441 +0,0 @@
-import { Context, Environment, Folder, HttpRequest, HttpUrlParameter, PluginDefinition, Workspace } from '@yaakapp/api';
-import { ControlOperator, parse, ParseEntry } from 'shell-quote';
-
-type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
-
-interface ExportResources {
-  workspaces: AtLeast<Workspace, 'name' | 'id' | 'model'>[];
-  environments: AtLeast<Environment, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  httpRequests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
-}
-
-const DATA_FLAGS = ['d', 'data', 'data-raw', 'data-urlencode', 'data-binary', 'data-ascii'];
-const SUPPORTED_FLAGS = [
-  ['cookie', 'b'],
-  ['d', 'data'], // Add url encoded data
-  ['data-ascii'],
-  ['data-binary'],
-  ['data-raw'],
-  ['data-urlencode'],
-  ['digest'], // Apply auth as digest
-  ['form', 'F'], // Add multipart data
-  ['get', 'G'], // Put the post data in the URL
-  ['header', 'H'],
-  ['request', 'X'], // Request method
-  ['url'], // Specify the URL explicitly
-  ['url-query'],
-  ['user', 'u'], // Authentication
-  DATA_FLAGS,
-].flatMap((v) => v);
-
-const BOOLEAN_FLAGS = ['G', 'get', 'digest'];
-
-type FlagValue = string | boolean;
-
-type FlagsByName = Record<string, FlagValue[]>;
-
-export const plugin: PluginDefinition = {
-  importer: {
-    name: 'cURL',
-    description: 'Import cURL commands',
-    onImport(_ctx: Context, args: { text: string }) {
-      return convertCurl(args.text) as any;
-    },
-  },
-};
-
-export function convertCurl(rawData: string) {
-  if (!rawData.match(/^\s*curl /)) {
-    return null;
-  }
-
-  const commands: ParseEntry[][] = [];
-
-  // Replace non-escaped newlines with semicolons to make parsing easier
-  // NOTE: This is really slow in debug build but fast in release mode
-  const normalizedData = rawData.replace(/\ncurl/g, '; curl');
-
-  let currentCommand: ParseEntry[] = [];
-
-  const parsed = parse(normalizedData);
-
-  // Break up `-XPOST` into `-X POST`
-  const normalizedParseEntries = parsed.flatMap((entry) => {
-    if (
-      typeof entry === 'string' &&
-      entry.startsWith('-') &&
-      !entry.startsWith('--') &&
-      entry.length > 2
-    ) {
-      return [entry.slice(0, 2), entry.slice(2)];
-    }
-    return entry;
-  });
-
-  for (const parseEntry of normalizedParseEntries) {
-    if (typeof parseEntry === 'string') {
-      if (parseEntry.startsWith('$')) {
-        currentCommand.push(parseEntry.slice(1));
-      } else {
-        currentCommand.push(parseEntry);
-      }
-      continue;
-    }
-
-    if ('comment' in parseEntry) {
-      continue;
-    }
-
-    const { op } = parseEntry as { op: 'glob'; pattern: string } | { op: ControlOperator };
-
-    // `;` separates commands
-    if (op === ';') {
-      commands.push(currentCommand);
-      currentCommand = [];
-      continue;
-    }
-
-    if (op?.startsWith('$')) {
-      // Handle the case where literal like -H $'Header: \'Some Quoted Thing\''
-      const str = op.slice(2, op.length - 1).replace(/\\'/g, '\'');
-
-      currentCommand.push(str);
-      continue;
-    }
-
-    if (op === 'glob') {
-      currentCommand.push((parseEntry as { op: 'glob'; pattern: string }).pattern);
-    }
-  }
-
-  commands.push(currentCommand);
-
-  const workspace: ExportResources['workspaces'][0] = {
-    model: 'workspace',
-    id: generateId('workspace'),
-    name: 'Curl Import',
-  };
-
-  const requests: ExportResources['httpRequests'] = commands
-    .filter((command) => command[0] === 'curl')
-    .map((v) => importCommand(v, workspace.id));
-
-  return {
-    resources: {
-      httpRequests: requests,
-      workspaces: [workspace],
-    },
-  };
-}
-
-function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
-  // ~~~~~~~~~~~~~~~~~~~~~ //
-  // Collect all the flags //
-  // ~~~~~~~~~~~~~~~~~~~~~ //
-  const flagsByName: FlagsByName = {};
-  const singletons: ParseEntry[] = [];
-
-  // Start at 1 so we can skip the ^curl part
-  for (let i = 1; i < parseEntries.length; i++) {
-    let parseEntry = parseEntries[i];
-    if (typeof parseEntry === 'string') {
-      parseEntry = parseEntry.trim();
-    }
-
-    if (typeof parseEntry === 'string' && parseEntry.match(/^-{1,2}[\w-]+/)) {
-      const isSingleDash = parseEntry[0] === '-' && parseEntry[1] !== '-';
-      let name = parseEntry.replace(/^-{1,2}/, '');
-
-      if (!SUPPORTED_FLAGS.includes(name)) {
-        continue;
-      }
-
-      let value;
-      const nextEntry = parseEntries[i + 1];
-      const hasValue = !BOOLEAN_FLAGS.includes(name);
-      if (isSingleDash && name.length > 1) {
-        // Handle squished arguments like -XPOST
-        value = name.slice(1);
-        name = name.slice(0, 1);
-      } else if (typeof nextEntry === 'string' && hasValue && !nextEntry.startsWith('-')) {
-        // Next arg is not a flag, so assign it as the value
-        value = nextEntry;
-        i++; // Skip next one
-      } else {
-        value = true;
-      }
-
-      flagsByName[name] = flagsByName[name] || [];
-      flagsByName[name]!.push(value);
-    } else if (parseEntry) {
-      singletons.push(parseEntry);
-    }
-  }
-
-  // ~~~~~~~~~~~~~~~~~ //
-  // Build the request //
-  // ~~~~~~~~~~~~~~~~~ //
-
-  // Url and Parameters
-  let urlParameters: HttpUrlParameter[];
-  let url: string;
-
-  const urlArg = getPairValue(flagsByName, (singletons[0] as string) || '', ['url']);
-  const [baseUrl, search] = splitOnce(urlArg, '?');
-  urlParameters =
-    search?.split('&').map((p) => {
-      const v = splitOnce(p, '=');
-      return { name: decodeURIComponent(v[0] ?? ''), value: decodeURIComponent(v[1] ?? ''), enabled: true };
-    }) ?? [];
-
-  url = baseUrl ?? urlArg;
-
-  // Query params
-  for (const p of flagsByName['url-query'] ?? []) {
-    if (typeof p !== 'string') {
-      continue;
-    }
-    const [name, value] = p.split('=');
-    urlParameters.push({
-      name: name ?? '',
-      value: value ?? '',
-      enabled: true,
-    });
-  }
-
-  // Authentication
-  const [username, password] = getPairValue(flagsByName, '', ['u', 'user']).split(/:(.*)$/);
-
-  const isDigest = getPairValue(flagsByName, false, ['digest']);
-  const authenticationType = username ? (isDigest ? 'digest' : 'basic') : null;
-  const authentication = username
-    ? {
-      username: username.trim(),
-      password: (password ?? '').trim(),
-    }
-    : {};
-
-  // Headers
-  const headers = [
-    ...((flagsByName['header'] as string[] | undefined) || []),
-    ...((flagsByName['H'] as string[] | undefined) || []),
-  ].map((header) => {
-    const [name, value] = header.split(/:(.*)$/);
-    // remove final colon from header name if present
-    if (!value) {
-      return {
-        name: (name ?? '').trim().replace(/;$/, ''),
-        value: '',
-        enabled: true,
-      };
-    }
-    return {
-      name: (name ?? '').trim(),
-      value: value.trim(),
-      enabled: true,
-    };
-  });
-
-  // Cookies
-  const cookieHeaderValue = [
-    ...((flagsByName['cookie'] as string[] | undefined) || []),
-    ...((flagsByName['b'] as string[] | undefined) || []),
-  ]
-    .map((str) => {
-      const name = str.split('=', 1)[0];
-      const value = str.replace(`${name}=`, '');
-      return `${name}=${value}`;
-    })
-    .join('; ');
-
-  // Convert cookie value to header
-  const existingCookieHeader = headers.find((header) => header.name.toLowerCase() === 'cookie');
-
-  if (cookieHeaderValue && existingCookieHeader) {
-    // Has existing cookie header, so let's update it
-    existingCookieHeader.value += `; ${cookieHeaderValue}`;
-  } else if (cookieHeaderValue) {
-    // No existing cookie header, so let's make a new one
-    headers.push({
-      name: 'Cookie',
-      value: cookieHeaderValue,
-      enabled: true,
-    });
-  }
-
-  // Body (Text or Blob)
-  const dataParameters = pairsToDataParameters(flagsByName);
-  const contentTypeHeader = headers.find((header) => header.name.toLowerCase() === 'content-type');
-  const mimeType = contentTypeHeader ? contentTypeHeader.value.split(';')[0] : null;
-
-  // Body (Multipart Form Data)
-  const formDataParams = [
-    ...((flagsByName['form'] as string[] | undefined) || []),
-    ...((flagsByName['F'] as string[] | undefined) || []),
-  ].map((str) => {
-    const parts = str.split('=');
-    const name = parts[0] ?? '';
-    const value = parts[1] ?? '';
-    const item: { name: string; value?: string; file?: string; enabled: boolean } = {
-      name,
-      enabled: true,
-    };
-
-    if (value.indexOf('@') === 0) {
-      item['file'] = value.slice(1);
-    } else {
-      item['value'] = value;
-    }
-
-    return item;
-  });
-
-  // Body
-  let body = {};
-  let bodyType: string | null = null;
-  const bodyAsGET = getPairValue(flagsByName, false, ['G', 'get']);
-
-  if (dataParameters.length > 0 && bodyAsGET) {
-    urlParameters.push(...dataParameters);
-  } else if (
-    dataParameters.length > 0 &&
-    (mimeType == null || mimeType === 'application/x-www-form-urlencoded')
-  ) {
-    bodyType = mimeType ?? 'application/x-www-form-urlencoded';
-    body = {
-      form: dataParameters.map((parameter) => ({
-        ...parameter,
-        name: decodeURIComponent(parameter.name || ''),
-        value: decodeURIComponent(parameter.value || ''),
-      })),
-    };
-    headers.push({
-      name: 'Content-Type',
-      value: 'application/x-www-form-urlencoded',
-      enabled: true,
-    });
-  } else if (dataParameters.length > 0) {
-    bodyType =
-      mimeType === 'application/json' || mimeType === 'text/xml' || mimeType === 'text/plain'
-        ? mimeType
-        : 'other';
-    body = {
-      text: dataParameters
-        .map(({ name, value }) => (name && value ? `${name}=${value}` : name || value))
-        .join('&'),
-    };
-  } else if (formDataParams.length) {
-    bodyType = mimeType ?? 'multipart/form-data';
-    body = {
-      form: formDataParams,
-    };
-    if (mimeType == null) {
-      headers.push({
-        name: 'Content-Type',
-        value: 'multipart/form-data',
-        enabled: true,
-      });
-    }
-  }
-
-  // Method
-  let method = getPairValue(flagsByName, '', ['X', 'request']).toUpperCase();
-
-  if (method === '' && body) {
-    method = 'text' in body || 'form' in body ? 'POST' : 'GET';
-  }
-
-  const request: ExportResources['httpRequests'][0] = {
-    id: generateId('http_request'),
-    model: 'http_request',
-    workspaceId,
-    name: '',
-    urlParameters,
-    url,
-    method,
-    headers,
-    authentication,
-    authenticationType,
-    body,
-    bodyType,
-    folderId: null,
-    sortPriority: 0,
-  };
-
-  return request;
-}
-
-interface DataParameter {
-  name: string;
-  value: string;
-  contentType?: string;
-  filePath?: string;
-  enabled?: boolean;
-}
-
-function pairsToDataParameters(keyedPairs: FlagsByName): DataParameter[] {
-  let dataParameters: DataParameter[] = [];
-
-  for (const flagName of DATA_FLAGS) {
-    const pairs = keyedPairs[flagName];
-
-    if (!pairs || pairs.length === 0) {
-      continue;
-    }
-
-    for (const p of pairs) {
-      if (typeof p !== 'string') continue;
-      let params = p.split("&");
-      for (const param of params) {
-        const [name, value] = param.split('=');
-        if (param.startsWith('@')) {
-          // Yaak doesn't support files in url-encoded data, so
-          dataParameters.push({
-            name: name ?? '',
-            value: '',
-            filePath: param.slice(1),
-            enabled: true,
-          });
-        } else {
-          dataParameters.push({
-            name: name ?? '',
-            value: flagName === 'data-urlencode' ? encodeURIComponent(value ?? '') : value ?? '',
-            enabled: true,
-          });
-        }
-      }
-    }
-  }
-
-  return dataParameters;
-}
-
-const getPairValue = <T extends string | boolean>(
-  pairsByName: FlagsByName,
-  defaultValue: T,
-  names: string[],
-) => {
-  for (const name of names) {
-    if (pairsByName[name] && pairsByName[name]!.length) {
-      return pairsByName[name]![0] as T;
-    }
-  }
-
-  return defaultValue;
-};
-
-function splitOnce(str: string, sep: string): string[] {
-  const index = str.indexOf(sep);
-  if (index > -1) {
-    return [str.slice(0, index), str.slice(index + 1)];
-  }
-  return [str];
-}
-
-const idCount: Partial<Record<string, number>> = {};
-
-function generateId(model: string): string {
-  idCount[model] = (idCount[model] ?? -1) + 1;
-  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
-}

plugins/importer-curl/tests/index.test.ts

@@ -1,400 +0,0 @@
-import { HttpRequest, Workspace } from '@yaakapp/api';
-import { describe, expect, test } from 'vitest';
-import { convertCurl } from '../src';
-
-describe('importer-curl', () => {
-  test('Imports basic GET', () => {
-    expect(convertCurl('curl https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Explicit URL', () => {
-    expect(convertCurl('curl --url https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Missing URL', () => {
-    expect(convertCurl('curl -X POST')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('URL between', () => {
-    expect(convertCurl('curl -v https://yaak.app -X POST')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Random flags', () => {
-    expect(convertCurl('curl --random -Z -Y -S --foo https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports --request method', () => {
-    expect(convertCurl('curl --request POST https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports -XPOST method', () => {
-    expect(convertCurl('curl -XPOST --request POST https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports multiple requests', () => {
-    expect(
-      convertCurl('curl \\\n  https://yaak.app\necho "foo"\ncurl example.com;curl foo.com'),
-    ).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({ url: 'https://yaak.app' }),
-          baseRequest({ url: 'example.com' }),
-          baseRequest({ url: 'foo.com' }),
-        ],
-      },
-    });
-  });
-
-  test('Imports form data', () => {
-    expect(
-      convertCurl('curl -X POST -F "a=aaa" -F b=bbb" -F f=@filepath https://yaak.app'),
-    ).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-            url: 'https://yaak.app',
-            headers: [
-              {
-                name: 'Content-Type',
-                value: 'multipart/form-data',
-                enabled: true,
-              },
-            ],
-            bodyType: 'multipart/form-data',
-            body: {
-              form: [
-                { enabled: true, name: 'a', value: 'aaa' },
-                { enabled: true, name: 'b', value: 'bbb' },
-                { enabled: true, name: 'f', file: 'filepath' },
-              ],
-            },
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports data params as form url-encoded', () => {
-    expect(convertCurl('curl -d a -d b -d c=ccc https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-            url: 'https://yaak.app',
-            bodyType: 'application/x-www-form-urlencoded',
-            headers: [
-              {
-                name: 'Content-Type',
-                value: 'application/x-www-form-urlencoded',
-                enabled: true,
-              },
-            ],
-            body: {
-              form: [
-                { name: 'a', value: '', enabled: true },
-                { name: 'b', value: '', enabled: true },
-                { name: 'c', value: 'ccc', enabled: true },
-              ],
-            },
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports combined data params as form url-encoded', () => {
-    expect(convertCurl(`curl -d 'a=aaa&b=bbb&c' https://yaak.app`)).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-            url: 'https://yaak.app',
-            bodyType: 'application/x-www-form-urlencoded',
-            headers: [
-              {
-                name: 'Content-Type',
-                value: 'application/x-www-form-urlencoded',
-                enabled: true,
-              },
-            ],
-            body: {
-              form: [
-                { name: 'a', value: 'aaa', enabled: true },
-                { name: 'b', value: 'bbb', enabled: true },
-                { name: 'c', value: '', enabled: true },
-              ],
-            },
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports data params as text', () => {
-    expect(
-      convertCurl('curl -H Content-Type:text/plain -d a -d b -d c=ccc https://yaak.app'),
-    ).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-            url: 'https://yaak.app',
-            headers: [{ name: 'Content-Type', value: 'text/plain', enabled: true }],
-            bodyType: 'text/plain',
-            body: { text: 'a&b&c=ccc' },
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports post data into URL', () => {
-    expect(
-      convertCurl('curl -G https://api.stripe.com/v1/payment_links -d limit=3'),
-    ).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'GET',
-            url: 'https://api.stripe.com/v1/payment_links',
-            urlParameters: [{
-              enabled: true,
-              name: 'limit',
-              value: '3',
-            }],
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports multi-line JSON', () => {
-    expect(
-      convertCurl(`curl -H Content-Type:application/json -d $'{\n  "foo":"bar"\n}' https://yaak.app`),
-    ).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-            url: 'https://yaak.app',
-            headers: [{ name: 'Content-Type', value: 'application/json', enabled: true }],
-            bodyType: 'application/json',
-            body: { text: '{\n  "foo":"bar"\n}' },
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports multiple headers', () => {
-    expect(
-      convertCurl('curl -H Foo:bar --header Name -H AAA:bbb -H :ccc https://yaak.app'),
-    ).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            headers: [
-              { name: 'Name', value: '', enabled: true },
-              { name: 'Foo', value: 'bar', enabled: true },
-              { name: 'AAA', value: 'bbb', enabled: true },
-              { name: '', value: 'ccc', enabled: true },
-            ],
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports basic auth', () => {
-    expect(convertCurl('curl --user user:pass https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            authenticationType: 'basic',
-            authentication: {
-              username: 'user',
-              password: 'pass',
-            },
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports digest auth', () => {
-    expect(convertCurl('curl --digest --user user:pass https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            authenticationType: 'digest',
-            authentication: {
-              username: 'user',
-              password: 'pass',
-            },
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports cookie as header', () => {
-    expect(convertCurl('curl --cookie "foo=bar" https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            headers: [{ name: 'Cookie', value: 'foo=bar', enabled: true }],
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports query params', () => {
-    expect(convertCurl('curl "https://yaak.app" --url-query foo=bar --url-query baz=qux')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            urlParameters: [
-              { name: 'foo', value: 'bar', enabled: true },
-              { name: 'baz', value: 'qux', enabled: true },
-            ],
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports query params from the URL', () => {
-    expect(convertCurl('curl "https://yaak.app?foo=bar&baz=a%20a"')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            urlParameters: [
-              { name: 'foo', value: 'bar', enabled: true },
-              { name: 'baz', value: 'a a', enabled: true },
-            ],
-          }),
-        ],
-      },
-    });
-  });
-});
-
-const idCount: Partial<Record<string, number>> = {};
-
-function baseRequest(mergeWith: Partial<HttpRequest>) {
-  idCount.http_request = (idCount.http_request ?? -1) + 1;
-  return {
-    id: `GENERATE_ID::HTTP_REQUEST_${idCount.http_request}`,
-    model: 'http_request',
-    authentication: {},
-    authenticationType: null,
-    body: {},
-    bodyType: null,
-    folderId: null,
-    headers: [],
-    method: 'GET',
-    name: '',
-    sortPriority: 0,
-    url: '',
-    urlParameters: [],
-    workspaceId: `GENERATE_ID::WORKSPACE_${idCount.workspace}`,
-    ...mergeWith,
-  };
-}
-
-function baseWorkspace(mergeWith: Partial<Workspace> = {}) {
-  idCount.workspace = (idCount.workspace ?? -1) + 1;
-  return {
-    id: `GENERATE_ID::WORKSPACE_${idCount.workspace}`,
-    model: 'workspace',
-    name: 'Curl Import',
-    ...mergeWith,
-  };
-}

plugins/importer-insomnia/package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "importer-insomnia",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "importer-insomnia",
+      "version": "0.0.1"
+    }
+  }
+}

plugins/importer-insomnia/package.json

@@ -1,12 +1,4 @@
 {
-  "name": "@yaakapp/importer-insomnia",
-  "private": true,
-  "version": "0.0.1",
-  "scripts": {
-    "build": "yaakcli build ./src/index.js",
-    "dev": "yaakcli dev ./src/index.js"
-  },
-  "dependencies": {
-    "yaml": "^2.4.2"
-  }
+  "name": "importer-insomnia",
+  "version": "0.0.1"
 }

plugins/importer-insomnia/src/common.ts

@@ -1,34 +0,0 @@
-
-export function convertSyntax(variable: string): string {
-  if (!isJSString(variable)) return variable;
-  return variable.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}');
-}
-
-export function isJSObject(obj: any) {
-  return Object.prototype.toString.call(obj) === '[object Object]';
-}
-
-export function isJSString(obj: any) {
-  return Object.prototype.toString.call(obj) === '[object String]';
-}
-
-export function convertId(id: string): string {
-  if (id.startsWith('GENERATE_ID::')) {
-    return id;
-  }
-  return `GENERATE_ID::${id}`;
-}
-
-export function deleteUndefinedAttrs<T>(obj: T): T {
-  if (Array.isArray(obj) && obj != null) {
-    return obj.map(deleteUndefinedAttrs) as T;
-  } else if (typeof obj === 'object' && obj != null) {
-    return Object.fromEntries(
-      Object.entries(obj)
-        .filter(([, v]) => v !== undefined)
-        .map(([k, v]) => [k, deleteUndefinedAttrs(v)]),
-    ) as T;
-  } else {
-    return obj;
-  }
-}

plugins/importer-insomnia/src/helpers/types.js

@@ -0,0 +1,23 @@
+export function isWorkspace(obj) {
+  return isJSObject(obj) && obj._type === 'workspace';
+}
+
+export function isRequestGroup(obj) {
+  return isJSObject(obj) && obj._type === 'request_group';
+}
+
+export function isRequest(obj) {
+  return isJSObject(obj) && obj._type === 'request';
+}
+
+export function isEnvironment(obj) {
+  return isJSObject(obj) && obj._type === 'environment';
+}
+
+export function isJSObject(obj) {
+  return Object.prototype.toString.call(obj) === '[object Object]';
+}
+
+export function isJSString(obj) {
+  return Object.prototype.toString.call(obj) === '[object String]';
+}

plugins/importer-insomnia/src/helpers/variables.js

@@ -0,0 +1,18 @@
+import { isJSString } from './types.js';
+
+export function parseVariables(data) {
+  return Object.entries(data).map(([name, value]) => ({
+    enabled: true,
+    name,
+    value: `${value}`,
+  }));
+}
+
+/**
+ * Convert Insomnia syntax to Yaak syntax
+ * @param {string} variable - Text to convert
+ */
+export function convertSyntax(variable) {
+  if (!isJSString(variable)) return variable;
+  return variable.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}');
+}

plugins/importer-insomnia/src/importers/environment.js

@@ -0,0 +1,21 @@
+/**
+ * Import an Insomnia environment object.
+ * @param {Object} e - The environment object to import.
+ * @param workspaceId - Workspace to import into.
+ */
+export function importEnvironment(e, workspaceId) {
+  console.log('IMPORTING Environment', e._id, e.name, JSON.stringify(e, null, 2));
+  return {
+    id: e._id,
+    createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
+    workspaceId,
+    model: 'environment',
+    name: e.name,
+    variables: Object.entries(e.data).map(([name, value]) => ({
+      enabled: true,
+      name,
+      value: `${value}`,
+    })),
+  };
+}

plugins/importer-insomnia/src/importers/folder.js

@@ -0,0 +1,17 @@
+/**
+ * Import an Insomnia folder object.
+ * @param {Object} f - The environment object to import.
+ * @param workspaceId - Workspace to import into.
+ */
+export function importFolder(f, workspaceId) {
+  console.log('IMPORTING FOLDER', f._id, f.name, JSON.stringify(f, null, 2));
+  return {
+    id: f._id,
+    createdAt: new Date(f.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(f.updated ?? Date.now()).toISOString().replace('Z', ''),
+    folderId: f.parentId === workspaceId ? null : f.parentId,
+    workspaceId,
+    model: 'folder',
+    name: f.name,
+  };
+}