Fix gRPC request creation

- [x] Move from `sqlx` to `rusqlite`
- [x] Generate TS types from Rust models

.eslintrc.cjs

@@ -12,7 +12,13 @@ module.exports = {
   parserOptions: {
     project: ["./tsconfig.json"]
   },
-  ignorePatterns: ["src-tauri/**/*", "plugins/**/*"],
+  ignorePatterns: [
+    "scripts/**/*",
+    "plugin-runtime/**/*",
+    "plugin-runtime-types/**/*",
+    "src-tauri/**/*",
+    "plugins/**/*",
+  ],
   settings: {
     react: {
       version: "detect"

.github/workflows/ci-js.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: lts/*
+          node-version: 20
       - run: npm ci
       - run: npm run lint
       - run: npm test

.github/workflows/release.yml

@@ -3,35 +3,51 @@ on:
   push:
     tags: [ v* ]
 
+env:
+  YAAK_PLUGINS_DIR: checkout/plugins
+
 jobs:
   build-artifacts:
     permissions:
       contents: write
+
     name: Build
     strategy:
       fail-fast: false
       matrix:
         include:
-          - platform: 'macos-latest' # for Arm based macs (M1 and above).
+          - platform: 'macos-latest' # for Arm-based macs (M1 and above).
             args: '--target aarch64-apple-darwin'
-          - platform: 'macos-latest' # for Intel based macs.
+            yaak_arch: 'arm64'
+          - platform: 'macos-latest' # for Intel-based macs.
             args: '--target x86_64-apple-darwin'
-          - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
+            yaak_arch: 'x64'
+          - platform: 'ubuntu-22.04' # for Tauri v1, you could replace this with ubuntu-20.04.
             args: ''
+            yaak_arch: 'x64'
           - platform: 'windows-latest'
             args: ''
+            yaak_arch: 'x64'
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v4
-      - name: setup node
+      - name: Checkout yaakapp/app
+        uses: actions/checkout@v4
+
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: lts/*
+          node-version: 20
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.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:
@@ -43,19 +59,48 @@ jobs:
             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
-        run: npm ci
+
+      - name: Install Node dependencies
+        run: |
+          npm ci
+
+      - name: Install plugin-runtime Node dependencies
+        working-directory: plugin-runtime
+        run: |
+          npm ci
+
+      - name: Install Protoc for plugin-runtime
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install yaak CLI
+        run: go install github.com/yaakapp/yaakcli@latest
+
       - name: Run lint
         run: npm run lint
-      - name: Run tests
-        run: npm test
+
+      - name: Checkout yaakapp/plugins
+        uses: actions/checkout@v4
+        with:
+          repository: yaakapp/plugins
+          path: ${{ env.YAAK_PLUGINS_DIR }}
+
+      - name: Set version
+        run: npm run replace-version
+        env:
+          YAAK_VERSION: ${{ github.ref_name }}
+
       - uses: tauri-apps/tauri-action@v0
         env:
+          YAAK_PLUGINS_DIR: ${{ env.YAAK_PLUGINS_DIR }}
+          YAAK_TARGET_ARCH: ${{ matrix.yaak_arch }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
@@ -69,7 +114,7 @@ jobs:
         with:
           tagName: 'v__VERSION__'
           releaseName: 'Release __VERSION__'
-          releaseBody: 'https://yaak.app/changelog/__VERSION__'
+          releaseBody: 'https://yaak.app/blog/__VERSION__'
           releaseDraft: true
           prerelease: false
           args: ${{ matrix.args }}

.gitignore

@@ -28,4 +28,6 @@ dist-ssr
 *.sqlite-*
 
 .cargo
-plugins/**/build
+
+.tmp
+tmp

index.html

@@ -4,20 +4,20 @@
   <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;
-      }
+    html, body {
+      background-color: white;
+    }
 
-      @media (prefers-color-scheme: dark) {
-          html, body {
-              background-color: #1b1a29;
-          }
+    @media (prefers-color-scheme: dark) {
+      html, body {
+        background-color: #1b1a29;
       }
+    }
   </style>
 </head>
 

package.json

@@ -9,23 +9,18 @@
     "tauri-dev:ios": "tauri ios dev --force-ip-prompt --config ./src-tauri/tauri-dev.conf.json",
     "tauri-build": "tauri build",
     "tauri": "tauri",
-    "build": "npm run build:frontend",
-    "dev": "vite dev",
+    "dev:js": "vite dev",
     "lint": "tsc && eslint . --ext .ts,.tsx",
+    "build": "run-p build:*",
     "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:exporter-curl": "cd plugins/exporter-curl && vite build --emptyOutDir",
-    "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:importer-curl": "cd plugins/importer-curl && 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"
+    "build:js": "vite build",
+    "build:plugin-runtime": "npm run --prefix plugin-runtime build",
+    "build:vendor-protoc": "node scripts/vendor-protoc.cjs",
+    "build:vendor-plugins": "node scripts/vendor-plugins.cjs",
+    "build:vendor-node": "node scripts/vendor-node.cjs",
+    "prepare": "husky install",
+    "replace-version": "node scripts/replace-version.cjs"
   },
   "dependencies": {
     "@codemirror/commands": "^6.2.1",
@@ -39,13 +34,15 @@
     "@lezer/lr": "^1.3.3",
     "@react-hook/resize-observer": "^1.2.6",
     "@tailwindcss/container-queries": "^0.1.0",
-    "@tanstack/react-query": "^5.35.5",
-    "@tauri-apps/api": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-clipboard-manager": "^2.1.0-beta.1",
-    "@tauri-apps/plugin-dialog": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-fs": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-os": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-shell": ">=2.0.0-beta.0",
+    "@tanstack/react-query": "^5.45.1",
+    "@tauri-apps/api": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-clipboard-manager": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-dialog": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-fs": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-os": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-shell": "^2.0.0-rc.0",
+    "@tauri-apps/plugin-log": "^2.0.0-rc.0",
+    "@yaakapp/api": "^0.1.4",
     "buffer": "^6.0.3",
     "classnames": "^2.3.2",
     "cm6-graphql": "^0.0.9",
@@ -69,14 +66,13 @@
     "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#v2",
     "uuid": "^9.0.0",
     "xml-formatter": "^3.6.2"
   },
   "devDependencies": {
     "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tanstack/react-query-devtools": "^5.35.5",
-    "@tauri-apps/cli": ">=2.0.0-beta.0",
+    "@tanstack/react-query-devtools": "^5.45.1",
+    "@tauri-apps/cli": "^2.0.0-rc.2",
     "@types/node": "^18.7.10",
     "@types/papaparse": "^5.3.7",
     "@types/parse-color": "^1.0.1",
@@ -88,6 +84,7 @@
     "@typescript-eslint/parser": "^7.0.2",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.13",
+    "decompress": "^4.2.1",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
@@ -97,18 +94,19 @@
     "husky": "^8.0.3",
     "internal-ip": "^8.0.0",
     "lint-staged": "^15.0.2",
+    "nodejs-file-downloader": "^4.13.0",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.21",
     "postcss-nesting": "^11.2.1",
     "prettier": "^2.8.4",
     "react-devtools": "^4.27.2",
+    "rimraf": "^5.0.7",
     "tailwindcss": "^3.2.7",
     "typescript": "^5.4.5",
     "vite": "^5.0.0",
     "vite-plugin-static-copy": "^1.0.5",
     "vite-plugin-svgr": "^4.2.0",
-    "vite-plugin-top-level-await": "^1.4.1",
-    "vitest": "^1.3.0"
+    "vite-plugin-top-level-await": "^1.4.1"
   },
   "lint-staged": {
     "*.{ts,tsx}": "eslint --cache --fix",

plugin-runtime-types/.gitignore

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

plugin-runtime-types/package-lock.json

@@ -0,0 +1,44 @@
+{
+  "name": "@yaakapp/api",
+  "version": "0.1.0-beta.4",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@yaakapp/api",
+      "version": "0.1.0-beta.4",
+      "dependencies": {
+        "@types/node": "^22.0.0"
+      },
+      "devDependencies": {
+        "typescript": "^5.5.4"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "22.0.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.0.0.tgz",
+      "integrity": "sha512-VT7KSYudcPOzP5Q0wfbowyNLaVR8QWUdw+088uFWwfvpY6uCWaXpqV6ieLAu9WBcnTa7H4Z5RLK8I5t2FuOcqw==",
+      "dependencies": {
+        "undici-types": "~6.11.1"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.11.1",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz",
+      "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ=="
+    }
+  }
+}

plugin-runtime-types/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "@yaakapp/api",
+  "version": "0.1.4",
+  "main": "lib/index.js",
+  "typings": "./lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "@types/node": "^22.0.0"
+  },
+  "devDependencies": {
+    "typescript": "^5.5.4"
+  }
+}

plugin-runtime-types/src/gen/BootRequest.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BootRequest = { dir: string, };

plugin-runtime-types/src/gen/BootResponse.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type BootResponse = { name: string, version: string, capabilities: Array<string>, };

plugin-runtime-types/src/gen/Cookie.ts

@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CookieDomain } from "./CookieDomain";
+import type { CookieExpires } from "./CookieExpires";
+
+export type Cookie = { raw_cookie: string, domain: CookieDomain, expires: CookieExpires, path: [string, boolean], };

plugin-runtime-types/src/gen/CookieDomain.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type CookieDomain = { "HostOnly": string } | { "Suffix": string } | "NotPresent" | "Empty";

plugin-runtime-types/src/gen/CookieExpires.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type CookieExpires = { "AtUtc": string } | "SessionEnd";

plugin-runtime-types/src/gen/CookieJar.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Cookie } from "./Cookie";
+
+export type CookieJar = { id: string, model: "cookie_jar", createdAt: string, updatedAt: string, workspaceId: string, name: string, cookies: Array<Cookie>, };

plugin-runtime-types/src/gen/EmptyResponse.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EmptyResponse = {};

plugin-runtime-types/src/gen/Environment.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EnvironmentVariable } from "./EnvironmentVariable";
+
+export type Environment = { id: string, workspaceId: string, model: "environment", createdAt: string, updatedAt: string, name: string, variables: Array<EnvironmentVariable>, };

plugin-runtime-types/src/gen/EnvironmentVariable.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/ExportHttpRequestRequest.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HttpRequest } from "./HttpRequest";
+
+export type ExportHttpRequestRequest = { httpRequest: HttpRequest, };

plugin-runtime-types/src/gen/ExportHttpRequestResponse.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ExportHttpRequestResponse = { content: string, };

plugin-runtime-types/src/gen/FilterRequest.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type FilterRequest = { content: string, filter: string, };

plugin-runtime-types/src/gen/FilterResponse.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type FilterResponse = { content: string, };

plugin-runtime-types/src/gen/Folder.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Folder = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "folder", name: string, sortPriority: number, };

plugin-runtime-types/src/gen/GrpcConnection.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GrpcConnection = { id: string, model: "grpc_connection", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, service: string, method: string, elapsed: number, status: number, url: string, error: string | null, trailers: { [key: string]: string }, };

plugin-runtime-types/src/gen/GrpcEvent.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { GrpcEventType } from "./GrpcEventType";
+
+export type GrpcEvent = { id: string, model: "grpc_event", workspaceId: string, requestId: string, connectionId: string, createdAt: string, content: string, eventType: GrpcEventType, metadata: { [key: string]: string }, status: number | null, error: string | null, };

plugin-runtime-types/src/gen/GrpcEventType.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GrpcEventType = "info" | "error" | "client_message" | "server_message" | "connection_start" | "connection_end";

plugin-runtime-types/src/gen/GrpcMetadataEntry.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GrpcMetadataEntry = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/GrpcRequest.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { GrpcMetadataEntry } from "./GrpcMetadataEntry";
+
+export type GrpcRequest = { id: string, model: "grpc_request", workspaceId: string, createdAt: string, updatedAt: string, folderId: string | null, name: string, sortPriority: number, url: string, service: string | null, method: string | null, message: string, authenticationType: string | null, authentication: Record<string, any>, metadata: Array<GrpcMetadataEntry>, };

plugin-runtime-types/src/gen/HttpRequest.ts

@@ -0,0 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HttpRequestHeader } from "./HttpRequestHeader";
+import type { HttpUrlParameter } from "./HttpUrlParameter";
+
+export type HttpRequest = { createdAt: string, updatedAt: string, id: string, workspaceId: string, folderId: string | null, model: "http_request", sortPriority: number, name: string, url: string, urlParameters: Array<HttpUrlParameter>, method: string, body: Record<string, any>, bodyType: string | null, authentication: Record<string, any>, authenticationType: string | null, headers: Array<HttpRequestHeader>, };

plugin-runtime-types/src/gen/HttpRequestHeader.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HttpRequestHeader = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/HttpResponse.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { HttpResponseHeader } from "./HttpResponseHeader";
+
+export type HttpResponse = { id: string, model: "http_response", workspaceId: string, requestId: string, createdAt: string, updatedAt: string, error: string | null, url: string, contentLength: number | null, version: string | null, elapsed: number, elapsedHeaders: number, remoteAddr: string | null, status: number, statusReason: string | null, bodyPath: string | null, headers: Array<HttpResponseHeader>, };

plugin-runtime-types/src/gen/HttpResponseHeader.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HttpResponseHeader = { name: string, value: string, };

plugin-runtime-types/src/gen/HttpUrlParameter.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type HttpUrlParameter = { enabled?: boolean, name: string, value: string, };

plugin-runtime-types/src/gen/ImportRequest.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ImportRequest = { content: string, };

plugin-runtime-types/src/gen/ImportResources.ts

@@ -0,0 +1,8 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Environment } from "./Environment";
+import type { Folder } from "./Folder";
+import type { GrpcRequest } from "./GrpcRequest";
+import type { HttpRequest } from "./HttpRequest";
+import type { Workspace } from "./Workspace";
+
+export type ImportResources = { workspaces: Array<Workspace>, environments: Array<Environment>, folders: Array<Folder>, httpRequests: Array<HttpRequest>, grpcRequests: Array<GrpcRequest>, };

plugin-runtime-types/src/gen/ImportResponse.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ImportResources } from "./ImportResources";
+
+export type ImportResponse = { resources: ImportResources, };

plugin-runtime-types/src/gen/InternalEvent.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { InternalEventPayload } from "./InternalEventPayload";
+
+export type InternalEvent = { id: string, pluginRefId: string, replyId: string | null, payload: InternalEventPayload, };

plugin-runtime-types/src/gen/InternalEventPayload.ts

@@ -0,0 +1,12 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { BootRequest } from "./BootRequest";
+import type { BootResponse } from "./BootResponse";
+import type { EmptyResponse } from "./EmptyResponse";
+import type { ExportHttpRequestRequest } from "./ExportHttpRequestRequest";
+import type { ExportHttpRequestResponse } from "./ExportHttpRequestResponse";
+import type { FilterRequest } from "./FilterRequest";
+import type { FilterResponse } from "./FilterResponse";
+import type { ImportRequest } from "./ImportRequest";
+import type { ImportResponse } from "./ImportResponse";
+
+export type InternalEventPayload = { "type": "boot_request" } & BootRequest | { "type": "boot_response" } & BootResponse | { "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": "empty_response" } & EmptyResponse;

plugin-runtime-types/src/gen/KeyValue.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type KeyValue = { model: "key_value", createdAt: string, updatedAt: string, namespace: string, key: string, value: string, };

plugin-runtime-types/src/gen/Model.ts

@@ -0,0 +1,14 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { CookieJar } from "./CookieJar";
+import type { Environment } from "./Environment";
+import type { Folder } from "./Folder";
+import type { GrpcConnection } from "./GrpcConnection";
+import type { GrpcEvent } from "./GrpcEvent";
+import type { GrpcRequest } from "./GrpcRequest";
+import type { HttpRequest } from "./HttpRequest";
+import type { HttpResponse } from "./HttpResponse";
+import type { KeyValue } from "./KeyValue";
+import type { Settings } from "./Settings";
+import type { Workspace } from "./Workspace";
+
+export type Model = Environment | Folder | GrpcConnection | GrpcEvent | GrpcRequest | HttpRequest | HttpResponse | KeyValue | Workspace | CookieJar | Settings;

plugin-runtime-types/src/gen/Settings.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Settings = { id: string, model: "settings", createdAt: string, updatedAt: string, theme: string, appearance: string, themeDark: string, themeLight: string, updateChannel: string, interfaceFontSize: number, interfaceScale: number, editorFontSize: number, editorSoftWrap: boolean, openWorkspaceNewWindow: boolean | null, };

plugin-runtime-types/src/gen/Workspace.ts

@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EnvironmentVariable } from "./EnvironmentVariable";
+
+export type Workspace = { id: string, model: "workspace", createdAt: string, updatedAt: string, name: string, description: string, variables: Array<EnvironmentVariable>, settingValidateCertificates: boolean, settingFollowRedirects: boolean, settingRequestTimeout: number, };

plugin-runtime-types/src/helpers.ts

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

plugin-runtime-types/src/index.ts

@@ -0,0 +1,35 @@
+export type * from './plugins';
+export type * from './themes';
+
+export * from './gen/BootRequest';
+export * from './gen/BootResponse';
+export * from './gen/Cookie';
+export * from './gen/CookieDomain';
+export * from './gen/CookieExpires';
+export * from './gen/CookieJar';
+export * from './gen/EmptyResponse';
+export * from './gen/Environment';
+export * from './gen/EnvironmentVariable';
+export * from './gen/ExportHttpRequestRequest';
+export * from './gen/ExportHttpRequestResponse';
+export * from './gen/FilterRequest';
+export * from './gen/FilterResponse';
+export * from './gen/Folder';
+export * from './gen/GrpcConnection';
+export * from './gen/GrpcEvent';
+export * from './gen/GrpcMetadataEntry';
+export * from './gen/GrpcRequest';
+export * from './gen/HttpRequest';
+export * from './gen/HttpRequestHeader';
+export * from './gen/HttpResponse';
+export * from './gen/HttpResponseHeader';
+export * from './gen/HttpUrlParameter';
+export * from './gen/ImportRequest';
+export * from './gen/ImportResources';
+export * from './gen/ImportResponse';
+export * from './gen/InternalEvent';
+export * from './gen/InternalEventPayload';
+export * from './gen/KeyValue';
+export * from './gen/Model';
+export * from './gen/Settings';
+export * from './gen/Workspace';

plugin-runtime-types/src/plugins/context.ts

@@ -0,0 +1,12 @@
+import { HttpRequest } from '../gen/HttpRequest';
+import { HttpResponse } from '../gen/HttpResponse';
+
+export type YaakContext = {
+  metadata: {
+    getVersion(): Promise<string>;
+  };
+  httpRequest: {
+    send(id: string): Promise<HttpResponse>;
+    getById(id: string): Promise<HttpRequest | null>;
+  };
+};

plugin-runtime-types/src/plugins/filter.ts

@@ -0,0 +1,13 @@
+import { YaakContext } from './context';
+
+export type FilterPluginResponse = string[];
+
+export type FilterPlugin = {
+  name: string;
+  description?: string;
+  canFilter(ctx: YaakContext, args: { mimeType: string }): Promise<boolean>;
+  onFilter(
+    ctx: YaakContext,
+    args: { payload: string; mimeType: string },
+  ): Promise<FilterPluginResponse>;
+};

plugin-runtime-types/src/plugins/httpRequestAction.ts

@@ -0,0 +1,8 @@
+import { HttpRequest } from '../gen/HttpRequest';
+import { YaakContext } from './context';
+
+export type HttpRequestActionPlugin = {
+  key: string;
+  label: string;
+  onSelect(ctx: YaakContext, args: { httpRequest: HttpRequest }): void;
+};

plugin-runtime-types/src/plugins/import.ts

@@ -0,0 +1,19 @@
+import { Environment } from '../gen/Environment';
+import { Folder } from '../gen/Folder';
+import { HttpRequest } from '../gen/HttpRequest';
+import { Workspace } from '../gen/Workspace';
+import { AtLeast } from '../helpers';
+import { YaakContext } from './context';
+
+export type ImportPluginResponse = null | {
+  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'>[];
+};
+
+export type ImporterPlugin = {
+  name: string;
+  description?: string;
+  onImport(ctx: YaakContext, args: { text: string }): Promise<ImportPluginResponse>;
+};

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

@@ -0,0 +1,15 @@
+import { OneOrMany } from '../helpers';
+import { FilterPlugin } from './filter';
+import { HttpRequestActionPlugin } from './httpRequestAction';
+import { ImporterPlugin } from './import';
+import { ThemePlugin } from './theme';
+
+/**
+ * The global structure of a Yaak plugin
+ */
+export type YaakPlugin = {
+  importer?: OneOrMany<ImporterPlugin>;
+  theme?: OneOrMany<ThemePlugin>;
+  filter?: OneOrMany<FilterPlugin>;
+  httpRequestAction?: OneOrMany<HttpRequestActionPlugin>;
+};

plugin-runtime-types/src/plugins/theme.ts

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

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

@@ -0,0 +1,44 @@
+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 Theme = 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>;
+  }>;
+};

plugin-runtime-types/tsconfig.json

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

plugin-runtime/.gitignore

@@ -0,0 +1,3 @@
+build
+node_modules
+*.blob

plugin-runtime/nodemon.json

@@ -0,0 +1,5 @@
+{
+  "watch": ["src"],
+  "ext": "ts",
+  "exec": "node -r ts-node/register ./src/index.ts"
+}

plugin-runtime/package.json

@@ -0,0 +1,25 @@
+{
+  "name": "@yaak/plugin-runtime",
+  "scripts": {
+    "dev": "nodemon",
+    "build": "run-p build:*",
+    "build:main": "esbuild src/index.ts --bundle --platform=node --outfile=build/index.cjs",
+    "build:worker": "esbuild src/index.worker.ts --bundle --platform=node --outfile=build/index.worker.cjs",
+    "build:proto": "grpc_tools_node_protoc --ts_proto_out=src/gen --ts_proto_opt=outputServices=nice-grpc,outputServices=generic-definitions,useExactTypes=false --proto_path=../proto ../proto/plugins/*.proto"
+  },
+  "dependencies": {
+    "intercept-stdout": "^0.1.2",
+    "long": "^5.2.3",
+    "nice-grpc": "^2.1.9",
+    "protobufjs": "^7.3.2"
+  },
+  "devDependencies": {
+    "@types/intercept-stdout": "^0.1.3",
+    "grpc-tools": "^1.12.4",
+    "nodemon": "^3.1.4",
+    "npm-run-all": "^4.1.5",
+    "ts-node": "^10.9.2",
+    "ts-proto": "^1.180.0",
+    "typescript": "^5.5.2"
+  }
+}

plugin-runtime/src/EventChannel.ts

@@ -0,0 +1,21 @@
+import { InternalEvent } from '@yaakapp/api';
+import EventEmitter from 'node:events';
+import { EventStreamEvent } from './gen/plugins/runtime';
+
+export class EventChannel {
+  emitter: EventEmitter = new EventEmitter();
+
+  emit(e: InternalEvent) {
+    this.emitter.emit('__plugin_event__', { event: JSON.stringify(e) });
+  }
+
+  async *listen(): AsyncGenerator<EventStreamEvent> {
+    while (true) {
+      yield new Promise<EventStreamEvent>((resolve) => {
+        this.emitter.once('__plugin_event__', (event: EventStreamEvent) => {
+          resolve(event);
+        });
+      });
+    }
+  }
+}

plugin-runtime/src/PluginHandle.ts

@@ -0,0 +1,42 @@
+import { InternalEvent } from '@yaakapp/api';
+import path from 'node:path';
+import { Worker } from 'node:worker_threads';
+import { EventChannel } from './EventChannel';
+
+export class PluginHandle {
+  readonly #worker: Worker;
+
+  constructor(
+    readonly pluginDir: string,
+    readonly pluginRefId: string,
+    readonly events: EventChannel,
+  ) {
+    const workerPath = process.env.YAAK_WORKER_PATH ?? path.join(__dirname, 'index.worker.cjs');
+    this.#worker = new Worker(workerPath, {
+      workerData: {
+        pluginDir,
+        pluginRefId,
+      },
+    });
+
+    this.#worker.on('message', (e) => this.events.emit(e));
+    this.#worker.on('error', this.#handleError.bind(this));
+    this.#worker.on('exit', this.#handleExit.bind(this));
+  }
+
+  sendToWorker(event: InternalEvent) {
+    this.#worker.postMessage(event);
+  }
+
+  async #handleError(err: Error) {
+    console.error('Plugin errored', this.pluginDir, err);
+  }
+
+  async #handleExit(code: number) {
+    if (code === 0) {
+      console.log('Plugin exited successfully', this.pluginDir);
+    } else {
+      console.log('Plugin exited with error', code, this.pluginDir);
+    }
+  }
+}

plugin-runtime/src/gen/plugins/runtime.ts

@@ -0,0 +1,475 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v1.180.0
+//   protoc               v3.19.1
+// source: plugins/runtime.proto
+
+/* eslint-disable */
+import { type CallContext, type CallOptions } from "nice-grpc-common";
+import * as _m0 from "protobufjs/minimal";
+
+export const protobufPackage = "yaak.plugins.runtime";
+
+export interface PluginInfo {
+  plugin: string;
+}
+
+export interface HookResponse {
+  info: PluginInfo | undefined;
+  data: string;
+}
+
+export interface HookImportRequest {
+  data: string;
+}
+
+export interface HookResponseFilterRequest {
+  filter: string;
+  body: string;
+  contentType: string;
+}
+
+export interface HookExportRequest {
+  request: string;
+}
+
+export interface EventStreamEvent {
+  event: string;
+}
+
+function createBasePluginInfo(): PluginInfo {
+  return { plugin: "" };
+}
+
+export const PluginInfo = {
+  encode(message: PluginInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.plugin !== "") {
+      writer.uint32(10).string(message.plugin);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): PluginInfo {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBasePluginInfo();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.plugin = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): PluginInfo {
+    return { plugin: isSet(object.plugin) ? globalThis.String(object.plugin) : "" };
+  },
+
+  toJSON(message: PluginInfo): unknown {
+    const obj: any = {};
+    if (message.plugin !== "") {
+      obj.plugin = message.plugin;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<PluginInfo>): PluginInfo {
+    return PluginInfo.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<PluginInfo>): PluginInfo {
+    const message = createBasePluginInfo();
+    message.plugin = object.plugin ?? "";
+    return message;
+  },
+};
+
+function createBaseHookResponse(): HookResponse {
+  return { info: undefined, data: "" };
+}
+
+export const HookResponse = {
+  encode(message: HookResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.info !== undefined) {
+      PluginInfo.encode(message.info, writer.uint32(10).fork()).ldelim();
+    }
+    if (message.data !== "") {
+      writer.uint32(18).string(message.data);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): HookResponse {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseHookResponse();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.info = PluginInfo.decode(reader, reader.uint32());
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.data = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HookResponse {
+    return {
+      info: isSet(object.info) ? PluginInfo.fromJSON(object.info) : undefined,
+      data: isSet(object.data) ? globalThis.String(object.data) : "",
+    };
+  },
+
+  toJSON(message: HookResponse): unknown {
+    const obj: any = {};
+    if (message.info !== undefined) {
+      obj.info = PluginInfo.toJSON(message.info);
+    }
+    if (message.data !== "") {
+      obj.data = message.data;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<HookResponse>): HookResponse {
+    return HookResponse.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<HookResponse>): HookResponse {
+    const message = createBaseHookResponse();
+    message.info = (object.info !== undefined && object.info !== null)
+      ? PluginInfo.fromPartial(object.info)
+      : undefined;
+    message.data = object.data ?? "";
+    return message;
+  },
+};
+
+function createBaseHookImportRequest(): HookImportRequest {
+  return { data: "" };
+}
+
+export const HookImportRequest = {
+  encode(message: HookImportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.data !== "") {
+      writer.uint32(10).string(message.data);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): HookImportRequest {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseHookImportRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.data = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HookImportRequest {
+    return { data: isSet(object.data) ? globalThis.String(object.data) : "" };
+  },
+
+  toJSON(message: HookImportRequest): unknown {
+    const obj: any = {};
+    if (message.data !== "") {
+      obj.data = message.data;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<HookImportRequest>): HookImportRequest {
+    return HookImportRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<HookImportRequest>): HookImportRequest {
+    const message = createBaseHookImportRequest();
+    message.data = object.data ?? "";
+    return message;
+  },
+};
+
+function createBaseHookResponseFilterRequest(): HookResponseFilterRequest {
+  return { filter: "", body: "", contentType: "" };
+}
+
+export const HookResponseFilterRequest = {
+  encode(message: HookResponseFilterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.filter !== "") {
+      writer.uint32(10).string(message.filter);
+    }
+    if (message.body !== "") {
+      writer.uint32(18).string(message.body);
+    }
+    if (message.contentType !== "") {
+      writer.uint32(26).string(message.contentType);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): HookResponseFilterRequest {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseHookResponseFilterRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.filter = reader.string();
+          continue;
+        case 2:
+          if (tag !== 18) {
+            break;
+          }
+
+          message.body = reader.string();
+          continue;
+        case 3:
+          if (tag !== 26) {
+            break;
+          }
+
+          message.contentType = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HookResponseFilterRequest {
+    return {
+      filter: isSet(object.filter) ? globalThis.String(object.filter) : "",
+      body: isSet(object.body) ? globalThis.String(object.body) : "",
+      contentType: isSet(object.contentType) ? globalThis.String(object.contentType) : "",
+    };
+  },
+
+  toJSON(message: HookResponseFilterRequest): unknown {
+    const obj: any = {};
+    if (message.filter !== "") {
+      obj.filter = message.filter;
+    }
+    if (message.body !== "") {
+      obj.body = message.body;
+    }
+    if (message.contentType !== "") {
+      obj.contentType = message.contentType;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<HookResponseFilterRequest>): HookResponseFilterRequest {
+    return HookResponseFilterRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<HookResponseFilterRequest>): HookResponseFilterRequest {
+    const message = createBaseHookResponseFilterRequest();
+    message.filter = object.filter ?? "";
+    message.body = object.body ?? "";
+    message.contentType = object.contentType ?? "";
+    return message;
+  },
+};
+
+function createBaseHookExportRequest(): HookExportRequest {
+  return { request: "" };
+}
+
+export const HookExportRequest = {
+  encode(message: HookExportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.request !== "") {
+      writer.uint32(10).string(message.request);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): HookExportRequest {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseHookExportRequest();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.request = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): HookExportRequest {
+    return { request: isSet(object.request) ? globalThis.String(object.request) : "" };
+  },
+
+  toJSON(message: HookExportRequest): unknown {
+    const obj: any = {};
+    if (message.request !== "") {
+      obj.request = message.request;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<HookExportRequest>): HookExportRequest {
+    return HookExportRequest.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<HookExportRequest>): HookExportRequest {
+    const message = createBaseHookExportRequest();
+    message.request = object.request ?? "";
+    return message;
+  },
+};
+
+function createBaseEventStreamEvent(): EventStreamEvent {
+  return { event: "" };
+}
+
+export const EventStreamEvent = {
+  encode(message: EventStreamEvent, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
+    if (message.event !== "") {
+      writer.uint32(10).string(message.event);
+    }
+    return writer;
+  },
+
+  decode(input: _m0.Reader | Uint8Array, length?: number): EventStreamEvent {
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseEventStreamEvent();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          if (tag !== 10) {
+            break;
+          }
+
+          message.event = reader.string();
+          continue;
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skipType(tag & 7);
+    }
+    return message;
+  },
+
+  fromJSON(object: any): EventStreamEvent {
+    return { event: isSet(object.event) ? globalThis.String(object.event) : "" };
+  },
+
+  toJSON(message: EventStreamEvent): unknown {
+    const obj: any = {};
+    if (message.event !== "") {
+      obj.event = message.event;
+    }
+    return obj;
+  },
+
+  create(base?: DeepPartial<EventStreamEvent>): EventStreamEvent {
+    return EventStreamEvent.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<EventStreamEvent>): EventStreamEvent {
+    const message = createBaseEventStreamEvent();
+    message.event = object.event ?? "";
+    return message;
+  },
+};
+
+export type PluginRuntimeDefinition = typeof PluginRuntimeDefinition;
+export const PluginRuntimeDefinition = {
+  name: "PluginRuntime",
+  fullName: "yaak.plugins.runtime.PluginRuntime",
+  methods: {
+    eventStream: {
+      name: "EventStream",
+      requestType: EventStreamEvent,
+      requestStream: true,
+      responseType: EventStreamEvent,
+      responseStream: true,
+      options: {},
+    },
+  },
+} as const;
+
+export interface PluginRuntimeServiceImplementation<CallContextExt = {}> {
+  eventStream(
+    request: AsyncIterable<EventStreamEvent>,
+    context: CallContext & CallContextExt,
+  ): ServerStreamingMethodResult<DeepPartial<EventStreamEvent>>;
+}
+
+export interface PluginRuntimeClient<CallOptionsExt = {}> {
+  eventStream(
+    request: AsyncIterable<DeepPartial<EventStreamEvent>>,
+    options?: CallOptions & CallOptionsExt,
+  ): AsyncIterable<EventStreamEvent>;
+}
+
+type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+
+export type DeepPartial<T> = T extends Builtin ? T
+  : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
+  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
+  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
+  : Partial<T>;
+
+function isSet(value: any): boolean {
+  return value !== null && value !== undefined;
+}
+
+export type ServerStreamingMethodResult<Response> = { [Symbol.asyncIterator](): AsyncIterator<Response, void> };

plugin-runtime/src/index.ts

@@ -0,0 +1,42 @@
+import { InternalEvent } from '@yaakapp/api';
+import { createChannel, createClient, Status } from 'nice-grpc';
+import { EventChannel } from './EventChannel';
+import { PluginRuntimeClient, PluginRuntimeDefinition } from './gen/plugins/runtime';
+import { PluginHandle } from './PluginHandle';
+
+const port = process.env.PORT || '50051';
+
+const channel = createChannel(`localhost:${port}`);
+const client: PluginRuntimeClient = createClient(PluginRuntimeDefinition, channel);
+
+const events = new EventChannel();
+const plugins: Record<string, PluginHandle> = {};
+
+(async () => {
+  try {
+    for await (const e of client.eventStream(events.listen())) {
+      const pluginEvent: InternalEvent = JSON.parse(e.event);
+      // Handle special event to bootstrap plugin
+      if (pluginEvent.payload.type === 'boot_request') {
+        const plugin = new PluginHandle(pluginEvent.payload.dir, pluginEvent.pluginRefId, events);
+        plugins[pluginEvent.pluginRefId] = plugin;
+      }
+
+      // Once booted, forward all events to plugin's worker
+      const plugin = plugins[pluginEvent.pluginRefId];
+      if (!plugin) {
+        console.warn('Failed to get plugin for event by', pluginEvent.pluginRefId);
+        continue;
+      }
+
+      plugin.sendToWorker(pluginEvent);
+    }
+    console.log('Stream ended');
+  } catch (err: any) {
+    if (err.code === Status.CANCELLED) {
+      console.log('Stream was cancelled by server');
+    } else {
+      console.log('Client stream errored', err);
+    }
+  }
+})();

plugin-runtime/src/index.worker.ts

@@ -0,0 +1,133 @@
+import { ImportResponse, InternalEvent, InternalEventPayload } from '@yaakapp/api';
+import interceptStdout from 'intercept-stdout';
+import * as console from 'node:console';
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import * as util from 'node:util';
+import { parentPort, workerData } from 'node:worker_threads';
+
+new Promise<void>(async (resolve, reject) => {
+  const { pluginDir /*, pluginRefId*/ } = workerData;
+  const pathPkg = path.join(pluginDir, 'package.json');
+
+  // NOTE: Use POSIX join because require() needs forward slash
+  const pathMod = path.posix.join(pluginDir, 'build', 'index.js');
+
+  let pkg: { [x: string]: any };
+  try {
+    pkg = JSON.parse(readFileSync(pathPkg, 'utf8'));
+  } catch (err) {
+    // TODO: Do something better here
+    reject(err);
+    return;
+  }
+
+  prefixStdout(`[plugin][${pkg.name}] %s`);
+
+  const mod = (await import(pathMod)).default ?? {};
+
+  const capabilities: string[] = [];
+  if (typeof mod.pluginHookExport === 'function') capabilities.push('export');
+  if (typeof mod.pluginHookImport === 'function') capabilities.push('import');
+  if (typeof mod.pluginHookResponseFilter === 'function') capabilities.push('filter');
+
+  console.log('Plugin initialized', pkg.name, capabilities, Object.keys(mod));
+
+  // Message comes into the plugin to be processed
+  parentPort!.on('message', async ({ payload, pluginRefId, id: replyId }: InternalEvent) => {
+    console.log(`Received ${payload.type}`);
+
+    try {
+      if (payload.type === 'boot_request') {
+        const payload: InternalEventPayload = {
+          type: 'boot_response',
+          name: pkg.name,
+          version: pkg.version,
+          capabilities,
+        };
+        sendToServer({ id: genId(), pluginRefId, replyId, payload });
+        return;
+      }
+
+      if (payload.type === 'import_request' && typeof mod.pluginHookImport === 'function') {
+        const reply: ImportResponse | null = await mod.pluginHookImport({}, payload.content);
+        if (reply != null) {
+          const replyPayload: InternalEventPayload = {
+            type: 'import_response',
+            resources: reply?.resources,
+          };
+          sendToServer({ id: genId(), pluginRefId, replyId, payload: replyPayload });
+          return;
+        } else {
+          // Continue, to send back an empty reply
+        }
+      }
+
+      if (
+        payload.type === 'export_http_request_request' &&
+        typeof mod.pluginHookExport === 'function'
+      ) {
+        const reply: string = await mod.pluginHookExport({}, payload.httpRequest);
+        const replyPayload: InternalEventPayload = {
+          type: 'export_http_request_response',
+          content: reply,
+        };
+        sendToServer({ id: genId(), pluginRefId, replyId, payload: replyPayload });
+        return;
+      }
+
+      if (payload.type === 'filter_request' && typeof mod.pluginHookResponseFilter === 'function') {
+        const reply: string = await mod.pluginHookResponseFilter(
+          {},
+          { filter: payload.filter, body: payload.content },
+        );
+        const replyPayload: InternalEventPayload = {
+          type: 'filter_response',
+          content: reply,
+        };
+        sendToServer({ id: genId(), pluginRefId, replyId, payload: replyPayload });
+        return;
+      }
+    } catch (err) {
+      console.log('Plugin call threw exception', payload.type, err);
+      // TODO: Return errors to server
+    }
+
+    // No matches, so send back an empty response so the caller doesn't block forever
+    const id = genId();
+    console.log('Sending nothing back to', id, { replyId });
+    sendToServer({ id, pluginRefId, replyId, payload: { type: 'empty_response' } });
+  });
+
+  resolve();
+}).catch((err) => {
+  console.log('failed to boot plugin', err);
+});
+
+function sendToServer(e: InternalEvent) {
+  parentPort!.postMessage(e);
+}
+
+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;
+}
+
+function prefixStdout(s: string) {
+  if (!s.includes('%s')) {
+    throw new Error('Console prefix must contain a "%s" replacer');
+  }
+  interceptStdout((text) => {
+    const lines = text.split(/\n/);
+    let newText = '';
+    for (let i = 0; i < lines.length; i++) {
+      if (lines[i] == '') continue;
+      newText += util.format(s, lines[i]) + '\n';
+    }
+    return newText.trimEnd();
+  });
+}

plugin-runtime/tsconfig.json

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

plugins/exporter-curl/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "exporter-curl",
-  "version": "0.0.1",
-  "devDependencies": {
-    "vitest": "^1.4.0"
-  }
-}

plugins/exporter-curl/src/index.ts

@@ -1,76 +0,0 @@
-import { HttpRequest } from '../../../src-web/lib/models';
-
-const NEWLINE = '\\\n ';
-
-export function pluginHookExport(_: any, 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?.text === 'string') {
-    // --data-raw $'...' to do special ANSI C quoting
-    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;
-}

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

@@ -1,177 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { pluginHookExport } from '../src';
-
-const ctx = {};
-
-describe('exporter-curl', () => {
-  test('Exports GET with params', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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 PUT with multipart form', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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', () => {
-    expect(
-      pluginHookExport(ctx, {
-        url: 'https://yaak.app',
-        authenticationType: 'basic',
-        authentication: {},
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--user ':'`].join(` \\\n  `));
-  });
-
-  test('Digest auth', () => {
-    expect(
-      pluginHookExport(ctx, {
-        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', () => {
-    expect(
-      pluginHookExport(ctx, {
-        url: 'https://yaak.app',
-        authenticationType: 'bearer',
-        authentication: {
-          token: 'tok',
-        },
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: Bearer tok'`].join(` \\\n  `));
-  });
-
-  test('Broken bearer auth', () => {
-    expect(
-      pluginHookExport(ctx, {
-        url: 'https://yaak.app',
-        authenticationType: 'bearer',
-        authentication: {
-          username: 'user',
-          password: 'pass',
-        },
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--header 'Authorization: Bearer '`].join(` \\\n  `));
-  });
-});

plugins/exporter-curl/vite.config.js

@@ -1,15 +0,0 @@
-import { resolve } from 'path';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
-      fileName: 'index',
-      formats: ['es'],
-    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
-  },
-});

plugins/filter-jsonpath/package-lock.json

@@ -1,173 +0,0 @@
-{
-  "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,7 +0,0 @@
-{
-  "name": "filter-jsonpath",
-  "version": "0.0.1",
-  "dependencies": {
-    "jsonpath": "^1.1.1"
-  }
-}

plugins/filter-jsonpath/src/index.js

@@ -1,12 +0,0 @@
-import jp from 'jsonpath';
-
-export function pluginHookResponseFilter(ctx, 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/vite.config.js

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

plugins/filter-xpath/package-lock.json

@@ -1,32 +0,0 @@
-{
-  "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,8 +0,0 @@
-{
-  "name": "filter-xpath",
-  "version": "0.0.1",
-  "dependencies": {
-    "@xmldom/xmldom": "^0.8.10",
-    "xpath": "^0.0.34"
-  }
-}

plugins/filter-xpath/src/index.js

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

plugins/filter-xpath/vite.config.js

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

plugins/importer-curl/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "importer-curl",
-  "version": "0.0.1",
-  "dependencies": {
-    "shell-quote": "^1.8.1"
-  },
-  "devDependencies": {
-    "@types/shell-quote": "^1.7.5",
-    "vitest": "^1.4.0"
-  }
-}

plugins/importer-curl/src/index.ts

@@ -1,421 +0,0 @@
-import { ControlOperator, parse, ParseEntry } from 'shell-quote';
-import {
-  Environment,
-  Folder,
-  HttpRequest,
-  HttpUrlParameter,
-  Model,
-  Workspace,
-} from '../../../src-web/lib/models';
-
-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'>[];
-}
-
-export const id = 'curl';
-export const name = 'cURL';
-export const description = 'cURL command line tool';
-
-const DATA_FLAGS = ['d', 'data', 'data-raw', 'data-urlencode', 'data-binary', 'data-ascii'];
-const SUPPORTED_ARGS = [
-  ['url'], // Specify the URL explicitly
-  ['user', 'u'], // Authentication
-  ['digest'], // Apply auth as digest
-  ['header', 'H'],
-  ['cookie', 'b'],
-  ['get', 'G'], // Put the post data in the URL
-  ['d', 'data'], // Add url encoded data
-  ['data-raw'],
-  ['data-urlencode'],
-  ['data-binary'],
-  ['data-ascii'],
-  ['form', 'F'], // Add multipart data
-  ['request', 'X'], // Request method
-  DATA_FLAGS,
-].flatMap((v) => v);
-
-type Pair = string | boolean;
-
-type PairsByName = Record<string, Pair[]>;
-
-export function pluginHookImport(_: any, 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],
-    },
-  };
-}
-
-export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
-  // ~~~~~~~~~~~~~~~~~~~~~ //
-  // Collect all the flags //
-  // ~~~~~~~~~~~~~~~~~~~~~ //
-  const pairsByName: PairsByName = {};
-  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_ARGS.includes(name)) {
-        continue;
-      }
-
-      let value;
-      const nextEntry = parseEntries[i + 1];
-      if (isSingleDash && name.length > 1) {
-        // Handle squished arguments like -XPOST
-        value = name.slice(1);
-        name = name.slice(0, 1);
-      } else if (typeof nextEntry === 'string' && !nextEntry.startsWith('-')) {
-        // Next arg is not a flag, so assign it as the value
-        value = nextEntry;
-        i++; // Skip next one
-      } else {
-        value = true;
-      }
-
-      pairsByName[name] = pairsByName[name] || [];
-      pairsByName[name]!.push(value);
-    } else if (parseEntry) {
-      singletons.push(parseEntry);
-    }
-  }
-
-  // ~~~~~~~~~~~~~~~~~ //
-  // Build the request //
-  // ~~~~~~~~~~~~~~~~~ //
-
-  // Url & parameters
-
-  let urlParameters: HttpUrlParameter[];
-  let url: string;
-
-  const urlArg = getPairValue(pairsByName, (singletons[0] as string) || '', ['url']);
-  const [baseUrl, search] = splitOnce(urlArg, '?');
-  urlParameters =
-    search?.split('&').map((p) => {
-      const v = splitOnce(p, '=');
-      return { name: v[0] ?? '', value: v[1] ?? '', enabled: true };
-    }) ?? [];
-
-  url = baseUrl ?? urlArg;
-
-  // Authentication
-  const [username, password] = getPairValue(pairsByName, '', ['u', 'user']).split(/:(.*)$/);
-
-  const isDigest = getPairValue(pairsByName, false, ['digest']);
-  const authenticationType = username ? (isDigest ? 'digest' : 'basic') : null;
-  const authentication = username
-    ? {
-        username: username.trim(),
-        password: (password ?? '').trim(),
-      }
-    : {};
-
-  // Headers
-  const headers = [
-    ...((pairsByName.header as string[] | undefined) || []),
-    ...((pairsByName.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 = [
-    ...((pairsByName.cookie as string[] | undefined) || []),
-    ...((pairsByName.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(pairsByName);
-  const contentTypeHeader = headers.find((header) => header.name.toLowerCase() === 'content-type');
-  const mimeType = contentTypeHeader ? contentTypeHeader.value.split(';')[0] : null;
-
-  // Body (Multipart Form Data)
-  const formDataParams = [
-    ...((pairsByName.form as string[] | undefined) || []),
-    ...((pairsByName.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(pairsByName, 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(pairsByName, '', ['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;
-}
-
-const pairsToDataParameters = (keyedPairs: PairsByName) => {
-  let dataParameters: {
-    name: string;
-    value: string;
-    contentType?: string;
-    filePath?: string;
-    enabled?: boolean;
-  }[] = [];
-
-  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;
-
-      const [name, value] = p.split('=');
-      if (p.startsWith('@')) {
-        // Yaak doesn't support files in url-encoded data, so
-        dataParameters.push({
-          name: name ?? '',
-          value: '',
-          filePath: p.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: PairsByName,
-  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<Model['model'], number>> = {};
-function generateId(model: Model['model']): string {
-  idCount[model] = (idCount[model] ?? -1) + 1;
-  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
-}

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

@@ -1,341 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { HttpRequest, Model, Workspace } from '../../../src-web/lib/models';
-import { pluginHookImport } from '../src';
-
-const ctx = {};
-
-describe('importer-curl', () => {
-  test('Imports basic GET', () => {
-    expect(pluginHookImport(ctx, 'curl https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Explicit URL', () => {
-    expect(pluginHookImport(ctx, 'curl --url https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Missing URL', () => {
-    expect(pluginHookImport(ctx, 'curl -X POST')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('URL between', () => {
-    expect(pluginHookImport(ctx, 'curl -v https://yaak.app -X POST')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Random flags', () => {
-    expect(pluginHookImport(ctx, 'curl --random -Z -Y -S --foo https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports --request method', () => {
-    expect(pluginHookImport(ctx, 'curl --request POST https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports -XPOST method', () => {
-    expect(pluginHookImport(ctx, 'curl -XPOST --request POST https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports multiple requests', () => {
-    expect(
-      pluginHookImport(
-        ctx,
-        '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(
-      pluginHookImport(ctx, '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(pluginHookImport(ctx, '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 data params as text', () => {
-    expect(
-      pluginHookImport(ctx, '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 multi-line JSON', () => {
-    expect(
-      pluginHookImport(
-        ctx,
-        `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(
-      pluginHookImport(ctx, '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(pluginHookImport(ctx, '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(pluginHookImport(ctx, '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(pluginHookImport(ctx, '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 from the URL', () => {
-    expect(pluginHookImport(ctx, '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%20a', enabled: true },
-            ],
-          }),
-        ],
-      },
-    });
-  });
-});
-
-const idCount: Partial<Record<Model['model'], 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-curl/vite.config.js

@@ -1,15 +0,0 @@
-import { resolve } from 'path';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
-      fileName: 'index',
-      formats: ['es'],
-    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
-  },
-});

plugins/importer-insomnia/package-lock.json

@@ -1,26 +0,0 @@
-{
-  "name": "importer-insomnia",
-  "version": "0.0.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "importer-insomnia",
-      "version": "0.0.1",
-      "dependencies": {
-        "yaml": "^2.4.2"
-      }
-    },
-    "node_modules/yaml": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz",
-      "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==",
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    }
-  }
-}

plugins/importer-insomnia/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "importer-insomnia",
-  "version": "0.0.1",
-  "dependencies": {
-    "yaml": "^2.4.2"
-  }
-}

plugins/importer-insomnia/src/index.ts

@@ -1,280 +0,0 @@
-import {
-  Environment,
-  Folder,
-  GrpcRequest,
-  HttpRequest,
-  Workspace,
-} from '../../../src-web/lib/models';
-import '../../../src-web/plugin/runtime.d.ts';
-
-type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
-
-export interface ExportResources {
-  workspaces: AtLeast<Workspace, 'name' | 'id' | 'model'>[];
-  environments: AtLeast<Environment, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  httpRequests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  grpcRequests: AtLeast<GrpcRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
-}
-
-export function pluginHookImport(ctx: YaakContext, contents: string) {
-  let parsed: any;
-
-  try {
-    parsed = JSON.parse(contents);
-  } catch (e) {}
-
-  try {
-    parsed = parsed ?? YAML.parse(contents);
-  } catch (e) {
-    console.log('FAILED', e);
-  }
-
-  if (!isJSObject(parsed)) return;
-  if (!Array.isArray(parsed.resources)) return;
-
-  const resources: ExportResources = {
-    workspaces: [],
-    httpRequests: [],
-    grpcRequests: [],
-    environments: [],
-    folders: [],
-  };
-
-  // Import workspaces
-  const workspacesToImport = parsed.resources.filter(isWorkspace);
-  for (const workspaceToImport of workspacesToImport) {
-    const baseEnvironment = parsed.resources.find(
-      (r: any) => isEnvironment(r) && r.parentId === workspaceToImport._id,
-    );
-    resources.workspaces.push({
-      id: convertId(workspaceToImport._id),
-      createdAt: new Date(workspacesToImport.created ?? Date.now()).toISOString().replace('Z', ''),
-      updatedAt: new Date(workspacesToImport.updated ?? Date.now()).toISOString().replace('Z', ''),
-      model: 'workspace',
-      name: workspaceToImport.name,
-      variables: baseEnvironment ? parseVariables(baseEnvironment.data) : [],
-    });
-    const environmentsToImport = parsed.resources.filter(
-      (r: any) => isEnvironment(r) && r.parentId === baseEnvironment?._id,
-    );
-    resources.environments.push(
-      ...environmentsToImport.map((r: any) => importEnvironment(r, workspaceToImport._id)),
-    );
-
-    const nextFolder = (parentId: string) => {
-      const children = parsed.resources.filter((r: any) => r.parentId === parentId);
-      let sortPriority = 0;
-      for (const child of children) {
-        if (isRequestGroup(child)) {
-          resources.folders.push(importFolder(child, workspaceToImport._id));
-          nextFolder(child._id);
-        } else if (isHttpRequest(child)) {
-          resources.httpRequests.push(
-            importHttpRequest(child, workspaceToImport._id, sortPriority++),
-          );
-        } else if (isGrpcRequest(child)) {
-          resources.grpcRequests.push(
-            importGrpcRequest(child, workspaceToImport._id, sortPriority++),
-          );
-        }
-      }
-    };
-
-    // Import folders
-    nextFolder(workspaceToImport._id);
-  }
-
-  // Filter out any `null` values
-  resources.httpRequests = resources.httpRequests.filter(Boolean);
-  resources.grpcRequests = resources.grpcRequests.filter(Boolean);
-  resources.environments = resources.environments.filter(Boolean);
-  resources.workspaces = resources.workspaces.filter(Boolean);
-
-  return { resources };
-}
-
-function importEnvironment(e: any, workspaceId: string): ExportResources['environments'][0] {
-  return {
-    id: convertId(e._id),
-    createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
-    workspaceId: convertId(workspaceId),
-    model: 'environment',
-    name: e.name,
-    variables: Object.entries(e.data).map(([name, value]) => ({
-      enabled: true,
-      name,
-      value: `${value}`,
-    })),
-  };
-}
-
-function importFolder(f: any, workspaceId: string): ExportResources['folders'][0] {
-  return {
-    id: convertId(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 : convertId(f.parentId),
-    workspaceId: convertId(workspaceId),
-    model: 'folder',
-    name: f.name,
-  };
-}
-
-function importGrpcRequest(
-  r: any,
-  workspaceId: string,
-  sortPriority = 0,
-): ExportResources['grpcRequests'][0] {
-  const parts = r.protoMethodName.split('/').filter((p: any) => p !== '');
-  const service = parts[0] ?? null;
-  const method = parts[1] ?? null;
-
-  return {
-    id: convertId(r._id),
-    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
-    workspaceId: convertId(workspaceId),
-    folderId: r.parentId === workspaceId ? null : convertId(r.parentId),
-    model: 'grpc_request',
-    sortPriority,
-    name: r.name,
-    url: convertSyntax(r.url),
-    service,
-    method,
-    message: r.body?.text ?? '',
-    metadata: (r.metadata ?? [])
-      .map((h: any) => ({
-        enabled: !h.disabled,
-        name: h.name ?? '',
-        value: h.value ?? '',
-      }))
-      .filter(({ name, value }: any) => name !== '' || value !== ''),
-  };
-}
-
-function importHttpRequest(
-  r: any,
-  workspaceId: string,
-  sortPriority = 0,
-): ExportResources['httpRequests'][0] {
-  let bodyType = null;
-  let body = {};
-  if (r.body.mimeType === 'application/octet-stream') {
-    bodyType = 'binary';
-    body = { filePath: r.body.fileName ?? '' };
-  } else if (r.body?.mimeType === 'application/x-www-form-urlencoded') {
-    bodyType = 'application/x-www-form-urlencoded';
-    body = {
-      form: (r.body.params ?? []).map((p: any) => ({
-        enabled: !p.disabled,
-        name: p.name ?? '',
-        value: p.value ?? '',
-      })),
-    };
-  } else if (r.body?.mimeType === 'multipart/form-data') {
-    bodyType = 'multipart/form-data';
-    body = {
-      form: (r.body.params ?? []).map((p: any) => ({
-        enabled: !p.disabled,
-        name: p.name ?? '',
-        value: p.value ?? '',
-        file: p.fileName ?? null,
-      })),
-    };
-  } else if (r.body?.mimeType === 'application/graphql') {
-    bodyType = 'graphql';
-    body = { text: convertSyntax(r.body.text ?? '') };
-  } else if (r.body?.mimeType === 'application/json') {
-    bodyType = 'application/json';
-    body = { text: convertSyntax(r.body.text ?? '') };
-  }
-
-  let authenticationType = null;
-  let authentication = {};
-  if (r.authentication.type === 'bearer') {
-    authenticationType = 'bearer';
-    authentication = {
-      token: convertSyntax(r.authentication.token),
-    };
-  } else if (r.authentication.type === 'basic') {
-    authenticationType = 'basic';
-    authentication = {
-      username: convertSyntax(r.authentication.username),
-      password: convertSyntax(r.authentication.password),
-    };
-  }
-
-  return {
-    id: convertId(r._id),
-    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
-    workspaceId: convertId(workspaceId),
-    folderId: r.parentId === workspaceId ? null : convertId(r.parentId),
-    model: 'http_request',
-    sortPriority,
-    name: r.name,
-    url: convertSyntax(r.url),
-    body,
-    bodyType,
-    authentication,
-    authenticationType,
-    method: r.method,
-    headers: (r.headers ?? [])
-      .map((h: any) => ({
-        enabled: !h.disabled,
-        name: h.name ?? '',
-        value: h.value ?? '',
-      }))
-      .filter(({ name, value }: any) => name !== '' || value !== ''),
-  };
-}
-
-function parseVariables(data: Record<string, string>) {
-  return Object.entries(data).map(([name, value]) => ({
-    enabled: true,
-    name,
-    value: `${value}`,
-  }));
-}
-
-function convertSyntax(variable: string): string {
-  if (!isJSString(variable)) return variable;
-  return variable.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}');
-}
-
-function isWorkspace(obj: any) {
-  return isJSObject(obj) && obj._type === 'workspace';
-}
-
-function isRequestGroup(obj: any) {
-  return isJSObject(obj) && obj._type === 'request_group';
-}
-
-function isHttpRequest(obj: any) {
-  return isJSObject(obj) && obj._type === 'request';
-}
-
-function isGrpcRequest(obj: any) {
-  return isJSObject(obj) && obj._type === 'grpc_request';
-}
-
-function isEnvironment(obj: any) {
-  return isJSObject(obj) && obj._type === 'environment';
-}
-
-function isJSObject(obj: any) {
-  return Object.prototype.toString.call(obj) === '[object Object]';
-}
-
-function isJSString(obj: any) {
-  return Object.prototype.toString.call(obj) === '[object String]';
-}
-
-function convertId(id: string): string {
-  if (id.startsWith('GENERATE_ID::')) {
-    return id;
-  }
-  return `GENERATE_ID::${id}`;
-}

plugins/importer-insomnia/vite.config.js

@@ -1,15 +0,0 @@
-import { resolve } from 'path';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
-      fileName: 'index',
-      formats: ['es'],
-    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
-  },
-});

plugins/importer-postman/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "importer-postman",
-  "version": "0.0.1",
-  "devDependencies": {
-    "vitest": "^1.4.0"
-  }
-}

plugins/importer-postman/src/index.ts

@@ -1,256 +0,0 @@
-import { Environment, Folder, HttpRequest, Model, Workspace } from '../../../src-web/lib/models';
-
-const POSTMAN_2_1_0_SCHEMA = 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json';
-const POSTMAN_2_0_0_SCHEMA = 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json';
-const VALID_SCHEMAS = [POSTMAN_2_0_0_SCHEMA, POSTMAN_2_1_0_SCHEMA];
-
-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'>[];
-}
-
-export function pluginHookImport(
-  ctx: any,
-  contents: string,
-): { resources: ExportResources } | undefined {
-  console.log('CTX', ctx);
-  const root = parseJSONToRecord(contents);
-  if (root == null) return;
-
-  const info = toRecord(root.info);
-  const isValidSchema = VALID_SCHEMAS.includes(info.schema);
-  if (!isValidSchema || !Array.isArray(root.item)) {
-    return;
-  }
-
-  const globalAuth = importAuth(root.auth);
-
-  const exportResources: ExportResources = {
-    workspaces: [],
-    environments: [],
-    httpRequests: [],
-    folders: [],
-  };
-
-  const workspace: ExportResources['workspaces'][0] = {
-    model: 'workspace',
-    id: generateId('workspace'),
-    name: info.name || 'Postman Import',
-    description: info.description || '',
-    variables:
-      root.variable?.map((v: any) => ({
-        name: v.key,
-        value: v.value,
-      })) ?? [],
-  };
-  exportResources.workspaces.push(workspace);
-
-  const importItem = (v: Record<string, any>, folderId: string | null = null) => {
-    if (typeof v.name === 'string' && Array.isArray(v.item)) {
-      const folder: ExportResources['folders'][0] = {
-        model: 'folder',
-        workspaceId: workspace.id,
-        id: generateId('folder'),
-        name: v.name,
-        folderId,
-      };
-      exportResources.folders.push(folder);
-      for (const child of v.item) {
-        importItem(child, folder.id);
-      }
-    } else if (typeof v.name === 'string' && 'request' in v) {
-      const r = toRecord(v.request);
-      const bodyPatch = importBody(r.body);
-      const requestAuthPath = importAuth(r.auth);
-      const authPatch = requestAuthPath.authenticationType == null ? globalAuth : requestAuthPath;
-      const request: ExportResources['httpRequests'][0] = {
-        model: 'http_request',
-        id: generateId('http_request'),
-        workspaceId: workspace.id,
-        folderId,
-        name: v.name,
-        method: r.method || 'GET',
-        url: typeof r.url === 'string' ? r.url : toRecord(r.url).raw,
-        body: bodyPatch.body,
-        bodyType: bodyPatch.bodyType,
-        authentication: authPatch.authentication,
-        authenticationType: authPatch.authenticationType,
-        headers: [
-          ...bodyPatch.headers,
-          ...authPatch.headers,
-          ...toArray(r.header).map((h) => {
-            return {
-              name: h.key,
-              value: h.value,
-              enabled: !h.disabled,
-            };
-          }),
-        ],
-      };
-      exportResources.httpRequests.push(request);
-    } else {
-      console.log('Unknown item', v, folderId);
-    }
-  };
-
-  for (const item of root.item) {
-    importItem(item);
-  }
-
-  return { resources: convertTemplateSyntax(exportResources) };
-}
-
-function importAuth(
-  rawAuth: any,
-): Pick<HttpRequest, 'authentication' | 'authenticationType' | 'headers'> {
-  const auth = toRecord(rawAuth);
-  if ('basic' in auth) {
-    return {
-      headers: [],
-      authenticationType: 'basic',
-      authentication: {
-        username: auth.basic.username || '',
-        password: auth.basic.password || '',
-      },
-    };
-  } else if ('bearer' in auth) {
-    return {
-      headers: [],
-      authenticationType: 'bearer',
-      authentication: {
-        token: auth.bearer.token || '',
-      },
-    };
-  } else {
-    // TODO: support other auth types
-    return { headers: [], authenticationType: null, authentication: {} };
-  }
-}
-
-function importBody(rawBody: any): Pick<HttpRequest, 'body' | 'bodyType' | 'headers'> {
-  const body = toRecord(rawBody);
-  if ('graphql' in body) {
-    return {
-      headers: [
-        {
-          name: 'Content-Type',
-          value: 'application/json',
-          enabled: true,
-        },
-      ],
-      bodyType: 'graphql',
-      body: {
-        text: JSON.stringify(
-          { query: body.graphql.query, variables: parseJSONToRecord(body.graphql.variables) },
-          null,
-          2,
-        ),
-      },
-    };
-  } else if ('urlencoded' in body) {
-    return {
-      headers: [
-        {
-          name: 'Content-Type',
-          value: 'application/x-www-form-urlencoded',
-          enabled: true,
-        },
-      ],
-      bodyType: 'application/x-www-form-urlencoded',
-      body: {
-        form: toArray(body.urlencoded).map((f) => ({
-          enabled: !f.disabled,
-          name: f.key ?? '',
-          value: f.value ?? '',
-        })),
-      },
-    };
-  } else if ('formdata' in body) {
-    return {
-      headers: [
-        {
-          name: 'Content-Type',
-          value: 'multipart/form-data',
-          enabled: true,
-        },
-      ],
-      bodyType: 'multipart/form-data',
-      body: {
-        form: toArray(body.formdata).map((f) =>
-          f.src != null
-            ? {
-                enabled: !f.disabled,
-                contentType: f.contentType ?? null,
-                name: f.key ?? '',
-                file: f.src ?? '',
-              }
-            : {
-                enabled: !f.disabled,
-                name: f.key ?? '',
-                value: f.value ?? '',
-              },
-        ),
-      },
-    };
-  } else if ('raw' in body) {
-    return {
-      headers: [
-        {
-          name: 'Content-Type',
-          value: body.options?.raw?.language === 'json' ? 'application/json' : '',
-          enabled: true,
-        },
-      ],
-      bodyType: body.options?.raw?.language === 'json' ? 'application/json' : 'other',
-      body: {
-        text: body.raw ?? '',
-      },
-    };
-  } else {
-    // TODO: support other body types
-    return { headers: [], bodyType: null, body: {} };
-  }
-}
-
-function parseJSONToRecord(jsonStr: string): Record<string, any> | null {
-  try {
-    return toRecord(JSON.parse(jsonStr));
-  } catch (err) {}
-  return null;
-}
-
-function toRecord(value: any): Record<string, any> {
-  if (Object.prototype.toString.call(value) === '[object Object]') return value;
-  else return {};
-}
-
-function toArray(value: any): any[] {
-  if (Object.prototype.toString.call(value) === '[object Array]') return value;
-  else return [];
-}
-
-/** Recursively render all nested object properties */
-function convertTemplateSyntax<T>(obj: T): T {
-  if (typeof obj === 'string') {
-    return obj.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}') as T;
-  } else if (Array.isArray(obj) && obj != null) {
-    return obj.map(convertTemplateSyntax) as T;
-  } else if (typeof obj === 'object' && obj != null) {
-    return Object.fromEntries(
-      Object.entries(obj).map(([k, v]) => [k, convertTemplateSyntax(v)]),
-    ) as T;
-  } else {
-    return obj;
-  }
-}
-
-const idCount: Partial<Record<Model['model'], number>> = {};
-
-function generateId(model: Model['model']): string {
-  idCount[model] = (idCount[model] ?? -1) + 1;
-  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
-}

plugins/importer-postman/tests/fixtures/nested.json

@@ -1,38 +0,0 @@
-{
-	"info": {
-		"_postman_id": "9e6dfada-256c-49ea-a38f-7d1b05b7ca2d",
-		"name": "New Collection",
-		"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json",
-		"_exporter_id": "18798"
-	},
-	"item": [
-		{
-			"name": "Top Folder",
-			"item": [
-				{
-					"name": "Nested Folder",
-					"item": [
-						{
-							"name": "Request 1",
-							"request": {
-								"method": "GET"
-							}
-						}
-					]
-				},
-				{
-					"name": "Request 2",
-					"request": {
-						"method": "GET"
-					}
-				}
-			]
-		},
-		{
-			"name": "Request 3",
-			"request": {
-				"method": "GET"
-			}
-		}
-	]
-}

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

@@ -1,90 +0,0 @@
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
-import { Model } from '../../../src-web/lib/models';
-import { pluginHookImport } from '../src';
-
-let originalRandom = Math.random;
-
-describe('importer-postman', () => {
-  beforeEach(() => {
-    let i = 0;
-    // Psuedo-random number generator to ensure consistent ID generation
-    Math.random = vi.fn(() => ((i++ * 1000) % 133) / 100);
-  });
-
-  afterEach(() => {
-    Math.random = originalRandom;
-  });
-
-  const p = path.join(__dirname, 'fixtures');
-  const fixtures = fs.readdirSync(p);
-
-  for (const fixture of fixtures) {
-    test('Imports ' + fixture, () => {
-      const contents = fs.readFileSync(path.join(p, fixture), 'utf-8');
-      const imported = pluginHookImport({}, contents);
-      const folder0 = newId('folder');
-      const folder1 = newId('folder');
-      expect(imported).toEqual({
-        resources: expect.objectContaining({
-          workspaces: [
-            expect.objectContaining({
-              id: newId('workspace'),
-              model: 'workspace',
-              name: 'New Collection',
-            }),
-          ],
-          folders: expect.arrayContaining([
-            expect.objectContaining({
-              id: folder0,
-              model: 'folder',
-              workspaceId: existingId('workspace'),
-              name: 'Top Folder',
-            }),
-            expect.objectContaining({
-              folderId: folder0,
-              id: folder1,
-              model: 'folder',
-              workspaceId: existingId('workspace'),
-              name: 'Nested Folder',
-            }),
-          ]),
-          httpRequests: expect.arrayContaining([
-            expect.objectContaining({
-              id: newId('http_request'),
-              model: 'http_request',
-              name: 'Request 1',
-              workspaceId: existingId('workspace'),
-              folderId: folder1,
-            }),
-            expect.objectContaining({
-              id: newId('http_request'),
-              model: 'http_request',
-              name: 'Request 2',
-              workspaceId: existingId('workspace'),
-              folderId: folder0,
-            }),
-            expect.objectContaining({
-              id: newId('http_request'),
-              model: 'http_request',
-              name: 'Request 3',
-              workspaceId: existingId('workspace'),
-              folderId: null,
-            }),
-          ]),
-        }),
-      });
-    });
-  }
-});
-
-const idCount: Partial<Record<Model['model'], number>> = {};
-function newId(model: Model['model']): string {
-  idCount[model] = (idCount[model] ?? -1) + 1;
-  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
-}
-
-function existingId(model: Model['model']): string {
-  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model] ?? 0}`;
-}

plugins/importer-postman/tsconfig.json

@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": [
-      "ESNext",
-    ],
-    "skipLibCheck": true,
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": [
-    "./src"
-  ]
-}

plugins/importer-postman/vite.config.js

@@ -1,15 +0,0 @@
-import { resolve } from 'path';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
-      fileName: 'index',
-      formats: ['es'],
-    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
-  },
-});

plugins/importer-yaak/package-lock.json

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

plugins/importer-yaak/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "importer-yaak",
-  "version": "0.0.1"
-}

plugins/importer-yaak/src/index.ts

@@ -1,29 +0,0 @@
-export function pluginHookImport(ctx: any, contents: string) {
-  let parsed;
-  try {
-    parsed = JSON.parse(contents);
-  } catch (err) {
-    return undefined;
-  }
-
-  if (!isJSObject(parsed)) {
-    return undefined;
-  }
-
-  const isYaakExport = 'yaakSchema' in parsed;
-  if (!isYaakExport) {
-    return;
-  }
-
-  // Migrate v1 to v2 -- changes requests to httpRequests
-  if ('requests' in parsed.resources) {
-    parsed.resources.httpRequests = parsed.resources.requests;
-    delete parsed.resources['requests'];
-  }
-
-  return { resources: parsed.resources }; // Should already be in the correct format
-}
-
-export function isJSObject(obj: any) {
-  return Object.prototype.toString.call(obj) === '[object Object]';
-}

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

@@ -1,32 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { pluginHookImport } from '../src';
-
-const ctx = {};
-
-describe('importer-yaak', () => {
-  test('Skips invalid imports', () => {
-    expect(pluginHookImport(ctx, 'not JSON')).toBeUndefined();
-    expect(pluginHookImport(ctx, '[]')).toBeUndefined();
-    expect(pluginHookImport(ctx, JSON.stringify({ resources: {} }))).toBeUndefined();
-  });
-
-  test('converts schema 1 to 2', () => {
-    const imported = pluginHookImport(
-      ctx,
-      JSON.stringify({
-        yaakSchema: 1,
-        resources: {
-          requests: [],
-        },
-      }),
-    );
-
-    expect(imported).toEqual(
-      expect.objectContaining({
-        resources: {
-          httpRequests: [],
-        },
-      }),
-    );
-  });
-});

plugins/importer-yaak/vite.config.js

@@ -1,15 +0,0 @@
-import { resolve } from 'path';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
-      fileName: 'index',
-      formats: ['es'],
-    },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
-  },
-});

proto/plugins/runtime.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package yaak.plugins.runtime;
+
+service PluginRuntime {
+  rpc EventStream (stream EventStreamEvent) returns (stream EventStreamEvent);
+}
+
+message EventStreamEvent {
+  string event = 1;
+}

scripts/replace-version.cjs

@@ -0,0 +1,15 @@
+const path = require('path');
+const fs = require('fs');
+
+const version = process.env.YAAK_VERSION?.replace('v', '');
+if (!version) {
+  throw new Error('YAAK_VERSION environment variable not set')
+}
+
+const tauriConfigPath = path.join(__dirname, '../src-tauri/tauri.conf.json');
+const tauriConfig = JSON.parse(fs.readFileSync(tauriConfigPath, 'utf8'));
+
+tauriConfig.version = version;
+
+console.log('Writing version ' + version + ' to ' + tauriConfigPath)
+fs.writeFileSync(tauriConfigPath, JSON.stringify(tauriConfig, null, 2));