Better padding

Fixes #6

.github/workflows/artifacts.yml

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

.github/workflows/ci-js.yml

@@ -1,18 +0,0 @@
-on:
-  pull_request:
-    branches: [develop]
-
-name: CI (JS)
-
-jobs:
-  test:
-    name: Lint/Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-      - 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,75 +0,0 @@
-name: Generate Artifacts
-on:
-  push:
-    tags: [ v* ]
-
-jobs:
-  build-artifacts:
-    permissions:
-      contents: write
-    name: Build
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: 'macos-latest' # for Arm based macs (M1 and above).
-            args: '--target aarch64-apple-darwin'
-          - platform: 'macos-latest' # for Intel based macs.
-            args: '--target x86_64-apple-darwin'
-          - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
-            args: ''
-          - platform: 'windows-latest'
-            args: ''
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-      - 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 dependencies
-        run: npm ci
-      - name: Run lint
-        run: npm run lint
-      - name: Run tests
-        run: npm test
-      - uses: tauri-apps/tauri-action@v0
-        env:
-          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/changelog/__VERSION__'
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}

.gitignore

@@ -26,6 +26,3 @@ dist-ssr
 
 *.sqlite
 *.sqlite-*
-
-.cargo
-plugins/**/build

.run/Build Desktop.run.xml

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

.tauriignore

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

index.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>Yaak App</title>
   <!-- <script src="http://localhost:8097"></script>-->
 
@@ -15,13 +15,13 @@
 
       @media (prefers-color-scheme: dark) {
           html, body {
-              background-color: #1b1a29;
+              background-color: black;
           }
       }
   </style>
 </head>
 
-<body class="text-base">
+<body>
 <div id="root"></div>
 <div id="cm-portal" class="cm-portal"></div>
 <div id="react-portal"></div>

package.json

@@ -4,9 +4,8 @@
   "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",
+    "start": "npm run build:plugins && npm run tauri-dev",
+    "tauri-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
     "tauri-build": "tauri build",
     "tauri": "tauri",
     "build": "npm run build:frontend",
@@ -16,11 +15,9 @@
     "build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev",
     "build:frontend": "vite build",
     "build:plugins": "run-p build:plugin:*",
-    "build:plugin:exporter-curl": "cd plugins/exporter-curl && vite build --emptyOutDir",
     "build:plugin:importer-insomnia": "cd plugins/importer-insomnia && vite build --emptyOutDir",
     "build:plugin:importer-postman": "cd plugins/importer-postman && vite build --emptyOutDir",
     "build:plugin:importer-yaak": "cd plugins/importer-yaak && vite build --emptyOutDir",
-    "build:plugin:importer-curl": "cd plugins/importer-curl && vite build --emptyOutDir",
     "build:plugin:filter-jsonpath": "cd plugins/filter-jsonpath && vite build --emptyOutDir",
     "build:plugin:filter-xpath": "cd plugins/filter-xpath && vite build --emptyOutDir",
     "test": "vitest",
@@ -29,7 +26,7 @@
   },
   "dependencies": {
     "@codemirror/commands": "^6.2.1",
-    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/lang-javascript": "^6.1.4",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-xml": "^6.0.2",
     "@codemirror/language": "^6.6.0",
@@ -39,20 +36,17 @@
     "@lezer/lr": "^1.3.3",
     "@react-hook/resize-observer": "^1.2.6",
     "@tailwindcss/container-queries": "^0.1.0",
-    "@tanstack/react-query": "^5.35.5",
-    "@tauri-apps/api": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-clipboard-manager": "^2.1.0-beta.1",
-    "@tauri-apps/plugin-dialog": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-fs": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-os": ">=2.0.0-beta.0",
-    "@tauri-apps/plugin-shell": ">=2.0.0-beta.0",
+    "@tanstack/query-sync-storage-persister": "^4.27.1",
+    "@tanstack/react-query": "^4.28.0",
+    "@tanstack/react-query-devtools": "^4.28.0",
+    "@tanstack/react-query-persist-client": "^4.28.0",
+    "@tauri-apps/api": "^1.5.3",
     "buffer": "^6.0.3",
     "classnames": "^2.3.2",
     "cm6-graphql": "^0.0.9",
     "codemirror": "^6.0.1",
     "codemirror-json-schema": "^0.6.1",
     "date-fns": "^3.3.1",
-    "fast-fuzzy": "^1.12.0",
     "focus-trap-react": "^10.1.1",
     "format-graphql": "^1.4.0",
     "framer-motion": "^9.0.4",
@@ -65,18 +59,16 @@
     "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",
-    "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v2",
+    "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1",
     "uuid": "^9.0.0",
     "xml-formatter": "^3.6.2"
   },
   "devDependencies": {
     "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tanstack/react-query-devtools": "^5.35.5",
-    "@tauri-apps/cli": ">=2.0.0-beta.0",
+    "@tauri-apps/cli": "^1.5.10",
     "@types/node": "^18.7.10",
     "@types/papaparse": "^5.3.7",
     "@types/parse-color": "^1.0.1",
@@ -95,7 +87,6 @@
     "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",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.21",
@@ -103,9 +94,8 @@
     "prettier": "^2.8.4",
     "react-devtools": "^4.27.2",
     "tailwindcss": "^3.2.7",
-    "typescript": "^5.4.5",
-    "vite": "^5.0.0",
-    "vite-plugin-static-copy": "^1.0.5",
+    "typescript": "^5.3.3",
+    "vite": "^5.1.1",
     "vite-plugin-svgr": "^4.2.0",
     "vite-plugin-top-level-await": "^1.4.1",
     "vitest": "^1.3.0"

plugins/exporter-curl/package.json

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

plugins/exporter-curl/src/index.ts

@@ -1,76 +0,0 @@
-import { HttpRequest } from '../../../src-web/lib/models';
-
-const NEWLINE = '\\\n ';
-
-export function pluginHookExport(_: any, request: Partial<HttpRequest>) {
-  const xs = ['curl'];
-
-  // Add method and URL all on first line
-  if (request.method) xs.push('-X', request.method);
-  if (request.url) xs.push(quote(request.url));
-
-  xs.push(NEWLINE);
-
-  // Add URL params
-  for (const p of (request.urlParameters ?? []).filter(onlyEnabled)) {
-    xs.push('--url-query', quote(`${p.name}=${p.value}`));
-    xs.push(NEWLINE);
-  }
-
-  // Add headers
-  for (const h of (request.headers ?? []).filter(onlyEnabled)) {
-    xs.push('--header', quote(`${h.name}: ${h.value}`));
-    xs.push(NEWLINE);
-  }
-
-  // Add form params
-  if (Array.isArray(request.body?.form)) {
-    const flag = request.bodyType === 'multipart/form-data' ? '--form' : '--data';
-    for (const p of (request.body?.form ?? []).filter(onlyEnabled)) {
-      if (p.file) {
-        let v = `${p.name}=@${p.file}`;
-        v += p.contentType ? `;type=${p.contentType}` : '';
-        xs.push(flag, v);
-      } else {
-        xs.push(flag, quote(`${p.name}=${p.value}`));
-      }
-      xs.push(NEWLINE);
-    }
-  } else if (typeof request.body?.text === 'string') {
-    // --data-raw $'...' to do special ANSI C quoting
-    xs.push('--data-raw', `$${quote(request.body.text)}`);
-    xs.push(NEWLINE);
-  }
-
-  // Add basic/digest authentication
-  if (request.authenticationType === 'basic' || request.authenticationType === 'digest') {
-    if (request.authenticationType === 'digest') xs.push('--digest');
-    xs.push(
-      '--user',
-      quote(`${request.authentication?.username ?? ''}:${request.authentication?.password ?? ''}`),
-    );
-    xs.push(NEWLINE);
-  }
-
-  // Add bearer authentication
-  if (request.authenticationType === 'bearer') {
-    xs.push('--header', quote(`Authorization: Bearer ${request.authentication?.token ?? ''}`));
-    xs.push(NEWLINE);
-  }
-
-  // Remove trailing newline
-  if (xs[xs.length - 1] === NEWLINE) {
-    xs.splice(xs.length - 1, 1);
-  }
-
-  return xs.join(' ');
-}
-
-function quote(arg: string): string {
-  const escaped = arg.replace(/'/g, "\\'");
-  return `'${escaped}'`;
-}
-
-function onlyEnabled(v: { name?: string; enabled?: boolean }): boolean {
-  return v.enabled !== false && !!v.name;
-}

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

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

plugins/exporter-curl/vite.config.js

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

plugins/filter-jsonpath/src/index.js

@@ -1,6 +1,6 @@
 import jp from 'jsonpath';
 
-export function pluginHookResponseFilter(ctx, filter, text) {
+export function pluginHookResponseFilter(filter, text) {
   let parsed;
   try {
     parsed = JSON.parse(text);

plugins/filter-jsonpath/vite.config.js

@@ -8,8 +8,6 @@ export default defineConfig({
       fileName: 'index',
       formats: ['es'],
     },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-jsonpath'),
   },
 });

plugins/filter-xpath/src/index.js

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

plugins/filter-xpath/vite.config.js

@@ -8,8 +8,6 @@ export default defineConfig({
       fileName: 'index',
       formats: ['es'],
     },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/filter-xpath'),
   },
 });

plugins/importer-curl/package.json

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

plugins/importer-curl/src/index.ts

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

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

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

plugins/importer-curl/vite.config.js

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

plugins/importer-insomnia/package-lock.json

@@ -6,21 +6,7 @@
   "packages": {
     "": {
       "name": "importer-insomnia",
-      "version": "0.0.1",
-      "dependencies": {
-        "yaml": "^2.4.2"
-      }
-    },
-    "node_modules/yaml": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz",
-      "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==",
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
+      "version": "0.0.1"
     }
   }
 }

plugins/importer-insomnia/package.json

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,60 @@
+import { convertSyntax } from '../helpers/variables.js';
+
+/**
+ * Import an Insomnia request object.
+ * @param {Object} r - The request object to import.
+ * @param workspaceId - The workspace ID to use for the request.
+ * @param {number} sortPriority - The sort priority to use for the request.
+ */
+export function importRequest(r, workspaceId, sortPriority = 0) {
+  console.log('IMPORTING REQUEST', r._id, r.name, JSON.stringify(r, null, 2));
+
+  let bodyType = null;
+  let body = null;
+  if (r.body?.mimeType === 'application/graphql') {
+    bodyType = 'graphql';
+    body = convertSyntax(r.body.text);
+  } else if (r.body?.mimeType === 'application/json') {
+    bodyType = 'application/json';
+    body = convertSyntax(r.body.text);
+  }
+
+  let authenticationType = null;
+  let authentication = {};
+  if (r.authentication.type === 'bearer') {
+    authenticationType = 'bearer';
+    authentication = {
+      token: convertSyntax(r.authentication.token),
+    };
+  } else if (r.authentication.type === 'basic') {
+    authenticationType = 'basic';
+    authentication = {
+      username: convertSyntax(r.authentication.username),
+      password: convertSyntax(r.authentication.password),
+    };
+  }
+
+  return {
+    id: r._id,
+    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
+    workspaceId,
+    folderId: r.parentId === workspaceId ? null : r.parentId,
+    model: 'http_request',
+    sortPriority,
+    name: r.name,
+    url: convertSyntax(r.url),
+    body,
+    bodyType,
+    authentication,
+    authenticationType,
+    method: r.method,
+    headers: (r.headers ?? [])
+      .map(({ name, value, disabled }) => ({
+        enabled: !disabled,
+        name,
+        value,
+      }))
+      .filter(({ name, value }) => name !== '' || value !== ''),
+  };
+}

plugins/importer-insomnia/src/index.js

@@ -0,0 +1,76 @@
+import { importEnvironment } from './importers/environment.js';
+import { importRequest } from './importers/request.js';
+import {
+  isEnvironment,
+  isJSObject,
+  isRequest,
+  isRequestGroup,
+  isWorkspace,
+} from './helpers/types.js';
+import { parseVariables } from './helpers/variables.js';
+import { importFolder } from './importers/folder.js';
+
+export function pluginHookImport(contents) {
+  console.log('RUNNING INSOMNIA');
+  let parsed;
+  try {
+    parsed = JSON.parse(contents);
+  } catch (e) {
+    return;
+  }
+
+  if (!isJSObject(parsed)) return;
+  if (!Array.isArray(parsed.resources)) return;
+
+  const resources = {
+    workspaces: [],
+    requests: [],
+    environments: [],
+    folders: [],
+  };
+
+  // Import workspaces
+  const workspacesToImport = parsed.resources.filter(isWorkspace);
+  for (const workspaceToImport of workspacesToImport) {
+    const baseEnvironment = parsed.resources.find(
+      (r) => isEnvironment(r) && r.parentId === workspaceToImport._id,
+    );
+    resources.workspaces.push({
+      id: workspaceToImport._id,
+      createdAt: new Date(workspacesToImport.created ?? Date.now()).toISOString().replace('Z', ''),
+      updatedAt: new Date(workspacesToImport.updated ?? Date.now()).toISOString().replace('Z', ''),
+      model: 'workspace',
+      name: workspaceToImport.name,
+      variables: baseEnvironment ? parseVariables(baseEnvironment.data) : [],
+    });
+    const environmentsToImport = parsed.resources.filter(
+      (r) => isEnvironment(r) && r.parentId === baseEnvironment?._id,
+    );
+    resources.environments.push(
+      ...environmentsToImport.map((r) => importEnvironment(r, workspaceToImport._id)),
+    );
+
+    const nextFolder = (parentId) => {
+      const children = parsed.resources.filter((r) => r.parentId === parentId);
+      let sortPriority = 0;
+      for (const child of children) {
+        if (isRequestGroup(child)) {
+          resources.folders.push(importFolder(child, workspaceToImport._id));
+          nextFolder(child._id);
+        } else if (isRequest(child)) {
+          resources.requests.push(importRequest(child, workspaceToImport._id, sortPriority++));
+        }
+      }
+    };
+
+    // Import folders
+    nextFolder(workspaceToImport._id);
+  }
+
+  // Filter out any `null` values
+  resources.requests = resources.requests.filter(Boolean);
+  resources.environments = resources.environments.filter(Boolean);
+  resources.workspaces = resources.workspaces.filter(Boolean);
+
+  return { resources };
+}

plugins/importer-insomnia/src/index.ts

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

plugins/importer-insomnia/vite.config.js

@@ -4,12 +4,10 @@ import { defineConfig } from 'vite';
 export default defineConfig({
   build: {
     lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
+      entry: resolve(__dirname, 'src/index.js'),
       fileName: 'index',
       formats: ['es'],
     },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-insomnia'),
   },
 });

plugins/importer-postman/package.json

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

plugins/importer-postman/src/index.ts

@@ -1,4 +1,4 @@
-import { Environment, Folder, HttpRequest, Model, Workspace } from '../../../src-web/lib/models';
+import { Environment, Folder, HttpRequest, Workspace } from '../../../src-web/lib/models';
 
 const POSTMAN_2_1_0_SCHEMA = 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json';
 const POSTMAN_2_0_0_SCHEMA = 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json';
@@ -9,15 +9,11 @@ type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
 interface ExportResources {
   workspaces: AtLeast<Workspace, 'name' | 'id' | 'model'>[];
   environments: AtLeast<Environment, 'name' | 'id' | 'model' | 'workspaceId'>[];
-  httpRequests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
+  requests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
   folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
 }
 
-export function pluginHookImport(
-  ctx: any,
-  contents: string,
-): { resources: ExportResources } | undefined {
-  console.log('CTX', ctx);
+export function pluginHookImport(contents: string): { resources: ExportResources } | undefined {
   const root = parseJSONToRecord(contents);
   if (root == null) return;
 
@@ -27,25 +23,18 @@ export function pluginHookImport(
     return;
   }
 
-  const globalAuth = importAuth(root.auth);
-
   const exportResources: ExportResources = {
     workspaces: [],
     environments: [],
-    httpRequests: [],
+    requests: [],
     folders: [],
   };
 
   const workspace: ExportResources['workspaces'][0] = {
     model: 'workspace',
-    id: generateId('workspace'),
+    id: generateId('wk'),
     name: info.name || 'Postman Import',
     description: info.description || '',
-    variables:
-      root.variable?.map((v: any) => ({
-        name: v.key,
-        value: v.value,
-      })) ?? [],
   };
   exportResources.workspaces.push(workspace);
 
@@ -54,7 +43,7 @@ export function pluginHookImport(
       const folder: ExportResources['folders'][0] = {
         model: 'folder',
         workspaceId: workspace.id,
-        id: generateId('folder'),
+        id: generateId('fl'),
         name: v.name,
         folderId,
       };
@@ -65,11 +54,10 @@ export function pluginHookImport(
     } else if (typeof v.name === 'string' && 'request' in v) {
       const r = toRecord(v.request);
       const bodyPatch = importBody(r.body);
-      const requestAuthPath = importAuth(r.auth);
-      const authPatch = requestAuthPath.authenticationType == null ? globalAuth : requestAuthPath;
-      const request: ExportResources['httpRequests'][0] = {
+      const authPatch = importAuth(r.auth);
+      const request: ExportResources['requests'][0] = {
         model: 'http_request',
-        id: generateId('http_request'),
+        id: generateId('rq'),
         workspaceId: workspace.id,
         folderId,
         name: v.name,
@@ -91,7 +79,7 @@ export function pluginHookImport(
           }),
         ],
       };
-      exportResources.httpRequests.push(request);
+      exportResources.requests.push(request);
     } else {
       console.log('Unknown item', v, folderId);
     }
@@ -117,14 +105,6 @@ function importAuth(
         password: auth.basic.password || '',
       },
     };
-  } else if ('bearer' in auth) {
-    return {
-      headers: [],
-      authenticationType: 'bearer',
-      authentication: {
-        token: auth.bearer.token || '',
-      },
-    };
   } else {
     // TODO: support other auth types
     return { headers: [], authenticationType: null, authentication: {} };
@@ -184,7 +164,6 @@ function importBody(rawBody: any): Pick<HttpRequest, 'body' | 'bodyType' | 'head
           f.src != null
             ? {
                 enabled: !f.disabled,
-                contentType: f.contentType ?? null,
                 name: f.key ?? '',
                 file: f.src ?? '',
               }
@@ -196,20 +175,6 @@ function importBody(rawBody: any): Pick<HttpRequest, 'body' | 'bodyType' | 'head
         ),
       },
     };
-  } else if ('raw' in body) {
-    return {
-      headers: [
-        {
-          name: 'Content-Type',
-          value: body.options?.raw?.language === 'json' ? 'application/json' : '',
-          enabled: true,
-        },
-      ],
-      bodyType: body.options?.raw?.language === 'json' ? 'application/json' : 'other',
-      body: {
-        text: body.raw ?? '',
-      },
-    };
   } else {
     // TODO: support other body types
     return { headers: [], bodyType: null, body: {} };
@@ -248,9 +213,11 @@ function convertTemplateSyntax<T>(obj: T): T {
   }
 }
 
-const idCount: Partial<Record<Model['model'], number>> = {};
-
-function generateId(model: Model['model']): string {
-  idCount[model] = (idCount[model] ?? -1) + 1;
-  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
+function generateId(prefix: 'wk' | 'rq' | 'fl'): string {
+  const alphabet = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  let id = `${prefix}_`;
+  for (let i = 0; i < 10; i++) {
+    id += alphabet[Math.floor(Math.random() * alphabet.length)];
+  }
+  return id;
 }

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

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

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

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

plugins/importer-postman/vite.config.js

@@ -8,8 +8,6 @@ export default defineConfig({
       fileName: 'index',
       formats: ['es'],
     },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-postman'),
   },
 });

plugins/importer-yaak/src/index.js

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

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

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

plugins/importer-yaak/vite.config.js

@@ -4,12 +4,10 @@ import { defineConfig } from 'vite';
 export default defineConfig({
   build: {
     lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
+      entry: resolve(__dirname, 'src/index.js'),
       fileName: 'index',
       formats: ['es'],
     },
-    emptyOutDir: true,
-    sourcemap: true,
-    outDir: resolve(__dirname, 'build'),
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-yaak'),
   },
 });

src-tauri/.sqlx/query-05dca7fe15ab1bf03952e94498ef3130e16f752da72782783696eb2cca4736d5.json

@@ -1,98 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id, model, created_at, updated_at, theme, appearance,\n                theme_dark, theme_light, update_channel,\n                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap, \n                open_workspace_new_window\n            FROM settings\n            WHERE id = 'default'\n        ",
-  "describe": {
-    "columns": [
-      {
-        "name": "id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "model",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "created_at",
-        "ordinal": 2,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "updated_at",
-        "ordinal": 3,
-        "type_info": "Datetime"
-      },
-      {
-        "name": "theme",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "appearance",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "theme_dark",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "theme_light",
-        "ordinal": 7,
-        "type_info": "Text"
-      },
-      {
-        "name": "update_channel",
-        "ordinal": 8,
-        "type_info": "Text"
-      },
-      {
-        "name": "interface_font_size",
-        "ordinal": 9,
-        "type_info": "Int64"
-      },
-      {
-        "name": "interface_scale",
-        "ordinal": 10,
-        "type_info": "Int64"
-      },
-      {
-        "name": "editor_font_size",
-        "ordinal": 11,
-        "type_info": "Int64"
-      },
-      {
-        "name": "editor_soft_wrap",
-        "ordinal": 12,
-        "type_info": "Bool"
-      },
-      {
-        "name": "open_workspace_new_window",
-        "ordinal": 13,
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "05dca7fe15ab1bf03952e94498ef3130e16f752da72782783696eb2cca4736d5"
-}

src-tauri/.sqlx/query-48ec5fdf20f34add763c540061caa25054545503704e19f149987f99b1a0e4f0.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            UPDATE settings SET (\n                theme, appearance, update_channel\n            ) = (?, ?, ?) WHERE id = 'default';\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "48ec5fdf20f34add763c540061caa25054545503704e19f149987f99b1a0e4f0"
+}

src-tauri/.sqlx/query-6b5edf45a6799cd7f87c23a3c7f818ad110d58c601f694a619d9345ae9e8e11d.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            UPDATE settings SET (\n                theme, appearance, theme_dark, theme_light, update_channel,\n                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap,\n                open_workspace_new_window\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) WHERE id = 'default';\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 10
-    },
-    "nullable": []
-  },
-  "hash": "6b5edf45a6799cd7f87c23a3c7f818ad110d58c601f694a619d9345ae9e8e11d"
-}

src-tauri/.sqlx/query-b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb.json

@@ -0,0 +1,56 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, theme, appearance, update_channel\n            FROM settings\n            WHERE id = 'default'\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 2,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 3,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "theme",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "appearance",
+        "ordinal": 5,
+        "type_info": "Text"
+      },
+      {
+        "name": "update_channel",
+        "ordinal": 6,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb"
+}

src-tauri/Cargo.toml

@@ -1,20 +1,18 @@
-workspace = { members = ["grpc", "templates"] }
-
+workspace = { members = ["grpc"] }
 [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.
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta", features = [] }
+tauri-build = { version = "1.5", features = [] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2.7"
@@ -24,35 +22,53 @@ cocoa = "0.25.0"
 openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work
 
 [dependencies]
-grpc = { path = "./grpc" }
-templates = { path = "./templates" }
-anyhow = "1.0.86"
-base64 = "0.22.0"
+base64 = "0.21.0"
+boa_engine = { version = "0.17.3", features = ["annex-b"] }
+boa_runtime = { version = "0.17.3" }
 chrono = { version = "0.4.31", features = ["serde"] }
-datetime = "0.5.2"
-deno_ast = { version = "0.39.0", features = ["transpiling"] }
-deno_console = "0.155.0"
-deno_core = { version = "0.284.0" }
-hex_color = "3.0.0"
-http = "1"
-log = "0.4.21"
+futures = "0.3.26"
+http = "0.2.8"
 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"
-sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
-tauri = { version = "2.0.0-beta", features = ["devtools", "protocol-asset"] }
-tauri-plugin-clipboard-manager = "2.1.0-beta"
-tauri-plugin-dialog = "2.0.0-beta"
-tauri-plugin-fs = "2.0.0-beta"
-tauri-plugin-log = { version = "2.0.0-beta", features = ["colored"] }
-tauri-plugin-os = "2.0.0-beta"
-tauri-plugin-shell = "2.0.0-beta"
-tauri-plugin-updater = "2.0.0-beta"
-tauri-plugin-window-state = "2.0.0-beta"
-tokio = { version = "1.36.0", features = ["sync"] }
-tokio-stream = "0.1.15"
-uuid = "1.7.0"
+reqwest = { version = "0.11.23", features = ["multipart", "cookies", "gzip", "brotli", "deflate"] }
+cookie = { version = "0.18.0" }
+serde = { version = "1.0.195", features = ["derive"] }
+serde_json = { version = "1.0.111", features = ["raw_value"] }
+sqlx = { version = "0.7.3", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
+tauri = { version = "1.5.4", features = [
+    "config-toml",
+    "path-all",
+    "devtools",
+    "dialog-open",
+    "dialog-save",
+    "fs-read-file",
+    "os-all",
+    "protocol-asset",
+    "shell-open",
+    "shell-sidecar",
+    "updater",
+    "window-close",
+    "window-maximize",
+    "window-minimize",
+    "window-set-decorations",
+    "window-set-title",
+    "window-start-dragging",
+    "window-unmaximize",
+] }
+tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1", features = ["colored"] }
+tokio = { version = "1.25.0", features = ["sync"] }
+uuid = "1.3.0"
+log = "0.4.20"
+datetime = "0.5.2"
+window-shadows = "0.2.2"
+reqwest_cookie_store = "0.6.0"
+grpc = { path = "./grpc" }
+tokio-stream = "0.1.14"
+
+[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,56 +0,0 @@
-{
-  "$schema": "../gen/schemas/capabilities.json",
-  "identifier": "main",
-  "description": "Main permissions",
-  "local": true,
-  "windows": [
-    "*"
-  ],
-  "permissions": [
-    "os:allow-os-type",
-    "event:allow-emit",
-    "clipboard-manager:allow-write-text",
-    "clipboard-manager:allow-read-text",
-    "dialog:allow-open",
-    "dialog:allow-save",
-    "event:allow-listen",
-    "event:allow-unlisten",
-    "fs:allow-read-file",
-    "fs:allow-read-text-file",
-    {
-      "identifier": "fs:scope",
-      "allow": [
-        {
-          "path": "$APPDATA"
-        },
-        {
-          "path": "$APPDATA/**"
-        }
-      ]
-    },
-    "shell:allow-open",
-    {
-      "identifier": "shell:allow-execute",
-      "allow": [
-        {
-          "name": "protoc",
-          "sidecar": true,
-          "args": true
-        }
-      ]
-    },
-    "webview:allow-set-webview-zoom",
-    "window:allow-close",
-    "window:allow-is-fullscreen",
-    "window:allow-maximize",
-    "window:allow-minimize",
-    "window:allow-toggle-maximize",
-    "window:allow-set-decorations",
-    "window:allow-set-title",
-    "window:allow-start-dragging",
-    "window:allow-unmaximize",
-    "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":["os:allow-os-type","event:allow-emit","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","dialog:allow-open","dialog:allow-save","event:allow-listen","event:allow-unlisten","fs:allow-read-file","fs:allow-read-text-file",{"identifier":"fs:scope","allow":[{"path":"$APPDATA"},{"path":"$APPDATA/**"}]},"shell:allow-open",{"identifier":"shell:allow-execute","allow":[{"args":true,"name":"protoc","sidecar":true}]},"webview:allow-set-webview-zoom","window:allow-close","window:allow-is-fullscreen","window:allow-maximize","window:allow-minimize","window:allow-toggle-maximize","window:allow-set-decorations","window:allow-set-title","window:allow-start-dragging","window:allow-unmaximize","window:allow-theme","clipboard-manager:allow-read-text","clipboard-manager:allow-write-text"]}}

src-tauri/grpc/Cargo.toml

@@ -14,9 +14,10 @@ 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"
+once_cell = { version = "1.19.0", features = [] }
 anyhow = "1.0.79"
 hyper = { version = "0.14" }
 hyper-rustls = { version = "0.24.0", features = ["http2"] }
+protoc-bin-vendored = "3.0.0"
 uuid = { version = "1.7.0", features = ["v4"] }
-tauri = { version = "2.0.0-beta" }
-tauri-plugin-shell = "2.0.0-beta"
+tauri = { version = "1.5.4", features = ["process-command-api"]}

src-tauri/grpc/src/manager.rs

@@ -174,10 +174,7 @@ pub struct GrpcHandle {
 impl GrpcHandle {
     pub fn new(app_handle: &AppHandle) -> Self {
         let pools = HashMap::new();
-        Self {
-            pools,
-            app_handle: app_handle.clone(),
-        }
+        Self { pools, app_handle: app_handle.clone() }
     }
 }
 
@@ -185,22 +182,20 @@ impl GrpcHandle {
     pub async fn services_from_files(
         &mut self,
         id: &str,
-        uri: &str,
+        uri: &Uri,
         paths: Vec<PathBuf>,
     ) -> Result<Vec<ServiceDefinition>, String> {
         let pool = fill_pool_from_files(&self.app_handle, paths).await?;
-        let uri = Uri::from_str(uri).map_err(|e| e.to_string())?;
-        self.pools.insert(self.get_pool_key(id, &uri), pool.clone());
+        self.pools.insert(self.get_pool_key(id, uri), pool.clone());
         Ok(self.services_from_pool(&pool))
     }
     pub async fn services_from_reflection(
         &mut self,
         id: &str,
-        uri: &str,
+        uri: &Uri,
     ) -> Result<Vec<ServiceDefinition>, String> {
-        let uri = Uri::from_str(uri).map_err(|e| e.to_string())?;
-        let pool = fill_pool(&uri).await?;
-        self.pools.insert(self.get_pool_key(id, &uri), pool.clone());
+        let pool = fill_pool(uri).await?;
+        self.pools.insert(self.get_pool_key(id, uri), pool.clone());
         Ok(self.services_from_pool(&pool))
     }
 
@@ -236,10 +231,9 @@ impl GrpcHandle {
     pub async fn connect(
         &mut self,
         id: &str,
-        uri: &str,
+        uri: Uri,
         proto_files: Vec<PathBuf>,
     ) -> Result<GrpcConnection, String> {
-        let uri = Uri::from_str(uri).map_err(|e| e.to_string())?;
         let pool = match self.pools.get(id) {
             Some(p) => p.clone(),
             None => match proto_files.len() {

src-tauri/grpc/src/proto.rs

@@ -1,7 +1,7 @@
 use std::env::temp_dir;
 use std::ops::Deref;
 use std::path::PathBuf;
-use std::str::{from_utf8, FromStr};
+use std::str::FromStr;
 
 use anyhow::anyhow;
 use hyper::client::HttpConnector;
@@ -11,10 +11,8 @@ use log::{debug, info, 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::process::CommandEvent;
-use tauri_plugin_shell::ShellExt;
+use tauri::api::process::{Command, CommandEvent};
+use tauri::AppHandle;
 use tokio::fs;
 use tokio_stream::StreamExt;
 use tonic::body::BoxBody;
@@ -34,8 +32,8 @@ pub async fn fill_pool_from_files(
     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-vendored/include", BaseDirectory::Resource)
+        .path_resolver()
+        .resolve_resource("protoc-vendored/include")
         .expect("failed to resolve protoc include directory");
 
     let mut args = vec![
@@ -65,9 +63,7 @@ pub async fn fill_pool_from_files(
         }
     }
 
-    let (mut rx, _child) = app_handle
-        .shell()
-        .sidecar("protoc")
+    let (mut rx, _child) = Command::new_sidecar("protoc")
         .expect("protoc not found")
         .args(args)
         .spawn()
@@ -76,16 +72,10 @@ pub async fn fill_pool_from_files(
     while let Some(event) = rx.recv().await {
         match event {
             CommandEvent::Stdout(line) => {
-                info!(
-                    "protoc stdout: {}",
-                    from_utf8(line.as_slice()).unwrap_or_default().to_string()
-                );
+                info!("protoc stdout: {}", line);
             }
             CommandEvent::Stderr(line) => {
-                info!(
-                    "protoc stderr: {}",
-                    from_utf8(line.as_slice()).unwrap_or_default().to_string()
-                );
+                info!("protoc stderr: {}", line);
             }
             CommandEvent::Error(e) => {
                 return Err(e.to_string());

src-tauri/migrations/20240522031045_theme-settings.sql

@@ -1,4 +0,0 @@
-ALTER TABLE settings
-    ADD COLUMN theme_dark TEXT DEFAULT 'yaak-dark' NOT NULL;
-ALTER TABLE settings
-    ADD COLUMN theme_light TEXT DEFAULT 'yaak-light' NOT NULL;

src-tauri/migrations/20240529143147_more-settings.sql

@@ -1,4 +0,0 @@
-ALTER TABLE settings ADD COLUMN interface_font_size INTEGER DEFAULT 15 NOT NULL;
-ALTER TABLE settings ADD COLUMN interface_scale INTEGER DEFAULT 1 NOT NULL;
-ALTER TABLE settings ADD COLUMN editor_font_size INTEGER DEFAULT 13 NOT NULL;
-ALTER TABLE settings ADD COLUMN editor_soft_wrap BOOLEAN DEFAULT 1 NOT NULL;

src-tauri/migrations/20240607151115_open-workspace-setting.sql

@@ -1 +0,0 @@
-ALTER TABLE settings ADD COLUMN open_workspace_new_window BOOLEAN NULL DEFAULT NULL;

src-tauri/plugins/exporter-curl/index.mjs

@@ -1,36 +0,0 @@
-const o = `\\
- `;
-function d(n) {
-  var h, f, r, u, l, s;
-  const t = ["curl"];
-  n.method && t.push("-X", n.method), n.url && t.push(i(n.url)), t.push(o);
-  for (const a of (n.urlParameters ?? []).filter(p))
-    t.push("--url-query", i(`${a.name}=${a.value}`)), t.push(o);
-  for (const a of (n.headers ?? []).filter(p))
-    t.push("--header", i(`${a.name}: ${a.value}`)), t.push(o);
-  if (Array.isArray((h = n.body) == null ? void 0 : h.form)) {
-    const a = n.bodyType === "multipart/form-data" ? "--form" : "--data";
-    for (const e of (((f = n.body) == null ? void 0 : f.form) ?? []).filter(p)) {
-      if (e.file) {
-        let c = `${e.name}=@${e.file}`;
-        c += e.contentType ? `;type=${e.contentType}` : "", t.push(a, c);
-      } else
-        t.push(a, i(`${e.name}=${e.value}`));
-      t.push(o);
-    }
-  } else
-    typeof ((r = n.body) == null ? void 0 : r.text) == "string" && (t.push("--data-raw", `$${i(n.body.text)}`), t.push(o));
-  return (n.authenticationType === "basic" || n.authenticationType === "digest") && (n.authenticationType === "digest" && t.push("--digest"), t.push(
-    "--user",
-    i(`${((u = n.authentication) == null ? void 0 : u.username) ?? ""}:${((l = n.authentication) == null ? void 0 : l.password) ?? ""}`)
-  ), t.push(o)), n.authenticationType === "bearer" && (t.push("--header", i(`Authorization: Bearer ${((s = n.authentication) == null ? void 0 : s.token) ?? ""}`)), t.push(o)), t[t.length - 1] === o && t.splice(t.length - 1, 1), t.join(" ");
-}
-function i(n) {
-  return `'${n.replace(/'/g, "\\'")}'`;
-}
-function p(n) {
-  return n.enabled !== !1 && !!n.name;
-}
-export {
-  d as pluginHookExport
-};

src-tauri/plugins/importer-insomnia/index.mjs

@@ -0,0 +1,134 @@
+function S(e, t) {
+  return console.log("IMPORTING Environment", e._id, e.name, JSON.stringify(e, null, 2)), {
+    id: e._id,
+    createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""),
+    updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""),
+    workspaceId: t,
+    model: "environment",
+    name: e.name,
+    variables: Object.entries(e.data).map(([n, a]) => ({
+      enabled: !0,
+      name: n,
+      value: `${a}`
+    }))
+  };
+}
+function I(e) {
+  return m(e) && e._type === "workspace";
+}
+function y(e) {
+  return m(e) && e._type === "request_group";
+}
+function g(e) {
+  return m(e) && e._type === "request";
+}
+function f(e) {
+  return m(e) && e._type === "environment";
+}
+function m(e) {
+  return Object.prototype.toString.call(e) === "[object Object]";
+}
+function w(e) {
+  return Object.prototype.toString.call(e) === "[object String]";
+}
+function O(e) {
+  return Object.entries(e).map(([t, n]) => ({
+    enabled: !0,
+    name: t,
+    value: `${n}`
+  }));
+}
+function l(e) {
+  return w(e) ? e.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : e;
+}
+function h(e, t, n = 0) {
+  var c, o;
+  console.log("IMPORTING REQUEST", e._id, e.name, JSON.stringify(e, null, 2));
+  let a = null, r = null;
+  ((c = e.body) == null ? void 0 : c.mimeType) === "application/graphql" ? (a = "graphql", r = l(e.body.text)) : ((o = e.body) == null ? void 0 : o.mimeType) === "application/json" && (a = "application/json", r = l(e.body.text));
+  let i = null, u = {};
+  return e.authentication.type === "bearer" ? (i = "bearer", u = {
+    token: l(e.authentication.token)
+  }) : e.authentication.type === "basic" && (i = "basic", u = {
+    username: l(e.authentication.username),
+    password: l(e.authentication.password)
+  }), {
+    id: e._id,
+    createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""),
+    updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""),
+    workspaceId: t,
+    folderId: e.parentId === t ? null : e.parentId,
+    model: "http_request",
+    sortPriority: n,
+    name: e.name,
+    url: l(e.url),
+    body: r,
+    bodyType: a,
+    authentication: u,
+    authenticationType: i,
+    method: e.method,
+    headers: (e.headers ?? []).map(({ name: d, value: p, disabled: s }) => ({
+      enabled: !s,
+      name: d,
+      value: p
+    })).filter(({ name: d, value: p }) => d !== "" || p !== "")
+  };
+}
+function _(e, t) {
+  return console.log("IMPORTING FOLDER", e._id, e.name, JSON.stringify(e, null, 2)), {
+    id: e._id,
+    createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""),
+    updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""),
+    folderId: e.parentId === t ? null : e.parentId,
+    workspaceId: t,
+    model: "folder",
+    name: e.name
+  };
+}
+function b(e) {
+  console.log("RUNNING INSOMNIA");
+  let t;
+  try {
+    t = JSON.parse(e);
+  } catch {
+    return;
+  }
+  if (!m(t) || !Array.isArray(t.resources))
+    return;
+  const n = {
+    workspaces: [],
+    requests: [],
+    environments: [],
+    folders: []
+  }, a = t.resources.filter(I);
+  for (const r of a) {
+    const i = t.resources.find(
+      (o) => f(o) && o.parentId === r._id
+    );
+    n.workspaces.push({
+      id: r._id,
+      createdAt: new Date(a.created ?? Date.now()).toISOString().replace("Z", ""),
+      updatedAt: new Date(a.updated ?? Date.now()).toISOString().replace("Z", ""),
+      model: "workspace",
+      name: r.name,
+      variables: i ? O(i.data) : []
+    });
+    const u = t.resources.filter(
+      (o) => f(o) && o.parentId === (i == null ? void 0 : i._id)
+    );
+    n.environments.push(
+      ...u.map((o) => S(o, r._id))
+    );
+    const c = (o) => {
+      const d = t.resources.filter((s) => s.parentId === o);
+      let p = 0;
+      for (const s of d)
+        y(s) ? (n.folders.push(_(s, r._id)), c(s._id)) : g(s) && n.requests.push(h(s, r._id, p++));
+    };
+    c(r._id);
+  }
+  return n.requests = n.requests.filter(Boolean), n.environments = n.environments.filter(Boolean), n.workspaces = n.workspaces.filter(Boolean), { resources: n };
+}
+export {
+  b as pluginHookImport
+};

src-tauri/plugins/importer-postman/index.mjs

@@ -0,0 +1,160 @@
+const T = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", w = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json", A = [w, T];
+function q(e) {
+  const t = b(e);
+  if (t == null)
+    return;
+  const n = a(t.info);
+  if (!A.includes(n.schema) || !Array.isArray(t.item))
+    return;
+  const i = {
+    workspaces: [],
+    environments: [],
+    requests: [],
+    folders: []
+  }, c = {
+    model: "workspace",
+    id: m("wk"),
+    name: n.name || "Postman Import",
+    description: n.description || ""
+  };
+  i.workspaces.push(c);
+  const f = (r, u = null) => {
+    if (typeof r.name == "string" && Array.isArray(r.item)) {
+      const o = {
+        model: "folder",
+        workspaceId: c.id,
+        id: m("fl"),
+        name: r.name,
+        folderId: u
+      };
+      i.folders.push(o);
+      for (const s of r.item)
+        f(s, o.id);
+    } else if (typeof r.name == "string" && "request" in r) {
+      const o = a(r.request), s = k(o.body), d = S(o.auth), g = {
+        model: "http_request",
+        id: m("rq"),
+        workspaceId: c.id,
+        folderId: u,
+        name: r.name,
+        method: o.method || "GET",
+        url: typeof o.url == "string" ? o.url : a(o.url).raw,
+        body: s.body,
+        bodyType: s.bodyType,
+        authentication: d.authentication,
+        authenticationType: d.authenticationType,
+        headers: [
+          ...s.headers,
+          ...d.headers,
+          ...y(o.header).map((p) => ({
+            name: p.key,
+            value: p.value,
+            enabled: !p.disabled
+          }))
+        ]
+      };
+      i.requests.push(g);
+    } else
+      console.log("Unknown item", r, u);
+  };
+  for (const r of t.item)
+    f(r);
+  return { resources: h(i) };
+}
+function S(e) {
+  const t = a(e);
+  return "basic" in t ? {
+    headers: [],
+    authenticationType: "basic",
+    authentication: {
+      username: t.basic.username || "",
+      password: t.basic.password || ""
+    }
+  } : { headers: [], authenticationType: null, authentication: {} };
+}
+function k(e) {
+  const t = a(e);
+  return "graphql" in t ? {
+    headers: [
+      {
+        name: "Content-Type",
+        value: "application/json",
+        enabled: !0
+      }
+    ],
+    bodyType: "graphql",
+    body: {
+      text: JSON.stringify(
+        { query: t.graphql.query, variables: b(t.graphql.variables) },
+        null,
+        2
+      )
+    }
+  } : "urlencoded" in t ? {
+    headers: [
+      {
+        name: "Content-Type",
+        value: "application/x-www-form-urlencoded",
+        enabled: !0
+      }
+    ],
+    bodyType: "application/x-www-form-urlencoded",
+    body: {
+      form: y(t.urlencoded).map((n) => ({
+        enabled: !n.disabled,
+        name: n.key ?? "",
+        value: n.value ?? ""
+      }))
+    }
+  } : "formdata" in t ? {
+    headers: [
+      {
+        name: "Content-Type",
+        value: "multipart/form-data",
+        enabled: !0
+      }
+    ],
+    bodyType: "multipart/form-data",
+    body: {
+      form: y(t.formdata).map(
+        (n) => n.src != null ? {
+          enabled: !n.disabled,
+          name: n.key ?? "",
+          file: n.src ?? ""
+        } : {
+          enabled: !n.disabled,
+          name: n.key ?? "",
+          value: n.value ?? ""
+        }
+      )
+    }
+  } : { headers: [], bodyType: null, body: {} };
+}
+function b(e) {
+  try {
+    return a(JSON.parse(e));
+  } catch {
+  }
+  return null;
+}
+function a(e) {
+  return Object.prototype.toString.call(e) === "[object Object]" ? e : {};
+}
+function y(e) {
+  return Object.prototype.toString.call(e) === "[object Array]" ? e : [];
+}
+function h(e) {
+  return typeof e == "string" ? e.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : Array.isArray(e) && e != null ? e.map(h) : typeof e == "object" && e != null ? Object.fromEntries(
+    Object.entries(e).map(([t, n]) => [t, h(n)])
+  ) : e;
+}
+function m(e) {
+  const t = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  let n = `${e}_`;
+  for (let l = 0; l < 10; l++)
+    n += t[Math.floor(Math.random() * t.length)];
+  return n;
+}
+export {
+  q as pluginHookImport
+};

src-tauri/plugins/importer-yaak/index.mjs

@@ -0,0 +1,17 @@
+function u(r) {
+  let e;
+  try {
+    e = JSON.parse(r);
+  } catch {
+    return;
+  }
+  if (t(e) && "yaakSchema" in e && (e.yaakSchema === 1 && (e.resources.httpRequests = e.resources.requests, e.yaakSchema = 2), e.yaakSchema === 2))
+    return { resources: e.resources };
+}
+function t(r) {
+  return Object.prototype.toString.call(r) === "[object Object]";
+}
+export {
+  t as isJSObject,
+  u as pluginHookImport
+};

src-tauri/src/analytics.rs

@@ -1,25 +1,19 @@
 use std::fmt::Display;
 
-use log::{debug, info};
+use log::{warn};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sqlx::types::JsonValue;
 use tauri::{AppHandle, Manager};
 
 use crate::is_dev;
-use crate::models::{
-    generate_id, get_key_value_int, get_key_value_string, set_key_value_int, set_key_value_string,
-};
-
-const NAMESPACE: &str = "analytics";
-const NUM_LAUNCHES_KEY: &str = "num_launches";
+use crate::models::{generate_id, get_key_value_int, get_key_value_string, set_key_value_int, set_key_value_string};
 
 // serializable
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum AnalyticsResource {
     App,
-    Appearance,
     CookieJar,
     Dialog,
     Environment,
@@ -30,9 +24,7 @@ pub enum AnalyticsResource {
     HttpRequest,
     HttpResponse,
     KeyValue,
-    Setting,
     Sidebar,
-    Theme,
     Workspace,
 }
 
@@ -98,19 +90,20 @@ pub struct LaunchEventInfo {
     pub num_launches: i32,
 }
 
-pub async fn track_launch_event(app: &AppHandle) -> LaunchEventInfo {
+pub async fn track_launch_event(app_handle: &AppHandle) -> LaunchEventInfo {
+    let namespace = "analytics";
     let last_tracked_version_key = "last_tracked_version";
 
     let mut info = LaunchEventInfo::default();
 
-    info.num_launches = get_num_launches(app).await + 1;
+    info.num_launches = get_key_value_int(app_handle, namespace, "num_launches", 0).await + 1;
     info.previous_version =
-        get_key_value_string(app, NAMESPACE, last_tracked_version_key, "").await;
-    info.current_version = app.package_info().version.to_string();
+        get_key_value_string(app_handle, namespace, last_tracked_version_key, "").await;
+    info.current_version = app_handle.package_info().version.to_string();
 
     if info.previous_version.is_empty() {
         track_event(
-            app,
+            app_handle,
             AnalyticsResource::App,
             AnalyticsAction::LaunchFirst,
             None,
@@ -120,10 +113,10 @@ pub async fn track_launch_event(app: &AppHandle) -> LaunchEventInfo {
         info.launched_after_update = info.current_version != info.previous_version;
         if info.launched_after_update {
             track_event(
-                app,
+                app_handle,
                 AnalyticsResource::App,
                 AnalyticsAction::LaunchUpdate,
-                Some(json!({ NUM_LAUNCHES_KEY: info.num_launches })),
+                Some(json!({ "num_launches": info.num_launches })),
             )
             .await;
         }
@@ -131,23 +124,23 @@ pub async fn track_launch_event(app: &AppHandle) -> LaunchEventInfo {
 
     // Track a launch event in all cases
     track_event(
-        app,
+        app_handle,
         AnalyticsResource::App,
         AnalyticsAction::Launch,
-        Some(json!({ NUM_LAUNCHES_KEY: info.num_launches })),
+        Some(json!({ "num_launches": info.num_launches })),
     )
     .await;
 
     // Update key values
 
     set_key_value_string(
-        app,
-        NAMESPACE,
+        app_handle,
+        namespace,
         last_tracked_version_key,
         info.current_version.as_str(),
     )
     .await;
-    set_key_value_int(app, NAMESPACE, NUM_LAUNCHES_KEY, info.num_launches).await;
+    set_key_value_int(app_handle, namespace, "num_launches", info.num_launches).await;
 
     info
 }
@@ -189,12 +182,15 @@ pub async fn track_event(
 
     // Disable analytics actual sending in dev
     if is_dev() {
-        debug!("track: {}", event);
+        // debug!("track: {} {} {:?}", event, attributes_json, params);
         return;
     }
 
     if let Err(e) = req.send().await {
-        info!("Error sending analytics event: {}", e);
+        warn!(
+            "Error sending analytics event: {} {} {} {:?}",
+            e, event, attributes_json, params,
+        );
     }
 }
 
@@ -211,7 +207,7 @@ fn get_os() -> &'static str {
 }
 
 fn get_window_size(app_handle: &AppHandle) -> String {
-    let window = match app_handle.webview_windows().into_values().next() {
+    let window = match app_handle.windows().into_values().next() {
         Some(w) => w,
         None => return "unknown".to_string(),
     };
@@ -236,14 +232,10 @@ fn get_window_size(app_handle: &AppHandle) -> String {
 async fn get_id(app_handle: &AppHandle) -> String {
     let id = get_key_value_string(app_handle, "analytics", "id", "").await;
     if id.is_empty() {
-        let new_id = generate_id();
+        let new_id = generate_id(None);
         set_key_value_string(app_handle, "analytics", "id", new_id.as_str()).await;
         new_id
     } else {
         id
     }
 }
-
-pub async fn get_num_launches(app: &AppHandle) -> i32 {
-    get_key_value_int(app, NAMESPACE, NUM_LAUNCHES_KEY, 0).await
-}

src-tauri/src/deno.rs

@@ -1,237 +0,0 @@
-// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-//! This example shows how to use swc to transpile TypeScript and JSX/TSX
-//! modules.
-//!
-//! It will only transpile, not typecheck (like Deno's `--no-check` flag).
-
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::rc::Rc;
-use std::sync::Arc;
-
-use crate::deno_ops::op_yaml_parse;
-use anyhow::anyhow;
-use anyhow::bail;
-use anyhow::Context;
-use anyhow::Error;
-use deno_ast::ParseParams;
-use deno_ast::{EmitOptions, MediaType, SourceMapOption, TranspileOptions};
-use deno_core::error::{AnyError, JsError};
-use deno_core::resolve_path;
-use deno_core::JsRuntime;
-use deno_core::ModuleLoadResponse;
-use deno_core::ModuleLoader;
-use deno_core::ModuleSource;
-use deno_core::ModuleSourceCode;
-use deno_core::ModuleSpecifier;
-use deno_core::ModuleType;
-use deno_core::RequestedModuleType;
-use deno_core::ResolutionKind;
-use deno_core::RuntimeOptions;
-use deno_core::SourceMapGetter;
-use deno_core::{resolve_import, v8};
-use tokio::task::block_in_place;
-
-#[derive(Clone)]
-struct SourceMapStore(Rc<RefCell<HashMap<String, Vec<u8>>>>);
-
-impl SourceMapGetter for SourceMapStore {
-    fn get_source_map(&self, specifier: &str) -> Option<Vec<u8>> {
-        self.0.borrow().get(specifier).cloned()
-    }
-
-    fn get_source_line(&self, _file_name: &str, _line_number: usize) -> Option<String> {
-        None
-    }
-}
-
-struct TypescriptModuleLoader {
-    source_maps: SourceMapStore,
-}
-
-impl ModuleLoader for TypescriptModuleLoader {
-    fn resolve(
-        &self,
-        specifier: &str,
-        referrer: &str,
-        _kind: ResolutionKind,
-    ) -> Result<ModuleSpecifier, Error> {
-        Ok(resolve_import(specifier, referrer)?)
-    }
-
-    fn load(
-        &self,
-        module_specifier: &ModuleSpecifier,
-        _maybe_referrer: Option<&ModuleSpecifier>,
-        _is_dyn_import: bool,
-        _requested_module_type: RequestedModuleType,
-    ) -> ModuleLoadResponse {
-        let source_maps = self.source_maps.clone();
-        fn load(
-            source_maps: SourceMapStore,
-            module_specifier: &ModuleSpecifier,
-        ) -> Result<ModuleSource, AnyError> {
-            let path = module_specifier
-                .to_file_path()
-                .map_err(|_| anyhow!("Only file:// URLs are supported."))?;
-
-            let media_type = MediaType::from_path(&path);
-            let (module_type, should_transpile) = match MediaType::from_path(&path) {
-                MediaType::JavaScript | MediaType::Mjs | MediaType::Cjs => {
-                    (ModuleType::JavaScript, false)
-                }
-                MediaType::Jsx => (ModuleType::JavaScript, true),
-                MediaType::TypeScript
-                | MediaType::Mts
-                | MediaType::Cts
-                | MediaType::Dts
-                | MediaType::Dmts
-                | MediaType::Dcts
-                | MediaType::Tsx => (ModuleType::JavaScript, true),
-                MediaType::Json => (ModuleType::Json, false),
-                _ => bail!("Unknown extension {:?}", path.extension()),
-            };
-
-            let code = std::fs::read_to_string(&path)?;
-            let code = if should_transpile {
-                let parsed = deno_ast::parse_module(ParseParams {
-                    specifier: module_specifier.clone(),
-                    text: Arc::from(code),
-                    media_type,
-                    capture_tokens: false,
-                    scope_analysis: false,
-                    maybe_syntax: None,
-                })?;
-                let res = parsed.transpile(
-                    &TranspileOptions::default(),
-                    &EmitOptions {
-                        source_map: SourceMapOption::Separate,
-                        inline_sources: true,
-                        ..Default::default()
-                    },
-                )?;
-                let src = res.into_source();
-                let source_map = src.source_map.unwrap();
-                let source = src.source;
-                source_maps
-                    .0
-                    .borrow_mut()
-                    .insert(module_specifier.to_string(), source_map);
-                String::from_utf8(source).unwrap()
-            } else {
-                code
-            };
-
-            Ok(ModuleSource::new(
-                module_type,
-                ModuleSourceCode::String(code.into()),
-                module_specifier,
-                None,
-            ))
-        }
-
-        ModuleLoadResponse::Sync(load(source_maps, module_specifier))
-    }
-}
-
-pub fn run_plugin_deno_block(
-    plugin_index_file: &str,
-    fn_name: &str,
-    fn_args: Vec<serde_json::Value>,
-) -> Result<serde_json::Value, Error> {
-    block_in_place(|| {
-        tauri::async_runtime::block_on(run_plugin_deno_2(plugin_index_file, fn_name, fn_args))
-    })
-}
-
-deno_core::extension!(
-    yaak_runtime,
-    ops = [ op_yaml_parse ],
-    esm_entry_point = "ext:yaak_runtime/yaml.js",
-    esm = [dir "src/plugin-runtime", "yaml.js"]
-);
-
-async fn run_plugin_deno_2(
-    plugin_index_file: &str,
-    fn_name: &str,
-    fn_args: Vec<serde_json::Value>,
-) -> Result<serde_json::Value, Error> {
-    let source_map_store = SourceMapStore(Rc::new(RefCell::new(HashMap::new())));
-
-    let mut ext_console = deno_console::deno_console::init_ops_and_esm();
-    ext_console.esm_entry_point = Some("ext:deno_console/01_console.js");
-
-    let ext_yaak = yaak_runtime::init_ops_and_esm();
-
-    let mut js_runtime = JsRuntime::new(RuntimeOptions {
-        module_loader: Some(Rc::new(TypescriptModuleLoader {
-            source_maps: source_map_store.clone(),
-        })),
-        source_map_getter: Some(Rc::new(source_map_store)),
-        extensions: vec![ext_console, ext_yaak],
-        ..Default::default()
-    });
-
-    let main_module = resolve_path(
-        plugin_index_file,
-        &std::env::current_dir().context("Unable to get CWD")?,
-    )?;
-
-    // Load the main module so we can do stuff with it
-    let mod_id = js_runtime.load_main_es_module(&main_module).await?;
-    let result = js_runtime.mod_evaluate(mod_id);
-    js_runtime.run_event_loop(Default::default()).await?;
-    result.await?;
-
-    let module_namespace = js_runtime.get_module_namespace(mod_id).unwrap();
-    let scope = &mut js_runtime.handle_scope();
-    let module_namespace = v8::Local::<v8::Object>::new(scope, module_namespace);
-
-    // Get the exported function we're calling
-    let func_key = v8::String::new(scope, fn_name).unwrap();
-    let func = module_namespace.get(scope, func_key.into()).unwrap();
-    let func = v8::Local::<v8::Function>::try_from(func).unwrap();
-    let tc_scope = &mut v8::TryCatch::new(scope);
-
-    // Create Yaak context object
-    let null = v8::null(tc_scope).into();
-    let name = v8::String::new(tc_scope, "foo").unwrap().into();
-    let value = v8::String::new(tc_scope, "bar").unwrap().into();
-    let yaak_ctx: v8::Local<v8::Value> =
-        v8::Object::with_prototype_and_properties(tc_scope, null, &[name], &[value]).into();
-
-    // Create the function arguments
-    let passed_args = &mut fn_args
-        .iter()
-        .map(|a| {
-            let v: v8::Local<v8::Value> = deno_core::serde_v8::to_v8(tc_scope, a).unwrap();
-            v
-        })
-        .collect::<Vec<v8::Local<v8::Value>>>();
-
-    let all_args = &mut vec![yaak_ctx];
-    all_args.append(passed_args);
-
-    // Call the function
-    let func_res = func.call(tc_scope, module_namespace.into(), all_args);
-
-    // Catch and return any thrown errors
-    if tc_scope.has_caught() {
-        let e = tc_scope.exception().unwrap();
-        let js_error = JsError::from_v8_exception(tc_scope, e);
-        return Err(Error::msg(js_error.stack.unwrap_or_default()));
-    }
-
-    // Handle the result
-    match func_res {
-        None => Ok(serde_json::Value::Null),
-        Some(res) => {
-            if res.is_null() || res.is_undefined() {
-                Ok(serde_json::Value::Null)
-            } else {
-                let value: serde_json::Value = deno_core::serde_v8::from_v8(tc_scope, res).unwrap();
-                Ok(value)
-            }
-        }
-    }
-}

src-tauri/src/deno_ops.rs

@@ -1,16 +0,0 @@
-use deno_core::error::AnyError;
-use deno_core::op2;
-
-#[op2]
-#[serde]
-pub fn op_yaml_parse(#[string] text: String) -> Result<serde_json::Value, AnyError> {
-    let value = serde_yaml::from_str(&text)?;
-    Ok(value)
-}
-
-#[op2]
-#[string]
-pub fn op_yaml_stringify(#[serde] value: serde_json::Value) -> Result<String, AnyError> {
-    let value = serde_yaml::to_string(&value)?;
-    Ok(value)
-}

src-tauri/src/http.rs

@@ -8,20 +8,19 @@ use std::time::Duration;
 
 use base64::Engine;
 use http::header::{ACCEPT, USER_AGENT};
-use http::{HeaderMap, HeaderName, HeaderValue};
+use http::{HeaderMap, HeaderName, HeaderValue, Method};
 use log::{error, info, warn};
 use reqwest::redirect::Policy;
-use reqwest::Method;
 use reqwest::{multipart, Url};
 use sqlx::types::{Json, JsonValue};
-use tauri::{Manager, WebviewWindow};
+use tauri::{Manager, Window};
 use tokio::sync::oneshot;
 use tokio::sync::watch::Receiver;
 
 use crate::{models, render, response_err};
 
 pub async fn send_http_request(
-    window: &WebviewWindow,
+    window: &Window,
     request: models::HttpRequest,
     response: &models::HttpResponse,
     environment: Option<models::Environment>,
@@ -36,7 +35,6 @@ pub async fn send_http_request(
 
     let mut url_string = render::render(&request.url, &workspace, environment.as_ref());
 
-    url_string = ensure_proto(&url_string);
     if !url_string.starts_with("http://") && !url_string.starts_with("https://") {
         url_string = format!("http://{}", url_string);
     }
@@ -46,7 +44,6 @@ pub async fn send_http_request(
             true => Policy::limited(10), // TODO: Handle redirects natively
             false => Policy::none(),
         })
-        .connection_verbose(true)
         .gzip(true)
         .brotli(true)
         .deflate(true)
@@ -91,24 +88,14 @@ pub async fn send_http_request(
     let uri = match http::Uri::from_str(url_string.as_str()) {
         Ok(u) => u,
         Err(e) => {
-            return response_err(
-                response,
-                format!("Failed to parse URL \"{}\": {}", url_string, e.to_string()),
-                window,
-            )
-            .await;
+            return response_err(response, e.to_string(), window).await;
         }
     };
     // Yes, we're parsing both URI and URL because they could return different errors
     let url = match Url::from_str(uri.to_string().as_str()) {
         Ok(u) => u,
         Err(e) => {
-            return response_err(
-                response,
-                format!("Failed to parse URL \"{}\": {}", url_string, e.to_string()),
-                window,
-            )
-            .await;
+            return response_err(response, e.to_string(), window).await;
         }
     };
 
@@ -125,6 +112,7 @@ pub async fn send_http_request(
     //  everything manually to know that).
     // if let Some(cookie_store) = maybe_cookie_store.clone() {
     //     let values1 = cookie_store.get_request_values(&url);
+    //     println!("COOKIE VLUAES: {:?}", values1.collect::<Vec<_>>());
     //     let raw_value = cookie_store.get_request_values(&url)
     //         .map(|(name, value)| format!("{}={}", name, value))
     //         .collect::<Vec<_>>()
@@ -290,7 +278,7 @@ pub async fn send_http_request(
                         continue;
                     }
 
-                    let file_path = p
+                    let file = p
                         .get("file")
                         .unwrap_or(empty_string)
                         .as_str()
@@ -302,14 +290,14 @@ pub async fn send_http_request(
                         .unwrap_or_default();
 
                     let name = render::render(name_raw, &workspace, environment_ref);
-                    let mut part = if file_path.is_empty() {
+                    let part = if file.is_empty() {
                         multipart::Part::text(render::render(
                             value_raw,
                             &workspace,
                             environment_ref,
                         ))
                     } else {
-                        match fs::read(file_path) {
+                        match fs::read(file) {
                             Ok(f) => multipart::Part::bytes(f),
                             Err(e) => {
                                 return response_err(response, e.to_string(), window).await;
@@ -323,24 +311,12 @@ pub async fn send_http_request(
                         .as_str()
                         .unwrap_or_default();
 
-                    if !ct_raw.is_empty() {
-                        let content_type = render::render(ct_raw, &workspace, environment_ref);
-                        part = part
-                            .mime_str(content_type.as_str())
-                            .map_err(|e| e.to_string())?;
-                    }
-
-                    if !file_path.is_empty() {
-                        let filename = PathBuf::from(file_path)
-                            .file_name()
-                            .unwrap_or_default()
-                            .to_str()
-                            .unwrap_or_default()
-                            .to_string();
-                        part = part.file_name(filename);
-                    }
-
-                    multipart_form = multipart_form.part(name, part);
+                    multipart_form = multipart_form.part(name, if ct_raw.is_empty() {
+                        part
+                    } else {
+                        let ct = render::render(ct_raw, &workspace, environment_ref);
+                        part.mime_str(ct.as_str()).map_err(|e| e.to_string())?
+                    });
                 }
             }
             headers.remove("Content-Type"); // reqwest will add this automatically
@@ -394,11 +370,11 @@ pub async fn send_http_request(
             response.url = v.url().to_string();
             response.remote_addr = v.remote_addr().map(|a| a.to_string());
             response.version = match v.version() {
-                reqwest::Version::HTTP_09 => Some("HTTP/0.9".to_string()),
-                reqwest::Version::HTTP_10 => Some("HTTP/1.0".to_string()),
-                reqwest::Version::HTTP_11 => Some("HTTP/1.1".to_string()),
-                reqwest::Version::HTTP_2 => Some("HTTP/2".to_string()),
-                reqwest::Version::HTTP_3 => Some("HTTP/3".to_string()),
+                http::Version::HTTP_09 => Some("HTTP/0.9".to_string()),
+                http::Version::HTTP_10 => Some("HTTP/1.0".to_string()),
+                http::Version::HTTP_11 => Some("HTTP/1.1".to_string()),
+                http::Version::HTTP_2 => Some("HTTP/2".to_string()),
+                http::Version::HTTP_3 => Some("HTTP/3".to_string()),
                 _ => None,
             };
 
@@ -414,7 +390,7 @@ pub async fn send_http_request(
 
             {
                 // Write body to FS
-                let dir = window.app_handle().path().app_data_dir().unwrap();
+                let dir = window.app_handle().path_resolver().app_data_dir().unwrap();
                 let base_dir = dir.join("responses");
                 create_dir_all(base_dir.clone()).expect("Failed to create responses dir");
                 let body_path = match response.id.is_empty() {
@@ -479,26 +455,3 @@ pub async fn send_http_request(
         Err(e) => response_err(response, e.to_string(), window).await,
     }
 }
-
-fn ensure_proto(url_str: &str) -> String {
-    if url_str.starts_with("http://") || url_str.starts_with("https://") {
-        return url_str.to_string();
-    }
-
-    // Url::from_str will fail without a proto, so add one
-    let parseable_url = format!("http://{}", url_str);
-    if let Ok(u) = Url::from_str(parseable_url.as_str()) {
-        match u.host() {
-            Some(host) => {
-                let h = host.to_string();
-                // These TLDs force HTTPS
-                if h.ends_with(".app") || h.ends_with(".dev") || h.ends_with(".page") {
-                    return format!("https://{url_str}");
-                }
-            }
-            None => {}
-        }
-    }
-
-    format!("http://{url_str}")
-}

src-tauri/src/models.rs

@@ -7,38 +7,9 @@ use serde::{Deserialize, Serialize};
 use sqlx::types::chrono::NaiveDateTime;
 use sqlx::types::{Json, JsonValue};
 use sqlx::{Pool, Sqlite};
-use tauri::{AppHandle, Manager, WebviewWindow, Wry};
+use tauri::{AppHandle, Manager, Wry};
 use tokio::sync::Mutex;
 
-pub enum ModelType {
-    TypeCookieJar,
-    TypeEnvironment,
-    TypeFolder,
-    TypeGrpcConnection,
-    TypeGrpcEvent,
-    TypeGrpcRequest,
-    TypeHttpRequest,
-    TypeHttpResponse,
-    TypeWorkspace,
-}
-
-impl ModelType {
-    pub fn id_prefix(&self) -> String {
-        match self {
-            ModelType::TypeCookieJar => "cj",
-            ModelType::TypeEnvironment => "ev",
-            ModelType::TypeFolder => "fl",
-            ModelType::TypeGrpcConnection => "gc",
-            ModelType::TypeGrpcEvent => "ge",
-            ModelType::TypeGrpcRequest => "gr",
-            ModelType::TypeHttpRequest => "rq",
-            ModelType::TypeHttpResponse => "rs",
-            ModelType::TypeWorkspace => "wk",
-        }
-        .to_string()
-    }
-}
-
 fn default_true() -> bool {
     true
 }
@@ -52,14 +23,7 @@ pub struct Settings {
     pub updated_at: NaiveDateTime,
     pub theme: String,
     pub appearance: String,
-    pub theme_dark: String,
-    pub theme_light: String,
     pub update_channel: String,
-    pub interface_font_size: i64,
-    pub interface_scale: i64,
-    pub editor_font_size: i64,
-    pub editor_soft_wrap: bool,
-    pub open_workspace_new_window: Option<bool>,
 }
 
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -462,9 +426,9 @@ pub async fn get_workspace(mgr: &impl Manager<Wry>, id: &str) -> Result<Workspac
     .await
 }
 
-pub async fn delete_workspace(window: &WebviewWindow, id: &str) -> Result<Workspace, sqlx::Error> {
-    let db = get_db(window).await;
-    let workspace = get_workspace(window, id).await?;
+pub async fn delete_workspace(mgr: &impl Manager<Wry>, id: &str) -> Result<Workspace, sqlx::Error> {
+    let db = get_db(mgr).await;
+    let workspace = get_workspace(mgr, id).await?;
     let _ = sqlx::query!(
         r#"
             DELETE FROM workspaces
@@ -475,11 +439,11 @@ pub async fn delete_workspace(window: &WebviewWindow, id: &str) -> Result<Worksp
     .execute(&db)
     .await;
 
-    for r in list_responses_by_workspace_id(window, id).await? {
-        delete_http_response(window, &r.id).await?;
+    for r in list_responses_by_workspace_id(mgr, id).await? {
+        delete_http_response(mgr, &r.id).await?;
     }
 
-    emit_deleted_model(window, workspace)
+    emit_deleted_model(mgr, workspace)
 }
 
 pub async fn get_cookie_jar(mgr: &impl Manager<Wry>, id: &str) -> Result<CookieJar, sqlx::Error> {
@@ -517,9 +481,12 @@ pub async fn list_cookie_jars(
     .await
 }
 
-pub async fn delete_cookie_jar(window: &WebviewWindow, id: &str) -> Result<CookieJar, sqlx::Error> {
-    let cookie_jar = get_cookie_jar(window, id).await?;
-    let db = get_db(window).await;
+pub async fn delete_cookie_jar(
+    mgr: &impl Manager<Wry>,
+    id: &str,
+) -> Result<CookieJar, sqlx::Error> {
+    let cookie_jar = get_cookie_jar(mgr, id).await?;
+    let db = get_db(mgr).await;
 
     let _ = sqlx::query!(
         r#"
@@ -531,25 +498,25 @@ pub async fn delete_cookie_jar(window: &WebviewWindow, id: &str) -> Result<Cooki
     .execute(&db)
     .await;
 
-    emit_deleted_model(window, cookie_jar)
+    emit_deleted_model(mgr, cookie_jar)
 }
 
 pub async fn duplicate_grpc_request(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     id: &str,
 ) -> Result<GrpcRequest, sqlx::Error> {
-    let mut request = get_grpc_request(window, id).await?.clone();
+    let mut request = get_grpc_request(mgr, id).await?.clone();
     request.id = "".to_string();
-    upsert_grpc_request(window, &request).await
+    upsert_grpc_request(mgr, &request).await
 }
 
 pub async fn upsert_grpc_request(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     request: &GrpcRequest,
 ) -> Result<GrpcRequest, sqlx::Error> {
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     let id = match request.id.as_str() {
-        "" => generate_model_id(ModelType::TypeGrpcRequest),
+        "" => generate_id(Some("gr")),
         _ => request.id.to_string(),
     };
     let trimmed_name = request.name.trim();
@@ -589,8 +556,8 @@ pub async fn upsert_grpc_request(
     .execute(&db)
     .await?;
 
-    match get_grpc_request(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_grpc_request(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
@@ -640,12 +607,12 @@ pub async fn list_grpc_requests(
 }
 
 pub async fn upsert_grpc_connection(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     connection: &GrpcConnection,
 ) -> Result<GrpcConnection, sqlx::Error> {
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     let id = match connection.id.as_str() {
-        "" => generate_model_id(ModelType::TypeGrpcConnection),
+        "" => generate_id(Some("gc")),
         _ => connection.id.to_string(),
     };
     sqlx::query!(
@@ -679,8 +646,8 @@ pub async fn upsert_grpc_connection(
     .execute(&db)
     .await?;
 
-    match get_grpc_connection(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_grpc_connection(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
@@ -729,12 +696,12 @@ pub async fn list_grpc_connections(
 }
 
 pub async fn upsert_grpc_event(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     event: &GrpcEvent,
 ) -> Result<GrpcEvent, sqlx::Error> {
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     let id = match event.id.as_str() {
-        "" => generate_model_id(ModelType::TypeGrpcEvent),
+        "" => generate_id(Some("ge")),
         _ => event.id.to_string(),
     };
     sqlx::query!(
@@ -765,8 +732,8 @@ pub async fn upsert_grpc_event(
     .execute(&db)
     .await?;
 
-    match get_grpc_event(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_grpc_event(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
@@ -811,16 +778,16 @@ pub async fn list_grpc_events(
 }
 
 pub async fn upsert_cookie_jar(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     cookie_jar: &CookieJar,
 ) -> Result<CookieJar, sqlx::Error> {
     let id = match cookie_jar.id.as_str() {
-        "" => generate_model_id(ModelType::TypeCookieJar),
+        "" => generate_id(Some("cj")),
         _ => cookie_jar.id.to_string(),
     };
     let trimmed_name = cookie_jar.name.trim();
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             INSERT INTO cookie_jars (
@@ -840,8 +807,8 @@ pub async fn upsert_cookie_jar(
     .execute(&db)
     .await?;
 
-    match get_cookie_jar(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_cookie_jar(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
@@ -866,11 +833,11 @@ pub async fn list_environments(
 }
 
 pub async fn delete_environment(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     id: &str,
 ) -> Result<Environment, sqlx::Error> {
-    let db = get_db(window).await;
-    let env = get_environment(window, id).await?;
+    let db = get_db(mgr).await;
+    let env = get_environment(mgr, id).await?;
     let _ = sqlx::query!(
         r#"
             DELETE FROM environments
@@ -881,7 +848,7 @@ pub async fn delete_environment(
     .execute(&db)
     .await;
 
-    emit_deleted_model(window, env)
+    emit_deleted_model(mgr, env)
 }
 
 async fn get_settings(mgr: &impl Manager<Wry>) -> Result<Settings, sqlx::Error> {
@@ -890,10 +857,7 @@ async fn get_settings(mgr: &impl Manager<Wry>) -> Result<Settings, sqlx::Error>
         Settings,
         r#"
             SELECT
-                id, model, created_at, updated_at, theme, appearance,
-                theme_dark, theme_light, update_channel,
-                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap, 
-                open_workspace_new_window
+                id, model, created_at, updated_at, theme, appearance, update_channel
             FROM settings
             WHERE id = 'default'
         "#,
@@ -922,48 +886,39 @@ pub async fn get_or_create_settings(mgr: &impl Manager<Wry>) -> Settings {
 }
 
 pub async fn update_settings(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     settings: Settings,
 ) -> Result<Settings, sqlx::Error> {
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             UPDATE settings SET (
-                theme, appearance, theme_dark, theme_light, update_channel,
-                interface_font_size, interface_scale, editor_font_size, editor_soft_wrap,
-                open_workspace_new_window
-            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) WHERE id = 'default';
+                theme, appearance, update_channel
+            ) = (?, ?, ?) WHERE id = 'default';
         "#,
         settings.theme,
         settings.appearance,
-        settings.theme_dark,
-        settings.theme_light,
-        settings.update_channel,
-        settings.interface_font_size,
-        settings.interface_scale,
-        settings.editor_font_size,
-        settings.editor_soft_wrap,
-        settings.open_workspace_new_window,
+        settings.update_channel
     )
     .execute(&db)
     .await?;
 
-    match get_settings(window).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_settings(mgr).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
 
 pub async fn upsert_environment(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     environment: Environment,
 ) -> Result<Environment, sqlx::Error> {
     let id = match environment.id.as_str() {
-        "" => generate_model_id(ModelType::TypeEnvironment),
+        "" => generate_id(Some("ev")),
         _ => environment.id.to_string(),
     };
     let trimmed_name = environment.name.trim();
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             INSERT INTO environments (
@@ -983,8 +938,8 @@ pub async fn upsert_environment(
     .execute(&db)
     .await?;
 
-    match get_environment(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_environment(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
@@ -1044,9 +999,9 @@ pub async fn list_folders(
     .await
 }
 
-pub async fn delete_folder(window: &WebviewWindow, id: &str) -> Result<Folder, sqlx::Error> {
-    let folder = get_folder(window, id).await?;
-    let db = get_db(window).await;
+pub async fn delete_folder(mgr: &impl Manager<Wry>, id: &str) -> Result<Folder, sqlx::Error> {
+    let folder = get_folder(mgr, id).await?;
+    let db = get_db(mgr).await;
     let _ = sqlx::query!(
         r#"
             DELETE FROM folders
@@ -1057,17 +1012,17 @@ pub async fn delete_folder(window: &WebviewWindow, id: &str) -> Result<Folder, s
     .execute(&db)
     .await;
 
-    emit_deleted_model(window, folder)
+    emit_deleted_model(mgr, folder)
 }
 
-pub async fn upsert_folder(window: &WebviewWindow, r: Folder) -> Result<Folder, sqlx::Error> {
+pub async fn upsert_folder(mgr: &impl Manager<Wry>, r: Folder) -> Result<Folder, sqlx::Error> {
     let id = match r.id.as_str() {
-        "" => generate_model_id(ModelType::TypeFolder),
+        "" => generate_id(Some("fl")),
         _ => r.id.to_string(),
     };
     let trimmed_name = r.name.trim();
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             INSERT INTO folders (
@@ -1089,32 +1044,32 @@ pub async fn upsert_folder(window: &WebviewWindow, r: Folder) -> Result<Folder,
     .execute(&db)
     .await?;
 
-    match get_folder(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_folder(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
 
 pub async fn duplicate_http_request(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     id: &str,
 ) -> Result<HttpRequest, sqlx::Error> {
-    let mut request = get_http_request(window, id).await?.clone();
+    let mut request = get_http_request(mgr, id).await?.clone();
     request.id = "".to_string();
-    upsert_http_request(window, request).await
+    upsert_http_request(mgr, request).await
 }
 
 pub async fn upsert_http_request(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     r: HttpRequest,
 ) -> Result<HttpRequest, sqlx::Error> {
     let id = match r.id.as_str() {
-        "" => generate_model_id(ModelType::TypeHttpRequest),
+        "" => generate_id(Some("rq")),
         _ => r.id.to_string(),
     };
     let trimmed_name = r.name.trim();
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
 
     sqlx::query!(
         r#"
@@ -1154,13 +1109,13 @@ pub async fn upsert_http_request(
     .execute(&db)
     .await?;
 
-    match get_http_request(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_http_request(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
 
-pub async fn list_http_requests(
+pub async fn list_requests(
     mgr: &impl Manager<Wry>,
     workspace_id: &str,
 ) -> Result<Vec<HttpRequest>, sqlx::Error> {
@@ -1210,15 +1165,15 @@ pub async fn get_http_request(
 }
 
 pub async fn delete_http_request(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     id: &str,
 ) -> Result<HttpRequest, sqlx::Error> {
-    let req = get_http_request(window, id).await?;
+    let req = get_http_request(mgr, id).await?;
 
     // DB deletes will cascade but this will delete the files
-    delete_all_http_responses(window, id).await?;
+    delete_all_http_responses(mgr, id).await?;
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     let _ = sqlx::query!(
         r#"
             DELETE FROM http_requests
@@ -1229,12 +1184,12 @@ pub async fn delete_http_request(
     .execute(&db)
     .await;
 
-    emit_deleted_model(window, req)
+    emit_deleted_model(mgr, req)
 }
 
 #[allow(clippy::too_many_arguments)]
 pub async fn create_http_response(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     request_id: &str,
     elapsed: i64,
     elapsed_headers: i64,
@@ -1247,10 +1202,10 @@ pub async fn create_http_response(
     version: Option<&str>,
     remote_addr: Option<&str>,
 ) -> Result<HttpResponse, sqlx::Error> {
-    let req = get_http_request(window, request_id).await?;
-    let id = generate_model_id(ModelType::TypeHttpResponse);
+    let req = get_http_request(mgr, request_id).await?;
+    let id = generate_id(Some("rp"));
     let headers_json = Json(headers);
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             INSERT INTO http_responses (
@@ -1276,14 +1231,14 @@ pub async fn create_http_response(
     .execute(&db)
     .await?;
 
-    match get_http_response(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_http_response(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
 
-pub async fn cancel_pending_grpc_connections(app: &AppHandle) -> Result<(), sqlx::Error> {
-    let db = get_db(app).await;
+pub async fn cancel_pending_grpc_connections(mgr: &impl Manager<Wry>) -> Result<(), sqlx::Error> {
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             UPDATE grpc_connections
@@ -1296,8 +1251,8 @@ pub async fn cancel_pending_grpc_connections(app: &AppHandle) -> Result<(), sqlx
     Ok(())
 }
 
-pub async fn cancel_pending_responses(app: &AppHandle) -> Result<(), sqlx::Error> {
-    let db = get_db(app).await;
+pub async fn cancel_pending_responses(mgr: &impl Manager<Wry>) -> Result<(), sqlx::Error> {
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             UPDATE http_responses
@@ -1311,27 +1266,27 @@ pub async fn cancel_pending_responses(app: &AppHandle) -> Result<(), sqlx::Error
 }
 
 pub async fn update_response_if_id(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     response: &HttpResponse,
 ) -> Result<HttpResponse, sqlx::Error> {
     if response.id.is_empty() {
         Ok(response.clone())
     } else {
-        update_response(window, response).await
+        update_response(mgr, response).await
     }
 }
 
 pub async fn upsert_workspace(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     workspace: Workspace,
 ) -> Result<Workspace, sqlx::Error> {
     let id = match workspace.id.as_str() {
-        "" => generate_model_id(ModelType::TypeWorkspace),
+        "" => generate_id(Some("wk")),
         _ => workspace.id.to_string(),
     };
     let trimmed_name = workspace.name.trim();
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             INSERT INTO workspaces (
@@ -1359,17 +1314,17 @@ pub async fn upsert_workspace(
     .execute(&db)
     .await?;
 
-    match get_workspace(window, &id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_workspace(mgr, &id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
 
 pub async fn update_response(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     response: &HttpResponse,
 ) -> Result<HttpResponse, sqlx::Error> {
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     sqlx::query!(
         r#"
             UPDATE http_responses SET (
@@ -1393,8 +1348,8 @@ pub async fn update_response(
     .execute(&db)
     .await?;
 
-    match get_http_response(window, &response.id).await {
-        Ok(m) => Ok(emit_upserted_model(window, m)),
+    match get_http_response(mgr, &response.id).await {
+        Ok(m) => Ok(emit_upserted_model(mgr, m)),
         Err(e) => Err(e),
     }
 }
@@ -1472,12 +1427,12 @@ pub async fn list_responses_by_workspace_id(
 }
 
 pub async fn delete_grpc_request(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     id: &str,
 ) -> Result<GrpcRequest, sqlx::Error> {
-    let req = get_grpc_request(window, id).await?;
+    let req = get_grpc_request(mgr, id).await?;
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     let _ = sqlx::query!(
         r#"
             DELETE FROM grpc_requests
@@ -1488,16 +1443,16 @@ pub async fn delete_grpc_request(
     .execute(&db)
     .await;
 
-    emit_deleted_model(window, req)
+    emit_deleted_model(mgr, req)
 }
 
 pub async fn delete_grpc_connection(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     id: &str,
 ) -> Result<GrpcConnection, sqlx::Error> {
-    let resp = get_grpc_connection(window, id).await?;
+    let resp = get_grpc_connection(mgr, id).await?;
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     let _ = sqlx::query!(
         r#"
             DELETE FROM grpc_connections
@@ -1508,14 +1463,14 @@ pub async fn delete_grpc_connection(
     .execute(&db)
     .await;
 
-    emit_deleted_model(window, resp)
+    emit_deleted_model(mgr, resp)
 }
 
 pub async fn delete_http_response(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     id: &str,
 ) -> Result<HttpResponse, sqlx::Error> {
-    let resp = get_http_response(window, id).await?;
+    let resp = get_http_response(mgr, id).await?;
 
     // Delete the body file if it exists
     if let Some(p) = resp.body_path.clone() {
@@ -1524,7 +1479,7 @@ pub async fn delete_http_response(
         };
     }
 
-    let db = get_db(window).await;
+    let db = get_db(mgr).await;
     let _ = sqlx::query!(
         r#"
             DELETE FROM http_responses
@@ -1535,129 +1490,92 @@ pub async fn delete_http_response(
     .execute(&db)
     .await;
 
-    emit_deleted_model(window, resp)
+    emit_deleted_model(mgr, resp)
 }
 
 pub async fn delete_all_grpc_connections(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     request_id: &str,
 ) -> Result<(), sqlx::Error> {
-    for r in list_grpc_connections(window, request_id).await? {
-        delete_grpc_connection(window, &r.id).await?;
+    for r in list_grpc_connections(mgr, request_id).await? {
+        delete_grpc_connection(mgr, &r.id).await?;
     }
     Ok(())
 }
 
 pub async fn delete_all_http_responses(
-    window: &WebviewWindow,
+    mgr: &impl Manager<Wry>,
     request_id: &str,
 ) -> Result<(), sqlx::Error> {
-    for r in list_responses(window, request_id, None).await? {
-        delete_http_response(window, &r.id).await?;
+    for r in list_responses(mgr, request_id, None).await? {
+        delete_http_response(mgr, &r.id).await?;
     }
     Ok(())
 }
 
-pub fn generate_model_id(model: ModelType) -> String {
-    let id = generate_id();
-    format!("{}_{}", model.id_prefix(), id)
-}
-
-pub fn generate_id() -> String {
-    Alphanumeric.sample_string(&mut rand::thread_rng(), 10)
+pub fn generate_id(prefix: Option<&str>) -> String {
+    let id = Alphanumeric.sample_string(&mut rand::thread_rng(), 10);
+    match prefix {
+        None => id,
+        Some(p) => format!("{p}_{id}"),
+    }
 }
 
 #[derive(Default, Debug, Deserialize, Serialize)]
 #[serde(default, rename_all = "camelCase")]
 pub struct WorkspaceExport {
-    pub yaak_version: String,
-    pub yaak_schema: i64,
-    pub timestamp: NaiveDateTime,
-    pub resources: WorkspaceExportResources,
+   pub yaak_version: String,
+   pub yaak_schema: i64,
+   pub timestamp: NaiveDateTime,
+   pub resources: WorkspaceExportResources,
 }
 
 #[derive(Default, Debug, Deserialize, Serialize)]
 #[serde(default, rename_all = "camelCase")]
 pub struct WorkspaceExportResources {
-    pub workspaces: Vec<Workspace>,
-    pub environments: Vec<Environment>,
-    pub folders: Vec<Folder>,
-    pub http_requests: Vec<HttpRequest>,
-    pub grpc_requests: Vec<GrpcRequest>,
+   pub workspaces: Vec<Workspace>,
+   pub environments: Vec<Environment>,
+   pub folders: Vec<Folder>,
+   pub http_requests: Vec<HttpRequest>,
+   pub grpc_requests: Vec<GrpcRequest>,
 }
 
 pub async fn get_workspace_export_resources(
-    window: &WebviewWindow,
-    workspace_ids: Vec<&str>,
+    app_handle: &AppHandle,
+    workspace_id: &str,
 ) -> WorkspaceExport {
-    let app_handle = window.app_handle();
-    let mut data = WorkspaceExport {
+    let workspace = get_workspace(app_handle, workspace_id)
+        .await
+        .expect("Failed to get workspace");
+    return WorkspaceExport {
         yaak_version: app_handle.package_info().version.clone().to_string(),
         yaak_schema: 2,
         timestamp: chrono::Utc::now().naive_utc(),
         resources: WorkspaceExportResources {
-            workspaces: Vec::new(),
-            environments: Vec::new(),
-            folders: Vec::new(),
-            http_requests: Vec::new(),
-            grpc_requests: Vec::new(),
-        },
-    };
-
-    for workspace_id in workspace_ids {
-        data.resources.workspaces.push(
-            get_workspace(window, workspace_id)
-                .await
-                .expect("Failed to get workspace"),
-        );
-        data.resources.environments.append(
-            &mut list_environments(window, workspace_id)
+            workspaces: vec![workspace],
+            environments: list_environments(app_handle, workspace_id)
                 .await
                 .expect("Failed to get environments"),
-        );
-        data.resources.folders.append(
-            &mut list_folders(window, workspace_id)
+            folders: list_folders(app_handle, workspace_id)
                 .await
                 .expect("Failed to get folders"),
-        );
-        data.resources.http_requests.append(
-            &mut list_http_requests(window, workspace_id)
+            http_requests: list_requests(app_handle, workspace_id)
                 .await
-                .expect("Failed to get http requests"),
-        );
-        data.resources.grpc_requests.append(
-            &mut list_grpc_requests(window, workspace_id)
+                .expect("Failed to get requests"),
+            grpc_requests: list_grpc_requests(app_handle, workspace_id)
                 .await
                 .expect("Failed to get grpc requests"),
-        );
-    }
-
-    return data;
-}
-
-#[derive(Clone, Serialize)]
-#[serde(default, rename_all = "camelCase")]
-struct ModelPayload<M: Serialize + Clone> {
-    pub model: M,
-    pub window_label: String,
-}
-
-fn emit_upserted_model<M: Serialize + Clone>(window: &WebviewWindow, model: M) -> M {
-    let payload = ModelPayload {
-        model: model.clone(),
-        window_label: window.label().to_string(),
+        },
     };
+}
 
-    window.emit("upserted_model", payload).unwrap();
+fn emit_upserted_model<S: Serialize + Clone>(mgr: &impl Manager<Wry>, model: S) -> S {
+    mgr.emit_all("upserted_model", model.clone()).unwrap();
     model
 }
 
-fn emit_deleted_model<M: Serialize + Clone, E>(window: &WebviewWindow, model: M) -> Result<M, E> {
-    let payload = ModelPayload {
-        model: model.clone(),
-        window_label: window.label().to_string(),
-    };
-    window.emit("deleted_model", payload).unwrap();
+fn emit_deleted_model<S: Serialize + Clone, E>(mgr: &impl Manager<Wry>, model: S) -> Result<S, E> {
+    mgr.emit_all("deleted_model", model.clone()).unwrap();
     Ok(model)
 }
 

src-tauri/src/notifications.rs

@@ -1,99 +0,0 @@
-use std::time::SystemTime;
-
-use chrono::{Duration, NaiveDateTime, Utc};
-use log::debug;
-use reqwest::Method;
-use serde::{Deserialize, Serialize};
-use tauri::{AppHandle, Manager};
-
-use crate::analytics::get_num_launches;
-use crate::models::{get_key_value_raw, set_key_value_raw};
-
-// Check for updates every hour
-const MAX_UPDATE_CHECK_SECONDS: u64 = 60 * 60;
-
-const KV_NAMESPACE: &str = "notifications";
-const KV_KEY: &str = "seen";
-
-// Create updater struct
-pub struct YaakNotifier {
-    last_check: SystemTime,
-}
-
-#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
-#[serde(default, rename_all = "camelCase")]
-pub struct YaakNotification {
-    timestamp: NaiveDateTime,
-    id: String,
-    message: String,
-    action: Option<YaakNotificationAction>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
-#[serde(default, rename_all = "camelCase")]
-pub struct YaakNotificationAction {
-    label: String,
-    url: String,
-}
-
-impl YaakNotifier {
-    pub fn new() -> Self {
-        Self {
-            last_check: SystemTime::UNIX_EPOCH,
-        }
-    }
-
-    pub async fn seen(&mut self, app: &AppHandle, id: &str) -> Result<(), String> {
-        let mut seen = get_kv(app).await?;
-        seen.push(id.to_string());
-        debug!("Marked notification as seen {}", id);
-        let seen_json = serde_json::to_string(&seen).map_err(|e| e.to_string())?;
-        set_key_value_raw(app, KV_NAMESPACE, KV_KEY, seen_json.as_str()).await;
-        Ok(())
-    }
-
-    pub async fn check(&mut self, app: &AppHandle) -> Result<(), String> {
-        let ignore_check = self.last_check.elapsed().unwrap().as_secs() < MAX_UPDATE_CHECK_SECONDS;
-
-        if ignore_check {
-            return Ok(());
-        }
-
-        self.last_check = SystemTime::now();
-
-        let num_launches = get_num_launches(app).await;
-        let info = app.package_info().clone();
-        let req = reqwest::Client::default()
-            .request(Method::GET, "https://notify.yaak.app/notifications")
-            .query(&[
-                ("version", info.version.to_string()),
-                ("launches", num_launches.to_string()),
-            ]);
-        let resp = req.send().await.map_err(|e| e.to_string())?;
-        let notification = resp
-            .json::<YaakNotification>()
-            .await
-            .map_err(|e| e.to_string())?;
-
-        let age = notification
-            .timestamp
-            .signed_duration_since(Utc::now().naive_utc());
-        let seen = get_kv(app).await?;
-        if seen.contains(&notification.id) || (age > Duration::days(1)) {
-            debug!("Already seen notification {}", notification.id);
-            return Ok(());
-        }
-        debug!("Got notification {:?}", notification);
-
-        let _ = app.emit("notification", notification.clone());
-
-        Ok(())
-    }
-}
-
-async fn get_kv(app: &AppHandle) -> Result<Vec<String>, String> {
-    match get_key_value_raw(app, "notifications", "seen").await {
-        None => Ok(Vec::new()),
-        Some(v) => serde_json::from_str(&v.value).map_err(|e| e.to_string()),
-    }
-}

src-tauri/src/plugin-runtime/yaml.js

@@ -1,7 +0,0 @@
-((globalThis) => {
-  const core = Deno.core;
-  globalThis.YAML = {
-    parse: core.ops.op_yaml_parse,
-    stringify: core.ops.op_yaml_stringify,
-  };
-})(globalThis);

src-tauri/src/plugin.rs

@@ -1,10 +1,18 @@
-use std::path;
+use std::fs;
 
-use log::error;
+use boa_engine::{
+    Context, js_string, JsNativeError, JsValue, Module, module::SimpleModuleLoader,
+    property::Attribute, Source,
+};
+use boa_engine::builtins::promise::PromiseState;
+use boa_engine::module::ModuleLoader;
+use boa_runtime::Console;
+use log::{debug, error};
 use serde::{Deserialize, Serialize};
+use serde_json::json;
+use tauri::AppHandle;
 
-use crate::deno::run_plugin_deno_block;
-use crate::models::{HttpRequest, WorkspaceExportResources};
+use crate::models::{WorkspaceExportResources};
 
 #[derive(Default, Debug, Deserialize, Serialize)]
 pub struct FilterResult {
@@ -17,68 +25,132 @@ pub struct ImportResult {
 }
 
 pub async fn run_plugin_filter(
+    app_handle: &AppHandle,
     plugin_name: &str,
     response_body: &str,
     filter: &str,
 ) -> Option<FilterResult> {
-    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
-    let plugin_index_file = plugin_dir.join(plugin_name).join("build/index.mjs");
-
-    let result = run_plugin_deno_block(
-        plugin_index_file.to_str().unwrap(),
+    let result_json = run_plugin(
+        app_handle,
+        plugin_name,
         "pluginHookResponseFilter",
-        vec![
-            serde_json::to_value(response_body).unwrap(),
-            serde_json::to_value(filter).unwrap(),
-        ],
-    )
-    .map_err(|e| e.to_string())
-    .expect("Failed to run plugin");
+        &[js_string!(response_body).into(), js_string!(filter).into()],
+    );
 
-    if result.is_null() {
+    if result_json.is_null() {
         error!("Plugin {} failed to run", plugin_name);
         return None;
     }
 
     let resources: FilterResult =
-        serde_json::from_value(result).expect("failed to parse filter plugin result json");
+        serde_json::from_value(result_json).expect("failed to parse filter plugin result json");
     Some(resources)
 }
 
-pub fn run_plugin_export_curl(request: &HttpRequest) -> Result<String, String> {
-    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
-    let plugin_index_file = plugin_dir.join("exporter-curl").join("build/index.mjs");
-
-    let request_json = serde_json::to_value(request).map_err(|e| e.to_string())?;
-    let result = run_plugin_deno_block(
-        plugin_index_file.to_str().unwrap(),
-        "pluginHookExport",
-        vec![request_json],
-    )
-    .map_err(|e| e.to_string())?;
-
-    let export_str: String = serde_json::from_value(result).map_err(|e| e.to_string())?;
-    Ok(export_str)
-}
-
 pub async fn run_plugin_import(
+    app_handle: &AppHandle,
     plugin_name: &str,
-    file_contents: &str,
-) -> Result<Option<ImportResult>, String> {
-    let plugin_dir = path::Path::new("/Users/gschier/Workspace/yaak/plugins");
-    let plugin_index_file = plugin_dir.join(plugin_name).join("build/index.mjs");
-
-    let result = run_plugin_deno_block(
-        plugin_index_file.to_str().unwrap(),
+    file_path: &str,
+) -> Option<ImportResult> {
+    let file = fs::read_to_string(file_path)
+        .unwrap_or_else(|_| panic!("Unable to read file {}", file_path));
+    let file_contents = file.as_str();
+    let result_json = run_plugin(
+        app_handle,
+        plugin_name,
         "pluginHookImport",
-        vec![serde_json::to_value(file_contents).map_err(|e| e.to_string())?],
-    )
-    .map_err(|e| e.to_string())?;
+        &[js_string!(file_contents).into()],
+    );
 
-    if result.is_null() {
-        return Ok(None);
+    if result_json.is_null() {
+        return None;
     }
 
-    let resources: ImportResult = serde_json::from_value(result).map_err(|e| e.to_string())?;
-    Ok(Some(resources))
+    let resources: ImportResult =
+        serde_json::from_value(result_json).expect("failed to parse result json");
+    Some(resources)
+}
+
+fn run_plugin(
+    app_handle: &AppHandle,
+    plugin_name: &str,
+    entrypoint: &str,
+    js_args: &[JsValue],
+) -> serde_json::Value {
+    let plugin_dir = app_handle
+        .path_resolver()
+        .resolve_resource("plugins")
+        .expect("failed to resolve plugin directory resource")
+        .join(plugin_name);
+    let plugin_index_file = plugin_dir.join("index.mjs");
+
+    debug!(
+        "Running plugin dir={:?} file={:?}",
+        plugin_dir, plugin_index_file
+    );
+
+    // Module loader for the specific plugin
+    let loader = &SimpleModuleLoader::new(plugin_dir).expect("failed to create module loader");
+    let dyn_loader: &dyn ModuleLoader = loader;
+
+    let context = &mut Context::builder()
+        .module_loader(dyn_loader)
+        .build()
+        .expect("failed to create context");
+
+    add_runtime(context);
+
+    let source = Source::from_filepath(&plugin_index_file).expect("Error opening file");
+
+    // Can also pass a `Some(realm)` if you need to execute the module in another realm.
+    let module = Module::parse(source, None, context).expect("failed to parse module");
+
+    // Insert parsed entrypoint into the module loader
+    loader.insert(plugin_index_file, module.clone());
+
+    let promise_result = module
+        .load_link_evaluate(context)
+        .expect("failed to evaluate module");
+
+    // Very important to push forward the job queue after queueing promises.
+    context.run_jobs();
+
+    // Checking if the final promise didn't return an error.
+    match promise_result.state().expect("failed to get promise state") {
+        PromiseState::Pending => {
+            panic!("Promise was pending");
+        }
+        PromiseState::Fulfilled(v) => {
+            assert_eq!(v, JsValue::undefined())
+        }
+        PromiseState::Rejected(err) => {
+            panic!("Failed to link: {}", err.display());
+        }
+    }
+
+    let namespace = module.namespace(context);
+
+    let result = namespace
+        .get(js_string!(entrypoint), context)
+        .expect("failed to get entrypoint")
+        .as_callable()
+        .cloned()
+        .ok_or_else(|| JsNativeError::typ().with_message("export wasn't a function!"))
+        .expect("Failed to get entrypoint")
+        .call(&JsValue::undefined(), js_args, context)
+        .expect("Failed to call entrypoint");
+
+    match result.is_undefined() {
+        true => json!(null), // to_json doesn't work with undefined (yet)
+        false => result
+            .to_json(context)
+            .expect("failed to convert result to json"),
+    }
+}
+
+fn add_runtime(context: &mut Context) {
+    let console = Console::init(context);
+    context
+        .register_global_property(js_string!(Console::NAME), console, Attribute::all())
+        .expect("the console builtin shouldn't exist");
 }

src-tauri/src/render.rs

@@ -1,94 +1,32 @@
+use crate::models::{Environment, Workspace};
 use std::collections::HashMap;
-
-use sqlx::types::{Json, JsonValue};
-
-use crate::models::{
-    Environment, EnvironmentVariable, HttpRequest, HttpRequestHeader, HttpUrlParameter, Workspace,
-};
-use templates::parse_and_render;
-
-pub fn render_request(r: &HttpRequest, w: &Workspace, e: Option<&Environment>) -> HttpRequest {
-    let r = r.clone();
-    HttpRequest {
-        url: render(r.url.as_str(), w, e),
-        url_parameters: Json(
-            r.url_parameters
-                .0
-                .iter()
-                .map(|p| HttpUrlParameter {
-                    enabled: p.enabled,
-                    name: render(p.name.as_str(), w, e),
-                    value: render(p.value.as_str(), w, e),
-                })
-                .collect::<Vec<HttpUrlParameter>>(),
-        ),
-        headers: Json(
-            r.headers
-                .0
-                .iter()
-                .map(|p| HttpRequestHeader {
-                    enabled: p.enabled,
-                    name: render(p.name.as_str(), w, e),
-                    value: render(p.value.as_str(), w, e),
-                })
-                .collect::<Vec<HttpRequestHeader>>(),
-        ),
-        body: Json(
-            r.body
-                .0
-                .iter()
-                .map(|(k, v)| {
-                    let v = if v.is_string() {
-                        render(v.as_str().unwrap(), w, e)
-                    } else {
-                        v.to_string()
-                    };
-                    (render(k, w, e), JsonValue::from(v))
-                })
-                .collect::<HashMap<String, JsonValue>>(),
-        ),
-        authentication: Json(
-            r.authentication
-                .0
-                .iter()
-                .map(|(k, v)| {
-                    let v = if v.is_string() {
-                        render(v.as_str().unwrap(), w, e)
-                    } else {
-                        v.to_string()
-                    };
-                    (render(k, w, e), JsonValue::from(v))
-                })
-                .collect::<HashMap<String, JsonValue>>(),
-        ),
-        ..r
-    }
-}
+use tauri::regex::Regex;
 
 pub fn render(template: &str, workspace: &Workspace, environment: Option<&Environment>) -> String {
-    let mut variables = HashMap::new();
-    variables = add_variable_to_map(variables, &workspace.variables.0);
-
-    if let Some(e) = environment {
-        variables = add_variable_to_map(variables, &e.variables.0);
-    }
-
-    parse_and_render(template, variables, None)
-}
-
-fn add_variable_to_map<'a>(
-    m: HashMap<&'a str, &'a str>,
-    variables: &'a Vec<EnvironmentVariable>,
-) -> HashMap<&'a str, &'a str> {
-    let mut map = m.clone();
-    for variable in variables {
+    let mut map = HashMap::new();
+    let workspace_variables = &workspace.variables.0;
+    for variable in workspace_variables {
         if !variable.enabled || variable.value.is_empty() {
             continue;
         }
-        let name = variable.name.as_str();
-        let value = variable.value.as_str();
-        map.insert(name, value);
+        map.insert(variable.name.as_str(), variable.value.as_str());
     }
 
-    map
+    if let Some(e) = environment {
+        let environment_variables = &e.variables.0;
+        for variable in environment_variables {
+            if !variable.enabled || variable.value.is_empty() {
+                continue;
+            }
+            map.insert(variable.name.as_str(), variable.value.as_str());
+        }
+    }
+
+    Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}")
+        .expect("Failed to create regex")
+        .replace_all(template, |caps: &tauri::regex::Captures| {
+            let key = caps.get(1).unwrap().as_str();
+            map.get(key).unwrap_or(&"")
+        })
+        .to_string()
 }

src-tauri/src/tauri_plugin_mac_window.rs

@@ -1,450 +0,0 @@
-use hex_color::HexColor;
-use objc::{msg_send, sel, sel_impl};
-use rand::{distributions::Alphanumeric, Rng};
-use tauri::{
-    plugin::{Builder, TauriPlugin},
-    Manager, Runtime, Window, WindowEvent,
-};
-
-const WINDOW_CONTROL_PAD_X: f64 = 13.0;
-const WINDOW_CONTROL_PAD_Y: f64 = 18.0;
-
-struct UnsafeWindowHandle(*mut std::ffi::c_void);
-
-unsafe impl Send for UnsafeWindowHandle {}
-
-unsafe impl Sync for UnsafeWindowHandle {}
-
-pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    Builder::new("mac_window")
-        .on_window_ready(|window| {
-            #[cfg(target_os = "macos")]
-            {
-                setup_traffic_light_positioner(&window);
-                let h = window.app_handle();
-
-                let window_for_theme = window.clone();
-                let id1 = h.listen("yaak_bg_changed", move |ev| {
-                    let payload = serde_json::from_str::<&str>(ev.payload()).unwrap().trim();
-                    let color = HexColor::parse_rgb(payload).unwrap();
-                    update_window_theme(window_for_theme.clone(), color);
-                });
-
-                let window_for_title = window.clone();
-                let id2 = h.listen("yaak_title_changed", move |ev| {
-                    let payload = serde_json::from_str::<&str>(ev.payload()).unwrap().trim();
-                    update_window_title(window_for_title.clone(), payload.to_string());
-                });
-
-                let h = h.clone();
-                window.on_window_event(move |e| {
-                    match e {
-                        WindowEvent::Destroyed => {
-                            h.unlisten(id1);
-                            h.unlisten(id2);
-                        }
-                        _ => {}
-                    };
-                });
-            }
-            return;
-        })
-        .build()
-}
-
-#[cfg(target_os = "macos")]
-fn update_window_title<R: Runtime>(window: Window<R>, title: String) {
-    use cocoa::{appkit::NSWindow, base::nil, foundation::NSString};
-
-    unsafe {
-        let window_handle = UnsafeWindowHandle(window.ns_window().unwrap());
-
-        let window2 = window.clone();
-        let label = window.label().to_string();
-        let _ = window.run_on_main_thread(move || {
-            let win_title = NSString::alloc(nil).init_str(&title);
-            let handle = window_handle;
-            NSWindow::setTitle_(handle.0 as cocoa::base::id, win_title);
-            position_traffic_lights(
-                UnsafeWindowHandle(window2.ns_window().expect("Failed to create window handle")),
-                WINDOW_CONTROL_PAD_X,
-                WINDOW_CONTROL_PAD_Y,
-                label,
-            );
-        });
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn update_window_theme<R: Runtime>(window: Window<R>, color: HexColor) {
-    use cocoa::appkit::{
-        NSAppearance, NSAppearanceNameVibrantDark, NSAppearanceNameVibrantLight, NSWindow,
-    };
-
-    let brightness = (color.r as u64 + color.g as u64 + color.b as u64) / 3;
-    let label = window.label().to_string();
-
-    unsafe {
-        let window_handle = UnsafeWindowHandle(window.ns_window().unwrap());
-        let window2 = window.clone();
-        let _ = window.run_on_main_thread(move || {
-            let handle = window_handle;
-
-            let selected_appearance = if brightness >= 128 {
-                NSAppearance(NSAppearanceNameVibrantLight)
-            } else {
-                NSAppearance(NSAppearanceNameVibrantDark)
-            };
-
-            NSWindow::setAppearance(handle.0 as cocoa::base::id, selected_appearance);
-            position_traffic_lights(
-                UnsafeWindowHandle(window2.ns_window().expect("Failed to create window handle")),
-                WINDOW_CONTROL_PAD_X,
-                WINDOW_CONTROL_PAD_Y,
-                label,
-            );
-        });
-    }
-}
-
-#[cfg(target_os = "macos")]
-fn position_traffic_lights(ns_window_handle: UnsafeWindowHandle, x: f64, y: f64, label: String) {
-    if label.starts_with("nested_") {
-        return;
-    }
-
-    use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
-    use cocoa::foundation::NSRect;
-
-    let ns_window = ns_window_handle.0 as cocoa::base::id;
-    unsafe {
-        let close = ns_window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
-        let miniaturize =
-            ns_window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
-        let zoom = ns_window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
-
-        let title_bar_container_view = close.superview().superview();
-
-        let close_rect: NSRect = msg_send![close, frame];
-        let button_height = close_rect.size.height;
-
-        let title_bar_frame_height = button_height + y;
-        let mut title_bar_rect = NSView::frame(title_bar_container_view);
-        title_bar_rect.size.height = title_bar_frame_height;
-        title_bar_rect.origin.y = NSView::frame(ns_window).size.height - title_bar_frame_height;
-        let _: () = msg_send![title_bar_container_view, setFrame: title_bar_rect];
-
-        let window_buttons = vec![close, miniaturize, zoom];
-        let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
-
-        for (i, button) in window_buttons.into_iter().enumerate() {
-            let mut rect: NSRect = NSView::frame(button);
-            rect.origin.x = x + (i as f64 * space_between);
-            button.setFrameOrigin(rect.origin);
-        }
-    }
-}
-
-#[cfg(target_os = "macos")]
-#[derive(Debug)]
-struct WindowState<R: Runtime> {
-    window: Window<R>,
-}
-
-#[cfg(target_os = "macos")]
-pub fn setup_traffic_light_positioner<R: Runtime>(window: &Window<R>) {
-    use cocoa::appkit::NSWindow;
-    use cocoa::base::{id, BOOL};
-    use cocoa::delegate;
-    use cocoa::foundation::NSUInteger;
-    use objc::runtime::{Object, Sel};
-    use std::ffi::c_void;
-
-    position_traffic_lights(
-        UnsafeWindowHandle(window.ns_window().expect("Failed to create window handle")),
-        WINDOW_CONTROL_PAD_X,
-        WINDOW_CONTROL_PAD_Y,
-        window.label().to_string(),
-    );
-
-    // Ensure they stay in place while resizing the window.
-    fn with_window_state<R: Runtime, F: FnOnce(&mut WindowState<R>) -> T, T>(
-        this: &Object,
-        func: F,
-    ) {
-        let ptr = unsafe {
-            let x: *mut c_void = *this.get_ivar("app_box");
-            &mut *(x as *mut WindowState<R>)
-        };
-        func(ptr);
-    }
-
-    unsafe {
-        let ns_win = window
-            .ns_window()
-            .expect("NS Window should exist to mount traffic light delegate.")
-            as id;
-
-        let current_delegate: id = ns_win.delegate();
-
-        extern "C" fn on_window_should_close(this: &Object, _cmd: Sel, sender: id) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, windowShouldClose: sender]
-            }
-        }
-        extern "C" fn on_window_will_close(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillClose: notification];
-            }
-        }
-        extern "C" fn on_window_did_resize<R: Runtime>(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    let id = state
-                        .window
-                        .ns_window()
-                        .expect("NS window should exist on state to handle resize")
-                        as id;
-
-                    position_traffic_lights(
-                        UnsafeWindowHandle(id as *mut c_void),
-                        WINDOW_CONTROL_PAD_X,
-                        WINDOW_CONTROL_PAD_Y,
-                        state.window.label().to_string(),
-                    );
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidResize: notification];
-            }
-        }
-        extern "C" fn on_window_did_move(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidMove: notification];
-            }
-        }
-        extern "C" fn on_window_did_change_backing_properties(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidChangeBackingProperties: notification];
-            }
-        }
-        extern "C" fn on_window_did_become_key(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidBecomeKey: notification];
-            }
-        }
-        extern "C" fn on_window_did_resign_key(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidResignKey: notification];
-            }
-        }
-        extern "C" fn on_dragging_entered(this: &Object, _cmd: Sel, notification: id) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, draggingEntered: notification]
-            }
-        }
-        extern "C" fn on_prepare_for_drag_operation(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, prepareForDragOperation: notification]
-            }
-        }
-        extern "C" fn on_perform_drag_operation(this: &Object, _cmd: Sel, sender: id) -> BOOL {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, performDragOperation: sender]
-            }
-        }
-        extern "C" fn on_conclude_drag_operation(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, concludeDragOperation: notification];
-            }
-        }
-        extern "C" fn on_dragging_exited(this: &Object, _cmd: Sel, notification: id) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, draggingExited: notification];
-            }
-        }
-        extern "C" fn on_window_will_use_full_screen_presentation_options(
-            this: &Object,
-            _cmd: Sel,
-            window: id,
-            proposed_options: NSUInteger,
-        ) -> NSUInteger {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                msg_send![super_del, window: window willUseFullScreenPresentationOptions: proposed_options]
-            }
-        }
-        extern "C" fn on_window_did_enter_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("did-enter-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidEnterFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_will_enter_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("will-enter-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillEnterFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_did_exit_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("did-exit-fullscreen", ())
-                        .expect("Failed to emit event");
-
-                    let id = state.window.ns_window().expect("Failed to emit event") as id;
-                    position_traffic_lights(
-                        UnsafeWindowHandle(id as *mut c_void),
-                        WINDOW_CONTROL_PAD_X,
-                        WINDOW_CONTROL_PAD_Y,
-                        state.window.label().to_string(),
-                    );
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidExitFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_will_exit_full_screen<R: Runtime>(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                with_window_state(&*this, |state: &mut WindowState<R>| {
-                    state
-                        .window
-                        .emit("will-exit-fullscreen", ())
-                        .expect("Failed to emit event");
-                });
-
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowWillExitFullScreen: notification];
-            }
-        }
-        extern "C" fn on_window_did_fail_to_enter_full_screen(
-            this: &Object,
-            _cmd: Sel,
-            window: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, windowDidFailToEnterFullScreen: window];
-            }
-        }
-        extern "C" fn on_effective_appearance_did_change(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![super_del, effectiveAppearanceDidChange: notification];
-            }
-        }
-        extern "C" fn on_effective_appearance_did_changed_on_main_thread(
-            this: &Object,
-            _cmd: Sel,
-            notification: id,
-        ) {
-            unsafe {
-                let super_del: id = *this.get_ivar("super_delegate");
-                let _: () = msg_send![
-                    super_del,
-                    effectiveAppearanceDidChangedOnMainThread: notification
-                ];
-            }
-        }
-
-        // Are we de-allocing this properly ? (I miss safe Rust :(  )
-        let window_label = window.label().to_string();
-
-        let app_state = WindowState {
-            window: window.clone(),
-        };
-        let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void;
-        let random_str: String = rand::thread_rng()
-            .sample_iter(&Alphanumeric)
-            .take(20)
-            .map(char::from)
-            .collect();
-
-        // We need to ensure we have a unique delegate name, otherwise we will panic while trying to create a duplicate
-        // delegate with the same name.
-        let delegate_name = format!("windowDelegate_{}_{}", window_label, random_str);
-
-        ns_win.setDelegate_(delegate!(&delegate_name, {
-            window: id = ns_win,
-            app_box: *mut c_void = app_box,
-            toolbar: id = cocoa::base::nil,
-            super_delegate: id = current_delegate,
-            (windowShouldClose:) => on_window_should_close as extern fn(&Object, Sel, id) -> BOOL,
-            (windowWillClose:) => on_window_will_close as extern fn(&Object, Sel, id),
-            (windowDidResize:) => on_window_did_resize::<R> as extern fn(&Object, Sel, id),
-            (windowDidMove:) => on_window_did_move as extern fn(&Object, Sel, id),
-            (windowDidChangeBackingProperties:) => on_window_did_change_backing_properties as extern fn(&Object, Sel, id),
-            (windowDidBecomeKey:) => on_window_did_become_key as extern fn(&Object, Sel, id),
-            (windowDidResignKey:) => on_window_did_resign_key as extern fn(&Object, Sel, id),
-            (draggingEntered:) => on_dragging_entered as extern fn(&Object, Sel, id) -> BOOL,
-            (prepareForDragOperation:) => on_prepare_for_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
-            (performDragOperation:) => on_perform_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
-            (concludeDragOperation:) => on_conclude_drag_operation as extern fn(&Object, Sel, id),
-            (draggingExited:) => on_dragging_exited as extern fn(&Object, Sel, id),
-            (window:willUseFullScreenPresentationOptions:) => on_window_will_use_full_screen_presentation_options as extern fn(&Object, Sel, id, NSUInteger) -> NSUInteger,
-            (windowDidEnterFullScreen:) => on_window_did_enter_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowWillEnterFullScreen:) => on_window_will_enter_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowDidExitFullScreen:) => on_window_did_exit_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowWillExitFullScreen:) => on_window_will_exit_full_screen::<R> as extern fn(&Object, Sel, id),
-            (windowDidFailToEnterFullScreen:) => on_window_did_fail_to_enter_full_screen as extern fn(&Object, Sel, id),
-            (effectiveAppearanceDidChange:) => on_effective_appearance_did_change as extern fn(&Object, Sel, id),
-            (effectiveAppearanceDidChangedOnMainThread:) => on_effective_appearance_did_changed_on_main_thread as extern fn(&Object, Sel, id)
-        }))
-    }
-}

src-tauri/src/updates.rs

@@ -1,10 +1,8 @@
-use std::fmt::{Display, Formatter};
 use std::time::SystemTime;
 
 use log::info;
-use tauri::AppHandle;
-use tauri_plugin_dialog::DialogExt;
-use tauri_plugin_updater::UpdaterExt;
+use tauri::api::dialog;
+use tauri::{updater, AppHandle, Window};
 
 use crate::is_dev;
 
@@ -19,28 +17,6 @@ pub struct YaakUpdater {
 pub enum UpdateMode {
     Stable,
     Beta,
-    Alpha,
-}
-
-impl Display for UpdateMode {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let s = match self {
-            UpdateMode::Stable => "stable",
-            UpdateMode::Beta => "beta",
-            UpdateMode::Alpha => "alpha",
-        };
-        write!(f, "{}", s)
-    }
-}
-
-impl UpdateMode {
-    pub fn new(mode: &str) -> UpdateMode {
-        match mode {
-            "beta" => UpdateMode::Beta,
-            "alpha" => UpdateMode::Alpha,
-            _ => UpdateMode::Stable,
-        }
-    }
 }
 
 impl YaakUpdater {
@@ -53,57 +29,64 @@ impl YaakUpdater {
         &mut self,
         app_handle: &AppHandle,
         mode: UpdateMode,
-    ) -> Result<bool, tauri_plugin_updater::Error> {
+    ) -> Result<bool, updater::Error> {
         self.last_update_check = SystemTime::now();
 
-        info!("Checking for updates mode={}", mode);
+        let update_mode = get_update_mode_str(mode);
+        let enabled = !is_dev();
+        info!(
+            "Checking for updates mode={} enabled={}",
+            update_mode, enabled
+        );
 
-        let update_check_result = app_handle
-            .updater_builder()
-            .header("X-Update-Mode", mode.to_string())?
-            .build()?
+        if !enabled {
+            return Ok(false);
+        }
+
+        match app_handle
+            .updater()
+            .header("X-Update-Mode", update_mode)?
             .check()
-            .await;
-
-        match update_check_result {
-            Ok(Some(update)) => {
+            .await
+        {
+            Ok(update) => {
                 let h = app_handle.clone();
-                app_handle
-                    .dialog()
-                    .message(format!(
+                dialog::ask(
+                    None::<&Window>,
+                    "Update Available",
+                    format!(
                         "{} is available. Would you like to download and install it now?",
-                        update.version
-                    ))
-                    .ok_button_label("Download")
-                    .cancel_button_label("Later")
-                    .title("Update Available")
-                    .show(|confirmed| {
+                        update.latest_version()
+                    ),
+                    |confirmed| {
                         if !confirmed {
                             return;
                         }
                         tauri::async_runtime::spawn(async move {
-                            match update.download_and_install(|_, _| {}, || {}).await {
+                            match update.download_and_install().await {
                                 Ok(_) => {
-                                    if h.dialog()
-                                        .message("Would you like to restart the app?")
-                                        .title("Update Installed")
-                                        .ok_button_label("Restart")
-                                        .cancel_button_label("Later")
-                                        .blocking_show()
-                                    {
+                                    if dialog::blocking::ask(
+                                        None::<&Window>,
+                                        "Update Installed",
+                                        "Would you like to restart the app?",
+                                    ) {
                                         h.restart();
                                     }
                                 }
                                 Err(e) => {
-                                    h.dialog()
-                                        .message(format!("The update failed to install: {}", e));
+                                    dialog::message(
+                                        None::<&Window>,
+                                        "Update Failed",
+                                        format!("The update failed to install: {}", e),
+                                    );
                                 }
                             }
                         });
-                    });
+                    },
+                );
                 Ok(true)
             }
-            Ok(None) => Ok(false),
+            Err(updater::Error::UpToDate) => Ok(false),
             Err(e) => Err(e),
         }
     }
@@ -111,18 +94,27 @@ impl YaakUpdater {
         &mut self,
         app_handle: &AppHandle,
         mode: UpdateMode,
-    ) -> Result<bool, tauri_plugin_updater::Error> {
+    ) -> Result<bool, updater::Error> {
         let ignore_check =
             self.last_update_check.elapsed().unwrap().as_secs() < MAX_UPDATE_CHECK_SECONDS;
         if ignore_check {
             return Ok(false);
         }
 
-        // Don't check if dev
-        if is_dev() {
-            return Ok(false);
-        }
-
         self.force_check(app_handle, mode).await
     }
 }
+
+pub fn update_mode_from_str(mode: &str) -> UpdateMode {
+    match mode {
+        "beta" => UpdateMode::Beta,
+        _ => UpdateMode::Stable,
+    }
+}
+
+fn get_update_mode_str(mode: UpdateMode) -> &'static str {
+    match mode {
+        UpdateMode::Stable => "stable",
+        UpdateMode::Beta => "beta",
+    }
+}

src-tauri/src/window_ext.rs

@@ -0,0 +1,53 @@
+use tauri::{Runtime, Window};
+
+const TRAFFIC_LIGHT_OFFSET_X: f64 = 13.0;
+const TRAFFIC_LIGHT_OFFSET_Y: f64 = 18.0;
+
+pub trait TrafficLightWindowExt {
+    fn position_traffic_lights(&self);
+}
+
+impl<R: Runtime> TrafficLightWindowExt for Window<R> {
+    #[cfg(not(target_os = "macos"))]
+    fn position_traffic_lights(&self) {
+        // No-op on other platforms
+    }
+
+    #[cfg(target_os = "macos")]
+    fn position_traffic_lights(&self) {
+        use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
+        use cocoa::foundation::NSRect;
+
+        let window = self.ns_window().unwrap() as cocoa::base::id;
+
+        let x = TRAFFIC_LIGHT_OFFSET_X;
+        let y = TRAFFIC_LIGHT_OFFSET_Y;
+
+        unsafe {
+            let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton);
+            let miniaturize =
+                window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
+            let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
+
+            let title_bar_container_view = close.superview().superview();
+
+            let close_rect: NSRect = msg_send![close, frame];
+            let button_height = close_rect.size.height;
+
+            let title_bar_frame_height = button_height + y;
+            let mut title_bar_rect = NSView::frame(title_bar_container_view);
+            title_bar_rect.size.height = title_bar_frame_height;
+            title_bar_rect.origin.y = NSView::frame(window).size.height - title_bar_frame_height;
+            let _: () = msg_send![title_bar_container_view, setFrame: title_bar_rect];
+
+            let window_buttons = vec![close, miniaturize, zoom];
+            let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
+
+            for (i, button) in window_buttons.into_iter().enumerate() {
+                let mut rect: NSRect = NSView::frame(button);
+                rect.origin.x = x + (i as f64 * space_between);
+                button.setFrameOrigin(rect.origin);
+            }
+        }
+    }
+}

src-tauri/src/window_menu.rs

@@ -1,148 +1,140 @@
-use tauri::menu::{
-    AboutMetadata, Menu, MenuItemBuilder, PredefinedMenuItem, Submenu, HELP_SUBMENU_ID,
-    WINDOW_SUBMENU_ID,
-};
-pub use tauri::AppHandle;
-use tauri::Wry;
+use tauri::{AboutMetadata, CustomMenuItem, Menu, MenuItem, Submenu};
+use crate::is_dev;
 
-pub fn app_menu(app_handle: &AppHandle) -> tauri::Result<Menu<Wry>> {
-    let pkg_info = app_handle.package_info();
-    let config = app_handle.config();
-    let about_metadata = AboutMetadata {
-        name: Some(pkg_info.name.clone()),
-        version: Some(pkg_info.version.to_string()),
-        copyright: config.bundle.copyright.clone(),
-        authors: config.bundle.publisher.clone().map(|p| vec![p]),
-        ..Default::default()
-    };
+pub fn os_default(#[allow(unused)] app_name: &str) -> Menu {
+    let mut menu = Menu::new();
+    #[cfg(target_os = "macos")]
+    {
+        menu = menu.add_submenu(Submenu::new(
+            app_name,
+            Menu::new()
+                .add_native_item(MenuItem::About(
+                    app_name.to_string(),
+                    AboutMetadata::default(),
+                ))
+                .add_native_item(MenuItem::Separator)
+                .add_item(
+                    CustomMenuItem::new("toggle_settings".to_string(), "Settings")
+                        .accelerator("CmdOrCtrl+,"),
+                )
+                .add_native_item(MenuItem::Separator)
+                .add_native_item(MenuItem::Services)
+                .add_native_item(MenuItem::Separator)
+                .add_native_item(MenuItem::Hide)
+                .add_native_item(MenuItem::HideOthers)
+                .add_native_item(MenuItem::ShowAll)
+                .add_native_item(MenuItem::Separator)
+                .add_native_item(MenuItem::Quit),
+        ));
+    }
 
-    let window_menu = Submenu::with_id_and_items(
-        app_handle,
-        WINDOW_SUBMENU_ID,
-        "Window",
-        true,
-        &[
-            &PredefinedMenuItem::minimize(app_handle, None)?,
-            &PredefinedMenuItem::maximize(app_handle, None)?,
-            #[cfg(target_os = "macos")]
-            &PredefinedMenuItem::separator(app_handle)?,
-            &PredefinedMenuItem::close_window(app_handle, None)?,
-        ],
-    )?;
+    let mut file_menu = Menu::new();
+    file_menu = file_menu.add_native_item(MenuItem::CloseWindow);
+    #[cfg(not(target_os = "macos"))]
+    {
+        file_menu = file_menu.add_native_item(MenuItem::Quit);
+    }
+    menu = menu.add_submenu(Submenu::new("File", file_menu));
 
-    let help_menu = Submenu::with_id_and_items(
-        app_handle,
-        HELP_SUBMENU_ID,
-        "Help",
-        true,
-        &[
-            #[cfg(not(target_os = "macos"))]
-            &PredefinedMenuItem::about(app_handle, None, Some(about_metadata))?,
-            #[cfg(target_os = "macos")]
-            &MenuItemBuilder::with_id("open_feedback".to_string(), "Give Feedback")
-                .build(app_handle)?,
-        ],
-    )?;
+    #[cfg(not(target_os = "linux"))]
+    let mut edit_menu = Menu::new();
+    #[cfg(target_os = "macos")]
+    {
+        edit_menu = edit_menu.add_native_item(MenuItem::Undo);
+        edit_menu = edit_menu.add_native_item(MenuItem::Redo);
+        edit_menu = edit_menu.add_native_item(MenuItem::Separator);
+    }
+    #[cfg(not(target_os = "linux"))]
+    {
+        edit_menu = edit_menu.add_native_item(MenuItem::Cut);
+        edit_menu = edit_menu.add_native_item(MenuItem::Copy);
+        edit_menu = edit_menu.add_native_item(MenuItem::Paste);
+    }
+    #[cfg(target_os = "macos")]
+    {
+        edit_menu = edit_menu.add_native_item(MenuItem::SelectAll);
+    }
+    #[cfg(not(target_os = "linux"))]
+    {
+        menu = menu.add_submenu(Submenu::new("Edit", edit_menu));
+    }
+    let mut view_menu = Menu::new();
+    #[cfg(target_os = "macos")]
+    {
+        view_menu = view_menu
+            .add_native_item(MenuItem::EnterFullScreen)
+            .add_native_item(MenuItem::Separator);
+    }
+    view_menu = view_menu
+        .add_item(
+            CustomMenuItem::new("zoom_reset".to_string(), "Zoom to Actual Size")
+                .accelerator("CmdOrCtrl+0"),
+        )
+        .add_item(
+            CustomMenuItem::new("zoom_in".to_string(), "Zoom In").accelerator("CmdOrCtrl+Plus"),
+        )
+        .add_item(
+            CustomMenuItem::new("zoom_out".to_string(), "Zoom Out").accelerator("CmdOrCtrl+-"),
+        );
+        // .add_native_item(MenuItem::Separator)
+        // .add_item(
+        //     CustomMenuItem::new("toggle_sidebar".to_string(), "Toggle Sidebar")
+        //         .accelerator("CmdOrCtrl+b"),
+        // )
+        // .add_item(
+        //     CustomMenuItem::new("focus_sidebar".to_string(), "Focus Sidebar")
+        //         .accelerator("CmdOrCtrl+1"),
+        // )
+        // .add_item(
+        //     CustomMenuItem::new("toggle_settings".to_string(), "Toggle Settings")
+        //         .accelerator("CmdOrCtrl+,"),
+        // )
+        // .add_item(
+        //     CustomMenuItem::new("focus_url".to_string(), "Focus URL").accelerator("CmdOrCtrl+l"),
+        // );
+    menu = menu.add_submenu(Submenu::new("View", view_menu));
 
-    let menu = Menu::with_items(
-        app_handle,
-        &[
-            #[cfg(target_os = "macos")]
-            &Submenu::with_items(
-                app_handle,
-                pkg_info.name.clone(),
-                true,
-                &[
-                    &PredefinedMenuItem::about(app_handle, None, Some(about_metadata))?,
-                    &PredefinedMenuItem::separator(app_handle)?,
-                    &MenuItemBuilder::with_id("settings".to_string(), "Settings")
-                        .accelerator("CmdOrCtrl+,")
-                        .build(app_handle)?,
-                    &PredefinedMenuItem::separator(app_handle)?,
-                    &PredefinedMenuItem::services(app_handle, None)?,
-                    &PredefinedMenuItem::separator(app_handle)?,
-                    &PredefinedMenuItem::hide(app_handle, None)?,
-                    &PredefinedMenuItem::hide_others(app_handle, None)?,
-                    &PredefinedMenuItem::separator(app_handle)?,
-                    &PredefinedMenuItem::quit(app_handle, None)?,
-                ],
-            )?,
-            #[cfg(not(any(
-                target_os = "linux",
-                target_os = "dragonfly",
-                target_os = "freebsd",
-                target_os = "netbsd",
-                target_os = "openbsd"
-            )))]
-            &Submenu::with_items(
-                app_handle,
-                "File",
-                true,
-                &[
-                    &PredefinedMenuItem::close_window(app_handle, None)?,
-                    #[cfg(not(target_os = "macos"))]
-                    &PredefinedMenuItem::quit(app_handle, None)?,
-                ],
-            )?,
-            &Submenu::with_items(
-                app_handle,
-                "Edit",
-                true,
-                &[
-                    &PredefinedMenuItem::undo(app_handle, None)?,
-                    &PredefinedMenuItem::redo(app_handle, None)?,
-                    &PredefinedMenuItem::separator(app_handle)?,
-                    &PredefinedMenuItem::cut(app_handle, None)?,
-                    &PredefinedMenuItem::copy(app_handle, None)?,
-                    &PredefinedMenuItem::paste(app_handle, None)?,
-                    &PredefinedMenuItem::select_all(app_handle, None)?,
-                ],
-            )?,
-            &Submenu::with_items(
-                app_handle,
-                "View",
-                true,
-                &[
-                    #[cfg(target_os = "macos")]
-                    &PredefinedMenuItem::fullscreen(app_handle, None)?,
-                    #[cfg(target_os = "macos")]
-                    &PredefinedMenuItem::separator(app_handle)?,
-                    &MenuItemBuilder::with_id("zoom_reset".to_string(), "Zoom to Actual Size")
-                        .accelerator("CmdOrCtrl+0")
-                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id("zoom_in".to_string(), "Zoom In")
-                        .accelerator("CmdOrCtrl+=")
-                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id("zoom_out".to_string(), "Zoom Out")
-                        .accelerator("CmdOrCtrl+-")
-                        .build(app_handle)?,
-                ],
-            )?,
-            &window_menu,
-            &help_menu,
-            #[cfg(dev)]
-            &Submenu::with_items(
-                app_handle,
-                "Develop",
-                true,
-                &[
-                    &MenuItemBuilder::with_id("dev.refresh".to_string(), "Refresh")
-                        .accelerator("CmdOrCtrl+Shift+r")
-                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id("dev.toggle_devtools".to_string(), "Open Devtools")
-                        .accelerator("CmdOrCtrl+Option+i")
-                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id("dev.reset_size".to_string(), "Reset Size")
-                        .build(app_handle)?,
-                    &MenuItemBuilder::with_id(
-                        "dev.generate_theme_css".to_string(),
-                        "Generate Theme CSS",
-                    )
-                    .build(app_handle)?,
-                ],
-            )?,
-        ],
-    )?;
+    let mut window_menu = Menu::new();
+    window_menu = window_menu.add_native_item(MenuItem::Minimize);
+    #[cfg(target_os = "macos")]
+    {
+        window_menu = window_menu.add_native_item(MenuItem::Zoom);
+        window_menu = window_menu.add_native_item(MenuItem::Separator);
+    }
+    window_menu = window_menu.add_native_item(MenuItem::CloseWindow);
+    menu = menu.add_submenu(Submenu::new("Window", window_menu));
 
-    Ok(menu)
+    // menu = menu.add_submenu(Submenu::new(
+    //     "Workspace",
+    //     Menu::new()
+    //         .add_item(
+    //             CustomMenuItem::new("send_request".to_string(), "Send Request")
+    //                 .accelerator("CmdOrCtrl+r"),
+    //         )
+    //         .add_item(
+    //             CustomMenuItem::new("new_request".to_string(), "New Request")
+    //                 .accelerator("CmdOrCtrl+n"),
+    //         )
+    //         .add_item(
+    //             CustomMenuItem::new("duplicate_request".to_string(), "Duplicate Request")
+    //                 .accelerator("CmdOrCtrl+d"),
+    //         ),
+    // ));
+
+    if is_dev() {
+        menu = menu.add_submenu(Submenu::new(
+            "Developer",
+            Menu::new()
+                .add_item(
+                    CustomMenuItem::new("refresh".to_string(), "Refresh")
+                        .accelerator("CmdOrCtrl + Shift + r"),
+                )
+                .add_item(
+                    CustomMenuItem::new("toggle_devtools".to_string(), "Open Devtools")
+                        .accelerator("CmdOrCtrl + Option + i"),
+                ),
+        ));
+    }
+
+    menu
 }

src-tauri/tauri-dev.conf.json

@@ -1,13 +1,17 @@
 {
-  "productName": "Daak",
-  "identifier": "app.yaak.desktop.dev",
-  "bundle": {
-    "icon": [
-      "icons/dev/32x32.png",
-      "icons/dev/128x128.png",
-      "icons/dev/128x128@2x.png",
-      "icons/dev/icon.icns",
-      "icons/dev/icon.ico"
-    ]
+  "package": {
+    "productName": "Daak"
+  },
+  "tauri": {
+    "bundle": {
+      "icon": [
+        "icons/dev/32x32.png",
+        "icons/dev/128x128.png",
+        "icons/dev/128x128@2x.png",
+        "icons/dev/icon.icns",
+        "icons/dev/icon.ico"
+      ],
+      "identifier": "app.yaak.desktop.dev"
+    }
   }
 }

src-tauri/tauri.conf.json

@@ -1,81 +1,114 @@
 {
-  "productName": "yaak",
-  "version": "2024.6.0",
-  "identifier": "app.yaak.desktop",
   "build": {
     "beforeBuildCommand": "npm run build",
     "beforeDevCommand": "npm run dev",
-    "devUrl": "http://localhost:1420",
-    "frontendDist": "../dist"
+    "devPath": "http://localhost:1420",
+    "distDir": "../dist",
+    "withGlobalTauri": false
   },
-  "app": {
-    "withGlobalTauri": false,
-    "security": {
-      "assetProtocol": {
-        "enable": true,
-        "scope": {
-          "allow": [
-            "$APPDATA/responses/*"
-          ]
-        }
-      }
-    }
+  "package": {
+    "productName": "Yaak",
+    "version": "2024.3.6"
   },
-  "plugins": {
-    "deep-link": {
-      "mobile": [],
-      "desktop": {
-        "schemes": [
-          "yaak"
+  "tauri": {
+    "windows": [],
+    "allowlist": {
+      "all": false,
+      "os": {
+        "all": true
+      },
+      "protocol": {
+        "assetScope": [
+          "$APPDATA/responses/*"
+        ],
+        "asset": true
+      },
+      "fs": {
+        "readFile": true,
+        "scope": [
+          "$RESOURCE/*",
+          "$APPDATA/responses/*"
+]
+      },
+      "shell": {
+        "all": false,
+        "open": true,
+        "sidecar": true,
+        "scope": [
+          { "name": "protoc", "sidecar": true,
+            "args": true
+          }
         ]
+      },
+      "window": {
+        "close": true,
+        "maximize": true,
+        "minimize": true,
+        "setDecorations": true,
+        "setTitle": true,
+        "startDragging": true,
+        "unmaximize": true
+      },
+      "dialog": {
+        "all": false,
+        "open": true,
+        "save": true
+      },
+      "path": {
+        "all": true
       }
     },
+    "bundle": {
+      "active": true,
+      "category": "DeveloperTool",
+      "copyright": "",
+      "externalBin": [
+        "protoc-vendored/protoc"
+      ],
+      "icon": [
+        "icons/release/32x32.png",
+        "icons/release/128x128.png",
+        "icons/release/128x128@2x.png",
+        "icons/release/icon.icns",
+        "icons/release/icon.ico"
+      ],
+      "identifier": "app.yaak.desktop",
+      "longDescription": "The best cross-platform visual API client",
+      "resources": [
+        "migrations/*",
+        "plugins/*",
+        "protoc-vendored/include/*"
+      ],
+      "shortDescription": "The best API client",
+      "targets": [
+        "deb",
+        "appimage",
+        "nsis",
+        "app",
+        "dmg",
+        "updater"
+      ],
+      "deb": {
+        "depends": []
+      },
+      "macOS": {
+        "exceptionDomain": "",
+        "entitlements": "macos/entitlements.plist",
+        "frameworks": []
+      },
+      "windows": {
+        "digestAlgorithm": "sha256",
+        "timestampUrl": ""
+      }
+    },
+    "security": {},
     "updater": {
+      "active": true,
+      "dialog": false,
       "endpoints": [
         "https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"
       ],
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEMxRDJFREQ1MjExQjdGN0IKUldSN2Z4c2gxZTNTd1FHNCtmYnFXMHVVQzhuNkJOM1cwOFBodmdLall3ckhKenpKUytHSTR1MlkK"
     }
-  },
-  "bundle": {
-    "active": true,
-    "category": "DeveloperTool",
-    "externalBin": [
-      "protoc-vendored/protoc"
-    ],
-    "icon": [
-      "icons/release/32x32.png",
-      "icons/release/128x128.png",
-      "icons/release/128x128@2x.png",
-      "icons/release/icon.icns",
-      "icons/release/icon.ico"
-    ],
-    "longDescription": "A cross-platform desktop app for interacting with REST, GraphQL, and gRPC",
-    "resources": [
-      "migrations/*",
-      "plugins/*",
-      "protoc-vendored/include/*"
-    ],
-    "shortDescription": "Desktop API client",
-    "targets": [
-      "deb",
-      "appimage",
-      "nsis",
-      "app",
-      "dmg",
-      "updater"
-    ],
-    "iOS": {
-      "developmentTeam": "7PU3P6ELJ8"
-    },
-    "macOS": {
-      "exceptionDomain": "",
-      "entitlements": "macos/entitlements.plist",
-      "frameworks": []
-    },
-    "windows": {
-      "digestAlgorithm": "sha256",
-      "timestampUrl": ""
-    }
   }
 }

src-tauri/templates/Cargo.toml

@@ -1,6 +0,0 @@
-[package]
-name = "templates"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]

src-tauri/templates/src/lib.rs

@@ -1,7 +0,0 @@
-pub mod parser;
-pub mod renderer;
-
-pub use parser::*;
-pub use renderer::*;
-
-pub fn template_foo() {}

src-tauri/templates/src/parser.rs

@@ -1,370 +0,0 @@
-#[derive(Clone, PartialEq, Debug)]
-pub enum Val {
-    Str(String),
-    Ident(String),
-}
-
-#[derive(Clone, PartialEq, Debug)]
-pub enum Token {
-    Raw(String),
-    Var { name: String },
-    Fn { name: String, args: Vec<Val> },
-    Eof,
-}
-
-// Template Syntax
-//
-//  ${[ my_var ]}
-//  ${[ my_fn() ]}
-//  ${[ my_fn(my_var) ]}
-//  ${[ my_fn(my_var, "A String") ]}
-
-// default
-#[derive(Default)]
-pub struct Parser {
-    tokens: Vec<Token>,
-    chars: Vec<char>,
-    pos: usize,
-    curr_text: String,
-}
-
-impl Parser {
-    pub fn new(text: &str) -> Parser {
-        Parser {
-            chars: text.chars().collect(),
-            ..Parser::default()
-        }
-    }
-
-    pub fn parse(&mut self) -> Vec<Token> {
-        let start_pos = self.pos;
-
-        while self.pos < self.chars.len() {
-            if self.match_str("${[") {
-                let start_curr = self.pos;
-                if let Some(t) = self.parse_tag() {
-                    self.push_token(t);
-                } else {
-                    self.pos = start_curr;
-                    self.curr_text += "${[";
-                }
-            } else {
-                let ch = self.next_char();
-                self.curr_text.push(ch);
-            }
-
-            if start_pos == self.pos {
-                panic!("Parser stuck!");
-            }
-        }
-
-        self.push_token(Token::Eof);
-        self.tokens.clone()
-    }
-
-    fn parse_tag(&mut self) -> Option<Token> {
-        // Parse up to first identifier
-        //    ${[ my_var...
-        self.skip_whitespace();
-        let name = match self.parse_ident() {
-            None => return None,
-            Some(v) => v,
-        };
-
-        // Parse fn args if they exist
-        //    ${[ my_var(a, b, c)
-        let args = if self.match_str("(") {
-            self.parse_fn_args()
-        } else {
-            None
-        };
-
-        // Parse to closing tag
-        //    ${[ my_var(a, b, c) ]}
-        self.skip_whitespace();
-        if !self.match_str("]}") {
-            return None;
-        }
-
-        Some(match args {
-            Some(a) => Token::Fn { args: a, name },
-            None => Token::Var { name },
-        })
-    }
-
-    #[allow(dead_code)]
-    fn debug_pos(&self, x: &str) {
-        println!(
-            r#"Position: {x} -- [{}] = {} --> "{}"#,
-            self.pos,
-            self.chars[self.pos],
-            self.chars.iter().collect::<String>()
-        );
-    }
-
-    fn parse_fn_args(&mut self) -> Option<Vec<Val>> {
-        let start_pos = self.pos;
-
-        let mut args: Vec<Val> = Vec::new();
-        while self.pos < self.chars.len() {
-            self.skip_whitespace();
-            if let Some(v) = self.parse_ident_or_string() {
-                args.push(v);
-            }
-
-            self.skip_whitespace();
-            if self.match_str(")") {
-                break;
-            }
-
-            self.skip_whitespace();
-
-            // If we don't find a comma, that's bad
-            if !args.is_empty() && !self.match_str(",") {
-                return None;
-            }
-
-            if start_pos == self.pos {
-                panic!("Parser stuck!");
-            }
-        }
-
-        return Some(args);
-    }
-
-    fn parse_ident_or_string(&mut self) -> Option<Val> {
-        if let Some(i) = self.parse_ident() {
-            Some(Val::Ident(i))
-        } else if let Some(s) = self.parse_string() {
-            Some(Val::Str(s))
-        } else {
-            None
-        }
-    }
-
-    fn parse_ident(&mut self) -> Option<String> {
-        let start_pos = self.pos;
-
-        let mut text = String::new();
-        while self.pos < self.chars.len() {
-            let ch = self.peek_char();
-            if ch.is_alphanumeric() || ch == '_' {
-                text.push(ch);
-                self.pos += 1;
-            } else {
-                break;
-            }
-
-            if start_pos == self.pos {
-                panic!("Parser stuck!");
-            }
-        }
-
-        if text.is_empty() {
-            return None;
-        }
-
-        return Some(text);
-    }
-
-    fn parse_string(&mut self) -> Option<String> {
-        let start_pos = self.pos;
-        let mut text = String::new();
-        if !self.match_str("\"") {
-            return None;
-        }
-
-        let mut found_closing = false;
-        while self.pos < self.chars.len() {
-            let ch = self.next_char();
-            match ch {
-                '\\' => {
-                    text.push(self.next_char());
-                }
-                '"' => {
-                    found_closing = true;
-                    break;
-                }
-                _ => {
-                    text.push(ch);
-                }
-            }
-
-            if start_pos == self.pos {
-                panic!("Parser stuck!");
-            }
-        }
-
-        if !found_closing {
-            self.pos = start_pos;
-            return None;
-        }
-
-        return Some(text);
-    }
-
-    fn skip_whitespace(&mut self) {
-        while self.pos < self.chars.len() {
-            if self.peek_char().is_whitespace() {
-                self.pos += 1;
-            } else {
-                break;
-            }
-        }
-    }
-
-    fn next_char(&mut self) -> char {
-        let ch = self.peek_char();
-
-        self.pos += 1;
-        ch
-    }
-
-    fn peek_char(&self) -> char {
-        let ch = self.chars[self.pos];
-        ch
-    }
-
-    fn push_token(&mut self, token: Token) {
-        // Push any text we've accumulated
-        if !self.curr_text.is_empty() {
-            let text_token = Token::Raw(self.curr_text.clone());
-            self.tokens.push(text_token);
-            self.curr_text.clear();
-        }
-
-        self.tokens.push(token);
-    }
-
-    fn match_str(&mut self, value: &str) -> bool {
-        if self.pos + value.len() > self.chars.len() {
-            return false;
-        }
-
-        let cmp = self.chars[self.pos..self.pos + value.len()]
-            .iter()
-            .collect::<String>();
-
-        if cmp == value {
-            // We have a match, so advance the current index
-            self.pos += value.len();
-            true
-        } else {
-            false
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::*;
-
-    #[test]
-    fn var_simple() {
-        let mut p = Parser::new("${[ foo ]}");
-        assert_eq!(
-            p.parse(),
-            vec![Token::Var { name: "foo".into() }, Token::Eof]
-        );
-    }
-
-    #[test]
-    fn var_multiple_names_invalid() {
-        let mut p = Parser::new("${[ foo bar ]}");
-        assert_eq!(
-            p.parse(),
-            vec![Token::Raw("${[ foo bar ]}".into()), Token::Eof]
-        );
-    }
-
-    #[test]
-    fn tag_string() {
-        let mut p = Parser::new(r#"${[ "foo \"bar\" baz" ]}"#);
-        assert_eq!(
-            p.parse(),
-            vec![Token::Raw(r#"${[ "foo \"bar\" baz" ]}"#.into()), Token::Eof]
-        );
-    }
-
-    #[test]
-    fn var_surrounded() {
-        let mut p = Parser::new("Hello ${[ foo ]}!");
-        assert_eq!(
-            p.parse(),
-            vec![
-                Token::Raw("Hello ".to_string()),
-                Token::Var { name: "foo".into() },
-                Token::Raw("!".to_string()),
-                Token::Eof,
-            ]
-        );
-    }
-
-    #[test]
-    fn fn_simple() {
-        let mut p = Parser::new("${[ foo() ]}");
-        assert_eq!(
-            p.parse(),
-            vec![
-                Token::Fn {
-                    name: "foo".into(),
-                    args: Vec::new(),
-                },
-                Token::Eof
-            ]
-        );
-    }
-
-    #[test]
-    fn fn_ident_arg() {
-        let mut p = Parser::new("${[ foo(bar) ]}");
-        assert_eq!(
-            p.parse(),
-            vec![
-                Token::Fn {
-                    name: "foo".into(),
-                    args: vec![Val::Ident("bar".into())],
-                },
-                Token::Eof
-            ]
-        );
-    }
-
-    #[test]
-    fn fn_ident_args() {
-        let mut p = Parser::new("${[ foo(bar,baz, qux ) ]}");
-        assert_eq!(
-            p.parse(),
-            vec![
-                Token::Fn {
-                    name: "foo".into(),
-                    args: vec![
-                        Val::Ident("bar".into()),
-                        Val::Ident("baz".into()),
-                        Val::Ident("qux".into()),
-                    ],
-                },
-                Token::Eof
-            ]
-        );
-    }
-
-    #[test]
-    fn fn_mixed_args() {
-        let mut p = Parser::new(r#"${[ foo(bar,"baz \"hi\"", qux ) ]}"#);
-        assert_eq!(
-            p.parse(),
-            vec![
-                Token::Fn {
-                    name: "foo".into(),
-                    args: vec![
-                        Val::Ident("bar".into()),
-                        Val::Str(r#"baz "hi""#.into()),
-                        Val::Ident("qux".into()),
-                    ],
-                },
-                Token::Eof
-            ]
-        );
-    }
-}

src-tauri/templates/src/renderer.rs

@@ -1,102 +0,0 @@
-use crate::{Parser, Token, Val};
-use std::collections::HashMap;
-
-type TemplateCallback = fn(name: &str, args: Vec<&str>) -> String;
-
-pub fn parse_and_render(
-    template: &str,
-    vars: HashMap<&str, &str>,
-    cb: Option<TemplateCallback>,
-) -> String {
-    let mut p = Parser::new(template);
-    let tokens = p.parse();
-    render(tokens, vars, cb)
-}
-
-pub fn render(
-    tokens: Vec<Token>,
-    vars: HashMap<&str, &str>,
-    cb: Option<TemplateCallback>,
-) -> String {
-    let mut doc_str: Vec<String> = Vec::new();
-
-    for t in tokens {
-        match t {
-            Token::Raw(s) => doc_str.push(s),
-            Token::Var { name } => {
-                if let Some(v) = vars.get(name.as_str()) {
-                    doc_str.push(v.to_string());
-                }
-            }
-            Token::Fn { name, args } => {
-                let empty = &"";
-                let resolved_args = args
-                    .iter()
-                    .map(|a| match a {
-                        Val::Str(s) => s.as_str(),
-                        Val::Ident(i) => vars.get(i.as_str()).unwrap_or(empty),
-                    })
-                    .collect();
-                let val = match cb {
-                    Some(cb) => cb(name.as_str(), resolved_args),
-                    None => "".into(),
-                };
-                doc_str.push(val);
-            }
-            Token::Eof => {}
-        }
-    }
-
-    return doc_str.join("");
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::*;
-    use std::collections::HashMap;
-
-    #[test]
-    fn render_empty() {
-        let template = "";
-        let vars = HashMap::new();
-        let result = "";
-        assert_eq!(parse_and_render(template, vars, None), result.to_string());
-    }
-
-    #[test]
-    fn render_text_only() {
-        let template = "Hello World!";
-        let vars = HashMap::new();
-        let result = "Hello World!";
-        assert_eq!(parse_and_render(template, vars, None), result.to_string());
-    }
-
-    #[test]
-    fn render_simple() {
-        let template = "${[ foo ]}";
-        let vars = HashMap::from([("foo", "bar")]);
-        let result = "bar";
-        assert_eq!(parse_and_render(template, vars, None), result.to_string());
-    }
-
-    #[test]
-    fn render_surrounded() {
-        let template = "hello ${[ word ]} world!";
-        let vars = HashMap::from([("word", "cruel")]);
-        let result = "hello cruel world!";
-        assert_eq!(parse_and_render(template, vars, None), result.to_string());
-    }
-
-    #[test]
-    fn render_valid_fn() {
-        let vars = HashMap::new();
-        let template = r#"${[ say_hello("John", "Kate") ]}"#;
-        let result = r#"say_hello: ["John", "Kate"]"#;
-        let cb: fn(&str, Vec<&str>) -> String =
-            |name: &str, args: Vec<&str>| format!("{name}: {:?}", args);
-        assert_eq!(
-            parse_and_render(template, vars, Some(cb)),
-            result.to_string()
-        );
-    }
-}

src-web/components/App.tsx

@@ -7,6 +7,7 @@ import { HelmetProvider } from 'react-helmet-async';
 import { AppRouter } from './AppRouter';
 
 const queryClient = new QueryClient({
+  logger: undefined,
   defaultOptions: {
     queries: {
       retry: false,

src-web/components/AppRouter.tsx

@@ -3,7 +3,6 @@ import { routePaths, useAppRoutes } from '../hooks/useAppRoutes';
 import { DefaultLayout } from './DefaultLayout';
 import { RedirectToLatestWorkspace } from './RedirectToLatestWorkspace';
 import RouteError from './RouteError';
-import { Settings } from './Settings/Settings';
 import Workspace from './Workspace';
 
 const router = createBrowserRouter([
@@ -37,12 +36,6 @@ const router = createBrowserRouter([
         path: '/workspaces/:workspaceId/environments/:environmentId/requests/:requestId',
         element: <RedirectLegacyEnvironmentURLs />,
       },
-      {
-        path: routePaths.workspaceSettings({
-          workspaceId: ':workspaceId',
-        }),
-        element: <Settings />,
-      },
     ],
   },
 ]);

src-web/components/BasicAuth.tsx

@@ -13,7 +13,7 @@ export function BasicAuth<T extends HttpRequest | GrpcRequest>({ request }: Prop
   const updateGrpcRequest = useUpdateGrpcRequest(request.id);
 
   return (
-    <VStack className="py-2 overflow-y-auto h-full" space={2}>
+    <VStack className="my-2" space={2}>
       <Input
         useTemplating
         autocompleteVariables

src-web/components/BinaryFileEditor.tsx

@@ -1,4 +1,4 @@
-import { open } from '@tauri-apps/plugin-dialog';
+import { open } from '@tauri-apps/api/dialog';
 import mime from 'mime';
 import { useKeyValue } from '../hooks/useKeyValue';
 import type { HttpRequest } from '../lib/models';
@@ -30,14 +30,15 @@ export function BinaryFileEditor({
 
   const handleClick = async () => {
     await ignoreContentType.set(false);
-    const selected = await open({
+    const path = await open({
       title: 'Select File',
       multiple: false,
     });
-    if (selected == null) {
-      return;
+    if (path) {
+      onChange({ filePath: path });
+    } else {
+      onChange({ filePath: undefined });
     }
-    onChange({ filePath: selected.path });
   };
 
   const filePath = typeof body.filePath === 'string' ? body.filePath : undefined;
@@ -45,11 +46,11 @@ export function BinaryFileEditor({
 
   return (
     <VStack space={2}>
-      <HStack space={2}>
-        <Button variant="border" color="secondary" size="sm" onClick={handleClick}>
+      <HStack space={2} alignItems="center">
+        <Button variant="border" color="gray" size="sm" onClick={handleClick}>
           Choose File
         </Button>
-        <div className="text-sm font-mono truncate rtl pr-3 text-fg">
+        <div className="text-xs font-mono truncate rtl pr-3 text-gray-800">
           {/* Special character to insert ltr text in rtl element without making things wonky */}
           &#x200E;
           {filePath ?? 'Select File'}
@@ -57,22 +58,22 @@ export function BinaryFileEditor({
       </HStack>
       {filePath != null && mimeType !== contentType && !ignoreContentType.value && (
         <Banner className="mt-3 !py-5">
-          <div className="mb-4 text-center">
+          <div className="text-sm mb-4 text-center">
             <div>Set Content-Type header</div>
             <InlineCode>{mimeType}</InlineCode> for current request?
           </div>
           <HStack space={1.5} justifyContent="center">
-            <Button size="sm" variant="border" onClick={() => ignoreContentType.set(true)}>
-              Ignore
-            </Button>
             <Button
               variant="solid"
-              color="primary"
-              size="sm"
+              color="gray"
+              size="xs"
               onClick={() => onChangeContentType(mimeType)}
             >
               Set Header
             </Button>
+            <Button size="xs" variant="border" onClick={() => ignoreContentType.set(true)}>
+              Ignore
+            </Button>
           </HStack>
         </Banner>
       )}

src-web/components/CommandPalette.tsx

@@ -1,444 +0,0 @@
-import { invoke } from '@tauri-apps/api/core';
-import classNames from 'classnames';
-import { search } from 'fast-fuzzy';
-import type { KeyboardEvent, ReactNode } from 'react';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useActiveCookieJar } from '../hooks/useActiveCookieJar';
-import { useActiveEnvironment } from '../hooks/useActiveEnvironment';
-import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
-import { useActiveRequestId } from '../hooks/useActiveRequestId';
-import { useActiveWorkspaceId } from '../hooks/useActiveWorkspaceId';
-import { useAppRoutes } from '../hooks/useAppRoutes';
-import { useCreateEnvironment } from '../hooks/useCreateEnvironment';
-import { useCreateGrpcRequest } from '../hooks/useCreateGrpcRequest';
-import { useCreateHttpRequest } from '../hooks/useCreateHttpRequest';
-import { useCreateWorkspace } from '../hooks/useCreateWorkspace';
-import { useDebouncedState } from '../hooks/useDebouncedState';
-import { useEnvironments } from '../hooks/useEnvironments';
-import type { HotkeyAction } from '../hooks/useHotKey';
-import { useHotKey } from '../hooks/useHotKey';
-import { useOpenWorkspace } from '../hooks/useOpenWorkspace';
-import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
-import { useRecentRequests } from '../hooks/useRecentRequests';
-import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
-import { useRequests } from '../hooks/useRequests';
-import { useSidebarHidden } from '../hooks/useSidebarHidden';
-import { useWorkspaces } from '../hooks/useWorkspaces';
-import { fallbackRequestName } from '../lib/fallbackRequestName';
-import { CookieDialog } from './CookieDialog';
-import { Button } from './core/Button';
-import { Heading } from './core/Heading';
-import { HotKey } from './core/HotKey';
-import { HttpMethodTag } from './core/HttpMethodTag';
-import { Icon } from './core/Icon';
-import { PlainInput } from './core/PlainInput';
-import { HStack } from './core/Stacks';
-import { useDialog } from './DialogContext';
-import { EnvironmentEditDialog } from './EnvironmentEditDialog';
-
-interface CommandPaletteGroup {
-  key: string;
-  label: ReactNode;
-  items: CommandPaletteItem[];
-}
-
-type CommandPaletteItem = {
-  key: string;
-  onSelect: () => void;
-  action?: HotkeyAction;
-} & ({ searchText: string; label: ReactNode } | { label: string });
-
-const MAX_PER_GROUP = 8;
-
-export function CommandPalette({ onClose }: { onClose: () => void }) {
-  const [command, setCommand] = useDebouncedState<string>('', 150);
-  const [selectedItemKey, setSelectedItemKey] = useState<string | null>(null);
-  const routes = useAppRoutes();
-  const activeEnvironmentId = useActiveEnvironmentId();
-  const activeRequestId = useActiveRequestId();
-  const active = useActiveWorkspaceId();
-  const workspaces = useWorkspaces();
-  const environments = useEnvironments();
-  const recentEnvironments = useRecentEnvironments();
-  const recentWorkspaces = useRecentWorkspaces();
-  const requests = useRequests();
-  const recentRequests = useRecentRequests();
-  const openWorkspace = useOpenWorkspace();
-  const createWorkspace = useCreateWorkspace();
-  const createHttpRequest = useCreateHttpRequest();
-  const { activeCookieJar } = useActiveCookieJar();
-  const createGrpcRequest = useCreateGrpcRequest();
-  const createEnvironment = useCreateEnvironment();
-  const dialog = useDialog();
-  const workspaceId = useActiveWorkspaceId();
-  const activeEnvironment = useActiveEnvironment();
-  const [, setSidebarHidden] = useSidebarHidden();
-
-  const workspaceCommands = useMemo<CommandPaletteItem[]>(() => {
-    const commands: CommandPaletteItem[] = [
-      {
-        key: 'settings.open',
-        label: 'Open Settings',
-        action: 'settings.show',
-        onSelect: async () => {
-          if (workspaceId == null) return;
-          await invoke('cmd_new_nested_window', {
-            url: routes.paths.workspaceSettings({ workspaceId }),
-            label: 'settings',
-            title: 'Yaak Settings',
-          });
-        },
-      },
-      {
-        key: 'app.create',
-        label: 'Create Workspace',
-        onSelect: createWorkspace.mutate,
-      },
-      {
-        key: 'http_request.create',
-        label: 'Create HTTP Request',
-        onSelect: () => createHttpRequest.mutate({}),
-      },
-      {
-        key: 'cookies.show',
-        label: 'Show Cookies',
-        onSelect: async () => {
-          dialog.show({
-            id: 'cookies',
-            title: 'Manage Cookies',
-            size: 'full',
-            render: () => <CookieDialog cookieJarId={activeCookieJar?.id ?? null} />,
-          });
-        },
-      },
-      {
-        key: 'grpc_request.create',
-        label: 'Create GRPC Request',
-        onSelect: () => createGrpcRequest.mutate({}),
-      },
-      {
-        key: 'environment.edit',
-        label: 'Edit Environment',
-        action: 'environmentEditor.toggle',
-        onSelect: () => {
-          dialog.toggle({
-            id: 'environment-editor',
-            noPadding: true,
-            size: 'lg',
-            className: 'h-[80vh]',
-            render: () => <EnvironmentEditDialog initialEnvironment={activeEnvironment} />,
-          });
-        },
-      },
-      {
-        key: 'environment.create',
-        label: 'Create Environment',
-        onSelect: createEnvironment.mutate,
-      },
-      {
-        key: 'sidebar.toggle',
-        label: 'Toggle Sidebar',
-        action: 'sidebar.focus',
-        onSelect: () => setSidebarHidden((h) => !h),
-      },
-    ];
-    return commands.sort((a, b) =>
-      ('searchText' in a ? a.searchText : a.label).localeCompare(
-        'searchText' in b ? b.searchText : b.label,
-      ),
-    );
-  }, [
-    activeCookieJar,
-    activeEnvironment,
-    createEnvironment.mutate,
-    createGrpcRequest,
-    createHttpRequest,
-    createWorkspace.mutate,
-    dialog,
-    routes.paths,
-    setSidebarHidden,
-    workspaceId,
-  ]);
-
-  const sortedRequests = useMemo(() => {
-    return [...requests].sort((a, b) => {
-      const aRecentIndex = recentRequests.indexOf(a.id);
-      const bRecentIndex = recentRequests.indexOf(b.id);
-
-      if (aRecentIndex >= 0 && bRecentIndex >= 0) {
-        return aRecentIndex - bRecentIndex;
-      } else if (aRecentIndex >= 0 && bRecentIndex === -1) {
-        return -1;
-      } else if (aRecentIndex === -1 && bRecentIndex >= 0) {
-        return 1;
-      } else {
-        return a.createdAt.localeCompare(b.createdAt);
-      }
-    });
-  }, [recentRequests, requests]);
-
-  const sortedEnvironments = useMemo(() => {
-    return [...environments].sort((a, b) => {
-      const aRecentIndex = recentEnvironments.indexOf(a.id);
-      const bRecentIndex = recentEnvironments.indexOf(b.id);
-
-      if (aRecentIndex >= 0 && bRecentIndex >= 0) {
-        return aRecentIndex - bRecentIndex;
-      } else if (aRecentIndex >= 0 && bRecentIndex === -1) {
-        return -1;
-      } else if (aRecentIndex === -1 && bRecentIndex >= 0) {
-        return 1;
-      } else {
-        return a.createdAt.localeCompare(b.createdAt);
-      }
-    });
-  }, [environments, recentEnvironments]);
-
-  const sortedWorkspaces = useMemo(() => {
-    return [...workspaces].sort((a, b) => {
-      const aRecentIndex = recentWorkspaces.indexOf(a.id);
-      const bRecentIndex = recentWorkspaces.indexOf(b.id);
-
-      if (aRecentIndex >= 0 && bRecentIndex >= 0) {
-        return aRecentIndex - bRecentIndex;
-      } else if (aRecentIndex >= 0 && bRecentIndex === -1) {
-        return -1;
-      } else if (aRecentIndex === -1 && bRecentIndex >= 0) {
-        return 1;
-      } else {
-        return a.createdAt.localeCompare(b.createdAt);
-      }
-    });
-  }, [recentWorkspaces, workspaces]);
-
-  const groups = useMemo<CommandPaletteGroup[]>(() => {
-    const actionsGroup: CommandPaletteGroup = {
-      key: 'actions',
-      label: 'Actions',
-      items: workspaceCommands,
-    };
-
-    const requestGroup: CommandPaletteGroup = {
-      key: 'requests',
-      label: 'Requests',
-      items: [],
-    };
-
-    for (const r of sortedRequests) {
-      if (r.id === activeRequestId) {
-        continue;
-      }
-
-      requestGroup.items.push({
-        key: `switch-request-${r.id}`,
-        searchText: fallbackRequestName(r),
-        label: (
-          <HStack space={2}>
-            <HttpMethodTag className="text-fg-subtler" request={r} />
-            <div className="truncate">{fallbackRequestName(r)}</div>
-          </HStack>
-        ),
-        onSelect: () => {
-          return routes.navigate('request', {
-            workspaceId: r.workspaceId,
-            requestId: r.id,
-            environmentId: activeEnvironmentId ?? undefined,
-          });
-        },
-      });
-    }
-
-    const environmentGroup: CommandPaletteGroup = {
-      key: 'environments',
-      label: 'Environments',
-      items: [],
-    };
-
-    for (const e of sortedEnvironments) {
-      if (e.id === activeEnvironment?.id) {
-        continue;
-      }
-      environmentGroup.items.push({
-        key: `switch-environment-${e.id}`,
-        label: e.name,
-        onSelect: () => routes.setEnvironment(e),
-      });
-    }
-
-    const workspaceGroup: CommandPaletteGroup = {
-      key: 'workspaces',
-      label: 'Workspaces',
-      items: [],
-    };
-
-    for (const w of sortedWorkspaces) {
-      if (w.id === active) {
-        continue;
-      }
-      workspaceGroup.items.push({
-        key: `switch-workspace-${w.id}`,
-        label: w.name,
-        onSelect: () => openWorkspace.mutate({ workspace: w, inNewWindow: false }),
-      });
-    }
-
-    return [actionsGroup, requestGroup, environmentGroup, workspaceGroup];
-  }, [
-    workspaceCommands,
-    sortedRequests,
-    activeRequestId,
-    routes,
-    activeEnvironmentId,
-    sortedEnvironments,
-    activeEnvironment?.id,
-    sortedWorkspaces,
-    active,
-    openWorkspace,
-  ]);
-
-  const allItems = useMemo(() => groups.flatMap((g) => g.items), [groups]);
-
-  useEffect(() => {
-    setSelectedItemKey(null);
-  }, [command]);
-
-  const { filteredGroups, filteredAllItems } = useMemo(() => {
-    const result = command
-      ? search(command, allItems, {
-          threshold: 0.5,
-          keySelector: (v) => ('searchText' in v ? v.searchText : v.label),
-        })
-      : allItems;
-
-    const filteredGroups = groups
-      .map((g) => {
-        g.items = result.filter((i) => g.items.includes(i)).slice(0, MAX_PER_GROUP);
-        return g;
-      })
-      .filter((g) => g.items.length > 0);
-
-    const filteredAllItems = filteredGroups.flatMap((g) => g.items);
-    return { filteredAllItems, filteredGroups };
-  }, [allItems, command, groups]);
-
-  const handleSelectAndClose = useCallback(
-    (cb: () => void) => {
-      onClose();
-      cb();
-    },
-    [onClose],
-  );
-
-  const selectedItem = useMemo(() => {
-    let selectedItem = filteredAllItems.find((i) => i.key === selectedItemKey) ?? null;
-    if (selectedItem == null) {
-      selectedItem = filteredAllItems[0] ?? null;
-    }
-    return selectedItem;
-  }, [filteredAllItems, selectedItemKey]);
-
-  const handleKeyDown = useCallback(
-    (e: KeyboardEvent<HTMLInputElement>) => {
-      const index = filteredAllItems.findIndex((v) => v.key === selectedItem?.key);
-
-      if (e.key === 'ArrowDown' || (e.ctrlKey && e.key === 'n')) {
-        const next = filteredAllItems[index + 1] ?? filteredAllItems[0];
-        setSelectedItemKey(next?.key ?? null);
-      } else if (e.key === 'ArrowUp' || (e.ctrlKey && e.key === 'k')) {
-        const prev = filteredAllItems[index - 1] ?? filteredAllItems[filteredAllItems.length - 1];
-        setSelectedItemKey(prev?.key ?? null);
-      } else if (e.key === 'Enter') {
-        const selected = filteredAllItems[index];
-        setSelectedItemKey(selected?.key ?? null);
-        if (selected) {
-          handleSelectAndClose(selected.onSelect);
-        }
-      }
-    },
-    [filteredAllItems, handleSelectAndClose, selectedItem?.key],
-  );
-
-  return (
-    <div className="h-full w-[400px] grid grid-rows-[auto_minmax(0,1fr)] overflow-hidden">
-      <div className="px-2 py-2 w-full">
-        <PlainInput
-          hideLabel
-          leftSlot={
-            <div className="h-md w-10 flex justify-center items-center">
-              <Icon icon="search" className="text-fg-subtle" />
-            </div>
-          }
-          name="command"
-          label="Command"
-          placeholder="Search or type a command"
-          className="font-sans !text-base"
-          defaultValue={command}
-          onChange={setCommand}
-          onKeyDownCapture={handleKeyDown}
-        />
-      </div>
-      <div className="h-full px-1.5 overflow-y-auto pb-1">
-        {filteredGroups.map((g) => (
-          <div key={g.key} className="mb-1.5 w-full">
-            <Heading size={2} className="!text-xs uppercase px-1.5 h-sm flex items-center">
-              {g.label}
-            </Heading>
-            {g.items.map((v) => (
-              <CommandPaletteItem
-                active={v.key === selectedItem?.key}
-                key={v.key}
-                onClick={() => handleSelectAndClose(v.onSelect)}
-                rightSlot={
-                  v.action && <CommandPaletteAction action={v.action} onAction={v.onSelect} />
-                }
-              >
-                {v.label}
-              </CommandPaletteItem>
-            ))}
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}
-
-function CommandPaletteItem({
-  children,
-  active,
-  onClick,
-  rightSlot,
-}: {
-  children: ReactNode;
-  active: boolean;
-  onClick: () => void;
-  rightSlot?: ReactNode;
-}) {
-  return (
-    <Button
-      onClick={onClick}
-      tabIndex={active ? undefined : -1}
-      rightSlot={rightSlot}
-      color="custom"
-      justify="start"
-      className={classNames(
-        'w-full h-sm flex items-center rounded px-1.5',
-        'hover:text-fg',
-        active && 'bg-background-highlight-secondary text-fg',
-        !active && 'text-fg-subtle',
-      )}
-    >
-      <span className="truncate">{children}</span>
-    </Button>
-  );
-}
-
-function CommandPaletteAction({
-  action,
-  onAction,
-}: {
-  action: HotkeyAction;
-  onAction: () => void;
-}) {
-  useHotKey(action, onAction);
-  return <HotKey className="ml-auto" action={action} />;
-}

src-web/components/CookieDialog.tsx

@@ -28,7 +28,7 @@ export const CookieDialog = function ({ cookieJarId }: Props) {
 
   return (
     <div className="pb-2">
-      <table className="w-full text-sm mb-auto min-w-full max-w-full divide-y divide-background-highlight">
+      <table className="w-full text-xs mb-auto min-w-full max-w-full divide-y">
         <thead>
           <tr>
             <th className="py-2 text-left">Domain</th>
@@ -36,13 +36,13 @@ export const CookieDialog = function ({ cookieJarId }: Props) {
             <th className="py-2 pl-4"></th>
           </tr>
         </thead>
-        <tbody className="divide-y divide-background-highlight-secondary">
+        <tbody className="divide-y">
           {cookieJar?.cookies.map((c) => (
             <tr key={c.domain + c.raw_cookie}>
               <td className="py-2 select-text cursor-text font-mono font-semibold max-w-0">
                 {cookieDomain(c)}
               </td>
-              <td className="py-2 pl-4 select-text cursor-text font-mono text-fg-subtle whitespace-nowrap overflow-x-auto max-w-[200px] hide-scrollbars">
+              <td className="py-2 pl-4 select-text cursor-text font-mono text-gray-700 whitespace-nowrap overflow-x-auto max-w-[200px] hide-scrollbars">
                 {c.raw_cookie}
               </td>
               <td className="max-w-0 w-10">
@@ -53,6 +53,11 @@ export const CookieDialog = function ({ cookieJarId }: Props) {
                   title="Delete"
                   className="ml-auto"
                   onClick={async () => {
+                    console.log(
+                      'DELETE COOKIE',
+                      c,
+                      cookieJar.cookies.filter((c2) => c2 !== c).length,
+                    );
                     await updateCookieJar.mutateAsync({
                       ...cookieJar,
                       cookies: cookieJar.cookies.filter((c2) => c2 !== c),

src-web/components/CreateDropdown.tsx

@@ -2,14 +2,16 @@ import { useCreateDropdownItems } from '../hooks/useCreateDropdownItems';
 import type { DropdownProps } from './core/Dropdown';
 import { Dropdown } from './core/Dropdown';
 
-interface Props extends Omit<DropdownProps, 'items'> {
+interface Props {
   hideFolder?: boolean;
+  children: DropdownProps['children'];
+  openOnHotKeyAction?: DropdownProps['openOnHotKeyAction'];
 }
 
-export function CreateDropdown({ hideFolder, children, ...props }: Props) {
+export function CreateDropdown({ hideFolder, children, openOnHotKeyAction }: Props) {
   const items = useCreateDropdownItems({ hideFolder, hideIcons: true });
   return (
-    <Dropdown items={items} {...props}>
+    <Dropdown openOnHotKeyAction={openOnHotKeyAction} items={items}>
       {children}
     </Dropdown>
   );

src-web/components/DefaultLayout.tsx

@@ -1,29 +1,12 @@
 import { Outlet } from 'react-router-dom';
 import { DialogProvider } from './DialogContext';
 import { GlobalHooks } from './GlobalHooks';
-import { ToastProvider } from './ToastContext';
-import classNames from 'classnames';
-import { useOsInfo } from '../hooks/useOsInfo';
-import { motion } from 'framer-motion';
 
 export function DefaultLayout() {
-  const osInfo = useOsInfo();
   return (
     <DialogProvider>
-      <ToastProvider>
-        <motion.div
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-          transition={{ duration: 0.1, delay: 0.1 }}
-          className={classNames(
-            'w-full h-full',
-            osInfo?.osType === 'linux' && 'border border-background-highlight-secondary',
-          )}
-        >
-          <Outlet />
-        </motion.div>
-        <GlobalHooks />
-      </ToastProvider>
+      <Outlet />
+      <GlobalHooks />
     </DialogProvider>
   );
 }

src-web/components/DialogContext.tsx

@@ -6,7 +6,7 @@ import { Dialog } from './core/Dialog';
 type DialogEntry = {
   id: string;
   render: ({ hide }: { hide: () => void }) => React.ReactNode;
-} & Omit<DialogProps, 'onClose' | 'open' | 'children'>;
+} & Pick<DialogProps, 'title' | 'description' | 'hideX' | 'className' | 'size' | 'noPadding'>;
 
 interface State {
   dialogs: DialogEntry[];

src-web/components/DropMarker.tsx

@@ -14,7 +14,7 @@ export const DropMarker = memo(
           'relative w-full h-0 overflow-visible pointer-events-none',
         )}
       >
-        <div className="absolute z-50 left-2 right-2 -bottom-[0.1rem] h-[0.2rem] bg-fg-primary rounded-full" />
+        <div className="absolute z-50 left-2 right-2 -bottom-[0.1rem] h-[0.2rem] bg-blue-500/50 rounded-full" />
       </div>
     );
   },

src-web/components/EmptyStateText.tsx

@@ -1,6 +1,5 @@
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
-import React from 'react';
 
 interface Props {
   children: ReactNode;
@@ -12,8 +11,7 @@ export function EmptyStateText({ children, className }: Props) {
     <div
       className={classNames(
         className,
-        'rounded-lg border border-dashed border-background-highlight',
-        'h-full py-2 text-fg-subtler flex items-center justify-center italic',
+        'rounded-lg border border-dashed border-highlight h-full py-2 text-gray-400 flex items-center justify-center',
       )}
     >
       {children}

src-web/components/EnvironmentActionsDropdown.tsx

@@ -71,8 +71,8 @@ export const EnvironmentActionsDropdown = memo(function EnvironmentActionsDropdo
         size="sm"
         className={classNames(
           className,
-          'text-fg !px-2 truncate',
-          activeEnvironment == null && 'text-fg-subtler italic',
+          'text-gray-800 !px-2 truncate',
+          activeEnvironment == null && 'text-opacity-disabled italic',
         )}
         {...buttonProps}
       >

src-web/components/EnvironmentEditDialog.tsx

@@ -21,7 +21,7 @@ import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
 import { InlineCode } from './core/InlineCode';
 import type { PairEditorProps } from './core/PairEditor';
-import { PairOrBulkEditor } from './core/PairOrBulkEditor';
+import { PairEditor } from './core/PairEditor';
 import { Separator } from './core/Separator';
 import { SplitLayout } from './core/SplitLayout';
 import { HStack, VStack } from './core/Stacks';
@@ -68,7 +68,7 @@ export const EnvironmentEditDialog = function ({ initialEnvironment }: Props) {
                   color="custom"
                   title="Add sub environment"
                   icon="plusCircle"
-                  iconClassName="text-fg-subtler group-hover:text-fg-subtle"
+                  iconClassName="text-gray-500 group-hover:text-gray-700"
                   className="group"
                   onClick={handleCreateEnvironment}
                 />
@@ -97,7 +97,7 @@ export const EnvironmentEditDialog = function ({ initialEnvironment }: Props) {
       secondSlot={() =>
         activeWorkspace != null && (
           <EnvironmentEditor
-            className="pt-2 border-l border-background-highlight-secondary"
+            className="pt-2 border-l border-highlight"
             environment={selectedEnvironment}
             workspace={activeWorkspace}
           />
@@ -175,7 +175,7 @@ const EnvironmentEditor = function ({
         <Heading className="w-full flex items-center gap-1">
           <div>{environment?.name ?? 'Global Variables'}</div>
           <IconButton
-            iconClassName="text-fg-subtler"
+            iconClassName="text-gray-600"
             size="sm"
             icon={valueVisibility.value ? 'eye' : 'eyeClosed'}
             title={valueVisibility.value ? 'Hide Values' : 'Reveal Values'}
@@ -185,20 +185,18 @@ const EnvironmentEditor = function ({
           />
         </Heading>
       </HStack>
-      <div className="h-full pr-2 pb-2">
-        <PairOrBulkEditor
-          preferenceName="environment"
-          nameAutocomplete={nameAutocomplete}
-          nameAutocompleteVariables={false}
-          namePlaceholder="VAR_NAME"
-          nameValidate={validateName}
-          valueType={valueVisibility.value ? 'text' : 'password'}
-          valueAutocompleteVariables={false}
-          forceUpdateKey={environment?.id ?? workspace?.id ?? 'n/a'}
-          pairs={variables}
-          onChange={handleChange}
-        />
-      </div>
+      <PairEditor
+        className="pr-2"
+        nameAutocomplete={nameAutocomplete}
+        nameAutocompleteVariables={false}
+        namePlaceholder="VAR_NAME"
+        nameValidate={validateName}
+        valueType={valueVisibility.value ? 'text' : 'password'}
+        valueAutocompleteVariables={false}
+        forceUpdateKey={environment?.id ?? workspace?.id ?? 'n/a'}
+        pairs={variables}
+        onChange={handleChange}
+      />
     </VStack>
   );
 };
@@ -246,7 +244,7 @@ function SidebarButton({
           size="xs"
           className={classNames(
             'w-full',
-            active ? 'text-fg bg-background-active' : 'text-fg-subtle hover:text-fg',
+            active ? 'text-gray-800 bg-highlightSecondary' : 'text-gray-600 hover:text-gray-700',
           )}
           justify="start"
           onClick={onClick}
@@ -283,7 +281,7 @@ function SidebarButton({
               },
             },
             {
-              key: 'delete-environment',
+              key: 'delete',
               variant: 'danger',
               label: 'Delete',
               leftSlot: <Icon icon="trash" size="sm" />,