Pass workspace id to import

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/release.yml

@@ -1,65 +0,0 @@
-name: Generate Artifacts
-on:
-  push:
-    branches:
-      - release
-      - beta
-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' || '' }}
-      - 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,5 +26,3 @@ dist-ssr
 
 *.sqlite
 *.sqlite-*
-
-.cargo

.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>

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,13 +36,11 @@
     "@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",
@@ -67,14 +62,13 @@
     "react-router-dom": "^6.8.1",
     "react-use": "^17.4.0",
     "slugify": "^1.6.6",
-    "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v2",
+    "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.15",
+    "@tauri-apps/cli": "^1.5.10",
     "@types/node": "^18.7.10",
     "@types/papaparse": "^5.3.7",
     "@types/parse-color": "^1.0.1",
@@ -93,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",
@@ -101,8 +94,8 @@
     "prettier": "^2.8.4",
     "react-devtools": "^4.27.2",
     "tailwindcss": "^3.2.7",
-    "typescript": "^5.4.5",
-    "vite": "^5.0.0",
+    "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(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,175 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { pluginHookExport } from '../src';
-
-describe('exporter-curl', () => {
-  test('Exports GET with params', () => {
-    expect(
-      pluginHookExport({
-        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({
-        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({
-        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({
-        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({
-        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({
-        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({
-        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({
-        url: 'https://yaak.app',
-        authenticationType: 'basic',
-        authentication: {},
-      }),
-    ).toEqual([`curl 'https://yaak.app'`, `--user ':'`].join(` \\\n  `));
-  });
-
-  test('Digest auth', () => {
-    expect(
-      pluginHookExport({
-        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({
-        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({
-        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,13 +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'],
-    },
-    outDir: resolve(__dirname, '../../src-tauri/plugins/exporter-curl'),
-  },
-});

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(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,335 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { HttpRequest, Model, Workspace } from '../../../src-web/lib/models';
-import { pluginHookImport } from '../src';
-
-describe('importer-curl', () => {
-  test('Imports basic GET', () => {
-    expect(pluginHookImport('curl https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Explicit URL', () => {
-    expect(pluginHookImport('curl --url https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Missing URL', () => {
-    expect(pluginHookImport('curl -X POST')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('URL between', () => {
-    expect(pluginHookImport('curl -v https://yaak.app -X POST')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Random flags', () => {
-    expect(pluginHookImport('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('curl --request POST https://yaak.app')).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            url: 'https://yaak.app',
-            method: 'POST',
-          }),
-        ],
-      },
-    });
-  });
-
-  test('Imports -XPOST method', () => {
-    expect(pluginHookImport('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('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('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('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('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(
-        `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('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('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('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('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('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,13 +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'],
-    },
-    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-curl'),
-  },
-});

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,27 @@
+export function isWorkspace(obj) {
+  return isJSObject(obj) && obj._type === 'workspace';
+}
+
+export function isRequestGroup(obj) {
+  return isJSObject(obj) && obj._type === 'request_group';
+}
+
+export function isHttpRequest(obj) {
+  return isJSObject(obj) && obj._type === 'request';
+}
+
+export function isGrpcRequest(obj) {
+  return isJSObject(obj) && obj._type === 'grpc_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/grpcRequest.js

@@ -0,0 +1,37 @@
+import { convertSyntax } from '../helpers/variables.js';
+
+/**
+ * Import an Insomnia GRPC 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 importGrpcRequest(r, workspaceId, sortPriority = 0) {
+  console.log('IMPORTING GRPC REQUEST', r._id, r.name, JSON.stringify(r, null, 2));
+
+  const parts = r.protoMethodName.split('/').filter((p) => p !== '');
+  const service = parts[0] ?? null;
+  const method = parts[1] ?? null;
+
+  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: 'grpc_request',
+    sortPriority,
+    name: r.name,
+    url: convertSyntax(r.url),
+    service,
+    method,
+    message: r.body?.text ?? '',
+    metadata: (r.metadata ?? [])
+      .map(({ name, value, disabled }) => ({
+        enabled: !disabled,
+        name,
+        value,
+      }))
+      .filter(({ name, value }) => name !== '' || value !== ''),
+  };
+}

plugins/importer-insomnia/src/importers/httpRequest.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 importHttpRequest(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,86 @@
+import { importEnvironment } from './importers/environment';
+import { importHttpRequest } from './importers/httpRequest';
+import {
+  isEnvironment,
+  isJSObject,
+  isHttpRequest,
+  isRequestGroup,
+  isWorkspace,
+  isGrpcRequest,
+} from './helpers/types.js';
+import { parseVariables } from './helpers/variables.js';
+import { importFolder } from './importers/folder.js';
+import { importGrpcRequest } from './importers/grpcRequest';
+
+export function pluginHookImport(contents) {
+  let parsed;
+  try {
+    parsed = JSON.parse(contents);
+  } catch (e) {
+    return;
+  }
+
+  if (!isJSObject(parsed)) return;
+  if (!Array.isArray(parsed.resources)) return;
+
+  const resources = {
+    workspaces: [],
+    httpRequests: [],
+    grpcRequests: [],
+    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 (isHttpRequest(child)) {
+          resources.httpRequests.push(
+            importHttpRequest(child, workspaceToImport._id, sortPriority++),
+          );
+        } else if (isGrpcRequest(child)) {
+          console.log('GRPC', JSON.stringify(child, null, 1));
+          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 };
+}

plugins/importer-insomnia/src/index.ts

@@ -1,278 +0,0 @@
-import {
-  Environment,
-  Folder,
-  GrpcRequest,
-  HttpRequest,
-  Workspace,
-} from '../../../src-web/lib/models';
-import { parse as parseYaml } from 'yaml';
-
-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(contents: string) {
-  let parsed: any;
-
-  try {
-    parsed = JSON.parse(contents);
-  } catch (e) {}
-
-  try {
-    parsed = parseYaml(contents);
-  } catch (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,7 +4,7 @@ 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'],
     },

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';
@@ -34,14 +34,13 @@ export function pluginHookImport(contents: string): { resources: ExportResources
 
   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,
-      })) ?? [],
+    variables: root.variable?.map((v: any) => ({
+      name: v.key,
+      value: v.value,
+    })),
   };
   exportResources.workspaces.push(workspace);
 
@@ -50,7 +49,7 @@ export function pluginHookImport(contents: string): { resources: ExportResources
       const folder: ExportResources['folders'][0] = {
         model: 'folder',
         workspaceId: workspace.id,
-        id: generateId('folder'),
+        id: generateId('fl'),
         name: v.name,
         folderId,
       };
@@ -65,7 +64,7 @@ export function pluginHookImport(contents: string): { resources: ExportResources
       const authPatch = requestAuthPath.authenticationType == null ? globalAuth : requestAuthPath;
       const request: ExportResources['httpRequests'][0] = {
         model: 'http_request',
-        id: generateId('http_request'),
+        id: generateId('rq'),
         workspaceId: workspace.id,
         folderId,
         name: v.name,
@@ -180,7 +179,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 ?? '',
               }
@@ -192,20 +190,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: {} };
@@ -244,9 +228,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]}`;
+export 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/index.test.ts

@@ -1,7 +1,6 @@
 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;
@@ -24,67 +23,42 @@ describe('importer-postman', () => {
     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',
+              workspaceId: 'wk_0G3J6M9QcT',
             }),
             expect.objectContaining({
-              folderId: folder0,
-              id: folder1,
-              model: 'folder',
-              workspaceId: existingId('workspace'),
               name: 'Nested Folder',
+              workspaceId: 'wk_0G3J6M9QcT',
             }),
           ]),
           httpRequests: expect.arrayContaining([
             expect.objectContaining({
-              id: newId('http_request'),
-              model: 'http_request',
               name: 'Request 1',
-              workspaceId: existingId('workspace'),
-              folderId: folder1,
+              workspaceId: 'wk_0G3J6M9QcT',
+              folderId: 'fl_vundefinedyundefinedBundefinedE0H3',
             }),
             expect.objectContaining({
-              id: newId('http_request'),
-              model: 'http_request',
               name: 'Request 2',
-              workspaceId: existingId('workspace'),
-              folderId: folder0,
+              workspaceId: 'wk_0G3J6M9QcT',
+              folderId: 'fl_fWiZlundefinedoundefinedrundefined',
             }),
             expect.objectContaining({
-              id: newId('http_request'),
-              model: 'http_request',
               name: 'Request 3',
-              workspaceId: existingId('workspace'),
+              workspaceId: 'wk_0G3J6M9QcT',
               folderId: null,
             }),
           ]),
+          workspaces: [
+            expect.objectContaining({
+              name: 'New Collection',
+            }),
+          ],
         }),
       });
     });
   }
 });
-
-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}`;
-}

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-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/.sqlx/query-ca3485d87b060cd77c4114d2af544adf18f6f15341d9d5db40865e92a80da4e2.json

@@ -1,92 +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            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"
-      }
-    ],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "ca3485d87b060cd77c4114d2af544adf18f6f15341d9d5db40865e92a80da4e2"
-}

src-tauri/.sqlx/query-efd8ba41ea909b18dd520c57c1d464c5ae057b720cbbedcaec1513d43535632c.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            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?) WHERE id = 'default';\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 9
-    },
-    "nullable": []
-  },
-  "hash": "efd8ba41ea909b18dd520c57c1d464c5ae057b720cbbedcaec1513d43535632c"
-}

src-tauri/Cargo.toml

@@ -1,62 +1,74 @@
 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", "rlib"]
-
 [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"
 cocoa = "0.25.0"
 
-[target.'cfg(target_os = "windows")'.dependencies]
-windows = { version = "0.56.0", features = [
-    "Win32_Graphics_Dwm",
-    "Win32_Foundation",
-    "Win32_UI_Controls",
-] }
-
 [target.'cfg(target_os = "linux")'.dependencies]
 openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work
 
 [dependencies]
-base64 = "0.22.0"
-boa_engine = { version = "0.18.0", features = ["annex-b"] }
-boa_runtime = { version = "0.18.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"] }
-http = "0.2.10"
+futures = "0.3.26"
+http = "0.2.8"
 rand = "0.8.5"
-reqwest = { version = "0.11.23", features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json"] }
-serde = { version = "1.0.198", features = ["derive"] }
-serde_json = { version = "1.0.116", features = ["raw_value"] }
-sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
-tauri = { version = "2.0.0-beta.22", features = ["config-toml", "devtools", "protocol-asset"] }
-tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2", features = ["colored"] }
-tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-deep-link = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tokio = { version = "1.36.0", features = ["sync"] }
-uuid = "1.7.0"
-log = "0.4.21"
+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.15"
-regex = "1.10.2"
-hex_color = "3.0.0"
+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.16" }
-tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+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() }
     }
 }
 

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/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-curl/index.mjs

@@ -1,297 +0,0 @@
-var j = "(?:" + [
-  "\\|\\|",
-  "\\&\\&",
-  ";;",
-  "\\|\\&",
-  "\\<\\(",
-  "\\<\\<\\<",
-  ">>",
-  ">\\&",
-  "<\\&",
-  "[&;()|<>]"
-].join("|") + ")", D = new RegExp("^" + j + "$"), q = "|&;()<> \\t", M = '"((\\\\"|[^"])*?)"', Q = "'((\\\\'|[^'])*?)'", V = /^#$/, _ = "'", G = '"', U = "$", $ = "", z = 4294967296;
-for (var L = 0; L < 4; L++)
-  $ += (z * Math.random()).toString(16);
-var J = new RegExp("^" + $);
-function X(n, s) {
-  for (var e = s.lastIndex, t = [], c; c = s.exec(n); )
-    t.push(c), s.lastIndex === c.index && (s.lastIndex += 1);
-  return s.lastIndex = e, t;
-}
-function F(n, s, e) {
-  var t = typeof n == "function" ? n(e) : n[e];
-  return typeof t > "u" && e != "" ? t = "" : typeof t > "u" && (t = "$"), typeof t == "object" ? s + $ + JSON.stringify(t) + $ : s + t;
-}
-function K(n, s, e) {
-  e || (e = {});
-  var t = e.escape || "\\", c = "(\\" + t + `['"` + q + `]|[^\\s'"` + q + "])+", m = new RegExp([
-    "(" + j + ")",
-    // control chars
-    "(" + c + "|" + M + "|" + Q + ")+"
-  ].join("|"), "g"), f = X(n, m);
-  if (f.length === 0)
-    return [];
-  s || (s = {});
-  var w = !1;
-  return f.map(function(r) {
-    var a = r[0];
-    if (!a || w)
-      return;
-    if (D.test(a))
-      return { op: a };
-    var x = !1, C = !1, d = "", O = !1, i;
-    function T() {
-      i += 1;
-      var v, p, R = a.charAt(i);
-      if (R === "{") {
-        if (i += 1, a.charAt(i) === "}")
-          throw new Error("Bad substitution: " + a.slice(i - 2, i + 1));
-        if (v = a.indexOf("}", i), v < 0)
-          throw new Error("Bad substitution: " + a.slice(i));
-        p = a.slice(i, v), i = v;
-      } else if (/[*@#?$!_-]/.test(R))
-        p = R, i += 1;
-      else {
-        var g = a.slice(i);
-        v = g.match(/[^\w\d_]/), v ? (p = g.slice(0, v.index), i += v.index - 1) : (p = g, i = a.length);
-      }
-      return F(s, "", p);
-    }
-    for (i = 0; i < a.length; i++) {
-      var u = a.charAt(i);
-      if (O = O || !x && (u === "*" || u === "?"), C)
-        d += u, C = !1;
-      else if (x)
-        u === x ? x = !1 : x == _ ? d += u : u === t ? (i += 1, u = a.charAt(i), u === G || u === t || u === U ? d += u : d += t + u) : u === U ? d += T() : d += u;
-      else if (u === G || u === _)
-        x = u;
-      else {
-        if (D.test(u))
-          return { op: a };
-        if (V.test(u)) {
-          w = !0;
-          var b = { comment: n.slice(r.index + i + 1) };
-          return d.length ? [d, b] : [b];
-        } else
-          u === t ? C = !0 : u === U ? d += T() : d += u;
-      }
-    }
-    return O ? { op: "glob", pattern: d } : d;
-  }).reduce(function(r, a) {
-    return typeof a > "u" ? r : r.concat(a);
-  }, []);
-}
-var Y = function(s, e, t) {
-  var c = K(s, e, t);
-  return typeof e != "function" ? c : c.reduce(function(m, f) {
-    if (typeof f == "object")
-      return m.concat(f);
-    var w = f.split(RegExp("(" + $ + ".*?" + $ + ")", "g"));
-    return w.length === 1 ? m.concat(w[0]) : m.concat(w.filter(Boolean).map(function(r) {
-      return J.test(r) ? JSON.parse(r.split($)[1]) : r;
-    }));
-  }, []);
-}, Z = Y;
-const ae = "curl", se = "cURL", ie = "cURL command line tool", H = ["d", "data", "data-raw", "data-urlencode", "data-binary", "data-ascii"], ee = [
-  ["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
-  H
-].flatMap((n) => n);
-function oe(n) {
-  if (!n.match(/^\s*curl /))
-    return null;
-  const s = [], e = n.replace(/\ncurl/g, "; curl");
-  let t = [];
-  const m = Z(e).flatMap((r) => typeof r == "string" && r.startsWith("-") && !r.startsWith("--") && r.length > 2 ? [r.slice(0, 2), r.slice(2)] : r);
-  for (const r of m) {
-    if (typeof r == "string") {
-      r.startsWith("$") ? t.push(r.slice(1)) : t.push(r);
-      continue;
-    }
-    if ("comment" in r)
-      continue;
-    const { op: a } = r;
-    if (a === ";") {
-      s.push(t), t = [];
-      continue;
-    }
-    if (a != null && a.startsWith("$")) {
-      const x = a.slice(2, a.length - 1).replace(/\\'/g, "'");
-      t.push(x);
-      continue;
-    }
-    a === "glob" && t.push(r.pattern);
-  }
-  s.push(t);
-  const f = {
-    model: "workspace",
-    id: N("workspace"),
-    name: "Curl Import"
-  };
-  return {
-    resources: {
-      httpRequests: s.filter((r) => r[0] === "curl").map((r) => te(r, f.id)),
-      workspaces: [f]
-    }
-  };
-}
-function te(n, s) {
-  const e = {}, t = [];
-  for (let o = 1; o < n.length; o++) {
-    let l = n[o];
-    if (typeof l == "string" && (l = l.trim()), typeof l == "string" && l.match(/^-{1,2}[\w-]+/)) {
-      const E = l[0] === "-" && l[1] !== "-";
-      let h = l.replace(/^-{1,2}/, "");
-      if (!ee.includes(h))
-        continue;
-      let y;
-      const S = n[o + 1];
-      E && h.length > 1 ? (y = h.slice(1), h = h.slice(0, 1)) : typeof S == "string" && !S.startsWith("-") ? (y = S, o++) : y = !0, e[h] = e[h] || [], e[h].push(y);
-    } else
-      l && t.push(l);
-  }
-  let c, m;
-  const f = A(e, t[0] || "", ["url"]), [w, r] = W(f, "?");
-  c = (r == null ? void 0 : r.split("&").map((o) => {
-    const l = W(o, "=");
-    return { name: l[0] ?? "", value: l[1] ?? "", enabled: !0 };
-  })) ?? [], m = w ?? f;
-  const [a, x] = A(e, "", ["u", "user"]).split(/:(.*)$/), C = A(e, !1, ["digest"]), d = a ? C ? "digest" : "basic" : null, O = a ? {
-    username: a.trim(),
-    password: (x ?? "").trim()
-  } : {}, i = [
-    ...e.header || [],
-    ...e.H || []
-  ].map((o) => {
-    const [l, E] = o.split(/:(.*)$/);
-    return E ? {
-      name: (l ?? "").trim(),
-      value: E.trim(),
-      enabled: !0
-    } : {
-      name: (l ?? "").trim().replace(/;$/, ""),
-      value: "",
-      enabled: !0
-    };
-  }), T = [
-    ...e.cookie || [],
-    ...e.b || []
-  ].map((o) => {
-    const l = o.split("=", 1)[0], E = o.replace(`${l}=`, "");
-    return `${l}=${E}`;
-  }).join("; "), u = i.find((o) => o.name.toLowerCase() === "cookie");
-  T && u ? u.value += `; ${T}` : T && i.push({
-    name: "Cookie",
-    value: T,
-    enabled: !0
-  });
-  const b = ne(e), v = i.find((o) => o.name.toLowerCase() === "content-type"), p = v ? v.value.split(";")[0] : null, R = [
-    ...e.form || [],
-    ...e.F || []
-  ].map((o) => {
-    const l = o.split("="), E = l[0] ?? "", h = l[1] ?? "", y = {
-      name: E,
-      enabled: !0
-    };
-    return h.indexOf("@") === 0 ? y.file = h.slice(1) : y.value = h, y;
-  });
-  let g = {}, I = null;
-  const B = A(e, !1, ["G", "get"]);
-  b.length > 0 && B ? c.push(...b) : b.length > 0 && (p == null || p === "application/x-www-form-urlencoded") ? (I = p ?? "application/x-www-form-urlencoded", g = {
-    form: b.map((o) => ({
-      ...o,
-      name: decodeURIComponent(o.name || ""),
-      value: decodeURIComponent(o.value || "")
-    }))
-  }, i.push({
-    name: "Content-Type",
-    value: "application/x-www-form-urlencoded",
-    enabled: !0
-  })) : b.length > 0 ? (I = p === "application/json" || p === "text/xml" || p === "text/plain" ? p : "other", g = {
-    text: b.map(({ name: o, value: l }) => o && l ? `${o}=${l}` : o || l).join("&")
-  }) : R.length && (I = p ?? "multipart/form-data", g = {
-    form: R
-  }, p == null && i.push({
-    name: "Content-Type",
-    value: "multipart/form-data",
-    enabled: !0
-  }));
-  let P = A(e, "", ["X", "request"]).toUpperCase();
-  return P === "" && g && (P = "text" in g || "form" in g ? "POST" : "GET"), {
-    id: N("http_request"),
-    model: "http_request",
-    workspaceId: s,
-    name: "",
-    urlParameters: c,
-    url: m,
-    method: P,
-    headers: i,
-    authentication: O,
-    authenticationType: d,
-    body: g,
-    bodyType: I,
-    folderId: null,
-    sortPriority: 0
-  };
-}
-const ne = (n) => {
-  let s = [];
-  for (const e of H) {
-    const t = n[e];
-    if (!(!t || t.length === 0))
-      for (const c of t) {
-        if (typeof c != "string")
-          continue;
-        const [m, f] = c.split("=");
-        c.startsWith("@") ? s.push({
-          name: m ?? "",
-          value: "",
-          filePath: c.slice(1),
-          enabled: !0
-        }) : s.push({
-          name: m ?? "",
-          value: e === "data-urlencode" ? encodeURIComponent(f ?? "") : f ?? "",
-          enabled: !0
-        });
-      }
-  }
-  return s;
-}, A = (n, s, e) => {
-  for (const t of e)
-    if (n[t] && n[t].length)
-      return n[t][0];
-  return s;
-};
-function W(n, s) {
-  const e = n.indexOf(s);
-  return e > -1 ? [n.slice(0, e), n.slice(e + 1)] : [n];
-}
-const k = {};
-function N(n) {
-  return k[n] = (k[n] ?? -1) + 1, `GENERATE_ID::${n.toUpperCase()}_${k[n]}`;
-}
-export {
-  ie as description,
-  ae as id,
-  te as importCommand,
-  se as name,
-  oe as pluginHookImport
-};

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

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

src-tauri/src/analytics.rs

@@ -1,25 +1,19 @@
 use std::fmt::Display;
 
-use log::{debug, warn};
+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,10 +24,9 @@ pub enum AnalyticsResource {
     HttpRequest,
     HttpResponse,
     KeyValue,
-    Setting,
     Sidebar,
-    Theme,
     Workspace,
+    Setting,
 }
 
 impl AnalyticsResource {
@@ -98,19 +91,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 +114,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 +125,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,7 +183,7 @@ pub async fn track_event(
 
     // Disable analytics actual sending in dev
     if is_dev() {
-        debug!("track: {}", event);
+        // debug!("track: {} {} {:?}", event, attributes_json, params);
         return;
     }
 
@@ -214,7 +208,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(),
     };
@@ -239,14 +233,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/http.rs

@@ -13,14 +13,14 @@ use log::{error, info, warn};
 use reqwest::redirect::Policy;
 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>,
@@ -35,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);
     }
@@ -89,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;
         }
     };
 
@@ -123,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<_>>()
@@ -300,7 +290,7 @@ 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_path.is_empty() {
                         multipart::Part::text(render::render(
                             value_raw,
                             &workspace,
@@ -321,24 +311,23 @@ 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 content_type = render::render(ct_raw, &workspace, environment_ref);
+                            let filename = PathBuf::from(file_path)
+                                .file_name()
+                                .unwrap_or_default()
+                                .to_str()
+                                .unwrap_or_default()
+                                .to_string();
+                            part.file_name(filename)
+                                .mime_str(content_type.as_str())
+                                .map_err(|e| e.to_string())?
+                        },
+                    );
                 }
             }
             headers.remove("Content-Type"); // reqwest will add this automatically
@@ -412,7 +401,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() {
@@ -477,26 +466,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,13 +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,
 }
 
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -461,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
@@ -474,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> {
@@ -516,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#"
@@ -530,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();
@@ -588,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),
     }
 }
@@ -639,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!(
@@ -678,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),
     }
 }
@@ -728,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!(
@@ -764,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),
     }
 }
@@ -810,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 (
@@ -839,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),
     }
 }
@@ -865,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
@@ -880,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> {
@@ -889,9 +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
+                id, model, created_at, updated_at, theme, appearance, update_channel
             FROM settings
             WHERE id = 'default'
         "#,
@@ -920,46 +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
-            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?) 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.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 (
@@ -979,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),
     }
 }
@@ -1040,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
@@ -1053,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 (
@@ -1085,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#"
@@ -1150,8 +1109,8 @@ 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),
     }
 }
@@ -1206,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
@@ -1225,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,
@@ -1243,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 (
@@ -1272,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
@@ -1292,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
@@ -1307,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 (
@@ -1355,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 (
@@ -1389,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),
     }
 }
@@ -1468,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
@@ -1484,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
@@ -1504,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() {
@@ -1520,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
@@ -1531,36 +1490,35 @@ 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)]
@@ -1583,10 +1541,9 @@ pub struct WorkspaceExportResources {
 }
 
 pub async fn get_workspace_export_resources(
-    window: &WebviewWindow,
+    app_handle: &AppHandle,
     workspace_ids: Vec<&str>,
 ) -> WorkspaceExport {
-    let app_handle = window.app_handle();
     let mut data = WorkspaceExport {
         yaak_version: app_handle.package_info().version.clone().to_string(),
         yaak_schema: 2,
@@ -1602,58 +1559,42 @@ pub async fn get_workspace_export_resources(
 
     for workspace_id in workspace_ids {
         data.resources.workspaces.push(
-            get_workspace(window, workspace_id)
+            get_workspace(app_handle, workspace_id)
                 .await
                 .expect("Failed to get workspace"),
         );
         data.resources.environments.append(
-            &mut list_environments(window, workspace_id)
+            &mut list_environments(app_handle, workspace_id)
                 .await
                 .expect("Failed to get environments"),
         );
         data.resources.folders.append(
-            &mut list_folders(window, workspace_id)
+            &mut list_folders(app_handle, workspace_id)
                 .await
                 .expect("Failed to get folders"),
         );
         data.resources.http_requests.append(
-            &mut list_http_requests(window, workspace_id)
+            &mut list_http_requests(app_handle, workspace_id)
                 .await
                 .expect("Failed to get http requests"),
         );
         data.resources.grpc_requests.append(
-            &mut list_grpc_requests(window, workspace_id)
+            &mut 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 http::Method;
-use log::debug;
-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.rs

@@ -1,18 +1,18 @@
-use std::rc::Rc;
+use std::fs;
 
-use boa_engine::builtins::promise::PromiseState;
 use boa_engine::{
-    js_string, module::SimpleModuleLoader, property::Attribute, Context, JsNativeError, JsValue,
-    Module, Source,
+    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::path::BaseDirectory;
-use tauri::{AppHandle, Manager};
+use tauri::AppHandle;
 
-use crate::models::{HttpRequest, WorkspaceExportResources};
+use crate::models::{WorkspaceExportResources};
 
 #[derive(Default, Debug, Deserialize, Serialize)]
 pub struct FilterResult {
@@ -47,28 +47,14 @@ pub async fn run_plugin_filter(
     Some(resources)
 }
 
-pub fn run_plugin_export_curl(
-    app_handle: &AppHandle,
-    request: &HttpRequest,
-) -> Result<String, String> {
-    let mut context = Context::default();
-    let request_json = serde_json::to_value(request).map_err(|e| e.to_string())?;
-    let result_json = run_plugin(
-        app_handle,
-        "exporter-curl",
-        "pluginHookExport",
-        &[JsValue::from_json(&request_json, &mut context).map_err(|e| e.to_string())?],
-    );
-
-    let resources: String = serde_json::from_value(result_json).map_err(|e| e.to_string())?;
-    Ok(resources)
-}
-
 pub async fn run_plugin_import(
     app_handle: &AppHandle,
     plugin_name: &str,
-    file_contents: &str,
-) -> Result<Option<ImportResult>, String> {
+    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,
@@ -77,11 +63,12 @@ pub async fn run_plugin_import(
     );
 
     if result_json.is_null() {
-        return Ok(None);
+        return None;
     }
 
-    let resources: ImportResult = serde_json::from_value(result_json).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(
@@ -91,8 +78,8 @@ fn run_plugin(
     js_args: &[JsValue],
 ) -> serde_json::Value {
     let plugin_dir = app_handle
-        .path()
-        .resolve("plugins", BaseDirectory::Resource)
+        .path_resolver()
+        .resolve_resource("plugins")
         .expect("failed to resolve plugin directory resource")
         .join(plugin_name);
     let plugin_index_file = plugin_dir.join("index.mjs");
@@ -102,9 +89,12 @@ fn run_plugin(
         plugin_dir, plugin_index_file
     );
 
-    let loader = Rc::new(SimpleModuleLoader::new(plugin_dir).unwrap());
+    // 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(loader.clone())
+        .module_loader(dyn_loader)
         .build()
         .expect("failed to create context");
 
@@ -118,13 +108,15 @@ fn run_plugin(
     // Insert parsed entrypoint into the module loader
     loader.insert(plugin_index_file, module.clone());
 
-    let promise_result = module.load_link_evaluate(context);
+    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() {
+    match promise_result.state().expect("failed to get promise state") {
         PromiseState::Pending => {
             panic!("Promise was pending");
         }

src-tauri/src/render.rs

@@ -1,67 +1,6 @@
+use crate::models::{Environment, Workspace};
 use std::collections::HashMap;
-
-use regex::Regex;
-use sqlx::types::{Json, JsonValue};
-
-use crate::models::{Environment, HttpRequest, HttpRequestHeader, HttpUrlParameter, Workspace};
-
-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 map = HashMap::new();
@@ -85,7 +24,7 @@ pub fn render(template: &str, workspace: &Workspace, environment: Option<&Enviro
 
     Regex::new(r"\$\{\[\s*([^]\s]+)\s*]}")
         .expect("Failed to create regex")
-        .replace_all(template, |caps: &regex::Captures| {
+        .replace_all(template, |caps: &tauri::regex::Captures| {
             let key = caps.get(1).unwrap().as_str();
             map.get(key).unwrap_or(&"")
         })

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/tauri_plugin_windows_window.rs

@@ -1,97 +0,0 @@
-use hex_color::HexColor;
-use tauri::{Manager, Runtime, Window, WindowEvent};
-
-use std::mem::transmute;
-use std::{ffi::c_void, mem::size_of, ptr};
-use tauri::plugin::{Builder, TauriPlugin};
-
-use windows::Win32::UI::Controls::{
-    WTA_NONCLIENT, WTNCA_NODRAWICON, WTNCA_NOMIRRORHELP, WTNCA_NOSYSMENU,
-};
-
-use windows::Win32::Foundation::COLORREF;
-use windows::Win32::Foundation::{BOOL, HWND};
-use windows::Win32::Graphics::Dwm::DwmSetWindowAttribute;
-use windows::Win32::Graphics::Dwm::DWMWA_CAPTION_COLOR;
-use windows::Win32::Graphics::Dwm::DWMWA_USE_IMMERSIVE_DARK_MODE;
-use windows::Win32::UI::Controls::SetWindowThemeAttribute;
-use windows::Win32::UI::Controls::WTNCA_NODRAWCAPTION;
-
-pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    Builder::new("windows_window")
-        .on_window_ready(|window| {
-            #[cfg(target_os = "windows")]
-            setup_win_window(window);
-            return;
-        })
-        .build()
-}
-
-fn hex_color_to_colorref(color: HexColor) -> COLORREF {
-    // TODO: Remove this unsafe, This operation doesn't need to be unsafe!
-    unsafe { COLORREF(transmute::<[u8; 4], u32>([color.r, color.g, color.b, 0])) }
-}
-
-struct WinThemeAttribute {
-    #[allow(dead_code)]
-    flag: u32,
-    #[allow(dead_code)]
-    mask: u32,
-}
-
-#[cfg(target_os = "windows")]
-fn update_bg_color(hwnd: &HWND, bg_color: HexColor) {
-    let use_dark_mode = BOOL::from(true);
-
-    let final_color = hex_color_to_colorref(bg_color);
-
-    unsafe {
-        DwmSetWindowAttribute(
-            HWND(hwnd.0),
-            DWMWA_USE_IMMERSIVE_DARK_MODE,
-            ptr::addr_of!(use_dark_mode) as *const c_void,
-            size_of::<BOOL>().try_into().unwrap(),
-        )
-        .unwrap();
-
-        DwmSetWindowAttribute(
-            HWND(hwnd.0),
-            DWMWA_CAPTION_COLOR,
-            ptr::addr_of!(final_color) as *const c_void,
-            size_of::<COLORREF>().try_into().unwrap(),
-        )
-        .unwrap();
-
-        let flags = WTNCA_NODRAWCAPTION | WTNCA_NODRAWICON;
-        let mask = WTNCA_NODRAWCAPTION | WTNCA_NODRAWICON | WTNCA_NOSYSMENU | WTNCA_NOMIRRORHELP;
-        let options = WinThemeAttribute { flag: flags, mask };
-
-        SetWindowThemeAttribute(
-            HWND(hwnd.0),
-            WTA_NONCLIENT,
-            ptr::addr_of!(options) as *const c_void,
-            size_of::<WinThemeAttribute>().try_into().unwrap(),
-        )
-        .unwrap();
-    }
-}
-
-#[cfg(target_os = "windows")]
-pub fn setup_win_window<R: Runtime>(window: Window<R>) {
-    let win_handle = window.hwnd().unwrap();
-    let win_clone = win_handle.clone();
-
-    let event_id = window.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_bg_color(&HWND(win_clone.0), color);
-    });
-
-    let h = window.app_handle().clone();
-    window.on_window_event(move |e| match e {
-        WindowEvent::Destroyed => {
-            h.unlisten(event_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,145 +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

@@ -2,80 +2,113 @@
   "build": {
     "beforeBuildCommand": "npm run build",
     "beforeDevCommand": "npm run dev",
-    "devUrl": "http://localhost:1420",
-    "frontendDist": "../dist"
+    "devPath": "http://localhost:1420",
+    "distDir": "../dist",
+    "withGlobalTauri": false
   },
-  "productName": "Yaak",
-  "version": "2024.5.0",
-  "identifier": "app.yaak.desktop",
-  "app": {
-    "withGlobalTauri": false,
-    "security": {
-      "assetProtocol": {
-        "enable": true,
-        "scope": {
-          "allow": [
-            "$APPDATA/responses/*"
-          ]
-        }
-      }
-    }
+  "package": {
+    "productName": "Yaak",
+    "version": "2024.3.7"
   },
-  "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-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,6 +1,6 @@
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
-import { useCallback, useMemo, useState } from 'react';
+import { useMemo, useCallback, useState } from 'react';
 import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
 import { useAppRoutes } from '../hooks/useAppRoutes';
 import { getRecentEnvironments } from '../hooks/useRecentEnvironments';
@@ -15,7 +15,6 @@ export function CommandPalette({ onClose }: { onClose: () => void }) {
   const activeEnvironmentId = useActiveEnvironmentId();
   const workspaces = useWorkspaces();
   const requests = useRequests();
-  const [command, setCommand] = useState<string>('');
 
   const items = useMemo<{ label: string; onSelect: () => void; key: string }[]>(() => {
     const items = [];
@@ -48,17 +47,10 @@ export function CommandPalette({ onClose }: { onClose: () => void }) {
     return items;
   }, [activeEnvironmentId, requests, routes, workspaces]);
 
-  const filteredItems = useMemo(() => {
-    return items.filter((v) => v.label.toLowerCase().includes(command.toLowerCase()));
-  }, [command, items]);
-
-  const handleSelectAndClose = useCallback(
-    (cb: () => void) => {
-      onClose();
-      cb();
-    },
-    [onClose],
-  );
+  const handleSelectAndClose = (cb: () => void) => {
+    onClose();
+    cb();
+  };
 
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
@@ -67,13 +59,13 @@ export function CommandPalette({ onClose }: { onClose: () => void }) {
       } else if (e.key === 'ArrowUp') {
         setSelectedIndex((prev) => prev - 1);
       } else if (e.key === 'Enter') {
-        const item = filteredItems[selectedIndex];
+        const item = items[selectedIndex];
         if (item) {
           handleSelectAndClose(item.onSelect);
         }
       }
     },
-    [filteredItems, handleSelectAndClose, selectedIndex],
+    [items, onClose, selectedIndex],
   );
 
   return (
@@ -84,13 +76,11 @@ export function CommandPalette({ onClose }: { onClose: () => void }) {
           name="command"
           label="Command"
           placeholder="Type a command"
-          defaultValue=""
-          onChange={setCommand}
           onKeyDown={handleKeyDown}
         />
       </div>
       <div className="h-full px-1.5 overflow-y-auto">
-        {filteredItems.map((v, i) => (
+        {items.map((v, i) => (
           <CommandPaletteItem
             active={i === selectedIndex}
             key={v.key}
@@ -117,8 +107,8 @@ function CommandPaletteItem({
     <button
       onClick={onClick}
       className={classNames(
-        'w-full h-xs flex items-center rounded px-1.5 text-fg-subtle',
-        active && 'bg-background-highlight-secondary text-fg',
+        'w-full h-xs flex items-center rounded px-1.5 text-gray-600',
+        active && 'bg-highlightSecondary text-gray-800',
       )}
     >
       {children}

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/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

@@ -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'}
@@ -244,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}
@@ -281,7 +281,7 @@ function SidebarButton({
               },
             },
             {
-              key: 'delete-environment',
+              key: 'delete',
               variant: 'danger',
               label: 'Delete',
               leftSlot: <Icon icon="trash" size="sm" />,

src-web/components/ExportDataDialog.tsx

@@ -1,6 +1,6 @@
-import { invoke } from '@tauri-apps/api/core';
-import { save } from '@tauri-apps/plugin-dialog';
-import { useCallback, useMemo, useState } from 'react';
+import { invoke } from '@tauri-apps/api';
+import { save } from '@tauri-apps/api/dialog';
+import { useState } from 'react';
 import slugify from 'slugify';
 import type { Workspace } from '../lib/models';
 import { count } from '../lib/pluralize';
@@ -10,26 +10,16 @@ import { HStack, VStack } from './core/Stacks';
 
 interface Props {
   onHide: () => void;
-  onSuccess: (path: string) => void;
   activeWorkspace: Workspace;
   workspaces: Workspace[];
 }
 
-export function ExportDataDialog({
-  onHide,
-  onSuccess,
-  activeWorkspace,
-  workspaces: allWorkspaces,
-}: Props) {
+export function ExportDataDialog({ onHide, activeWorkspace, workspaces: allWorkspaces }: Props) {
   const [selectedWorkspaces, setSelectedWorkspaces] = useState<Record<string, boolean>>({
     [activeWorkspace.id]: true,
   });
 
-  // Put active workspace first
-  const workspaces = useMemo(
-    () => [activeWorkspace, ...allWorkspaces.filter((w) => w.id !== activeWorkspace.id)],
-    [activeWorkspace, allWorkspaces],
-  );
+  const workspaces = [activeWorkspace, ...allWorkspaces.filter((w) => w.id !== activeWorkspace.id)];
 
   const handleToggleAll = () => {
     setSelectedWorkspaces(
@@ -37,7 +27,7 @@ export function ExportDataDialog({
     );
   };
 
-  const handleExport = useCallback(async () => {
+  const handleExport = async () => {
     const ids = Object.keys(selectedWorkspaces).filter((k) => selectedWorkspaces[k]);
     const workspace = ids.length === 1 ? workspaces.find((w) => w.id === ids[0]) : undefined;
     const slug = workspace ? slugify(workspace.name, { lower: true }) : 'workspaces';
@@ -51,8 +41,7 @@ export function ExportDataDialog({
 
     await invoke('cmd_export_data', { workspaceIds: ids, exportPath });
     onHide();
-    onSuccess(exportPath);
-  }, [onHide, onSuccess, selectedWorkspaces, workspaces]);
+  };
 
   const allSelected = workspaces.every((w) => selectedWorkspaces[w.id]);
   const numSelected = Object.values(selectedWorkspaces).filter(Boolean).length;
@@ -90,7 +79,7 @@ export function ExportDataDialog({
                 />
               </td>
               <td
-                className="py-1 pl-4 text-fg whitespace-nowrap overflow-x-auto hide-scrollbars"
+                className="py-1 pl-4 text-gray-700 whitespace-nowrap overflow-x-auto hide-scrollbars"
                 onClick={() => setSelectedWorkspaces((prev) => ({ ...prev, [w.id]: !prev[w.id] }))}
               >
                 {w.name} {w.id === activeWorkspace.id ? '(current workspace)' : ''}
@@ -100,7 +89,7 @@ export function ExportDataDialog({
         </tbody>
       </table>
       <HStack space={2} justifyContent="end">
-        <Button className="focus" variant="border" onClick={onHide}>
+        <Button className="focus" color="gray" onClick={onHide}>
           Cancel
         </Button>
         <Button
@@ -108,7 +97,7 @@ export function ExportDataDialog({
           className="focus"
           color="primary"
           disabled={noneSelected}
-          onClick={() => handleExport()}
+          onClick={handleExport}
         >
           Export {count('Workspace', numSelected, { omitSingle: true, noneWord: 'Nothing' })}
         </Button>

src-web/components/FormUrlencodedEditor.tsx

@@ -30,8 +30,6 @@ export function FormUrlencodedEditor({ body, forceUpdateKey, onChange }: Props)
     <PairEditor
       valueAutocompleteVariables
       nameAutocompleteVariables
-      namePlaceholder="entry_name"
-      valuePlaceholder="Value"
       pairs={pairs}
       onChange={handleChange}
       forceUpdateKey={forceUpdateKey}

src-web/components/GlobalHooks.tsx

@@ -1,175 +1,138 @@
 import { useQueryClient } from '@tanstack/react-query';
-import { getCurrent } from '@tauri-apps/api/webviewWindow';
+import { appWindow } from '@tauri-apps/api/window';
 import { useEffect } from 'react';
-import { useClipboardText } from '../hooks/useClipboardText';
+import { useLocation } from 'react-router-dom';
 import { useCommandPalette } from '../hooks/useCommandPalette';
 import { cookieJarsQueryKey } from '../hooks/useCookieJars';
-import { environmentsQueryKey } from '../hooks/useEnvironments';
-import { foldersQueryKey } from '../hooks/useFolders';
 import { useGlobalCommands } from '../hooks/useGlobalCommands';
 import { grpcConnectionsQueryKey } from '../hooks/useGrpcConnections';
 import { grpcEventsQueryKey } from '../hooks/useGrpcEvents';
 import { grpcRequestsQueryKey } from '../hooks/useGrpcRequests';
-import { useHotKey } from '../hooks/useHotKey';
 import { httpRequestsQueryKey } from '../hooks/useHttpRequests';
 import { httpResponsesQueryKey } from '../hooks/useHttpResponses';
 import { keyValueQueryKey } from '../hooks/useKeyValue';
 import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
-import { useNotificationToast } from '../hooks/useNotificationToast';
 import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
 import { useRecentRequests } from '../hooks/useRecentRequests';
 import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
-import { settingsQueryKey, useSettings } from '../hooks/useSettings';
-import { useSyncThemeToDocument } from '../hooks/useSyncThemeToDocument';
+import { settingsQueryKey } from '../hooks/useSettings';
+import { useSyncAppearance } from '../hooks/useSyncAppearance';
+import { useSyncWindowTitle } from '../hooks/useSyncWindowTitle';
 import { workspacesQueryKey } from '../hooks/useWorkspaces';
-import { useZoom } from '../hooks/useZoom';
 import type { Model } from '../lib/models';
 import { modelsEq } from '../lib/models';
-import { catppuccinMacchiato } from '../lib/theme/themes/catppuccin';
-import { githubLight } from '../lib/theme/themes/github';
-import { hotdogStandDefault } from '../lib/theme/themes/hotdog-stand';
-import { monokaiProDefault } from '../lib/theme/themes/monokai-pro';
-import { rosePineDefault } from '../lib/theme/themes/rose-pine';
-import { yaakDark } from '../lib/theme/themes/yaak';
-import { getThemeCSS } from '../lib/theme/window';
+import { setPathname } from '../lib/persistPathname';
+
+const DEFAULT_FONT_SIZE = 16;
 
 export function GlobalHooks() {
-  // Include here so they always update, even if no component references them
+  // Include here so they always update, even
+  // if no component references them
   useRecentWorkspaces();
   useRecentEnvironments();
   useRecentRequests();
 
-  // Other useful things
-  useSyncThemeToDocument();
+  useSyncAppearance();
+  useSyncWindowTitle();
   useGlobalCommands();
   useCommandPalette();
-  useNotificationToast();
 
   const queryClient = useQueryClient();
   const { wasUpdatedExternally } = useRequestUpdateKey(null);
 
-  interface ModelPayload {
-    model: Model;
-    windowLabel: string;
-  }
+  // Listen for location changes and update the pathname
+  const location = useLocation();
+  useEffect(() => {
+    setPathname(location.pathname).catch(console.error);
+  }, [location.pathname]);
 
-  useListenToTauriEvent<ModelPayload>('upserted_model', ({ payload }) => {
-    const { model, windowLabel } = payload;
+  useListenToTauriEvent<Model>('upserted_model', ({ payload, windowLabel }) => {
     const queryKey =
-      model.model === 'http_request'
-        ? httpRequestsQueryKey(model)
-        : model.model === 'http_response'
-        ? httpResponsesQueryKey(model)
-        : model.model === 'folder'
-        ? foldersQueryKey(model)
-        : model.model === 'environment'
-        ? environmentsQueryKey(model)
-        : model.model === 'grpc_connection'
-        ? grpcConnectionsQueryKey(model)
-        : model.model === 'grpc_event'
-        ? grpcEventsQueryKey(model)
-        : model.model === 'grpc_request'
-        ? grpcRequestsQueryKey(model)
-        : model.model === 'workspace'
-        ? workspacesQueryKey(model)
-        : model.model === 'key_value'
-        ? keyValueQueryKey(model)
-        : model.model === 'cookie_jar'
-        ? cookieJarsQueryKey(model)
-        : model.model === 'settings'
+      payload.model === 'http_request'
+        ? httpRequestsQueryKey(payload)
+        : payload.model === 'http_response'
+        ? httpResponsesQueryKey(payload)
+        : payload.model === 'grpc_connection'
+        ? grpcConnectionsQueryKey(payload)
+        : payload.model === 'grpc_event'
+        ? grpcEventsQueryKey(payload)
+        : payload.model === 'grpc_request'
+        ? grpcRequestsQueryKey(payload)
+        : payload.model === 'workspace'
+        ? workspacesQueryKey(payload)
+        : payload.model === 'key_value'
+        ? keyValueQueryKey(payload)
+        : payload.model === 'cookie_jar'
+        ? cookieJarsQueryKey(payload)
+        : payload.model === 'settings'
         ? settingsQueryKey()
         : null;
 
     if (queryKey === null) {
-      console.log('Unrecognized updated model:', model);
+      console.log('Unrecognized updated model:', payload);
       return;
     }
 
-    if (model.model === 'http_request' && windowLabel !== getCurrent().label) {
-      wasUpdatedExternally(model.id);
+    if (payload.model === 'http_request' && windowLabel !== appWindow.label) {
+      wasUpdatedExternally(payload.id);
     }
 
     const pushToFront = (['http_response', 'grpc_connection'] as Model['model'][]).includes(
-      model.model,
+      payload.model,
     );
 
-    if (shouldIgnoreModel(model)) return;
+    if (shouldIgnoreModel(payload)) return;
 
     queryClient.setQueryData<Model[]>(queryKey, (values = []) => {
-      const index = values.findIndex((v) => modelsEq(v, model)) ?? -1;
+      const index = values.findIndex((v) => modelsEq(v, payload)) ?? -1;
       if (index >= 0) {
-        return [...values.slice(0, index), model, ...values.slice(index + 1)];
+        // console.log('UPDATED', payload);
+        return [...values.slice(0, index), payload, ...values.slice(index + 1)];
       } else {
-        return pushToFront ? [model, ...(values ?? [])] : [...(values ?? []), model];
+        // console.log('CREATED', payload);
+        return pushToFront ? [payload, ...(values ?? [])] : [...(values ?? []), payload];
       }
     });
   });
 
-  useListenToTauriEvent<ModelPayload>('deleted_model', ({ payload }) => {
-    const { model } = payload;
-    if (shouldIgnoreModel(model)) return;
+  useListenToTauriEvent<Model>('deleted_model', ({ payload }) => {
+    if (shouldIgnoreModel(payload)) return;
 
-    if (model.model === 'workspace') {
-      queryClient.setQueryData(workspacesQueryKey(), removeById(model));
-    } else if (model.model === 'http_request') {
-      queryClient.setQueryData(httpRequestsQueryKey(model), removeById(model));
-    } else if (model.model === 'http_response') {
-      queryClient.setQueryData(httpResponsesQueryKey(model), removeById(model));
-    } else if (model.model === 'folder') {
-      queryClient.setQueryData(foldersQueryKey(model), removeById(model));
-    } else if (model.model === 'environment') {
-      queryClient.setQueryData(environmentsQueryKey(model), removeById(model));
-    } else if (model.model === 'grpc_request') {
-      queryClient.setQueryData(grpcRequestsQueryKey(model), removeById(model));
-    } else if (model.model === 'grpc_connection') {
-      queryClient.setQueryData(grpcConnectionsQueryKey(model), removeById(model));
-    } else if (model.model === 'grpc_event') {
-      queryClient.setQueryData(grpcEventsQueryKey(model), removeById(model));
-    } else if (model.model === 'key_value') {
-      queryClient.setQueryData(keyValueQueryKey(model), undefined);
-    } else if (model.model === 'cookie_jar') {
-      queryClient.setQueryData(cookieJarsQueryKey(model), undefined);
-    } else if (model.model === 'settings') {
+    if (payload.model === 'workspace') {
+      queryClient.setQueryData(workspacesQueryKey(), removeById(payload));
+    } else if (payload.model === 'http_request') {
+      queryClient.setQueryData(httpRequestsQueryKey(payload), removeById(payload));
+    } else if (payload.model === 'http_response') {
+      queryClient.setQueryData(httpResponsesQueryKey(payload), removeById(payload));
+    } else if (payload.model === 'grpc_request') {
+      queryClient.setQueryData(grpcRequestsQueryKey(payload), removeById(payload));
+    } else if (payload.model === 'grpc_connection') {
+      queryClient.setQueryData(grpcConnectionsQueryKey(payload), removeById(payload));
+    } else if (payload.model === 'grpc_event') {
+      queryClient.setQueryData(grpcEventsQueryKey(payload), removeById(payload));
+    } else if (payload.model === 'key_value') {
+      queryClient.setQueryData(keyValueQueryKey(payload), undefined);
+    } else if (payload.model === 'cookie_jar') {
+      queryClient.setQueryData(cookieJarsQueryKey(payload), undefined);
+    } else if (payload.model === 'settings') {
       queryClient.setQueryData(settingsQueryKey(), undefined);
     }
   });
+  useListenToTauriEvent<number>('zoom', ({ payload: zoomDelta, windowLabel }) => {
+    if (windowLabel !== appWindow.label) return;
+    const fontSize = parseFloat(window.getComputedStyle(document.documentElement).fontSize);
 
-  const settings = useSettings();
-  useEffect(() => {
-    if (settings == null) {
-      return;
+    let newFontSize;
+    if (zoomDelta === 0) {
+      newFontSize = DEFAULT_FONT_SIZE;
+    } else if (zoomDelta > 0) {
+      newFontSize = Math.min(fontSize * 1.1, DEFAULT_FONT_SIZE * 5);
+    } else if (zoomDelta < 0) {
+      newFontSize = Math.max(fontSize * 0.9, DEFAULT_FONT_SIZE * 0.4);
     }
 
-    const { interfaceScale, interfaceFontSize, editorFontSize } = settings;
-    getCurrent().setZoom(interfaceScale).catch(console.error);
-    document.documentElement.style.setProperty('font-size', `${interfaceFontSize}px`);
-    document.documentElement.style.setProperty('--editor-font-size', `${editorFontSize}px`);
-  }, [settings]);
-
-  // Handle Zoom. Note, Mac handles it in app menu, so need to also handle keyboard
-  // shortcuts for Windows/Linux
-  const zoom = useZoom();
-  useHotKey('app.zoom_in', () => zoom.zoomIn);
-  useListenToTauriEvent('zoom_in', () => zoom.zoomIn);
-  useHotKey('app.zoom_out', () => zoom.zoomOut);
-  useListenToTauriEvent('zoom_out', () => zoom.zoomOut);
-  useHotKey('app.zoom_reset', () => zoom.zoomReset);
-  useListenToTauriEvent('zoom_reset', () => zoom.zoomReset);
-
-  const [, copy] = useClipboardText();
-  useListenToTauriEvent('generate_theme_css', () => {
-    const themesCss = [
-      yaakDark,
-      monokaiProDefault,
-      rosePineDefault,
-      catppuccinMacchiato,
-      githubLight,
-      hotdogStandDefault,
-    ]
-      .map(getThemeCSS)
-      .join('\n\n');
-    copy(themesCss);
+    document.documentElement.style.fontSize = `${newFontSize}px`;
   });
 
   return null;

src-web/components/GraphQLEditor.tsx

@@ -88,7 +88,7 @@ export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEdi
                   <Button
                     key="introspection"
                     size="xs"
-                    color={error ? 'danger' : 'secondary'}
+                    color={error ? 'danger' : 'gray'}
                     isLoading={isLoading}
                     onClick={() => {
                       dialog.show({
@@ -105,7 +105,7 @@ export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEdi
                                   refetch();
                                 }}
                                 className="ml-auto"
-                                color="primary"
+                                color="secondary"
                                 size="sm"
                               >
                                 Try Again
@@ -124,7 +124,7 @@ export function GraphQLEditor({ defaultValue, onChange, baseRequest, ...extraEdi
         }
         {...extraEditorProps}
       />
-      <div className="grid grid-rows-[auto_minmax(0,1fr)] grid-cols-1 min-h-[5rem]">
+      <div className="grid grid-rows-[auto_minmax(0,1fr)] min-h-[5rem]">
         <Separator variant="primary" className="pb-1">
           Variables
         </Separator>

src-web/components/GrpcConnectionLayout.tsx

@@ -94,14 +94,13 @@ export function GrpcConnectionLayout({ style }: Props) {
         />
       )}
       secondSlot={({ style }) =>
-        !grpc.go.isPending && (
+        !grpc.go.isLoading && (
           <div
             style={style}
             className={classNames(
-              'x-theme-responsePane',
               'max-h-full h-full grid grid-rows-[minmax(0,1fr)] grid-cols-1',
-              'bg-background rounded-md border border-background-highlight',
-              'shadow relative',
+              'bg-gray-50 dark:bg-gray-100 rounded-md border border-highlight',
+              'shadow shadow-gray-100 dark:shadow-gray-0 relative',
             )}
           >
             {grpc.go.error ? (

src-web/components/GrpcConnectionMessagesPane.tsx

@@ -2,17 +2,15 @@ import classNames from 'classnames';
 import { format } from 'date-fns';
 import type { CSSProperties } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
+import { useGrpcConnections } from '../hooks/useGrpcConnections';
 import { useGrpcEvents } from '../hooks/useGrpcEvents';
-import { usePinnedGrpcConnection } from '../hooks/usePinnedGrpcConnection';
-import { useStateWithDeps } from '../hooks/useStateWithDeps';
 import type { GrpcEvent, GrpcRequest } from '../lib/models';
-import { Button } from './core/Button';
 import { Icon } from './core/Icon';
 import { JsonAttributeTree } from './core/JsonAttributeTree';
 import { KeyValueRow, KeyValueRows } from './core/KeyValueRow';
 import { Separator } from './core/Separator';
 import { SplitLayout } from './core/SplitLayout';
-import { HStack, VStack } from './core/Stacks';
+import { HStack } from './core/Stacks';
 import { EmptyStateText } from './EmptyStateText';
 import { RecentConnectionsDropdown } from './RecentConnectionsDropdown';
 
@@ -31,10 +29,8 @@ interface Props {
 
 export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }: Props) {
   const [activeEventId, setActiveEventId] = useState<string | null>(null);
-  const [showLarge, setShowLarge] = useStateWithDeps<boolean>(false, [activeRequest.id]);
-  const [showingLarge, setShowingLarge] = useState<boolean>(false);
-  const { activeConnection, connections, setPinnedConnectionId } =
-    usePinnedGrpcConnection(activeRequest);
+  const connections = useGrpcConnections(activeRequest.id ?? null);
+  const activeConnection = connections[0] ?? null;
   const events = useGrpcEvents(activeConnection?.id ?? null);
 
   const activeEvent = useMemo(
@@ -61,17 +57,19 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
       firstSlot={() =>
         activeConnection && (
           <div className="w-full grid grid-rows-[auto_minmax(0,1fr)] items-center">
-            <HStack className="pl-3 mb-1 font-mono">
-              <HStack space={2}>
+            <HStack className="pl-3 mb-1 font-mono" alignItems="center">
+              <HStack alignItems="center" space={2}>
                 <span>{events.length} messages</span>
                 {activeConnection.elapsed === 0 && (
-                  <Icon icon="refresh" size="sm" spin className="text-fg-subtler" />
+                  <Icon icon="refresh" size="sm" spin className="text-gray-600" />
                 )}
               </HStack>
               <RecentConnectionsDropdown
                 connections={connections}
                 activeConnection={activeConnection}
-                onPinnedConnectionId={setPinnedConnectionId}
+                onPinned={() => {
+                  // todo
+                }}
               />
             </HStack>
             <div className="overflow-y-auto h-full">
@@ -104,30 +102,7 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
                   <div className="mb-2 select-text cursor-text font-semibold">
                     Message {activeEvent.eventType === 'client_message' ? 'Sent' : 'Received'}
                   </div>
-                  {!showLarge && activeEvent.content.length > 1000 * 1000 ? (
-                    <VStack space={2} className="italic text-fg-subtler">
-                      Message previews larger than 1MB are hidden
-                      <div>
-                        <Button
-                          onClick={() => {
-                            setShowingLarge(true);
-                            setTimeout(() => {
-                              setShowLarge(true);
-                              setShowingLarge(false);
-                            }, 500);
-                          }}
-                          isLoading={showingLarge}
-                          color="secondary"
-                          variant="border"
-                          size="xs"
-                        >
-                          Try Showing
-                        </Button>
-                      </div>
-                    </VStack>
-                  ) : (
-                    <JsonAttributeTree attrValue={JSON.parse(activeEvent?.content ?? '{}')} />
-                  )}
+                  <JsonAttributeTree attrValue={JSON.parse(activeEvent?.content ?? '{}')} />
                 </>
               ) : (
                 <div className="h-full grid grid-rows-[auto_minmax(0,1fr)]">
@@ -136,7 +111,7 @@ export function GrpcConnectionMessagesPane({ style, methodType, activeRequest }:
                       {activeEvent.content}
                     </div>
                     {activeEvent.error && (
-                      <div className="select-text cursor-text text-sm font-mono py-1 text-fg-warning">
+                      <div className="text-xs font-mono py-1 text-orange-700">
                         {activeEvent.error}
                       </div>
                     )}
@@ -181,21 +156,21 @@ function EventRow({
         className={classNames(
           'w-full grid grid-cols-[auto_minmax(0,3fr)_auto] gap-2 items-center text-left',
           'px-1.5 py-1 font-mono cursor-default group focus:outline-none rounded',
-          isActive && '!bg-background-highlight-secondary !text-fg',
-          'text-fg-subtle hover:text-fg',
+          isActive && '!bg-highlight text-gray-900',
+          'text-gray-800 hover:text-gray-900',
         )}
       >
         <Icon
           className={
             eventType === 'server_message'
-              ? 'text-fg-info'
+              ? 'text-blue-600'
               : eventType === 'client_message'
-              ? 'text-fg-primary'
+              ? 'text-violet-600'
               : eventType === 'error' || (status != null && status > 0)
-              ? 'text-fg-danger'
+              ? 'text-orange-600'
               : eventType === 'connection_end'
-              ? 'text-fg-success'
-              : 'text-fg-subtle'
+              ? 'text-green-600'
+              : 'text-gray-700'
           }
           title={
             eventType === 'server_message'
@@ -220,11 +195,15 @@ function EventRow({
               : 'info'
           }
         />
-        <div className={classNames('w-full truncate text-xs')}>
-          {content.slice(0, 1000)}
-          {error && <span className="text-fg-warning"> ({error})</span>}
+        <div className={classNames('w-full truncate text-2xs')}>
+          {content}
+          {error && (
+            <>
+              <span className="text-orange-600"> ({error})</span>
+            </>
+          )}
         </div>
-        <div className={classNames('opacity-50 text-xs')}>
+        <div className={classNames('opacity-50 text-2xs')}>
           {format(createdAt + 'Z', 'HH:mm:ss.SSS')}
         </div>
       </button>

src-web/components/GrpcConnectionSetupPane.tsx

@@ -199,17 +199,17 @@ export function GrpcConnectionSetupPane({
                 label: 'Refresh',
                 type: 'default',
                 key: 'custom',
-                leftSlot: <Icon className="text-fg-subtler" size="sm" icon="refresh" />,
+                leftSlot: <Icon className="text-gray-600" size="sm" icon="refresh" />,
               },
             ]}
           >
             <Button
               size="sm"
               variant="border"
-              rightSlot={<Icon className="text-fg-subtler" size="sm" icon="chevronDown" />}
+              rightSlot={<Icon className="text-gray-600" size="sm" icon="chevronDown" />}
               disabled={isStreaming || services == null}
               className={classNames(
-                'font-mono text-sm min-w-[5rem] !ring-0',
+                'font-mono text-xs min-w-[5rem] !ring-0',
                 paneSize < 400 && 'flex-1',
               )}
             >
@@ -221,14 +221,14 @@ export function GrpcConnectionSetupPane({
               {isStreaming && (
                 <>
                   <IconButton
-                    className="border border-background-highlight-secondary"
+                    className="border border-highlight"
                     size="sm"
                     title="Cancel"
                     onClick={onCancel}
                     icon="x"
                   />
                   <IconButton
-                    className="border border-background-highlight-secondary"
+                    className="border border-highlight"
                     size="sm"
                     title="Commit"
                     onClick={onCommit}
@@ -237,7 +237,7 @@ export function GrpcConnectionSetupPane({
                 </>
               )}
               <IconButton
-                className="border border-background-highlight-secondary"
+                className="border border-highlight"
                 size="sm"
                 title={isStreaming ? 'Connect' : 'Send'}
                 hotkeyAction="grpc_request.send"
@@ -247,7 +247,7 @@ export function GrpcConnectionSetupPane({
             </>
           ) : (
             <IconButton
-              className="border border-background-highlight-secondary"
+              className="border border-highlight"
               size="sm"
               title={methodType === 'unary' ? 'Send' : 'Connect'}
               hotkeyAction="grpc_request.send"
@@ -275,6 +275,7 @@ export function GrpcConnectionSetupPane({
           <GrpcEditor
             onChange={handleChangeMessage}
             services={services}
+            className="bg-gray-50"
             reflectionError={reflectionError}
             reflectionLoading={reflectionLoading}
             request={activeRequest}

src-web/components/GrpcEditor.tsx

@@ -133,12 +133,12 @@ export function GrpcEditor({
           size="xs"
           color={
             reflectionLoading
-              ? 'secondary'
+              ? 'gray'
               : reflectionUnavailable
-              ? 'info'
+              ? 'secondary'
               : reflectionError
               ? 'danger'
-              : 'secondary'
+              : 'gray'
           }
           isLoading={reflectionLoading}
           onClick={() => {

src-web/components/GrpcProtoSelection.tsx

@@ -1,4 +1,4 @@
-import { open } from '@tauri-apps/plugin-dialog';
+import { open } from '@tauri-apps/api/dialog';
 import { useGrpc } from '../hooks/useGrpc';
 import { useGrpcProtoFiles } from '../hooks/useGrpcProtoFiles';
 import { useGrpcRequest } from '../hooks/useGrpcRequest';
@@ -40,16 +40,15 @@ export function GrpcProtoSelection({ requestId }: Props) {
       <HStack space={2} justifyContent="start" className="flex-row-reverse">
         <Button
           color="primary"
+          size="sm"
           onClick={async () => {
-            const selected = await open({
+            const files = await open({
               title: 'Select Proto Files',
               multiple: true,
               filters: [{ name: 'Proto Files', extensions: ['proto'] }],
             });
-            if (selected == null) {
-              return;
-            }
-            const newFiles = selected.map((f) => f.path).filter((p) => !protoFiles.includes(p));
+            if (files == null || typeof files === 'string') return;
+            const newFiles = files.filter((f) => !protoFiles.includes(f));
             await protoFilesKv.set([...protoFiles, ...newFiles]);
             await grpc.reflect.refetch();
           }}
@@ -59,7 +58,8 @@ export function GrpcProtoSelection({ requestId }: Props) {
         <Button
           isLoading={grpc.reflect.isFetching}
           disabled={grpc.reflect.isFetching}
-          color="secondary"
+          color="gray"
+          size="sm"
           onClick={() => grpc.reflect.refetch()}
         >
           Refresh Schema
@@ -69,7 +69,7 @@ export function GrpcProtoSelection({ requestId }: Props) {
         {!serverReflection && services != null && services.length > 0 && (
           <Banner className="flex flex-col gap-2">
             <p>
-              Found services{' '}
+              Found services
               {services?.slice(0, 5).map((s, i) => {
                 return (
                   <span key={i}>
@@ -101,26 +101,28 @@ export function GrpcProtoSelection({ requestId }: Props) {
         )}
 
         {protoFiles.length > 0 && (
-          <table className="w-full divide-y divide-background-highlight">
+          <table className="w-full divide-y">
             <thead>
               <tr>
-                <th className="text-fg-subtler">
-                  <span className="font-mono">*.proto</span> Files
+                <th className="text-gray-600">
+                  <span className="font-mono text-sm">*.proto</span> Files
                 </th>
                 <th></th>
               </tr>
             </thead>
-            <tbody className="divide-y divide-background-highlight">
+            <tbody className="divide-y">
               {protoFiles.map((f, i) => (
                 <tr key={f + i} className="group">
-                  <td className="pl-1 font-mono">{f.split('/').pop()}</td>
+                  <td className="pl-1 text-sm font-mono">{f.split('/').pop()}</td>
                   <td className="w-0 py-0.5">
                     <IconButton
                       title="Remove file"
+                      size="sm"
                       icon="trash"
-                      className="ml-auto opacity-50 transition-opacity group-hover:opacity-100"
+                      className="ml-auto opacity-30 transition-opacity group-hover:opacity-100"
                       onClick={async () => {
                         await protoFilesKv.set(protoFiles.filter((p) => p !== f));
+                        grpc.reflect.remove();
                       }}
                     />
                   </td>

src-web/components/HeaderSize.tsx

@@ -1,38 +0,0 @@
-import classNames from 'classnames';
-import type { HTMLAttributes, ReactNode } from 'react';
-import { useIsFullscreen } from '../hooks/useIsFullscreen';
-import { useOsInfo } from '../hooks/useOsInfo';
-
-interface HeaderSizeProps extends HTMLAttributes<HTMLDivElement> {
-  children?: ReactNode;
-  size: 'md' | 'lg';
-  ignoreStoplights?: boolean;
-}
-
-export function HeaderSize({
-  className,
-  style,
-  size,
-  ignoreStoplights,
-  ...props
-}: HeaderSizeProps) {
-  const platform = useOsInfo();
-  const fullscreen = useIsFullscreen();
-  const stoplightsVisible = platform?.osType === 'macos' && !fullscreen && !ignoreStoplights;
-  return (
-    <div
-      data-tauri-drag-region
-      style={style}
-      className={classNames(
-        className,
-        'pt-[1px] w-full border-b border-background-highlight min-w-0',
-        stoplightsVisible ? 'pl-20 pr-1' : 'pl-1',
-        size === 'md' && 'h-[27px]',
-        size === 'lg' && 'h-[38px]',
-      )}
-    >
-      {/* NOTE: This needs display:grid or else the element shrinks (even though scrollable) */}
-      <div className="h-full w-full overflow-x-auto hide-scrollbars grid" {...props} />
-    </div>
-  );
-}

src-web/components/ImportCurlButton.tsx

@@ -1,43 +0,0 @@
-import { motion } from 'framer-motion';
-import React, { useState } from 'react';
-import { useClipboardText } from '../hooks/useClipboardText';
-import { useImportCurl } from '../hooks/useImportCurl';
-import { Button } from './core/Button';
-import { Icon } from './core/Icon';
-
-export function ImportCurlButton() {
-  const [clipboardText] = useClipboardText();
-  const importCurl = useImportCurl({ clearClipboard: true });
-  const [isLoading, setIsLoading] = useState(false);
-
-  if (!clipboardText?.trim().startsWith('curl ')) {
-    return null;
-  }
-
-  return (
-    <motion.div
-      initial={{ opacity: 0, scale: 0 }}
-      animate={{ opacity: 1, scale: 1 }}
-      transition={{ delay: 0.5 }}
-    >
-      <Button
-        size="xs"
-        variant="border"
-        color="primary"
-        leftSlot={<Icon icon="paste" size="sm" />}
-        isLoading={isLoading}
-        onClick={() => {
-          setIsLoading(true);
-          importCurl
-            .mutateAsync({
-              requestId: null, // Create request
-              command: clipboardText,
-            })
-            .finally(() => setIsLoading(false));
-        }}
-      >
-        Import Curl
-      </Button>
-    </motion.div>
-  );
-}

src-web/components/ImportDataDialog.tsx

@@ -1,42 +0,0 @@
-import { VStack } from './core/Stacks';
-import { Button } from './core/Button';
-import React, { useState } from 'react';
-import { Banner } from './core/Banner';
-import { Icon } from './core/Icon';
-
-interface Props {
-  importData: () => Promise<void>;
-}
-
-export function ImportDataDialog({ importData }: Props) {
-  const [isLoading, setIsLoading] = useState<boolean>(false);
-  return (
-    <VStack space={5} className="pb-4">
-      <VStack space={1}>
-        <ul className="list-disc pl-5">
-          <li>Postman Collection v2+</li>
-          <li>Insomnia v4+</li>
-          <li>Curl commands</li>
-        </ul>
-        <Banner className="mt-3 flex items-center gap-2">
-          <Icon icon="magicWand" />
-          Paste any Curl command into URL bar
-        </Banner>
-      </VStack>
-      <Button
-        color="primary"
-        isLoading={isLoading}
-        onClick={async () => {
-          setIsLoading(true);
-          try {
-            await importData();
-          } finally {
-            setIsLoading(false);
-          }
-        }}
-      >
-        {isLoading ? 'Importing' : 'Select File'}
-      </Button>
-    </VStack>
-  );
-}

src-web/components/IsDev.tsx

@@ -1,15 +0,0 @@
-import type { ReactNode } from 'react';
-import { useAppInfo } from '../hooks/useAppInfo';
-
-interface Props {
-  children: ReactNode;
-}
-
-export function IsDev({ children }: Props) {
-  const appInfo = useAppInfo();
-  if (!appInfo?.isDev) {
-    return null;
-  }
-
-  return <>{children}</>;
-}

src-web/components/KeyboardShortcutsDialog.tsx

@@ -1,10 +1,10 @@
 import { hotkeyActions } from '../hooks/useHotKey';
 import { HotKeyList } from './core/HotKeyList';
 
-export function KeyboardShortcutsDialog() {
+export const KeyboardShortcutsDialog = () => {
   return (
     <div className="h-full w-full pb-2">
       <HotKeyList hotkeys={hotkeyActions} />
     </div>
   );
-}
+};

src-web/components/Overlay.tsx

@@ -2,7 +2,6 @@ import classNames from 'classnames';
 import FocusTrap from 'focus-trap-react';
 import { motion } from 'framer-motion';
 import type { ReactNode } from 'react';
-import React from 'react';
 import { Portal } from './Portal';
 
 interface Props {
@@ -44,16 +43,10 @@ export function Overlay({
               onClick={onClose}
               className={classNames(
                 'absolute inset-0',
-                variant === 'default' && 'bg-background-backdrop backdrop-blur-sm',
+                variant === 'default' && 'bg-gray-600/30 dark:bg-black/30 backdrop-blur-sm',
               )}
             />
-            {children}
-
-            {/* Show draggable region at the top */}
-            {/* TODO: Figure out tauri drag region and also make clickable still */}
-            {variant === 'default' && (
-              <div data-tauri-drag-region className="absolute top-0 left-0 h-md right-0" />
-            )}
+            <div className="bg-red-100">{children}</div>
           </motion.div>
         </FocusTrap>
       )}

src-web/components/RecentConnectionsDropdown.tsx

@@ -11,17 +11,12 @@ import { HStack } from './core/Stacks';
 interface Props {
   connections: GrpcConnection[];
   activeConnection: GrpcConnection;
-  onPinnedConnectionId: (id: string) => void;
+  onPinned: (r: GrpcConnection) => void;
 }
 
-export function RecentConnectionsDropdown({
-  activeConnection,
-  connections,
-  onPinnedConnectionId,
-}: Props) {
+export function RecentConnectionsDropdown({ activeConnection, connections, onPinned }: Props) {
   const deleteConnection = useDeleteGrpcConnection(activeConnection?.id ?? null);
   const deleteAllConnections = useDeleteGrpcConnections(activeConnection?.requestId);
-  const latestConnectionId = connections[0]?.id ?? 'n/a';
 
   return (
     <Dropdown
@@ -43,19 +38,19 @@ export function RecentConnectionsDropdown({
         ...connections.slice(0, 20).map((c) => ({
           key: c.id,
           label: (
-            <HStack space={2}>
+            <HStack space={2} alignItems="center">
               {formatDistanceToNowStrict(c.createdAt + 'Z')} ago &bull;{' '}
-              <span className="font-mono text-sm">{c.elapsed}ms</span>
+              <span className="font-mono text-xs">{c.elapsed}ms</span>
             </HStack>
           ),
           leftSlot: activeConnection?.id === c.id ? <Icon icon="check" /> : <Icon icon="empty" />,
-          onSelect: () => onPinnedConnectionId(c.id),
+          onSelect: () => onPinned(c),
         })),
       ]}
     >
       <IconButton
         title="Show connection history"
-        icon={activeConnection?.id === latestConnectionId ? 'chevronDown' : 'pin'}
+        icon="chevronDown"
         className="ml-auto"
         size="sm"
         iconSize="md"

src-web/components/RecentRequestsDropdown.tsx

@@ -41,6 +41,10 @@ export function RecentRequestsDropdown({ className }: Pick<ButtonProps, 'classNa
     dropdownRef.current?.prev?.();
   });
 
+  useHotKey('request_switcher.toggle', () => {
+    dropdownRef.current?.toggle();
+  });
+
   const items = useMemo<DropdownItem[]>(() => {
     if (activeWorkspaceId === null) return [];
 
@@ -83,11 +87,10 @@ export function RecentRequestsDropdown({ className }: Pick<ButtonProps, 'classNa
       <Button
         data-tauri-drag-region
         size="sm"
-        hotkeyAction="request_switcher.toggle"
         className={classNames(
           className,
-          'text-fg truncate pointer-events-auto',
-          activeRequest === null && 'text-fg-subtler italic',
+          'text-gray-800 text-sm truncate pointer-events-auto',
+          activeRequest === null && 'text-opacity-disabled italic',
         )}
       >
         {fallbackRequestName(activeRequest)}

src-web/components/RecentResponsesDropdown.tsx

@@ -1,30 +1,26 @@
-import classNames from 'classnames';
 import { useDeleteHttpResponse } from '../hooks/useDeleteHttpResponse';
 import { useDeleteHttpResponses } from '../hooks/useDeleteHttpResponses';
 import type { HttpResponse } from '../lib/models';
-import { pluralize } from '../lib/pluralize';
 import { Dropdown } from './core/Dropdown';
-import { Icon } from './core/Icon';
-import { IconButton } from './core/IconButton';
+import { pluralize } from '../lib/pluralize';
 import { HStack } from './core/Stacks';
 import { StatusTag } from './core/StatusTag';
+import { Icon } from './core/Icon';
+import { IconButton } from './core/IconButton';
 
 interface Props {
   responses: HttpResponse[];
   activeResponse: HttpResponse;
-  onPinnedResponseId: (id: string) => void;
-  className?: string;
+  onPinnedResponse: (r: HttpResponse) => void;
 }
 
 export const RecentResponsesDropdown = function ResponsePane({
   activeResponse,
   responses,
-  onPinnedResponseId,
-  className,
+  onPinnedResponse,
 }: Props) {
   const deleteResponse = useDeleteHttpResponse(activeResponse?.id ?? null);
   const deleteAllResponses = useDeleteHttpResponses(activeResponse?.requestId);
-  const latestResponseId = responses[0]?.id ?? 'n/a';
 
   return (
     <Dropdown
@@ -43,24 +39,23 @@ export const RecentResponsesDropdown = function ResponsePane({
           disabled: responses.length === 0,
         },
         { type: 'separator', label: 'History' },
-        ...responses.slice(0, 20).map((r: HttpResponse) => ({
+        ...responses.slice(0, 20).map((r) => ({
           key: r.id,
           label: (
-            <HStack space={2}>
-              <StatusTag className="text-sm" response={r} />
-              <span>&rarr;</span>{' '}
-              <span className="font-mono text-sm">{r.elapsed >= 0 ? `${r.elapsed}ms` : 'n/a'}</span>
+            <HStack space={2} alignItems="center">
+              <StatusTag className="text-xs" response={r} />
+              <span>&bull;</span> <span className="font-mono text-xs">{r.elapsed}ms</span>
             </HStack>
           ),
           leftSlot: activeResponse?.id === r.id ? <Icon icon="check" /> : <Icon icon="empty" />,
-          onSelect: () => onPinnedResponseId(r.id),
+          onSelect: () => onPinnedResponse(r),
         })),
       ]}
     >
       <IconButton
         title="Show response history"
-        icon={activeResponse?.id === latestResponseId ? 'chevronDown' : 'pin'}
-        className={classNames(className, 'm-0.5')}
+        icon="chevronDown"
+        className="ml-auto"
         size="sm"
         iconSize="md"
       />

src-web/components/RequestMethodDropdown.tsx

@@ -1,4 +1,3 @@
-import classNames from 'classnames';
 import { memo, useMemo } from 'react';
 import { usePrompt } from '../hooks/usePrompt';
 import { Button } from './core/Button';
@@ -20,7 +19,6 @@ const radioItems: RadioDropdownItem<string>[] = [
   'PATCH',
   'DELETE',
   'OPTIONS',
-  'QUERY',
   'HEAD',
 ].map((m) => ({
   value: m,
@@ -35,6 +33,7 @@ export const RequestMethodDropdown = memo(function RequestMethodDropdown({
   const prompt = usePrompt();
   const extraItems = useMemo<DropdownItem[]>(
     () => [
+      { type: 'separator' },
       {
         key: 'custom',
         label: 'CUSTOM',
@@ -58,7 +57,7 @@ export const RequestMethodDropdown = memo(function RequestMethodDropdown({
 
   return (
     <RadioDropdown value={method} items={radioItems} extraItems={extraItems} onChange={onChange}>
-      <Button size="xs" className={classNames(className, 'text-fg-subtle hover:text-fg')}>
+      <Button size="xs" className={className}>
         {method.toUpperCase()}
       </Button>
     </RadioDropdown>

src-web/components/RequestPane.tsx

@@ -1,14 +1,12 @@
 import classNames from 'classnames';
 import type { CSSProperties } from 'react';
-import React, { memo, useCallback, useMemo, useState } from 'react';
+import { memo, useCallback, useMemo, useState } from 'react';
 import { createGlobalState } from 'react-use';
 import { useCancelHttpResponse } from '../hooks/useCancelHttpResponse';
-import { useContentTypeFromHeaders } from '../hooks/useContentTypeFromHeaders';
-import { useImportCurl } from '../hooks/useImportCurl';
 import { useIsResponseLoading } from '../hooks/useIsResponseLoading';
 import { usePinnedHttpResponse } from '../hooks/usePinnedHttpResponse';
-import { useRequests } from '../hooks/useRequests';
 import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
+import { useContentTypeFromHeaders } from '../hooks/useContentTypeFromHeaders';
 import { useSendRequest } from '../hooks/useSendRequest';
 import { useUpdateHttpRequest } from '../hooks/useUpdateHttpRequest';
 import { tryFormatJson } from '../lib/formatters';
@@ -31,7 +29,6 @@ import { BearerAuth } from './BearerAuth';
 import { BinaryFileEditor } from './BinaryFileEditor';
 import { CountBadge } from './core/CountBadge';
 import { Editor } from './core/Editor';
-import type { GenericCompletionOption } from './core/Editor/genericCompletion';
 import type { TabItem } from './core/Tabs/Tabs';
 import { TabContent, Tabs } from './core/Tabs/Tabs';
 import { EmptyStateText } from './EmptyStateText';
@@ -57,7 +54,6 @@ export const RequestPane = memo(function RequestPane({
   className,
   activeRequest,
 }: Props) {
-  const requests = useRequests();
   const activeRequestId = activeRequest.id;
   const updateRequest = useUpdateHttpRequest(activeRequestId);
   const [activeTab, setActiveTab] = useActiveTab();
@@ -109,14 +105,11 @@ export const RequestPane = memo(function RequestPane({
             if (bodyType === BODY_TYPE_NONE) {
               newContentType = null;
             } else if (
-              activeRequest.method.toLowerCase() !== 'put' &&
-              activeRequest.method.toLowerCase() !== 'patch' &&
-              activeRequest.method.toLowerCase() !== 'post' &&
-              (bodyType === BODY_TYPE_FORM_URLENCODED ||
-                bodyType === BODY_TYPE_FORM_MULTIPART ||
-                bodyType === BODY_TYPE_JSON ||
-                bodyType === BODY_TYPE_OTHER ||
-                bodyType === BODY_TYPE_XML)
+              bodyType === BODY_TYPE_FORM_URLENCODED ||
+              bodyType === BODY_TYPE_FORM_MULTIPART ||
+              bodyType === BODY_TYPE_JSON ||
+              bodyType === BODY_TYPE_OTHER ||
+              bodyType === BODY_TYPE_XML
             ) {
               patch.method = 'POST';
               newContentType = bodyType === BODY_TYPE_OTHER ? 'text/plain' : bodyType;
@@ -184,7 +177,6 @@ export const RequestPane = memo(function RequestPane({
       activeRequest.authenticationType,
       activeRequest.bodyType,
       activeRequest.headers,
-      activeRequest.method,
       activeRequest.urlParameters,
       handleContentTypeChange,
       updateRequest,
@@ -237,7 +229,6 @@ export const RequestPane = memo(function RequestPane({
 
   const isLoading = useIsResponseLoading(activeRequestId ?? null);
   const { updateKey } = useRequestUpdateKey(activeRequestId ?? null);
-  const importCurl = useImportCurl({ clearClipboard: true });
 
   return (
     <div
@@ -247,34 +238,9 @@ export const RequestPane = memo(function RequestPane({
       {activeRequest && (
         <>
           <UrlBar
-            key={forceUpdateKey}
             url={activeRequest.url}
             method={activeRequest.method}
             placeholder="https://example.com"
-            onPaste={async (command) => {
-              if (!command.startsWith('curl ')) {
-                return;
-              }
-              importCurl.mutate({ requestId: activeRequestId, command });
-            }}
-            autocomplete={{
-              minMatch: 3,
-              options:
-                requests.length > 0
-                  ? [
-                      ...requests.map(
-                        (r) =>
-                          ({
-                            type: 'constant',
-                            label: r.url,
-                          } as GenericCompletionOption),
-                      ),
-                    ]
-                  : [
-                      { label: 'http://', type: 'constant' },
-                      { label: 'https://', type: 'constant' },
-                    ],
-            }}
             onSend={handleSend}
             onCancel={handleCancel}
             onMethodChange={handleMethodChange}
@@ -321,6 +287,7 @@ export const RequestPane = memo(function RequestPane({
                   useTemplating
                   autocompleteVariables
                   placeholder="..."
+                  className="!bg-gray-50"
                   heightMode={fullHeight ? 'full' : 'auto'}
                   defaultValue={`${activeRequest.body?.text ?? ''}`}
                   contentType="application/json"
@@ -333,15 +300,28 @@ export const RequestPane = memo(function RequestPane({
                   useTemplating
                   autocompleteVariables
                   placeholder="..."
+                  className="!bg-gray-50"
                   heightMode={fullHeight ? 'full' : 'auto'}
                   defaultValue={`${activeRequest.body?.text ?? ''}`}
                   contentType="text/xml"
                   onChange={handleBodyTextChange}
                 />
+              ) : activeRequest.bodyType === BODY_TYPE_OTHER ? (
+                <Editor
+                  forceUpdateKey={forceUpdateKey}
+                  useTemplating
+                  autocompleteVariables
+                  placeholder="..."
+                  className="!bg-gray-50"
+                  heightMode={fullHeight ? 'full' : 'auto'}
+                  defaultValue={`${activeRequest.body?.text ?? ''}`}
+                  onChange={handleBodyTextChange}
+                />
               ) : activeRequest.bodyType === BODY_TYPE_GRAPHQL ? (
                 <GraphQLEditor
                   forceUpdateKey={forceUpdateKey}
                   baseRequest={activeRequest}
+                  className="!bg-gray-50"
                   defaultValue={`${activeRequest.body?.text ?? ''}`}
                   onChange={handleBodyTextChange}
                 />
@@ -365,18 +345,8 @@ export const RequestPane = memo(function RequestPane({
                   onChange={handleBinaryFileChange}
                   onChangeContentType={handleContentTypeChange}
                 />
-              ) : typeof activeRequest.bodyType === 'string' ? (
-                <Editor
-                  forceUpdateKey={forceUpdateKey}
-                  useTemplating
-                  autocompleteVariables
-                  placeholder="..."
-                  heightMode={fullHeight ? 'full' : 'auto'}
-                  defaultValue={`${activeRequest.body?.text ?? ''}`}
-                  onChange={handleBodyTextChange}
-                />
               ) : (
-                <EmptyStateText>Empty Body</EmptyStateText>
+                <EmptyStateText>No Body</EmptyStateText>
               )}
             </TabContent>
           </Tabs>

src-web/components/ResizeHandle.tsx

@@ -32,7 +32,7 @@ export function ResizeHandle({
       className={classNames(
         className,
         'group z-10 flex',
-        // 'bg-fg-info', // For debugging
+        // 'bg-blue-100/10', // For debugging
         vertical ? 'w-full h-3 cursor-row-resize' : 'h-full w-3 cursor-col-resize',
         justify === 'center' && 'justify-center',
         justify === 'end' && 'justify-end',