Fix platform check

.eslintrc.cjs

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

.github/workflows/artifacts.yml

@@ -0,0 +1,49 @@
+name: Generate Artifacts
+on:
+  push:
+    tags: [ v* ]
+
+jobs:
+  build-artifacts:
+    runs-on: ${{ matrix.platform }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ ubuntu-latest, macos-latest, windows-latest ]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Cache Rust
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            ./src-tauri/target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('src-tauri/Cargo.lock') }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'npm'
+      - name: install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+      - name: Install dependencies
+        run: npm ci
+      - name: Run tests
+        run: npm test
+      - uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
+          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+        with:
+          tagName: v__VERSION__
+          releaseName: 'App v__VERSION__'
+          releaseBody: 'See the assets to download this version and install.'
+          releaseDraft: true
+          prerelease: false

.github/workflows/ci-js.yml

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

.github/workflows/ci-rust.yml

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

.github/workflows/release.yml

@@ -1,120 +0,0 @@
-name: Generate Artifacts
-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).
-            args: '--target aarch64-apple-darwin'
-            yaak_arch: 'arm64'
-          - platform: 'macos-latest' # for Intel-based macs.
-            args: '--target x86_64-apple-darwin'
-            yaak_arch: 'x64'
-          - platform: 'ubuntu-22.04' # 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:
-      - name: Checkout yaakapp/app
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          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:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
-
-      - 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 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: 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 }}
-          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-        with:
-          tagName: 'v__VERSION__'
-          releaseName: 'Release __VERSION__'
-          releaseBody: 'https://yaak.app/blog/__VERSION__'
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}

.gitignore

@@ -22,12 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-.eslintcache
 
 *.sqlite
-*.sqlite-*
-
-.cargo
-
-.tmp
-tmp

.husky/.gitignore

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

.husky/pre-commit

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

.nvmrc

@@ -1 +1 @@
-20
+18

.prettierignore

@@ -1,4 +1,3 @@
 node_modules/
 dist/
-out/
 .prettierrc.cjs

.run/Dev Desktop.run.xml

@@ -3,10 +3,11 @@
     <package-json value="$PROJECT_DIR$/package.json" />
     <command value="run" />
     <scripts>
-      <script value="start" />
+      <script value="tauri-dev" />
     </scripts>
     <node-interpreter value="project" />
     <envs>
+      <env name="DATABASE_URL" value="sqlite://$USER_HOME$/Library/Application%20Support/co.schier.yaak/db.sqlite" />
     </envs>
     <method v="2" />
   </configuration>

.sqllsrc.json

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

Makefile

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

README.md

@@ -1,16 +1,3 @@
-# Yaak Network Toolkit
+# Tauri REST Client
 
-The most fun you'll ever have working with APIs.
-
-## Common Commands
-
-```sh
-# Start dev app
-npm run tauri-dev
-
-# Migration commands
-cd src-tauri
-cargo sqlx migrate add ${MIGRATION_NAME}
-cargo sqlx migrate run --database-url 'sqlite://db.sqlite?mode=rw'
-cargo sqlx prepare --database-url 'sqlite://db.sqlite'
-```
+It's a REST client, yo.

index.html

@@ -1,31 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <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>-->
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Yaak App</title>
+<!--    <script src="http://localhost:8097"></script>-->
+  </head>
 
-  <!-- Certain elements like webview (and maybe <select>?) will use background
-  color depending on document background color-->
-  <style>
-    html, body {
-      background-color: white;
-    }
-
-    @media (prefers-color-scheme: dark) {
-      html, body {
-        background-color: #1b1a29;
-      }
-    }
-  </style>
-</head>
-
-<body class="text-base">
-<div id="root"></div>
-<div id="cm-portal" class="cm-portal"></div>
-<div id="react-portal"></div>
-<div id="radix-portal" class="cm-portal"></div>
-<script type="module" src="/src-web/main.tsx"></script>
-</body>
+  <body>
+    <div id="root"></div>
+    <div id="cm-portal" class="cm-portal" style="pointer-events: auto"></div>
+    <div id="radix-portal" class="cm-portal"></div>
+    <script type="module" src="/src-web/main.tsx"></script>
+  </body>
 </html>

package.json

@@ -1,30 +1,23 @@
 {
-  "name": "yaak-app",
+  "name": "tauri-app",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "start": "npm run tauri-dev:desktop",
-    "tauri-dev:desktop": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
-    "tauri-dev:ios": "tauri ios dev --force-ip-prompt --config ./src-tauri/tauri-dev.conf.json",
-    "tauri-build": "tauri build",
-    "tauri": "tauri",
-    "dev:js": "vite dev",
+    "tauri-dev": "tauri dev",
+    "tauri-build": "npm run build:icon && tauri build",
+    "build": "npm run build:frontend",
+    "dev": "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: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"
+    "build:icon": "tauri icon src-tauri/icons/icon.png",
+    "build:frontend": "vite build",
+    "test": "vitest",
+    "coverage": "vitest run --coverage"
   },
   "dependencies": {
     "@codemirror/commands": "^6.2.1",
-    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/lang-html": "^6.4.2",
+    "@codemirror/lang-javascript": "^6.1.4",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-xml": "^6.0.2",
     "@codemirror/language": "^6.6.0",
@@ -32,84 +25,51 @@
     "@lezer/generator": "^1.2.2",
     "@lezer/highlight": "^1.1.3",
     "@lezer/lr": "^1.3.3",
-    "@react-hook/resize-observer": "^1.2.6",
-    "@tailwindcss/container-queries": "^0.1.0",
-    "@tanstack/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",
+    "@radix-ui/react-dialog": "^1.0.2",
+    "@radix-ui/react-dropdown-menu": "^2.0.2",
+    "@radix-ui/react-icons": "^1.2.0",
+    "@radix-ui/react-popover": "1.0.3",
+    "@radix-ui/react-scroll-area": "^1.0.2",
+    "@radix-ui/react-separator": "^1.0.1",
+    "@radix-ui/react-tabs": "^1.0.3",
+    "@tanstack/react-query": "^4.24.10",
+    "@tauri-apps/api": "^1.2.0",
+    "@vitejs/plugin-react": "^3.1.0",
     "classnames": "^2.3.2",
-    "cm6-graphql": "^0.0.9",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.8.1",
+    "cm6-graphql": "^0.0.4-canary-b30a2325.0",
     "codemirror": "^6.0.1",
-    "codemirror-json-schema": "^0.6.1",
-    "date-fns": "^3.3.1",
-    "fast-fuzzy": "^1.12.0",
-    "focus-trap-react": "^10.1.1",
     "format-graphql": "^1.4.0",
     "framer-motion": "^9.0.4",
-    "lucide-react": "^0.309.0",
-    "mime": "^4.0.1",
-    "papaparse": "^5.4.1",
     "parse-color": "^1.0.0",
-    "react": "^18.2.0",
-    "react-dnd": "^16.0.1",
-    "react-dnd-html5-backend": "^16.0.1",
-    "react-dom": "^18.2.0",
     "react-helmet-async": "^1.3.0",
-    "react-pdf": "^9.0.0",
-    "react-router-dom": "^6.8.1",
-    "react-use": "^17.4.0",
-    "slugify": "^1.6.6",
-    "uuid": "^9.0.0",
-    "xml-formatter": "^3.6.2"
+    "react-use": "^17.4.0"
   },
   "devDependencies": {
     "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tanstack/react-query-devtools": "^5.45.1",
-    "@tauri-apps/cli": "^2.0.0-rc.2",
+    "@tauri-apps/cli": "^1.2.2",
     "@types/node": "^18.7.10",
-    "@types/papaparse": "^5.3.7",
     "@types/parse-color": "^1.0.1",
     "@types/parse-json": "^4.0.0",
-    "@types/react": "^18.0.31",
-    "@types/react-dom": "^18.0.11",
-    "@types/uuid": "^9.0.1",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@types/react-dom": "^18.0.6",
+    "@typescript-eslint/eslint-plugin": "^5.52.0",
+    "@typescript-eslint/parser": "^5.52.0",
     "autoprefixer": "^10.4.13",
-    "decompress": "^4.2.1",
+    "concurrently": "^7.6.0",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "husky": "^8.0.3",
-    "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"
-  },
-  "lint-staged": {
-    "*.{ts,tsx}": "eslint --cache --fix",
-    "*.{js,css,md}": "prettier --write"
+    "typescript": "^4.6.4",
+    "vite": "^4.0.0",
+    "vite-plugin-top-level-await": "^1.2.4",
+    "vitest": "^0.29.2"
   }
 }

plugin-runtime-types/.gitignore

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

plugin-runtime-types/package-lock.json

@@ -1,44 +0,0 @@
-{
-  "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

@@ -1,19 +0,0 @@
-{
-  "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

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

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

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

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

@@ -1,5 +0,0 @@
-// 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

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

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

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

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

@@ -1,4 +0,0 @@
-// 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

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

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

@@ -1,4 +0,0 @@
-// 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

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

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

@@ -1,4 +0,0 @@
-// 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

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

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

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

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

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

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

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type 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

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type 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

@@ -1,4 +0,0 @@
-// 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

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

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

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

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

@@ -1,4 +0,0 @@
-// 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

@@ -1,5 +0,0 @@
-// 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

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

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

@@ -1,4 +0,0 @@
-// 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

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

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

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

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

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

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

@@ -1,8 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Environment } 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

@@ -1,4 +0,0 @@
-// 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

@@ -1,4 +0,0 @@
-// 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

@@ -1,12 +0,0 @@
-// 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

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

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

@@ -1,14 +0,0 @@
-// 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

@@ -1,3 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type 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

@@ -1,4 +0,0 @@
-// 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

@@ -1,2 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,44 +0,0 @@
-export type Colors = {
-  surface: string;
-  surfaceHighlight?: string;
-  surfaceActive?: string;
-
-  text: string;
-  textSubtle?: string;
-  textSubtlest?: string;
-
-  border?: string;
-  borderSubtle?: string;
-  borderFocus?: string;
-
-  shadow?: string;
-  backdrop?: string;
-  selection?: string;
-
-  primary?: string;
-  secondary?: string;
-  info?: string;
-  success?: string;
-  notice?: string;
-  warning?: string;
-  danger?: string;
-};
-
-export type 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

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

plugin-runtime/.gitignore

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

plugin-runtime/nodemon.json

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

plugin-runtime/package.json

@@ -1,25 +0,0 @@
-{
-  "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

@@ -1,21 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

@@ -1,475 +0,0 @@
-// 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

@@ -1,42 +0,0 @@
-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

@@ -1,133 +0,0 @@
-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

@@ -1,24 +0,0 @@
-{
-  "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/**/*"
-  ]
-}

proto/plugins/runtime.proto

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

rustfmt.toml

@@ -1 +0,0 @@
-edition = "2018"

scripts/replace-version.cjs

@@ -1,15 +0,0 @@
-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));

scripts/vendor-node.cjs

@@ -1,69 +0,0 @@
-const path = require('node:path');
-const decompress = require('decompress');
-const Downloader = require("nodejs-file-downloader");
-const {rmSync, cpSync, mkdirSync, existsSync} = require("node:fs");
-const {execSync} = require("node:child_process");
-
-const NODE_VERSION = 'v22.5.1';
-
-// `${process.platform}_${process.arch}`
-const MAC_ARM = 'darwin_arm64';
-const MAC_X64 = 'darwin_x64';
-const LNX_X64 = 'linux_x64';
-const WIN_X64 = 'win32_x64';
-
-const URL_MAP = {
-  [MAC_ARM]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-darwin-arm64.tar.gz`,
-  [MAC_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-darwin-x64.tar.gz`,
-  [LNX_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz`,
-  [WIN_X64]: `https://nodejs.org/download/release/${NODE_VERSION}/node-${NODE_VERSION}-win-x64.zip`,
-};
-
-const SRC_BIN_MAP = {
-  [MAC_ARM]: `node-${NODE_VERSION}-darwin-arm64/bin/node`,
-  [MAC_X64]: `node-${NODE_VERSION}-darwin-x64/bin/node`,
-  [LNX_X64]: `node-${NODE_VERSION}-linux-x64/bin/node`,
-  [WIN_X64]: `node-${NODE_VERSION}-win-x64/node.exe`,
-};
-
-const DST_BIN_MAP = {
-  darwin_arm64: 'yaaknode-aarch64-apple-darwin',
-  darwin_x64: 'yaaknode-x86_64-apple-darwin',
-  linux_x64: 'yaaknode-x86_64-unknown-linux-gnu',
-  win32_x64: 'yaaknode-x86_64-pc-windows-msvc.exe',
-};
-
-const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`;
-
-const destDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'node');
-const binDest = path.join(destDir, DST_BIN_MAP[key]);
-console.log(`Vendoring NodeJS ${NODE_VERSION} for ${key}`);
-
-if (existsSync(binDest) && execSync(`${binDest} --version`).toString('utf-8').trim() === NODE_VERSION) {
-  console.log("NodeJS already vendored");
-  return;
-}
-
-rmSync(destDir, {recursive: true, force: true});
-mkdirSync(destDir, {recursive: true});
-
-(async function () {
-  const url = URL_MAP[key];
-  const tmpDir = path.join(__dirname, 'tmp', Date.now().toString());
-
-  // Download GitHub release artifact
-  const {filePath} = await new Downloader({url, directory: tmpDir}).download();
-
-  // Decompress to the same directory
-  await decompress(filePath, tmpDir, {});
-
-  // Copy binary
-  const binSrc = path.join(tmpDir, SRC_BIN_MAP[key]);
-  cpSync(binSrc, binDest);
-  rmSync(tmpDir, {recursive: true, force: true});
-
-  console.log("Downloaded NodeJS to", binDest);
-})().catch(err => {
-  console.log('Script failed:', err);
-  process.exit(1);
-});

scripts/vendor-plugins.cjs

@@ -1,25 +0,0 @@
-const {readdirSync, cpSync} = require("node:fs");
-const path = require("node:path");
-const {execSync} = require("node:child_process");
-const pluginsDir = process.env.YAAK_PLUGINS_DIR;
-if (!pluginsDir) {
-  console.log("YAAK_PLUGINS_DIR is not set");
-  process.exit(1);
-}
-
-console.log('Installing Yaak plugins dependencies', pluginsDir);
-execSync('npm ci', {cwd: pluginsDir});
-console.log('Building Yaak plugins', pluginsDir);
-execSync('npm run build', {cwd: pluginsDir});
-
-console.log('Copying Yaak plugins to', pluginsDir);
-
-const pluginsRoot = path.join(pluginsDir, 'plugins');
-for (const name of readdirSync(pluginsRoot)) {
-  const dir = path.join(pluginsRoot, name);
-  if (name.startsWith('.')) continue;
-  const destDir = path.join(__dirname, '../src-tauri/vendored/plugins/', name);
-  console.log(`Copying ${name} to ${destDir}`);
-  cpSync(path.join(dir, 'package.json'), path.join(destDir, 'package.json'));
-  cpSync(path.join(dir, 'build/index.js'), path.join(destDir, 'build/index.js'));
-}

scripts/vendor-protoc.cjs

@@ -1,64 +0,0 @@
-const decompress = require('decompress');
-const Downloader = require("nodejs-file-downloader");
-const path = require("node:path");
-const {rmSync, mkdirSync, cpSync} = require("node:fs");
-
-const VERSION = '27.2';
-
-// `${process.platform}_${process.arch}`
-const MAC_ARM = 'darwin_arm64';
-const MAC_X64 = 'darwin_x64';
-const LNX_X64 = 'linux_x64';
-const WIN_X64 = 'win32_x64';
-
-const URL_MAP = {
-  [MAC_ARM]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-osx-aarch_64.zip`,
-  [MAC_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-osx-x86_64.zip`,
-  [LNX_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-linux-x86_64.zip`,
-  [WIN_X64]: `https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-win64.zip`,
-};
-
-const SRC_BIN_MAP = {
-  [MAC_ARM]: 'bin/protoc',
-  [MAC_X64]: 'bin/protoc',
-  [LNX_X64]: 'bin/protoc',
-  [WIN_X64]: 'bin/protoc.exe',
-};
-
-const DST_BIN_MAP = {
-  [MAC_ARM]: 'yaakprotoc-aarch64-apple-darwin',
-  [MAC_X64]: 'yaakprotoc-x86_64-apple-darwin',
-  [LNX_X64]: 'yaakprotoc-x86_64-unknown-linux-gnu',
-  [WIN_X64]: 'yaakprotoc-x86_64-pc-windows-msvc.exe',
-};
-
-const dstDir = path.join(__dirname, `..`, 'src-tauri', 'vendored', 'protoc');
-rmSync(dstDir, {recursive: true, force: true});
-mkdirSync(dstDir, {recursive: true});
-
-(async function () {
-  const key = `${process.platform}_${process.env.YAAK_TARGET_ARCH ?? process.arch}`;
-  console.log(`Vendoring protoc ${VERSION} for ${key}`);
-  const url = URL_MAP[key];
-  const tmpDir = path.join(__dirname, 'tmp', Date.now().toString());
-
-  // Download GitHub release artifact
-  const {filePath} = await new Downloader({url, directory: tmpDir,}).download();
-
-  // Decompress to the same directory
-  await decompress(filePath, tmpDir, {});
-
-  // Copy binary
-  const binSrc = path.join(tmpDir, SRC_BIN_MAP[key]);
-  const binDst = path.join(dstDir, DST_BIN_MAP[key]);
-  cpSync(binSrc, binDst);
-
-  // Copy other files
-  const includeSrc = path.join(tmpDir, 'include');
-  const includeDst = path.join(dstDir, 'include');
-  cpSync(includeSrc, includeDst, {recursive: true});
-
-  rmSync(tmpDir, {recursive: true, force: true});
-
-  console.log("Downloaded protoc to", binDst);
-})().catch(err => console.log('Script failed:', err));

src-tauri/.gitignore

@@ -2,4 +2,3 @@
 # will have compiled files and executables
 /target/
 
-vendored

src-tauri/Cargo.toml

@@ -1,65 +1,40 @@
-[workspace]
-members = ["grpc", "templates", "yaak_plugin_runtime", "yaak_models"]
-
-
 [package]
 name = "yaak-app"
 version = "0.0.0"
+description = "A network protocol testing utility app"
+authors = ["Gregory Schier"]
+license = "MIT"
+repository = "https://github.com/gschier/yaak-app"
 edition = "2021"
 
-# Produce a library for mobile support
-[lib]
-name = "tauri_app_lib"
-crate-type = ["staticlib", "cdylib", "lib"]
-
-[profile.release]
-strip = true  # Automatically strip symbols from the binary.
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-rc.0", features = [] }
+tauri-build = { version = "1.2", features = [] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc = "0.2.7"
-cocoa = "0.25.0"
-
-[target.'cfg(target_os = "linux")'.dependencies]
-openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work
+objc = { version = "0.2.7" }
+cocoa = { version = "0.24.1" }
 
 [dependencies]
-grpc = { path = "./grpc" }
-templates = { path = "./templates" }
-yaak_plugin_runtime = { path = "yaak_plugin_runtime" }
-anyhow = "1.0.86"
-base64 = "0.22.0"
-chrono = { version = "0.4.31", features = ["serde"] }
-datetime = "0.5.2"
-hex_color = "3.0.0"
-http = "1"
-log = "0.4.21"
-rand = "0.8.5"
-regex = "1.10.2"
-reqwest = { version = "0.12.4", features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "native-tls-alpn"] }
-reqwest_cookie_store = "0.8.0"
-serde = { version = "1.0.198", features = ["derive"] }
-serde_json = { version = "1.0.116", features = ["raw_value"] }
-serde_yaml = "0.9.34"
-tauri = { workspace = true }
-tauri-plugin-shell = { workspace = true }
-tauri-plugin-clipboard-manager = "2.0.0-rc.0"
-tauri-plugin-dialog = "2.0.0-rc.0"
-tauri-plugin-fs = "2.0.0-rc.0"
-tauri-plugin-log = { version = "2.0.0-rc.0", features = ["colored"] }
-tauri-plugin-os = "2.0.0-rc.0"
-tauri-plugin-updater = "2.0.0-rc.0"
-tauri-plugin-window-state = "2.0.0-rc.0"
-tokio = { version = "1.36.0", features = ["sync"] }
-tokio-stream = "0.1.15"
-yaak_models = {workspace = true}
-uuid = "1.7.0"
-thiserror = "1.0.61"
-mime_guess = "2.0.5"
+serde_json = { version = "1.0", features = ["raw_value"] }
+serde = { version = "1.0", features = ["derive"] }
+tauri = { version = "1.2", features = ["config-toml", "devtools", "shell-open", "system-tray", "updater", "window-start-dragging"] }
+http = { version = "0.2.8" }
+reqwest = { version = "0.11.14", features = ["json"] }
+tokio = { version = "1.25.0", features = ["sync"] }
+futures = { version = "0.3.26" }
+deno_core = { version = "0.174.0" }
+deno_ast = { version = "0.24.0", features = ["transpiling"] }
+sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time", "offline"] }
+uuid = { version = "1.3.0" }
+rand = { version = "0.8.5" }
+chrono = { version = "0.4.23", features = ["serde"] }
 
-[workspace.dependencies]
-yaak_models = { path = "yaak_models" }
-tauri = { version = "2.0.0-rc.2", features = ["devtools", "protocol-asset"] }
-tauri-plugin-shell = "2.0.0-rc.0"
+[features]
+# by default Tauri runs in production mode
+# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
+default = ["custom-protocol"]
+# this feature is used used for production builds where `devPath` points to the filesystem
+# DO NOT remove this
+custom-protocol = ["tauri/custom-protocol"]

src-tauri/capabilities/capabilities.json

@@ -1,46 +0,0 @@
-{
-  "$schema": "../gen/schemas/capabilities.json",
-  "identifier": "main",
-  "description": "Main permissions",
-  "local": true,
-  "windows": [
-    "*"
-  ],
-  "permissions": [
-    "core:event:allow-emit",
-    "core:event:allow-listen",
-    "core:event:allow-unlisten",
-    "os:allow-os-type",
-    "clipboard-manager:allow-write-text",
-    "clipboard-manager:allow-read-text",
-    "dialog:allow-open",
-    "dialog:allow-save",
-    "fs:allow-read-file",
-    "fs:allow-read-text-file",
-    {
-      "identifier": "fs:scope",
-      "allow": [
-        {
-          "path": "$APPDATA"
-        },
-        {
-          "path": "$APPDATA/**"
-        }
-      ]
-    },
-    "shell:allow-open",
-    "core:webview:allow-set-webview-zoom",
-    "core:window:allow-close",
-    "core:window:allow-is-fullscreen",
-    "core:window:allow-maximize",
-    "core:window:allow-minimize",
-    "core:window:allow-toggle-maximize",
-    "core:window:allow-set-decorations",
-    "core:window:allow-set-title",
-    "core:window:allow-start-dragging",
-    "core:window:allow-unmaximize",
-    "core:window:allow-theme",
-    "clipboard-manager:allow-read-text",
-    "clipboard-manager:allow-write-text"
-  ]
-}

src-tauri/gen/schemas/capabilities.json

@@ -1 +0,0 @@
-{"main":{"identifier":"main","description":"Main permissions","local":true,"windows":["*"],"permissions":["core:event:allow-emit","core:event:allow-listen","core:event:allow-unlisten","os:allow-os-type","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open","core:webview:allow-set-webview-zoom","core:window:allow-close","core:window:allow-is-fullscreen","core:window:allow-maximize","core:window:allow-minimize","core:window:allow-toggle-maximize","core:window:allow-set-decorations","core:window:allow-set-title","core:window:allow-start-dragging","core:window:allow-unmaximize","core:window:allow-theme","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}

src-tauri/grpc/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "grpc"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-tonic = "0.10.2"
-prost = "0.12"
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread", "fs"] }
-tonic-reflection = "0.10.2"
-tokio-stream = "0.1.14"
-prost-types = "0.12.3"
-serde = { version = "1.0.196", features = ["derive"] }
-serde_json = "1.0.113"
-prost-reflect = { version = "0.12.0", features = ["serde", "derive"] }
-log = "0.4.20"
-anyhow = "1.0.79"
-hyper = { version = "0.14" }
-hyper-rustls = { version = "0.24.0", features = ["http2"] }
-uuid = { version = "1.7.0", features = ["v4"] }
-tauri = { workspace = true }
-tauri-plugin-shell = { workspace = true }
-md5 = "0.7.0"
-dunce = "1.0.4"

src-tauri/grpc/src/codec.rs

@@ -1,52 +0,0 @@
-use prost_reflect::prost::Message;
-use prost_reflect::{DynamicMessage, MethodDescriptor};
-use tonic::codec::{Codec, DecodeBuf, Decoder, EncodeBuf, Encoder};
-use tonic::Status;
-
-#[derive(Clone)]
-pub struct DynamicCodec(MethodDescriptor);
-
-impl DynamicCodec {
-    #[allow(dead_code)]
-    pub fn new(md: MethodDescriptor) -> Self {
-        Self(md)
-    }
-}
-
-impl Codec for DynamicCodec {
-    type Encode = DynamicMessage;
-    type Decode = DynamicMessage;
-    type Encoder = Self;
-    type Decoder = Self;
-
-    fn encoder(&mut self) -> Self::Encoder {
-        self.clone()
-    }
-
-    fn decoder(&mut self) -> Self::Decoder {
-        self.clone()
-    }
-}
-
-impl Encoder for DynamicCodec {
-    type Item = DynamicMessage;
-    type Error = Status;
-
-    fn encode(&mut self, item: Self::Item, dst: &mut EncodeBuf<'_>) -> Result<(), Self::Error> {
-        item.encode(dst)
-            .expect("buffer is too small to decode this message");
-        Ok(())
-    }
-}
-
-impl Decoder for DynamicCodec {
-    type Item = DynamicMessage;
-    type Error = Status;
-
-    fn decode(&mut self, src: &mut DecodeBuf<'_>) -> Result<Option<Self::Item>, Self::Error> {
-        let mut msg = DynamicMessage::new(self.0.output());
-        msg.merge(src)
-            .map_err(|err| Status::internal(err.to_string()))?;
-        Ok(Some(msg))
-    }
-}

src-tauri/grpc/src/json_schema.rs

@@ -1,179 +0,0 @@
-use prost_reflect::{DescriptorPool, MessageDescriptor};
-use prost_types::field_descriptor_proto;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-
-#[derive(Default, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct JsonSchemaEntry {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    title: Option<String>,
-
-    #[serde(rename = "type")]
-    type_: JsonType,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    description: Option<String>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    properties: Option<HashMap<String, JsonSchemaEntry>>,
-
-    #[serde(rename = "enum", skip_serializing_if = "Option::is_none")]
-    enum_: Option<Vec<String>>,
-
-    /// Don't allow any other properties in the object
-    additional_properties: bool,
-
-    /// Set all properties to required
-    #[serde(skip_serializing_if = "Option::is_none")]
-    required: Option<Vec<String>>,
-
-    #[serde(skip_serializing_if = "Option::is_none")]
-    items: Option<Box<JsonSchemaEntry>>,
-}
-
-enum JsonType {
-    String,
-    Number,
-    Object,
-    Array,
-    Boolean,
-    Null,
-    _UNKNOWN,
-}
-
-impl Default for JsonType {
-    fn default() -> Self {
-        JsonType::_UNKNOWN
-    }
-}
-
-impl serde::Serialize for JsonType {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        match self {
-            JsonType::String => serializer.serialize_str("string"),
-            JsonType::Number => serializer.serialize_str("number"),
-            JsonType::Object => serializer.serialize_str("object"),
-            JsonType::Array => serializer.serialize_str("array"),
-            JsonType::Boolean => serializer.serialize_str("boolean"),
-            JsonType::Null => serializer.serialize_str("null"),
-            JsonType::_UNKNOWN => serializer.serialize_str("unknown"),
-        }
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for JsonType {
-    fn deserialize<D>(deserializer: D) -> Result<JsonType, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let s = String::deserialize(deserializer)?;
-        match s.as_str() {
-            "string" => Ok(JsonType::String),
-            "number" => Ok(JsonType::Number),
-            "object" => Ok(JsonType::Object),
-            "array" => Ok(JsonType::Array),
-            "boolean" => Ok(JsonType::Boolean),
-            "null" => Ok(JsonType::Null),
-            _ => Ok(JsonType::_UNKNOWN),
-        }
-    }
-}
-
-pub fn message_to_json_schema(
-    pool: &DescriptorPool,
-    message: MessageDescriptor,
-) -> JsonSchemaEntry {
-    let mut schema = JsonSchemaEntry {
-        title: Some(message.name().to_string()),
-        type_: JsonType::Object, // Messages are objects
-        ..Default::default()
-    };
-
-    let mut properties = HashMap::new();
-    message.fields().for_each(|f| match f.kind() {
-        prost_reflect::Kind::Message(m) => {
-            properties.insert(f.name().to_string(), message_to_json_schema(pool, m));
-        }
-        prost_reflect::Kind::Enum(e) => {
-            properties.insert(
-                f.name().to_string(),
-                JsonSchemaEntry {
-                    type_: map_proto_type_to_json_type(f.field_descriptor_proto().r#type()),
-                    enum_: Some(e.values().map(|v| v.name().to_string()).collect::<Vec<_>>()),
-                    ..Default::default()
-                },
-            );
-        }
-        _ => {
-            // TODO: Handle repeated label
-            match f.field_descriptor_proto().label() {
-                field_descriptor_proto::Label::Repeated => {
-                    // TODO: Handle more complex repeated types. This just handles primitives for now
-                    properties.insert(
-                        f.name().to_string(),
-                        JsonSchemaEntry {
-                            type_: JsonType::Array,
-                            items: Some(Box::new(JsonSchemaEntry {
-                                type_: map_proto_type_to_json_type(
-                                    f.field_descriptor_proto().r#type(),
-                                ),
-                                ..Default::default()
-                            })),
-                            ..Default::default()
-                        },
-                    );
-                }
-                _ => {
-                    // Regular JSON field
-                    properties.insert(
-                        f.name().to_string(),
-                        JsonSchemaEntry {
-                            type_: map_proto_type_to_json_type(f.field_descriptor_proto().r#type()),
-                            ..Default::default()
-                        },
-                    );
-                }
-            };
-        }
-    });
-
-    schema.properties = Some(properties);
-
-    // All proto 3 fields are optional, so maybe we could
-    // make this a setting?
-    // schema.required = Some(
-    //     message
-    //         .fields()
-    //         .map(|f| f.name().to_string())
-    //         .collect::<Vec<_>>(),
-    // );
-
-    schema
-}
-
-fn map_proto_type_to_json_type(proto_type: field_descriptor_proto::Type) -> JsonType {
-    match proto_type {
-        field_descriptor_proto::Type::Double => JsonType::Number,
-        field_descriptor_proto::Type::Float => JsonType::Number,
-        field_descriptor_proto::Type::Int64 => JsonType::Number,
-        field_descriptor_proto::Type::Uint64 => JsonType::Number,
-        field_descriptor_proto::Type::Int32 => JsonType::Number,
-        field_descriptor_proto::Type::Fixed64 => JsonType::Number,
-        field_descriptor_proto::Type::Fixed32 => JsonType::Number,
-        field_descriptor_proto::Type::Bool => JsonType::Boolean,
-        field_descriptor_proto::Type::String => JsonType::String,
-        field_descriptor_proto::Type::Group => JsonType::_UNKNOWN,
-        field_descriptor_proto::Type::Message => JsonType::Object,
-        field_descriptor_proto::Type::Bytes => JsonType::String,
-        field_descriptor_proto::Type::Uint32 => JsonType::Number,
-        field_descriptor_proto::Type::Enum => JsonType::String,
-        field_descriptor_proto::Type::Sfixed32 => JsonType::Number,
-        field_descriptor_proto::Type::Sfixed64 => JsonType::Number,
-        field_descriptor_proto::Type::Sint32 => JsonType::Number,
-        field_descriptor_proto::Type::Sint64 => JsonType::Number,
-    }
-}

src-tauri/grpc/src/lib.rs

@@ -1,52 +0,0 @@
-use prost_reflect::{DynamicMessage, MethodDescriptor, SerializeOptions};
-use serde::{Deserialize, Serialize};
-use serde_json::Deserializer;
-
-mod codec;
-mod json_schema;
-pub mod manager;
-mod proto;
-
-pub use tonic::metadata::*;
-pub use tonic::Code;
-
-pub fn serialize_options() -> SerializeOptions {
-    SerializeOptions::new().skip_default_fields(false)
-}
-
-#[derive(Serialize, Deserialize, Debug, Default)]
-#[serde(default, rename_all = "camelCase")]
-pub struct ServiceDefinition {
-    pub name: String,
-    pub methods: Vec<MethodDefinition>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Default)]
-#[serde(default, rename_all = "camelCase")]
-pub struct MethodDefinition {
-    pub name: String,
-    pub schema: String,
-    pub client_streaming: bool,
-    pub server_streaming: bool,
-}
-
-static SERIALIZE_OPTIONS: &'static SerializeOptions = &SerializeOptions::new()
-    .skip_default_fields(false)
-    .stringify_64_bit_integers(false);
-
-pub fn serialize_message(msg: &DynamicMessage) -> Result<String, String> {
-    let mut buf = Vec::new();
-    let mut se = serde_json::Serializer::pretty(&mut buf);
-    msg.serialize_with_options(&mut se, SERIALIZE_OPTIONS)
-        .map_err(|e| e.to_string())?;
-    let s = String::from_utf8(buf).expect("serde_json to emit valid utf8");
-    Ok(s)
-}
-
-pub fn deserialize_message(msg: &str, method: MethodDescriptor) -> Result<DynamicMessage, String> {
-    let mut deserializer = Deserializer::from_str(&msg);
-    let req_message = DynamicMessage::deserialize(method.input(), &mut deserializer)
-        .map_err(|e| e.to_string())?;
-    deserializer.end().map_err(|e| e.to_string())?;
-    Ok(req_message)
-}

src-tauri/grpc/src/manager.rs

@@ -1,304 +0,0 @@
-use std::collections::HashMap;
-use std::path::PathBuf;
-use std::str::FromStr;
-
-use hyper::client::HttpConnector;
-use hyper::Client;
-use hyper_rustls::HttpsConnector;
-pub use prost_reflect::DynamicMessage;
-use prost_reflect::{DescriptorPool, MethodDescriptor, ServiceDescriptor};
-use serde_json::Deserializer;
-use tauri::AppHandle;
-use tokio_stream::wrappers::ReceiverStream;
-use tonic::body::BoxBody;
-use tonic::metadata::{MetadataKey, MetadataValue};
-use tonic::transport::Uri;
-use tonic::{IntoRequest, IntoStreamingRequest, Request, Response, Status, Streaming};
-
-use crate::codec::DynamicCodec;
-use crate::proto::{
-    fill_pool_from_files, fill_pool_from_reflection, get_transport, method_desc_to_path,
-};
-use crate::{json_schema, MethodDefinition, ServiceDefinition};
-
-#[derive(Clone)]
-pub struct GrpcConnection {
-    pool: DescriptorPool,
-    conn: Client<HttpsConnector<HttpConnector>, BoxBody>,
-    pub uri: Uri,
-}
-
-#[derive(Default)]
-pub struct StreamError {
-    pub message: String,
-    pub status: Option<Status>,
-}
-
-impl From<String> for StreamError {
-    fn from(value: String) -> Self {
-        StreamError {
-            message: value.to_string(),
-            status: None,
-        }
-    }
-}
-
-impl From<Status> for StreamError {
-    fn from(s: Status) -> Self {
-        StreamError {
-            message: s.message().to_string(),
-            status: Some(s),
-        }
-    }
-}
-
-impl GrpcConnection {
-    pub fn service(&self, service: &str) -> Result<ServiceDescriptor, String> {
-        let service = self
-            .pool
-            .get_service_by_name(service)
-            .ok_or("Failed to find service")?;
-        Ok(service)
-    }
-
-    pub fn method(&self, service: &str, method: &str) -> Result<MethodDescriptor, String> {
-        let service = self.service(service)?;
-        let method = service
-            .methods()
-            .find(|m| m.name() == method)
-            .ok_or("Failed to find method")?;
-        Ok(method)
-    }
-
-    pub async fn unary(
-        &self,
-        service: &str,
-        method: &str,
-        message: &str,
-        metadata: HashMap<String, String>,
-    ) -> Result<Response<DynamicMessage>, StreamError> {
-        let method = &self.method(&service, &method)?;
-        let input_message = method.input();
-
-        let mut deserializer = Deserializer::from_str(message);
-        let req_message = DynamicMessage::deserialize(input_message, &mut deserializer)
-            .map_err(|e| e.to_string())?;
-        deserializer.end().unwrap();
-
-        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
-
-        let mut req = req_message.into_request();
-        decorate_req(metadata, &mut req).map_err(|e| e.to_string())?;
-
-        let path = method_desc_to_path(method);
-        let codec = DynamicCodec::new(method.clone());
-        client.ready().await.unwrap();
-
-        Ok(client.unary(req, path, codec).await?)
-    }
-
-    pub async fn streaming(
-        &self,
-        service: &str,
-        method: &str,
-        stream: ReceiverStream<DynamicMessage>,
-        metadata: HashMap<String, String>,
-    ) -> Result<Response<Streaming<DynamicMessage>>, StreamError> {
-        let method = &self.method(&service, &method)?;
-        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
-
-        let mut req = stream.into_streaming_request();
-
-        decorate_req(metadata, &mut req).map_err(|e| e.to_string())?;
-
-        let path = method_desc_to_path(method);
-        let codec = DynamicCodec::new(method.clone());
-        client.ready().await.map_err(|e| e.to_string())?;
-        Ok(client.streaming(req, path, codec).await?)
-    }
-
-    pub async fn client_streaming(
-        &self,
-        service: &str,
-        method: &str,
-        stream: ReceiverStream<DynamicMessage>,
-        metadata: HashMap<String, String>,
-    ) -> Result<Response<DynamicMessage>, StreamError> {
-        let method = &self.method(&service, &method)?;
-        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
-        let mut req = stream.into_streaming_request();
-        decorate_req(metadata, &mut req).map_err(|e| e.to_string())?;
-
-        let path = method_desc_to_path(method);
-        let codec = DynamicCodec::new(method.clone());
-        client.ready().await.unwrap();
-        client
-            .client_streaming(req, path, codec)
-            .await
-            .map_err(|e| StreamError {
-                message: e.message().to_string(),
-                status: Some(e),
-            })
-    }
-
-    pub async fn server_streaming(
-        &self,
-        service: &str,
-        method: &str,
-        message: &str,
-        metadata: HashMap<String, String>,
-    ) -> Result<Response<Streaming<DynamicMessage>>, StreamError> {
-        let method = &self.method(&service, &method)?;
-        let input_message = method.input();
-
-        let mut deserializer = Deserializer::from_str(message);
-        let req_message = DynamicMessage::deserialize(input_message, &mut deserializer)
-            .map_err(|e| e.to_string())?;
-        deserializer.end().unwrap();
-
-        let mut client = tonic::client::Grpc::with_origin(self.conn.clone(), self.uri.clone());
-
-        let mut req = req_message.into_request();
-        decorate_req(metadata, &mut req).map_err(|e| e.to_string())?;
-
-        let path = method_desc_to_path(method);
-        let codec = DynamicCodec::new(method.clone());
-        client.ready().await.map_err(|e| e.to_string())?;
-        Ok(client.server_streaming(req, path, codec).await?)
-    }
-}
-
-pub struct GrpcHandle {
-    app_handle: AppHandle,
-    pools: HashMap<String, DescriptorPool>,
-}
-
-impl GrpcHandle {
-    pub fn new(app_handle: &AppHandle) -> Self {
-        let pools = HashMap::new();
-        Self {
-            pools,
-            app_handle: app_handle.clone(),
-        }
-    }
-}
-
-impl GrpcHandle {
-    pub async fn reflect(
-        &mut self,
-        id: &str,
-        uri: &str,
-        proto_files: &Vec<PathBuf>,
-    ) -> Result<(), String> {
-        let pool = if proto_files.is_empty() {
-            let full_uri = uri_from_str(uri)?;
-            fill_pool_from_reflection(&full_uri).await
-        } else {
-            fill_pool_from_files(&self.app_handle, proto_files).await
-        }?;
-
-        self.pools
-            .insert(make_pool_key(id, uri, proto_files), pool.clone());
-        Ok(())
-    }
-
-    pub async fn services(
-        &mut self,
-        id: &str,
-        uri: &str,
-        proto_files: &Vec<PathBuf>,
-    ) -> Result<Vec<ServiceDefinition>, String> {
-        // Ensure reflection is up-to-date
-        self.reflect(id, uri, proto_files).await?;
-
-        let pool = self
-            .get_pool(id, uri, proto_files)
-            .ok_or("Failed to get pool".to_string())?;
-        Ok(self.services_from_pool(&pool))
-    }
-
-    fn services_from_pool(&self, pool: &DescriptorPool) -> Vec<ServiceDefinition> {
-        pool.services()
-            .map(|s| {
-                let mut def = ServiceDefinition {
-                    name: s.full_name().to_string(),
-                    methods: vec![],
-                };
-                for method in s.methods() {
-                    let input_message = method.input();
-                    def.methods.push(MethodDefinition {
-                        name: method.name().to_string(),
-                        server_streaming: method.is_server_streaming(),
-                        client_streaming: method.is_client_streaming(),
-                        schema: serde_json::to_string_pretty(&json_schema::message_to_json_schema(
-                            &pool,
-                            input_message,
-                        ))
-                        .unwrap(),
-                    })
-                }
-                def
-            })
-            .collect::<Vec<_>>()
-    }
-
-    pub async fn connect(
-        &mut self,
-        id: &str,
-        uri: &str,
-        proto_files: &Vec<PathBuf>,
-    ) -> Result<GrpcConnection, String> {
-        self.reflect(id, uri, proto_files).await?;
-        let pool = self
-            .get_pool(id, uri, proto_files)
-            .ok_or("Failed to get pool")?;
-
-        let uri = uri_from_str(uri)?;
-        let conn = get_transport();
-        let connection = GrpcConnection {
-            pool: pool.clone(),
-            conn,
-            uri,
-        };
-        Ok(connection)
-    }
-
-    fn get_pool(&self, id: &str, uri: &str, proto_files: &Vec<PathBuf>) -> Option<&DescriptorPool> {
-        self.pools.get(make_pool_key(id, uri, proto_files).as_str())
-    }
-}
-
-fn decorate_req<T>(metadata: HashMap<String, String>, req: &mut Request<T>) -> Result<(), String> {
-    for (k, v) in metadata {
-        req.metadata_mut().insert(
-            MetadataKey::from_str(k.as_str()).map_err(|e| e.to_string())?,
-            MetadataValue::from_str(v.as_str()).map_err(|e| e.to_string())?,
-        );
-    }
-    Ok(())
-}
-
-fn uri_from_str(uri_str: &str) -> Result<Uri, String> {
-    match Uri::from_str(uri_str) {
-        Ok(uri) => Ok(uri),
-        Err(err) => {
-            // Uri::from_str basically only returns "invalid format" so we add more context here
-            Err(format!("Failed to parse URL, {}", err.to_string()))
-        }
-    }
-}
-
-fn make_pool_key(id: &str, uri: &str, proto_files: &Vec<PathBuf>) -> String {
-    let pool_key = format!(
-        "{}::{}::{}",
-        id,
-        uri,
-        proto_files
-            .iter()
-            .map(|p| p.to_string_lossy().to_string())
-            .collect::<Vec<String>>()
-            .join(":")
-    );
-
-    format!("{:x}", md5::compute(pool_key))
-}

src-tauri/grpc/src/proto.rs

@@ -1,252 +0,0 @@
-use std::env::temp_dir;
-use std::ops::Deref;
-use std::path::PathBuf;
-use std::str::FromStr;
-
-use anyhow::anyhow;
-use hyper::client::HttpConnector;
-use hyper::Client;
-use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
-use log::{debug, warn};
-use prost::Message;
-use prost_reflect::{DescriptorPool, MethodDescriptor};
-use prost_types::{FileDescriptorProto, FileDescriptorSet};
-use tauri::path::BaseDirectory;
-use tauri::{AppHandle, Manager};
-use tauri_plugin_shell::ShellExt;
-use tokio::fs;
-use tokio_stream::StreamExt;
-use tonic::body::BoxBody;
-use tonic::codegen::http::uri::PathAndQuery;
-use tonic::transport::Uri;
-use tonic::Request;
-use tonic_reflection::pb::server_reflection_client::ServerReflectionClient;
-use tonic_reflection::pb::server_reflection_request::MessageRequest;
-use tonic_reflection::pb::server_reflection_response::MessageResponse;
-use tonic_reflection::pb::ServerReflectionRequest;
-
-pub async fn fill_pool_from_files(
-    app_handle: &AppHandle,
-    paths: &Vec<PathBuf>,
-) -> Result<DescriptorPool, String> {
-    let mut pool = DescriptorPool::new();
-    let random_file_name = format!("{}.desc", uuid::Uuid::new_v4());
-    let desc_path = temp_dir().join(random_file_name);
-    let global_import_dir = app_handle
-        .path()
-        .resolve("protoc-include", BaseDirectory::Resource)
-        .expect("failed to resolve protoc include directory");
-
-    // HACK: Remove UNC prefix for Windows paths
-    let global_import_dir = dunce::simplified(global_import_dir.as_path())
-        .to_string_lossy()
-        .to_string();
-    let desc_path = dunce::simplified(desc_path.as_path());
-
-    let mut args = vec![
-        "--include_imports".to_string(),
-        "--include_source_info".to_string(),
-        "-I".to_string(),
-        global_import_dir,
-        "-o".to_string(),
-        desc_path.to_string_lossy().to_string(),
-    ];
-
-    for p in paths {
-        if p.as_path().exists() {
-            args.push(p.to_string_lossy().to_string());
-        } else {
-            continue;
-        }
-
-        let parent = p.as_path().parent();
-        if let Some(parent_path) = parent {
-            args.push("-I".to_string());
-            args.push(parent_path.to_string_lossy().to_string());
-            args.push("-I".to_string());
-            args.push(parent_path.parent().unwrap().to_string_lossy().to_string());
-        } else {
-            debug!("ignoring {:?} since it does not exist.", parent)
-        }
-    }
-
-    let out = app_handle
-        .shell()
-        .sidecar("yaakprotoc")
-        .expect("yaakprotoc not found")
-        .args(args)
-        .output()
-        .await
-        .expect("yaakprotoc failed to run");
-
-    if !out.status.success() {
-        return Err(format!(
-            "protoc failed with status {}: {}",
-            out.status.code().unwrap(),
-            String::from_utf8_lossy(out.stderr.as_slice())
-        ));
-    }
-
-    let bytes = fs::read(desc_path).await.map_err(|e| e.to_string())?;
-    let fdp = FileDescriptorSet::decode(bytes.deref()).map_err(|e| e.to_string())?;
-    pool.add_file_descriptor_set(fdp)
-        .map_err(|e| e.to_string())?;
-
-    fs::remove_file(desc_path)
-        .await
-        .map_err(|e| e.to_string())?;
-
-    Ok(pool)
-}
-
-pub async fn fill_pool_from_reflection(uri: &Uri) -> Result<DescriptorPool, String> {
-    let mut pool = DescriptorPool::new();
-    let mut client = ServerReflectionClient::with_origin(get_transport(), uri.clone());
-
-    for service in list_services(&mut client).await? {
-        if service == "grpc.reflection.v1alpha.ServerReflection" {
-            continue;
-        }
-        file_descriptor_set_from_service_name(&service, &mut pool, &mut client).await;
-    }
-
-    Ok(pool)
-}
-
-pub fn get_transport() -> Client<HttpsConnector<HttpConnector>, BoxBody> {
-    let connector = HttpsConnectorBuilder::new().with_native_roots();
-    let connector = connector.https_or_http().enable_http2().wrap_connector({
-        let mut http_connector = HttpConnector::new();
-        http_connector.enforce_http(false);
-        http_connector
-    });
-    Client::builder()
-        .pool_max_idle_per_host(0)
-        .http2_only(true)
-        .build(connector)
-}
-
-async fn list_services(
-    reflect_client: &mut ServerReflectionClient<Client<HttpsConnector<HttpConnector>, BoxBody>>,
-) -> Result<Vec<String>, String> {
-    let response =
-        send_reflection_request(reflect_client, MessageRequest::ListServices("".into())).await?;
-
-    let list_services_response = match response {
-        MessageResponse::ListServicesResponse(resp) => resp,
-        _ => panic!("Expected a ListServicesResponse variant"),
-    };
-
-    Ok(list_services_response
-        .service
-        .iter()
-        .map(|s| s.name.clone())
-        .collect::<Vec<_>>())
-}
-
-async fn file_descriptor_set_from_service_name(
-    service_name: &str,
-    pool: &mut DescriptorPool,
-    client: &mut ServerReflectionClient<Client<HttpsConnector<HttpConnector>, BoxBody>>,
-) {
-    let response = match send_reflection_request(
-        client,
-        MessageRequest::FileContainingSymbol(service_name.into()),
-    )
-    .await
-    {
-        Ok(resp) => resp,
-        Err(e) => {
-            warn!(
-                "Error fetching file descriptor for service {}: {}",
-                service_name, e
-            );
-            return;
-        }
-    };
-
-    let file_descriptor_response = match response {
-        MessageResponse::FileDescriptorResponse(resp) => resp,
-        _ => panic!("Expected a FileDescriptorResponse variant"),
-    };
-
-    for fd in file_descriptor_response.file_descriptor_proto {
-        let fdp = FileDescriptorProto::decode(fd.deref()).unwrap();
-
-        // Add deps first or else we'll get an error
-        for dep_name in fdp.clone().dependency {
-            file_descriptor_set_by_filename(&dep_name, pool, client).await;
-        }
-
-        pool.add_file_descriptor_proto(fdp)
-            .expect("add file descriptor proto");
-    }
-}
-
-async fn file_descriptor_set_by_filename(
-    filename: &str,
-    pool: &mut DescriptorPool,
-    client: &mut ServerReflectionClient<Client<HttpsConnector<HttpConnector>, BoxBody>>,
-) {
-    // We already fetched this file
-    if let Some(_) = pool.get_file_by_name(filename) {
-        return;
-    }
-
-    let response =
-        send_reflection_request(client, MessageRequest::FileByFilename(filename.into())).await;
-    let file_descriptor_response = match response {
-        Ok(MessageResponse::FileDescriptorResponse(resp)) => resp,
-        Ok(_) => {
-            panic!("Expected a FileDescriptorResponse variant")
-        }
-        Err(e) => {
-            warn!("Error fetching file descriptor for {}: {}", filename, e);
-            return;
-        }
-    };
-
-    for fd in file_descriptor_response.file_descriptor_proto {
-        let fdp = FileDescriptorProto::decode(fd.deref()).unwrap();
-        pool.add_file_descriptor_proto(fdp)
-            .expect("add file descriptor proto");
-    }
-}
-
-async fn send_reflection_request(
-    client: &mut ServerReflectionClient<Client<HttpsConnector<HttpConnector>, BoxBody>>,
-    message: MessageRequest,
-) -> Result<MessageResponse, String> {
-    let reflection_request = ServerReflectionRequest {
-        host: "".into(), // Doesn't matter
-        message_request: Some(message),
-    };
-
-    let request = Request::new(tokio_stream::once(reflection_request));
-
-    client
-        .server_reflection_info(request)
-        .await
-        .map_err(|e| match e.code() {
-            tonic::Code::Unavailable => "Failed to connect to endpoint".to_string(),
-            tonic::Code::Unauthenticated => "Authentication failed".to_string(),
-            tonic::Code::DeadlineExceeded => "Deadline exceeded".to_string(),
-            _ => e.to_string(),
-        })?
-        .into_inner()
-        .next()
-        .await
-        .expect("steamed response")
-        .map_err(|e| e.to_string())?
-        .message_response
-        .ok_or("No reflection response".to_string())
-}
-
-pub fn method_desc_to_path(md: &MethodDescriptor) -> PathAndQuery {
-    let full_name = md.full_name();
-    let (namespace, method_name) = full_name
-        .rsplit_once('.')
-        .ok_or_else(|| anyhow!("invalid method path"))
-        .expect("invalid method path");
-    PathAndQuery::from_str(&format!("/{}/{}", namespace, method_name)).expect("invalid method path")
-}