Fix release targets

Don't commit .cargo
Fix args
2026-01-18 15:06:58 +01:00 · 2024-05-09 15:38:27 -07:00 · 2024-05-09 10:17:35 -07:00 · 2024-05-09 09:35:39 -07:00 · 2024-05-09 09:33:47 -07:00 · 2024-05-09 08:37:18 -07:00
341 changed files with 40711 additions and 7283 deletions
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -1,71 +0,0 @@
-name: Generate Artifacts
-on:
-  push:
-    tags: [ v* ]
-
-permissions: write-all
-
-jobs:
-  build-artifacts:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: macos-12
-            target: aarch64-apple-darwin
-          - os: macos-latest
-            target: x86_64-apple-darwin
-          - os: windows-2022
-            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: 18
-          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: '<!-- Release Notes -->'
-          releaseDraft: true
-          prerelease: false
-          args: '--target ${{ matrix.target }}'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,72 @@
+name: Generate Artifacts
+on:
+  push:
+    tags: [ v* ]
+
+permissions: write-all
+
+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.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
+        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run tests
+        run: npm test
+
+      - uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAURI_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 }}
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ dist-ssr

 *.sqlite
 *.sqlite-*
+
+.cargo
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -4,8 +4,9 @@
  "version": "0.0.0",
  "type": "module",
  "scripts": {
-    "start": "npm run build:plugins && npm run tauri-dev",
-    "tauri-dev": "tauri dev --no-watch --config ./src-tauri/tauri-dev.conf.json",
+    "start": "npm run build:plugins && 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 --no-watch --config ./src-tauri/tauri-dev.conf.json",
    "tauri-build": "tauri build",
    "tauri": "tauri",
    "build": "npm run build:frontend",
@@ -15,9 +16,11 @@
    "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",
@@ -40,15 +43,23 @@
    "@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",
+    "@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",
    "buffer": "^6.0.3",
    "classnames": "^2.3.2",
    "cm6-graphql": "^0.0.9",
    "codemirror": "^6.0.1",
+    "codemirror-json-schema": "^0.6.1",
+    "date-fns": "^3.3.1",
    "focus-trap-react": "^10.1.1",
    "format-graphql": "^1.4.0",
    "framer-motion": "^9.0.4",
    "lucide-react": "^0.309.0",
+    "mime": "^4.0.1",
    "papaparse": "^5.4.1",
    "parse-color": "^1.0.0",
    "react": "^18.2.0",
@@ -59,12 +70,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#v1",
-    "uuid": "^9.0.0"
+    "tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v2",
+    "uuid": "^9.0.0",
+    "xml-formatter": "^3.6.2"
  },
  "devDependencies": {
    "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tauri-apps/cli": "^1.5.6",
+    "@tauri-apps/cli": ">=2.0.0-beta.0",
    "@types/node": "^18.7.10",
    "@types/papaparse": "^5.3.7",
    "@types/parse-color": "^1.0.1",
@@ -72,9 +84,9 @@
    "@types/react": "^18.0.31",
    "@types/react-dom": "^18.0.11",
    "@types/uuid": "^9.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
-    "@vitejs/plugin-react": "^3.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
+    "@vitejs/plugin-react": "^4.2.1",
    "autoprefixer": "^10.4.13",
    "eslint": "^8.34.0",
    "eslint-config-prettier": "^8.6.0",
@@ -83,18 +95,19 @@
    "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",
    "postcss-nesting": "^11.2.1",
    "prettier": "^2.8.4",
-    "react-devtools": "^4.28.5",
+    "react-devtools": "^4.27.2",
    "tailwindcss": "^3.2.7",
-    "typescript": "^5.0.2",
-    "vite": "^4.0.0",
-    "vite-plugin-svgr": "^2.4.0",
-    "vite-plugin-top-level-await": "^1.2.4",
-    "vitest": "^0.29.2"
+    "typescript": "^5.3.3",
+    "vite": "^5.0.0",
+    "vite-plugin-svgr": "^4.2.0",
+    "vite-plugin-top-level-await": "^1.4.1",
+    "vitest": "^1.3.0"
  },
  "lint-staged": {
    "*.{ts,tsx}": "eslint --cache --fix",
--- a/plugins/exporter-curl/package-lock.json
+++ b/plugins/exporter-curl/package-lock.json
--- a/plugins/exporter-curl/package.json
+++ b/plugins/exporter-curl/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "exporter-curl",
+  "version": "0.0.1",
+  "devDependencies": {
+    "vitest": "^1.4.0"
+  }
+}
--- a/plugins/exporter-curl/src/index.ts
+++ b/plugins/exporter-curl/src/index.ts
@@ -0,0 +1,76 @@
+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;
+}
--- a/plugins/exporter-curl/tests/index.test.ts
+++ b/plugins/exporter-curl/tests/index.test.ts
@@ -0,0 +1,155 @@
+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 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  `));
+  });
+});
--- a/plugins/exporter-curl/vite.config.js
+++ b/plugins/exporter-curl/vite.config.js
@@ -0,0 +1,13 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.ts'),
+      fileName: 'index',
+      formats: ['es'],
+    },
+    outDir: resolve(__dirname, '../../src-tauri/plugins/exporter-curl'),
+  },
+});
--- a/plugins/importer-curl/package-lock.json
+++ b/plugins/importer-curl/package-lock.json
--- a/plugins/importer-curl/package.json
+++ b/plugins/importer-curl/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "importer-curl",
+  "version": "0.0.1",
+  "dependencies": {
+    "shell-quote": "^1.8.1"
+  },
+  "devDependencies": {
+    "@types/shell-quote": "^1.7.5",
+    "vitest": "^1.4.0"
+  }
+}
--- a/plugins/importer-curl/src/index.ts
+++ b/plugins/importer-curl/src/index.ts
@@ -0,0 +1,405 @@
+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(/([^\\])\n/g, '$1; ');
+
+  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];
+    // trim leading spaces between parsed entries
+    // regex won't match otherwise (e.g.    -H 'Content-Type: application/json')
+    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] ?? '' };
+    }) ?? [];
+
+  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: '',
+      };
+    }
+    return {
+      name: (name ?? '').trim(),
+      value: value.trim(),
+    };
+  });
+
+  // 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,
+    });
+  }
+
+  ///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 = {
+      params: dataParameters.map((parameter) => ({
+        ...parameter,
+        name: decodeURIComponent(parameter.name || ''),
+        value: decodeURIComponent(parameter.value || ''),
+      })),
+    };
+  } 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,
+    };
+  }
+
+  // Method
+  let method = getPairValue(pairsByName, '', ['X', 'request']).toUpperCase();
+
+  if (method === '' && body) {
+    method = 'text' in body || 'params' 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;
+  }[] = [];
+
+  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),
+        });
+      } else {
+        dataParameters.push({
+          name: name ?? '',
+          value: flagName === 'data-urlencode' ? encodeURIComponent(value ?? '') : value ?? '',
+        });
+      }
+    }
+  }
+
+  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]}`;
+}
--- a/plugins/importer-curl/tests/index.test.ts
+++ b/plugins/importer-curl/tests/index.test.ts
@@ -0,0 +1,300 @@
+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',
+            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',
+            body: {
+              params: [
+                { name: 'a', value: '' },
+                { name: 'b', value: '' },
+                { name: 'c', value: 'ccc' },
+              ],
+            },
+          }),
+        ],
+      },
+    });
+  });
+
+  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' }],
+            bodyType: 'text/plain',
+            body: { text: 'a&b&c=ccc' },
+          }),
+        ],
+      },
+    });
+  });
+
+  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: '' },
+              { name: 'Foo', value: 'bar' },
+              { name: 'AAA', value: 'bbb' },
+              { name: '', value: 'ccc' },
+            ],
+          }),
+        ],
+      },
+    });
+  });
+
+  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' }],
+          }),
+        ],
+      },
+    });
+  });
+
+  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' },
+              { name: 'baz', value: 'a%20a' },
+            ],
+          }),
+        ],
+      },
+    });
+  });
+});
+
+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,
+  };
+}
--- a/plugins/importer-curl/vite.config.js
+++ b/plugins/importer-curl/vite.config.js
@@ -0,0 +1,13 @@
+import { resolve } from 'path';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'src/index.ts'),
+      fileName: 'index',
+      formats: ['es'],
+    },
+    outDir: resolve(__dirname, '../../src-tauri/plugins/importer-curl'),
+  },
+});
--- a/plugins/importer-insomnia/package-lock.json
+++ b/plugins/importer-insomnia/package-lock.json
@@ -0,0 +1,12 @@
+{
+  "name": "importer-insomnia",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "importer-insomnia",
+      "version": "0.0.1"
+    }
+  }
+}
--- a/plugins/importer-insomnia/src/helpers/types.js
+++ b/plugins/importer-insomnia/src/helpers/types.js
@@ -1,23 +0,0 @@
-export function isWorkspace(obj) {
-  return isJSObject(obj) && obj._type === 'workspace';
-}
-
-export function isRequestGroup(obj) {
-  return isJSObject(obj) && obj._type === 'request_group';
-}
-
-export function isRequest(obj) {
-  return isJSObject(obj) && obj._type === 'request';
-}
-
-export function isEnvironment(obj) {
-  return isJSObject(obj) && obj._type === 'environment';
-}
-
-export function isJSObject(obj) {
-  return Object.prototype.toString.call(obj) === '[object Object]';
-}
-
-export function isJSString(obj) {
-  return Object.prototype.toString.call(obj) === '[object String]';
-}
--- a/plugins/importer-insomnia/src/helpers/variables.js
+++ b/plugins/importer-insomnia/src/helpers/variables.js
@@ -1,18 +0,0 @@
-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]}');
-}
--- a/plugins/importer-insomnia/src/importers/environment.js
+++ b/plugins/importer-insomnia/src/importers/environment.js
@@ -1,21 +0,0 @@
-/**
- * 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}`,
-    })),
-  };
-}
--- a/plugins/importer-insomnia/src/importers/folder.js
+++ b/plugins/importer-insomnia/src/importers/folder.js
@@ -1,17 +0,0 @@
-/**
- * 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,
-  };
-}
--- a/plugins/importer-insomnia/src/importers/request.js
+++ b/plugins/importer-insomnia/src/importers/request.js
@@ -1,60 +0,0 @@
-import { convertSyntax } from '../helpers/variables.js';
-
-/**
- * Import an Insomnia request object.
- * @param {Object} r - The request object to import.
- * @param workspaceId - The workspace ID to use for the request.
- * @param {number} sortPriority - The sort priority to use for the request.
- */
-export function importRequest(r, workspaceId, sortPriority = 0) {
-  console.log('IMPORTING REQUEST', r._id, r.name, JSON.stringify(r, null, 2));
-
-  let bodyType = null;
-  let body = null;
-  if (r.body?.mimeType === 'application/graphql') {
-    bodyType = 'graphql';
-    body = convertSyntax(r.body.text);
-  } else if (r.body?.mimeType === 'application/json') {
-    bodyType = 'application/json';
-    body = convertSyntax(r.body.text);
-  }
-
-  let authenticationType = null;
-  let authentication = {};
-  if (r.authentication.type === 'bearer') {
-    authenticationType = 'bearer';
-    authentication = {
-      token: convertSyntax(r.authentication.token),
-    };
-  } else if (r.authentication.type === 'basic') {
-    authenticationType = 'basic';
-    authentication = {
-      username: convertSyntax(r.authentication.username),
-      password: convertSyntax(r.authentication.password),
-    };
-  }
-
-  return {
-    id: r._id,
-    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
-    workspaceId,
-    folderId: r.parentId === workspaceId ? null : r.parentId,
-    model: 'http_request',
-    sortPriority,
-    name: r.name,
-    url: convertSyntax(r.url),
-    body,
-    bodyType,
-    authentication,
-    authenticationType,
-    method: r.method,
-    headers: (r.headers ?? [])
-      .map(({ name, value, disabled }) => ({
-        enabled: !disabled,
-        name,
-        value,
-      }))
-      .filter(({ name, value }) => name !== '' || value !== ''),
-  };
-}
--- a/plugins/importer-insomnia/src/index.js
+++ b/plugins/importer-insomnia/src/index.js
@@ -1,76 +0,0 @@
-import { importEnvironment } from './importers/environment.js';
-import { importRequest } from './importers/request.js';
-import {
-  isEnvironment,
-  isJSObject,
-  isRequest,
-  isRequestGroup,
-  isWorkspace,
-} from './helpers/types.js';
-import { parseVariables } from './helpers/variables.js';
-import { importFolder } from './importers/folder.js';
-
-export function pluginHookImport(contents) {
-  console.log('RUNNING INSOMNIA');
-  let parsed;
-  try {
-    parsed = JSON.parse(contents);
-  } catch (e) {
-    return;
-  }
-
-  if (!isJSObject(parsed)) return;
-  if (!Array.isArray(parsed.resources)) return;
-
-  const resources = {
-    workspaces: [],
-    requests: [],
-    environments: [],
-    folders: [],
-  };
-
-  // Import workspaces
-  const workspacesToImport = parsed.resources.filter(isWorkspace);
-  for (const workspaceToImport of workspacesToImport) {
-    const baseEnvironment = parsed.resources.find(
-      (r) => isEnvironment(r) && r.parentId === workspaceToImport._id,
-    );
-    resources.workspaces.push({
-      id: workspaceToImport._id,
-      createdAt: new Date(workspacesToImport.created ?? Date.now()).toISOString().replace('Z', ''),
-      updatedAt: new Date(workspacesToImport.updated ?? Date.now()).toISOString().replace('Z', ''),
-      model: 'workspace',
-      name: workspaceToImport.name,
-      variables: baseEnvironment ? parseVariables(baseEnvironment.data) : [],
-    });
-    const environmentsToImport = parsed.resources.filter(
-      (r) => isEnvironment(r) && r.parentId === baseEnvironment?._id,
-    );
-    resources.environments.push(
-      ...environmentsToImport.map((r) => importEnvironment(r, workspaceToImport._id)),
-    );
-
-    const nextFolder = (parentId) => {
-      const children = parsed.resources.filter((r) => r.parentId === parentId);
-      let sortPriority = 0;
-      for (const child of children) {
-        if (isRequestGroup(child)) {
-          resources.folders.push(importFolder(child, workspaceToImport._id));
-          nextFolder(child._id);
-        } else if (isRequest(child)) {
-          resources.requests.push(importRequest(child, workspaceToImport._id, sortPriority++));
-        }
-      }
-    };
-
-    // Import folders
-    nextFolder(workspaceToImport._id);
-  }
-
-  // Filter out any `null` values
-  resources.requests = resources.requests.filter(Boolean);
-  resources.environments = resources.environments.filter(Boolean);
-  resources.workspaces = resources.workspaces.filter(Boolean);
-
-  return { resources };
-}
--- a/plugins/importer-insomnia/src/index.ts
+++ b/plugins/importer-insomnia/src/index.ts
@@ -0,0 +1,274 @@
+import {
+  Environment,
+  Folder,
+  GrpcRequest,
+  HttpRequest,
+  Workspace,
+} from '../../../src-web/lib/models';
+
+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;
+  try {
+    parsed = JSON.parse(contents);
+  } catch (e) {
+    return;
+  }
+
+  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}`;
+}
--- a/plugins/importer-insomnia/vite.config.js
+++ b/plugins/importer-insomnia/vite.config.js
@@ -4,7 +4,7 @@ import { defineConfig } from 'vite';
 export default defineConfig({
  build: {
    lib: {
-      entry: resolve(__dirname, 'src/index.js'),
+      entry: resolve(__dirname, 'src/index.ts'),
      fileName: 'index',
      formats: ['es'],
    },
--- a/plugins/importer-postman/package-lock.json
+++ b/plugins/importer-postman/package-lock.json
--- a/plugins/importer-postman/package.json
+++ b/plugins/importer-postman/package.json
@@ -1,4 +1,7 @@
 {
  "name": "importer-postman",
-  "version": "0.0.1"
+  "version": "0.0.1",
+  "devDependencies": {
+    "vitest": "^1.4.0"
+  }
 }
--- a/plugins/importer-postman/src/index.ts
+++ b/plugins/importer-postman/src/index.ts
@@ -1,4 +1,4 @@
-import { Environment, Folder, HttpRequest, Workspace } from '../../../../src-web/lib/models';
+import { Environment, Folder, HttpRequest, Model, Workspace } from '../../../src-web/lib/models';

 const POSTMAN_2_1_0_SCHEMA = 'https://schema.getpostman.com/json/collection/v2.1.0/collection.json';
 const POSTMAN_2_0_0_SCHEMA = 'https://schema.getpostman.com/json/collection/v2.0.0/collection.json';
@@ -9,7 +9,7 @@ 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'>[];
-  requests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
+  httpRequests: AtLeast<HttpRequest, 'name' | 'id' | 'model' | 'workspaceId'>[];
  folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
 }

@@ -23,18 +23,25 @@ export function pluginHookImport(contents: string): { resources: ExportResources
    return;
  }

+  const globalAuth = importAuth(root.auth);
+
  const exportResources: ExportResources = {
    workspaces: [],
    environments: [],
-    requests: [],
+    httpRequests: [],
    folders: [],
  };

  const workspace: ExportResources['workspaces'][0] = {
    model: 'workspace',
-    id: generateId('wk'),
+    id: generateId('workspace'),
    name: info.name || 'Postman Import',
    description: info.description || '',
+    variables:
+      root.variable?.map((v: any) => ({
+        name: v.key,
+        value: v.value,
+      })) ?? [],
  };
  exportResources.workspaces.push(workspace);

@@ -43,7 +50,7 @@ export function pluginHookImport(contents: string): { resources: ExportResources
      const folder: ExportResources['folders'][0] = {
        model: 'folder',
        workspaceId: workspace.id,
-        id: generateId('fl'),
+        id: generateId('folder'),
        name: v.name,
        folderId,
      };
@@ -54,10 +61,11 @@ export function pluginHookImport(contents: string): { resources: ExportResources
    } else if (typeof v.name === 'string' && 'request' in v) {
      const r = toRecord(v.request);
      const bodyPatch = importBody(r.body);
-      const authPatch = importAuth(r.auth);
-      const request: ExportResources['requests'][0] = {
+      const requestAuthPath = importAuth(r.auth);
+      const authPatch = requestAuthPath.authenticationType == null ? globalAuth : requestAuthPath;
+      const request: ExportResources['httpRequests'][0] = {
        model: 'http_request',
-        id: generateId('rq'),
+        id: generateId('http_request'),
        workspaceId: workspace.id,
        folderId,
        name: v.name,
@@ -79,7 +87,7 @@ export function pluginHookImport(contents: string): { resources: ExportResources
          }),
        ],
      };
-      exportResources.requests.push(request);
+      exportResources.httpRequests.push(request);
    } else {
      console.log('Unknown item', v, folderId);
    }
@@ -105,6 +113,14 @@ function importAuth(
        password: auth.basic.password || '',
      },
    };
+  } else if ('bearer' in auth) {
+    return {
+      headers: [],
+      authenticationType: 'bearer',
+      authentication: {
+        token: auth.bearer.token || '',
+      },
+    };
  } else {
    // TODO: support other auth types
    return { headers: [], authenticationType: null, authentication: {} };
@@ -175,6 +191,20 @@ 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: {} };
@@ -213,11 +243,8 @@ function convertTemplateSyntax<T>(obj: T): T {
  }
 }

-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;
+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]}`;
 }
--- a/plugins/importer-postman/tests/fixtures/nested.json
+++ b/plugins/importer-postman/tests/fixtures/nested.json
@@ -0,0 +1,38 @@
+{
+	"info": {
+		"_postman_id": "9e6dfada-256c-49ea-a38f-7d1b05b7ca2d",
+		"name": "New Collection",
+		"schema": "https://schema.getpostman.com/json/collection/v2.0.0/collection.json",
+		"_exporter_id": "18798"
+	},
+	"item": [
+		{
+			"name": "Top Folder",
+			"item": [
+				{
+					"name": "Nested Folder",
+					"item": [
+						{
+							"name": "Request 1",
+							"request": {
+								"method": "GET"
+							}
+						}
+					]
+				},
+				{
+					"name": "Request 2",
+					"request": {
+						"method": "GET"
+					}
+				}
+			]
+		},
+		{
+			"name": "Request 3",
+			"request": {
+				"method": "GET"
+			}
+		}
+	]
+}
--- a/plugins/importer-postman/tests/index.test.ts
+++ b/plugins/importer-postman/tests/index.test.ts
@@ -0,0 +1,90 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { Model } from '../../../src-web/lib/models';
+import { pluginHookImport } from '../src';
+
+let originalRandom = Math.random;
+
+describe('importer-postman', () => {
+  beforeEach(() => {
+    let i = 0;
+    // Psuedo-random number generator to ensure consistent ID generation
+    Math.random = vi.fn(() => ((i++ * 1000) % 133) / 100);
+  });
+
+  afterEach(() => {
+    Math.random = originalRandom;
+  });
+
+  const p = path.join(__dirname, 'fixtures');
+  const fixtures = fs.readdirSync(p);
+
+  for (const fixture of fixtures) {
+    test('Imports ' + fixture, () => {
+      const contents = fs.readFileSync(path.join(p, fixture), 'utf-8');
+      const imported = pluginHookImport(contents);
+      const folder0 = newId('folder');
+      const folder1 = newId('folder');
+      expect(imported).toEqual({
+        resources: expect.objectContaining({
+          workspaces: [
+            expect.objectContaining({
+              id: newId('workspace'),
+              model: 'workspace',
+              name: 'New Collection',
+            }),
+          ],
+          folders: expect.arrayContaining([
+            expect.objectContaining({
+              id: folder0,
+              model: 'folder',
+              workspaceId: existingId('workspace'),
+              name: 'Top Folder',
+            }),
+            expect.objectContaining({
+              folderId: folder0,
+              id: folder1,
+              model: 'folder',
+              workspaceId: existingId('workspace'),
+              name: 'Nested Folder',
+            }),
+          ]),
+          httpRequests: expect.arrayContaining([
+            expect.objectContaining({
+              id: newId('http_request'),
+              model: 'http_request',
+              name: 'Request 1',
+              workspaceId: existingId('workspace'),
+              folderId: folder1,
+            }),
+            expect.objectContaining({
+              id: newId('http_request'),
+              model: 'http_request',
+              name: 'Request 2',
+              workspaceId: existingId('workspace'),
+              folderId: folder0,
+            }),
+            expect.objectContaining({
+              id: newId('http_request'),
+              model: 'http_request',
+              name: 'Request 3',
+              workspaceId: existingId('workspace'),
+              folderId: null,
+            }),
+          ]),
+        }),
+      });
+    });
+  }
+});
+
+const idCount: Partial<Record<Model['model'], number>> = {};
+function newId(model: Model['model']): string {
+  idCount[model] = (idCount[model] ?? -1) + 1;
+  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;
+}
+
+function existingId(model: Model['model']): string {
+  return `GENERATE_ID::${model.toUpperCase()}_${idCount[model] ?? 0}`;
+}
--- a/plugins/importer-yaak/package-lock.json
+++ b/plugins/importer-yaak/package-lock.json
@@ -0,0 +1,12 @@
+{
+  "name": "importer-yaak",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "importer-yaak",
+      "version": "0.0.1"
+    }
+  }
+}
--- a/plugins/importer-yaak/src/index.js
+++ b/plugins/importer-yaak/src/index.js
@@ -1,20 +0,0 @@
-export function pluginHookImport(contents) {
-  let parsed;
-  try {
-    parsed = JSON.parse(contents);
-  } catch (err) {
-    return undefined;
-  }
-
-  if (!isJSObject(parsed)) {
-    return undefined;
-  }
-
-  if (parsed.yaakSchema !== 1) return undefined;
-
-  return { resources: parsed.resources }; // Should already be in the correct format
-}
-
-export function isJSObject(obj) {
-  return Object.prototype.toString.call(obj) === '[object Object]';
-}
--- a/plugins/importer-yaak/src/index.ts
+++ b/plugins/importer-yaak/src/index.ts
@@ -0,0 +1,29 @@
+export function pluginHookImport(contents: string) {
+  let parsed;
+  try {
+    parsed = JSON.parse(contents);
+  } catch (err) {
+    return undefined;
+  }
+
+  if (!isJSObject(parsed)) {
+    return undefined;
+  }
+
+  const isYaakExport = 'yaakSchema' in parsed;
+  if (!isYaakExport) {
+    return;
+  }
+
+  // Migrate v1 to v2 -- changes requests to httpRequests
+  if ('requests' in parsed.resources) {
+    parsed.resources.httpRequests = parsed.resources.requests;
+    delete parsed.resources.requests;
+  }
+
+  return { resources: parsed.resources }; // Should already be in the correct format
+}
+
+export function isJSObject(obj: any) {
+  return Object.prototype.toString.call(obj) === '[object Object]';
+}
--- a/plugins/importer-yaak/tests/index.test.ts
+++ b/plugins/importer-yaak/tests/index.test.ts
@@ -0,0 +1,29 @@
+import { describe, expect, test } from 'vitest';
+import { pluginHookImport } from '../src';
+
+describe('importer-yaak', () => {
+  test('Skips invalid imports', () => {
+    expect(pluginHookImport('not JSON')).toBeUndefined();
+    expect(pluginHookImport('[]')).toBeUndefined();
+    expect(pluginHookImport(JSON.stringify({ resources: {} }))).toBeUndefined();
+  });
+
+  test('converts schema 1 to 2', () => {
+    const imported = pluginHookImport(
+      JSON.stringify({
+        yaakSchema: 1,
+        resources: {
+          requests: [],
+        },
+      }),
+    );
+
+    expect(imported).toEqual(
+      expect.objectContaining({
+        resources: {
+          httpRequests: [],
+        },
+      }),
+    );
+  });
+});
--- a/plugins/importer-yaak/vite.config.js
+++ b/plugins/importer-yaak/vite.config.js
@@ -4,7 +4,7 @@ import { defineConfig } from 'vite';
 export default defineConfig({
  build: {
    lib: {
-      entry: resolve(__dirname, 'src/index.js'),
+      entry: resolve(__dirname, 'src/index.ts'),
      fileName: 'index',
      formats: ['es'],
    },
--- a/src-tauri/.sqlx/query-02506ad41cc94cd937422ef1977a97174431f008a9fb4ce39667d587a858b876.json
+++ b/src-tauri/.sqlx/query-02506ad41cc94cd937422ef1977a97174431f008a9fb4ce39667d587a858b876.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO folders (\n                id,\n                workspace_id,\n                folder_id,\n                name,\n                sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               sort_priority = excluded.sort_priority\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "02506ad41cc94cd937422ef1977a97174431f008a9fb4ce39667d587a858b876"
-}
--- a/src-tauri/.sqlx/query-11394af12419cca3be3a26dff9275514ea2a44504e3c7a568a9578c64b5713d1.json
+++ b/src-tauri/.sqlx/query-11394af12419cca3be3a26dff9275514ea2a44504e3c7a568a9578c64b5713d1.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO http_requests (\n                id, workspace_id, folder_id, name, url, url_parameters, method, body, body_type,\n                authentication, authentication_type, headers, sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               method = excluded.method,\n               headers = excluded.headers,\n               body = excluded.body,\n               body_type = excluded.body_type,\n               authentication = excluded.authentication,\n               authentication_type = excluded.authentication_type,\n               url = excluded.url,\n               url_parameters = excluded.url_parameters,\n               sort_priority = excluded.sort_priority\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "11394af12419cca3be3a26dff9275514ea2a44504e3c7a568a9578c64b5713d1"
+}
--- a/src-tauri/.sqlx/query-12b265491d1ebba19e1ce8a660e458ffbcd8c0850aef16ba1f70e358623ac66a.json
+++ b/src-tauri/.sqlx/query-12b265491d1ebba19e1ce8a660e458ffbcd8c0850aef16ba1f70e358623ac66a.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO workspaces (\n                id, name, description, variables, setting_request_timeout,\n                setting_follow_redirects, setting_validate_certificates\n             )\n            VALUES (?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               description = excluded.description,\n               variables = excluded.variables,\n               setting_request_timeout = excluded.setting_request_timeout,\n               setting_follow_redirects = excluded.setting_follow_redirects,\n               setting_validate_certificates = excluded.setting_validate_certificates\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "12b265491d1ebba19e1ce8a660e458ffbcd8c0850aef16ba1f70e358623ac66a"
+}
--- a/src-tauri/.sqlx/query-13cb883199e81966174e6fda9c252bf7213fe01b5346266c0a89dc0ac89eda64.json
+++ b/src-tauri/.sqlx/query-13cb883199e81966174e6fda9c252bf7213fe01b5346266c0a89dc0ac89eda64.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO environments (\n                id, workspace_id, name, variables\n            )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               variables = excluded.variables\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "13cb883199e81966174e6fda9c252bf7213fe01b5346266c0a89dc0ac89eda64"
+}
--- a/src-tauri/.sqlx/query-14930955e8a914e292dfbebfce2ea43cc41c1d517386ed816c16d436bf626bf3.json
+++ b/src-tauri/.sqlx/query-14930955e8a914e292dfbebfce2ea43cc41c1d517386ed816c16d436bf626bf3.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO grpc_events (\n                id, workspace_id, request_id, connection_id, content, event_type, metadata,\n                status, error\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n                updated_at = CURRENT_TIMESTAMP,\n                content = excluded.content,\n                event_type = excluded.event_type,\n                metadata = excluded.metadata,\n                status = excluded.status,\n                error = excluded.error\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 9
+    },
+    "nullable": []
+  },
+  "hash": "14930955e8a914e292dfbebfce2ea43cc41c1d517386ed816c16d436bf626bf3"
+}
--- a/src-tauri/.sqlx/query-1821c2f60b9fa4514d58eb73b23e25ad683b80b9bd0c2944063190a0d0a19ee5.json
+++ b/src-tauri/.sqlx/query-1821c2f60b9fa4514d58eb73b23e25ad683b80b9bd0c2944063190a0d0a19ee5.json
@@ -0,0 +1,104 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, sort_priority,\n                url, service, method, message, authentication_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                metadata AS \"metadata!: sqlx::types::Json<Vec<GrpcMetadataEntry>>\"\n            FROM grpc_requests\n            WHERE workspace_id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "folder_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "name",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "sort_priority",
+        "ordinal": 7,
+        "type_info": "Float"
+      },
+      {
+        "name": "url",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "service",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "message",
+        "ordinal": 11,
+        "type_info": "Text"
+      },
+      {
+        "name": "authentication_type",
+        "ordinal": 12,
+        "type_info": "Text"
+      },
+      {
+        "name": "authentication!: Json<HashMap<String, JsonValue>>",
+        "ordinal": 13,
+        "type_info": "Text"
+      },
+      {
+        "name": "metadata!: sqlx::types::Json<Vec<GrpcMetadataEntry>>",
+        "ordinal": 14,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "1821c2f60b9fa4514d58eb73b23e25ad683b80b9bd0c2944063190a0d0a19ee5"
+}
--- a/src-tauri/.sqlx/query-18ada3bb42c29f1940ab2e61961d79cdd69210f3dc2076aedcadeba8e34dcb6e.json
+++ b/src-tauri/.sqlx/query-18ada3bb42c29f1940ab2e61961d79cdd69210f3dc2076aedcadeba8e34dcb6e.json
@@ -0,0 +1,80 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, request_id, connection_id, created_at, content, status, error,\n                event_type AS \"event_type!: GrpcEventType\",\n                metadata AS \"metadata!: sqlx::types::Json<HashMap<String, String>>\"\n            FROM grpc_events\n            WHERE connection_id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "connection_id",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "content",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "status",
+        "ordinal": 7,
+        "type_info": "Int64"
+      },
+      {
+        "name": "error",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "event_type!: GrpcEventType",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "metadata!: sqlx::types::Json<HashMap<String, String>>",
+        "ordinal": 10,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "18ada3bb42c29f1940ab2e61961d79cdd69210f3dc2076aedcadeba8e34dcb6e"
+}
--- a/src-tauri/.sqlx/query-2c9658a639c5e4994ae9c8ec30bd4e40a1945d640962991f879928619950ef62.json
+++ b/src-tauri/.sqlx/query-2c9658a639c5e4994ae9c8ec30bd4e40a1945d640962991f879928619950ef62.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO http_responses (\n                id, request_id, workspace_id, elapsed, elapsed_headers, url, status, status_reason,\n                content_length, body_path, headers, version, remote_addr\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "2c9658a639c5e4994ae9c8ec30bd4e40a1945d640962991f879928619950ef62"
+}
--- a/src-tauri/.sqlx/query-3e8651cca7feecc208a676dfd24c7d8775040d5287c16890056dcb474674edfb.json
+++ b/src-tauri/.sqlx/query-3e8651cca7feecc208a676dfd24c7d8775040d5287c16890056dcb474674edfb.json
@@ -0,0 +1,92 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, request_id, created_at, updated_at, service,\n                method, elapsed, status, error, url,\n                trailers AS \"trailers!: sqlx::types::Json<HashMap<String, String>>\"\n            FROM grpc_connections\n            WHERE request_id = ?\n            ORDER BY created_at DESC\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "service",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 7,
+        "type_info": "Text"
+      },
+      {
+        "name": "elapsed",
+        "ordinal": 8,
+        "type_info": "Int64"
+      },
+      {
+        "name": "status",
+        "ordinal": 9,
+        "type_info": "Int64"
+      },
+      {
+        "name": "error",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "url",
+        "ordinal": 11,
+        "type_info": "Text"
+      },
+      {
+        "name": "trailers!: sqlx::types::Json<HashMap<String, String>>",
+        "ordinal": 12,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "3e8651cca7feecc208a676dfd24c7d8775040d5287c16890056dcb474674edfb"
+}
--- a/src-tauri/.sqlx/query-42bc0ded60b44dab19daf6d8fc7df83d83af5d88ea0b84514fdc877a668c27cd.json
+++ b/src-tauri/.sqlx/query-42bc0ded60b44dab19daf6d8fc7df83d83af5d88ea0b84514fdc877a668c27cd.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            DELETE FROM grpc_connections\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "42bc0ded60b44dab19daf6d8fc7df83d83af5d88ea0b84514fdc877a668c27cd"
+}
--- a/src-tauri/.sqlx/query-467b87ad1209a4653b1dc8462d79236a655240c5b402fa9fd75c12ebd9bb6b86.json
+++ b/src-tauri/.sqlx/query-467b87ad1209a4653b1dc8462d79236a655240c5b402fa9fd75c12ebd9bb6b86.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO grpc_requests (\n                id, name, workspace_id, folder_id, sort_priority, url, service, method, message,\n                authentication_type, authentication, metadata\n             )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n                updated_at = CURRENT_TIMESTAMP,\n                name = excluded.name,\n                folder_id = excluded.folder_id,\n                sort_priority = excluded.sort_priority,\n                url = excluded.url,\n                service = excluded.service,\n                method = excluded.method,\n                message = excluded.message,\n                authentication_type = excluded.authentication_type,\n                authentication = excluded.authentication,\n                metadata = excluded.metadata\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 12
+    },
+    "nullable": []
+  },
+  "hash": "467b87ad1209a4653b1dc8462d79236a655240c5b402fa9fd75c12ebd9bb6b86"
+}
--- a/src-tauri/.sqlx/query-48ec5fdf20f34add763c540061caa25054545503704e19f149987f99b1a0e4f0.json
+++ b/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"
+}
--- a/src-tauri/.sqlx/query-4a5fd6c81401ccafac64b05cb476da92cc30919d5bdb0a0226ea5e30d5b30c0f.json
+++ b/src-tauri/.sqlx/query-4a5fd6c81401ccafac64b05cb476da92cc30919d5bdb0a0226ea5e30d5b30c0f.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO http_requests (\n                id,\n                workspace_id,\n                folder_id,\n                name,\n                url,\n                url_parameters,\n                method,\n                body,\n                body_type,\n                authentication,\n                authentication_type,\n                headers,\n                sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               method = excluded.method,\n               headers = excluded.headers,\n               body = excluded.body,\n               body_type = excluded.body_type,\n               authentication = excluded.authentication,\n               authentication_type = excluded.authentication_type,\n               url = excluded.url,\n               url_parameters = excluded.url_parameters,\n               sort_priority = excluded.sort_priority\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "4a5fd6c81401ccafac64b05cb476da92cc30919d5bdb0a0226ea5e30d5b30c0f"
-}
--- a/src-tauri/.sqlx/query-558e72df3c6f2635c6b3d52a199f9a5f7a3d82b379ff9af36645dcfb92548fdd.json
+++ b/src-tauri/.sqlx/query-558e72df3c6f2635c6b3d52a199f9a5f7a3d82b379ff9af36645dcfb92548fdd.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                created_at,\n                updated_at,\n                folder_id,\n                name,\n                sort_priority\n            FROM folders\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, created_at, updated_at, folder_id, name, sort_priority\n            FROM folders\n            WHERE workspace_id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -58,5 +58,5 @@
      false
    ]
  },
-  "hash": "1428d25b6aa3d6ec55742a968571fa951da0406d7bb32408883c584eae7dd53c"
+  "hash": "558e72df3c6f2635c6b3d52a199f9a5f7a3d82b379ff9af36645dcfb92548fdd"
 }
--- a/src-tauri/.sqlx/query-573db23160de025e5c72efb90be7fff5e3ec4619b962d149fdd4d618fe02c680.json
+++ b/src-tauri/.sqlx/query-573db23160de025e5c72efb90be7fff5e3ec4619b962d149fdd4d618fe02c680.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                method,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, url, method,\n                body_type, authentication_type, sort_priority,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -44,39 +44,39 @@
        "type_info": "Text"
      },
      {
-        "name": "url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>",
+        "name": "method",
        "ordinal": 8,
        "type_info": "Text"
      },
      {
-        "name": "method",
+        "name": "body_type",
        "ordinal": 9,
        "type_info": "Text"
      },
      {
-        "name": "body!: Json<HashMap<String, JsonValue>>",
+        "name": "authentication_type",
        "ordinal": 10,
        "type_info": "Text"
      },
      {
-        "name": "body_type",
+        "name": "sort_priority",
        "ordinal": 11,
-        "type_info": "Text"
+        "type_info": "Float"
      },
      {
-        "name": "authentication!: Json<HashMap<String, JsonValue>>",
+        "name": "url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>",
        "ordinal": 12,
        "type_info": "Text"
      },
      {
-        "name": "authentication_type",
+        "name": "body!: Json<HashMap<String, JsonValue>>",
        "ordinal": 13,
        "type_info": "Text"
      },
      {
-        "name": "sort_priority",
+        "name": "authentication!: Json<HashMap<String, JsonValue>>",
        "ordinal": 14,
-        "type_info": "Float"
+        "type_info": "Text"
      },
      {
        "name": "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>",
@@ -97,14 +97,14 @@
      false,
      false,
      false,
-      false,
-      false,
+      true,
      true,
      false,
-      true,
+      false,
+      false,
      false,
      false
    ]
  },
-  "hash": "6483f3ffeb90e019e9078d98bb831b8e4fbedfb45751d6cd33bd42e518b634dd"
+  "hash": "573db23160de025e5c72efb90be7fff5e3ec4619b962d149fdd4d618fe02c680"
 }
--- a/src-tauri/.sqlx/query-5765e9565a8b89c5bc2d72197e0e4a1093739e9abba69f6fe5527d453fab4db8.json
+++ b/src-tauri/.sqlx/query-5765e9565a8b89c5bc2d72197e0e4a1093739e9abba69f6fe5527d453fab4db8.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                created_at,\n                updated_at,\n                name,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM environments\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, created_at, updated_at, name,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM environments\n            WHERE id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -52,5 +52,5 @@
      false
    ]
  },
-  "hash": "689bcc92b914f50c14921faa796c07a256deb84c832fc3d90200b393fb159417"
+  "hash": "5765e9565a8b89c5bc2d72197e0e4a1093739e9abba69f6fe5527d453fab4db8"
 }
--- a/src-tauri/.sqlx/query-587aedf827b00bb706c35457a75b811317e66fc84ac0906bf5513d938121a078.json
+++ b/src-tauri/.sqlx/query-587aedf827b00bb706c35457a75b811317e66fc84ac0906bf5513d938121a078.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            UPDATE http_responses SET (\n                elapsed,\n                elapsed_headers,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body_path,\n                error,\n                headers,\n                version,\n                remote_addr,\n                updated_at\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 12
-    },
-    "nullable": []
-  },
-  "hash": "587aedf827b00bb706c35457a75b811317e66fc84ac0906bf5513d938121a078"
-}
--- a/src-tauri/.sqlx/query-612efa9ac45723dc604a88f5e7e288b4055fec4ba7d9102131bd255c037fa021.json
+++ b/src-tauri/.sqlx/query-612efa9ac45723dc604a88f5e7e288b4055fec4ba7d9102131bd255c037fa021.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                workspace_id,\n                name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, workspace_id, name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE workspace_id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -52,5 +52,5 @@
      false
    ]
  },
-  "hash": "f2ba4708d4a9ff9ce74c407a730040bd7883e9a5c0eb79ef0d8a6782a8eae299"
+  "hash": "612efa9ac45723dc604a88f5e7e288b4055fec4ba7d9102131bd255c037fa021"
 }
--- a/src-tauri/.sqlx/query-66deed028199c78ed15ea2f837907887c2a2cb564d1d076dd4ebf0ecbc82e098.json
+++ b/src-tauri/.sqlx/query-66deed028199c78ed15ea2f837907887c2a2cb564d1d076dd4ebf0ecbc82e098.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO grpc_connections (\n                id, workspace_id, request_id, service, method, elapsed,\n                status, error, trailers, url\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n                updated_at = CURRENT_TIMESTAMP,\n                service = excluded.service,\n                method = excluded.method,\n                elapsed = excluded.elapsed,\n                status = excluded.status,\n                error = excluded.error,\n                trailers = excluded.trailers,\n                url = excluded.url\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 10
+    },
+    "nullable": []
+  },
+  "hash": "66deed028199c78ed15ea2f837907887c2a2cb564d1d076dd4ebf0ecbc82e098"
+}
--- a/src-tauri/.sqlx/query-86a9d12d7b00217f3143671908c31c2c6a3c24774a505280dcba169eb5b6b0fb.json
+++ b/src-tauri/.sqlx/query-86a9d12d7b00217f3143671908c31c2c6a3c24774a505280dcba169eb5b6b0fb.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            UPDATE settings SET (\n                theme,\n                appearance,\n                update_channel\n            ) = (?, ?, ?) WHERE id = 'default';\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "86a9d12d7b00217f3143671908c31c2c6a3c24774a505280dcba169eb5b6b0fb"
-}
--- a/src-tauri/.sqlx/query-8dfbae65ddec905ea3734448cc9f7029b6c78de227c6fa3a85d75d0a7f21e0e9.json
+++ b/src-tauri/.sqlx/query-8dfbae65ddec905ea3734448cc9f7029b6c78de227c6fa3a85d75d0a7f21e0e9.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                name,\n                description,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, name, description, setting_request_timeout,\n                setting_follow_redirects, setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces\n        ",
  "describe": {
    "columns": [
      {
@@ -70,5 +70,5 @@
      false
    ]
  },
-  "hash": "20cf0f8b71e600bc40ee204b60a12b2f3728178f3b8788d2e5cc92821b74d470"
+  "hash": "8dfbae65ddec905ea3734448cc9f7029b6c78de227c6fa3a85d75d0a7f21e0e9"
 }
--- a/src-tauri/.sqlx/query-9238f94c688d91f42627e5b73c627c514bab4039ab5edadc79b77dfdfd63b208.json
+++ b/src-tauri/.sqlx/query-9238f94c688d91f42627e5b73c627c514bab4039ab5edadc79b77dfdfd63b208.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO folders (\n                id, workspace_id, folder_id, name, sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               sort_priority = excluded.sort_priority\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "9238f94c688d91f42627e5b73c627c514bab4039ab5edadc79b77dfdfd63b208"
+}
--- a/src-tauri/.sqlx/query-92d8f003a8f7df692345f2d2fd2504c9222645976e3433e32e190f4ee4bf100d.json
+++ b/src-tauri/.sqlx/query-92d8f003a8f7df692345f2d2fd2504c9222645976e3433e32e190f4ee4bf100d.json
@@ -0,0 +1,80 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, request_id, connection_id, created_at, content, status, error,\n                event_type AS \"event_type!: GrpcEventType\",\n                metadata AS \"metadata!: sqlx::types::Json<HashMap<String, String>>\"\n            FROM grpc_events\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "connection_id",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "content",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "status",
+        "ordinal": 7,
+        "type_info": "Int64"
+      },
+      {
+        "name": "error",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "event_type!: GrpcEventType",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "metadata!: sqlx::types::Json<HashMap<String, String>>",
+        "ordinal": 10,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "92d8f003a8f7df692345f2d2fd2504c9222645976e3433e32e190f4ee4bf100d"
+}
--- a/src-tauri/.sqlx/query-9ba3f783238b77637ffded4171b2fbb5e5ad0be952a0d832448d65cc5f0effc1.json
+++ b/src-tauri/.sqlx/query-9ba3f783238b77637ffded4171b2fbb5e5ad0be952a0d832448d65cc5f0effc1.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                name,\n                description,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, name, description, setting_request_timeout,\n                setting_follow_redirects, setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces WHERE id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -70,5 +70,5 @@
      false
    ]
  },
-  "hash": "e08fa4f9b2929f20a01d1dc43d6847a309d3e8c5b324df2d039d1c6e07e6eb2f"
+  "hash": "9ba3f783238b77637ffded4171b2fbb5e5ad0be952a0d832448d65cc5f0effc1"
 }
--- a/src-tauri/.sqlx/query-a1c9a862ca6a07476cb8e7d16d73bd109c070603396a890dc717e50020d006f5.json
+++ b/src-tauri/.sqlx/query-a1c9a862ca6a07476cb8e7d16d73bd109c070603396a890dc717e50020d006f5.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO http_responses (\n                id,\n                request_id,\n                workspace_id,\n                elapsed,\n                elapsed_headers,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body_path,\n                headers,\n                version,\n                remote_addr\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "a1c9a862ca6a07476cb8e7d16d73bd109c070603396a890dc717e50020d006f5"
-}
--- a/src-tauri/.sqlx/query-a690a04cd1ebe8c3dbfd0cd98ae4ef093a1696d7b7ecaf694d12e5fafd62b685.json
+++ b/src-tauri/.sqlx/query-a690a04cd1ebe8c3dbfd0cd98ae4ef093a1696d7b7ecaf694d12e5fafd62b685.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            UPDATE grpc_connections\n            SET (elapsed) = (-1)\n            WHERE elapsed = 0;\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": []
+  },
+  "hash": "a690a04cd1ebe8c3dbfd0cd98ae4ef093a1696d7b7ecaf694d12e5fafd62b685"
+}
--- a/src-tauri/.sqlx/query-ae98a7b35a5cb80a4bcd04faa22545deac2a5e9bfb814b60191f16b98ed49796.json
+++ b/src-tauri/.sqlx/query-ae98a7b35a5cb80a4bcd04faa22545deac2a5e9bfb814b60191f16b98ed49796.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                created_at,\n                updated_at,\n                folder_id,\n                name,\n                sort_priority\n            FROM folders\n            WHERE workspace_id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, created_at, updated_at, folder_id, name, sort_priority\n            FROM folders\n            WHERE id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -58,5 +58,5 @@
      false
    ]
  },
-  "hash": "1517b0f86c841b5f1247bd40c3a9b38ab001d846a410b6e3cd36f9e844d50ddb"
+  "hash": "ae98a7b35a5cb80a4bcd04faa22545deac2a5e9bfb814b60191f16b98ed49796"
 }
--- a/src-tauri/.sqlx/query-b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb.json
+++ b/src-tauri/.sqlx/query-b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                theme,\n                appearance,\n                update_channel\n            FROM settings\n            WHERE id = 'default'\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, theme, appearance, update_channel\n            FROM settings\n            WHERE id = 'default'\n        ",
  "describe": {
    "columns": [
      {
@@ -52,5 +52,5 @@
      false
    ]
  },
-  "hash": "3b3fb6271340c6ec21a10b4f1b20502c86c425e0b53ac07692f8a4ed0be09335"
+  "hash": "b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb"
 }
--- a/src-tauri/.sqlx/query-b3fae40a793a6724dd2286a9ca4bc0a9c000a631ee0d751a9dc4f3e76de3d57c.json
+++ b/src-tauri/.sqlx/query-b3fae40a793a6724dd2286a9ca4bc0a9c000a631ee0d751a9dc4f3e76de3d57c.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO cookie_jars (\n                id, workspace_id, name, cookies\n             )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               cookies = excluded.cookies\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "b3fae40a793a6724dd2286a9ca4bc0a9c000a631ee0d751a9dc4f3e76de3d57c"
+}
--- a/src-tauri/.sqlx/query-b5ed4dc77f8cf21de1a06f146e47821bdb51fcfe747170bea41e7a366d736bda.json
+++ b/src-tauri/.sqlx/query-b5ed4dc77f8cf21de1a06f146e47821bdb51fcfe747170bea41e7a366d736bda.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO cookie_jars (\n                id,\n                workspace_id,\n                name,\n                cookies\n             )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               cookies = excluded.cookies\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "b5ed4dc77f8cf21de1a06f146e47821bdb51fcfe747170bea41e7a366d736bda"
-}
--- a/src-tauri/.sqlx/query-cae4e905515ddea1ec2cd685020241f06b49719085a695b897ef8ad409d2cef2.json
+++ b/src-tauri/.sqlx/query-cae4e905515ddea1ec2cd685020241f06b49719085a695b897ef8ad409d2cef2.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO workspaces (\n                id,\n                name,\n                description,\n                variables,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates\n             )\n            VALUES (?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               description = excluded.description,\n               variables = excluded.variables,\n               setting_request_timeout = excluded.setting_request_timeout,\n               setting_follow_redirects = excluded.setting_follow_redirects,\n               setting_validate_certificates = excluded.setting_validate_certificates\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "cae4e905515ddea1ec2cd685020241f06b49719085a695b897ef8ad409d2cef2"
-}
--- a/src-tauri/.sqlx/query-d4b64c466624eb75e0f5bd201ebfb6a73d25eb7c9e09cb9690afdb7fef5fca8b.json
+++ b/src-tauri/.sqlx/query-d4b64c466624eb75e0f5bd201ebfb6a73d25eb7c9e09cb9690afdb7fef5fca8b.json
@@ -0,0 +1,92 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, request_id, created_at, updated_at, service,\n                method, elapsed, status, error, url,\n                trailers AS \"trailers!: sqlx::types::Json<HashMap<String, String>>\"\n            FROM grpc_connections\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "service",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 7,
+        "type_info": "Text"
+      },
+      {
+        "name": "elapsed",
+        "ordinal": 8,
+        "type_info": "Int64"
+      },
+      {
+        "name": "status",
+        "ordinal": 9,
+        "type_info": "Int64"
+      },
+      {
+        "name": "error",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "url",
+        "ordinal": 11,
+        "type_info": "Text"
+      },
+      {
+        "name": "trailers!: sqlx::types::Json<HashMap<String, String>>",
+        "ordinal": 12,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "d4b64c466624eb75e0f5bd201ebfb6a73d25eb7c9e09cb9690afdb7fef5fca8b"
+}
--- a/src-tauri/.sqlx/query-dcc2f405f8e29d0599d86bcde509187e9cc5fc647067eaa5c738cb24e2f081e5.json
+++ b/src-tauri/.sqlx/query-dcc2f405f8e29d0599d86bcde509187e9cc5fc647067eaa5c738cb24e2f081e5.json
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO environments (\n                id,\n                workspace_id,\n                name,\n                variables\n            )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               variables = excluded.variables\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "dcc2f405f8e29d0599d86bcde509187e9cc5fc647067eaa5c738cb24e2f081e5"
-}
--- a/src-tauri/.sqlx/query-e1cdba43bd938772631263966a9bee263923c387f4864917f36a04043bec4857.json
+++ b/src-tauri/.sqlx/query-e1cdba43bd938772631263966a9bee263923c387f4864917f36a04043bec4857.json
@@ -0,0 +1,104 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, sort_priority,\n                url, service, method, message, authentication_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                metadata AS \"metadata!: sqlx::types::Json<Vec<GrpcMetadataEntry>>\"\n            FROM grpc_requests\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "folder_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "name",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "sort_priority",
+        "ordinal": 7,
+        "type_info": "Float"
+      },
+      {
+        "name": "url",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "service",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "message",
+        "ordinal": 11,
+        "type_info": "Text"
+      },
+      {
+        "name": "authentication_type",
+        "ordinal": 12,
+        "type_info": "Text"
+      },
+      {
+        "name": "authentication!: Json<HashMap<String, JsonValue>>",
+        "ordinal": 13,
+        "type_info": "Text"
+      },
+      {
+        "name": "metadata!: sqlx::types::Json<Vec<GrpcMetadataEntry>>",
+        "ordinal": 14,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      true,
+      false,
+      false
+    ]
+  },
+  "hash": "e1cdba43bd938772631263966a9bee263923c387f4864917f36a04043bec4857"
+}
--- a/src-tauri/.sqlx/query-e61c0dddb3e86d271cb9399faa4e4443342796cb72bdd43a821fae2994ae8e2f.json
+++ b/src-tauri/.sqlx/query-e61c0dddb3e86d271cb9399faa4e4443342796cb72bdd43a821fae2994ae8e2f.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                method,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE workspace_id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, url,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                method, body_type, authentication_type, sort_priority,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE workspace_id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -54,29 +54,29 @@
        "type_info": "Text"
      },
      {
-        "name": "body!: Json<HashMap<String, JsonValue>>",
+        "name": "body_type",
        "ordinal": 10,
        "type_info": "Text"
      },
      {
-        "name": "body_type",
+        "name": "authentication_type",
        "ordinal": 11,
        "type_info": "Text"
      },
      {
-        "name": "authentication!: Json<HashMap<String, JsonValue>>",
+        "name": "sort_priority",
        "ordinal": 12,
-        "type_info": "Text"
+        "type_info": "Float"
      },
      {
-        "name": "authentication_type",
+        "name": "body!: Json<HashMap<String, JsonValue>>",
        "ordinal": 13,
        "type_info": "Text"
      },
      {
-        "name": "sort_priority",
+        "name": "authentication!: Json<HashMap<String, JsonValue>>",
        "ordinal": 14,
-        "type_info": "Float"
+        "type_info": "Text"
      },
      {
        "name": "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>",
@@ -98,13 +98,13 @@
      false,
      false,
      false,
-      false,
+      true,
      true,
      false,
-      true,
+      false,
      false,
      false
    ]
  },
-  "hash": "7a7bc4df7e52ad3a987c97af8f43b46381e2cc16ba0c553713d0b6c64354eb39"
+  "hash": "e61c0dddb3e86d271cb9399faa4e4443342796cb72bdd43a821fae2994ae8e2f"
 }
--- a/src-tauri/.sqlx/query-e7124f5570076bfd65985744f48d8e12cf29d6d243fffdd62ade2ab70c7bddda.json
+++ b/src-tauri/.sqlx/query-e7124f5570076bfd65985744f48d8e12cf29d6d243fffdd62ade2ab70c7bddda.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            UPDATE http_responses SET (\n                elapsed, elapsed_headers, url, status, status_reason, content_length, body_path,\n                error, headers, version, remote_addr, updated_at\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 12
+    },
+    "nullable": []
+  },
+  "hash": "e7124f5570076bfd65985744f48d8e12cf29d6d243fffdd62ade2ab70c7bddda"
+}
--- a/src-tauri/.sqlx/query-f5f20f3b37d932617499a0da50997edad59e4f5998b15c50ed6eae2e97064068.json
+++ b/src-tauri/.sqlx/query-f5f20f3b37d932617499a0da50997edad59e4f5998b15c50ed6eae2e97064068.json
@@ -1,6 +1,6 @@
 {
  "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                workspace_id,\n                name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE workspace_id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, workspace_id, name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -52,5 +52,5 @@
      false
    ]
  },
-  "hash": "cb939b45a715d91f7631dea6b2d1bdc59fb3dffbd44ff99bc15adb34ea7093f7"
+  "hash": "f5f20f3b37d932617499a0da50997edad59e4f5998b15c50ed6eae2e97064068"
 }
--- a/src-tauri/.sqlx/query-fe0652396bc30d926cf99083651c1cbd668bcf00ebe1a5f36616700c84972b39.json
+++ b/src-tauri/.sqlx/query-fe0652396bc30d926cf99083651c1cbd668bcf00ebe1a5f36616700c84972b39.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            DELETE FROM grpc_requests\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": []
+  },
+  "hash": "fe0652396bc30d926cf99083651c1cbd668bcf00ebe1a5f36616700c84972b39"
+}
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,3 +1,5 @@
+workspace = { members = ["grpc"] }
+
 [package]
 name = "yaak-app"
 version = "0.0.0"
@@ -7,11 +9,16 @@ 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 = "1.2", features = [] }
+tauri-build = { version = "2.0.0-beta", features = [] }

 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2.7"
@@ -21,9 +28,9 @@ cocoa = "0.25.0"
 openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work

 [dependencies]
-base64 = "0.21.0"
-boa_engine = { version = "0.17.3", features = ["annex-b"] }
-boa_runtime = { version = "0.17.3" }
+base64 = "0.22.0"
+boa_engine = { version = "0.18.0", features = ["annex-b"] }
+boa_runtime = { version = "0.18.0" }
 chrono = { version = "0.4.31", features = ["serde"] }
 futures = "0.3.26"
 http = "0.2.8"
@@ -32,38 +39,25 @@ reqwest = { version = "0.11.23", features = ["multipart", "cookies", "gzip", "br
 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.2", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
-tauri = { version = "1.5.2", features = [
+sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
+tauri = { version = "2.0.0-beta.17", features = [
    "config-toml",
    "devtools",
-    "dialog-open",
-    "dialog-save",
-    "fs-read-file",
-    "os-all",
-    "protocol-asset",
-    "shell-open",
-    "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"] }
+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" }
+tokio = { version = "1.36.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"
-
-[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"]
+grpc = { path = "./grpc" }
+tokio-stream = "0.1.15"
+regex = "1.10.2"
--- a/src-tauri/capabilities/capabilities.json
+++ b/src-tauri/capabilities/capabilities.json
@@ -0,0 +1,51 @@
+{
+  "$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",
+    "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
+        }
+      ]
+    },
+    "window:allow-close",
+    "window:allow-is-fullscreen",
+    "window:allow-maximize",
+    "window:allow-minimize",
+    "window:allow-set-decorations",
+    "window:allow-set-title",
+    "window:allow-start-dragging",
+    "window:allow-unmaximize",
+    "clipboard-manager:default"
+  ]
+}
--- a/src-tauri/gen/apple/.gitignore
+++ b/src-tauri/gen/apple/.gitignore
@@ -0,0 +1,3 @@
+xcuserdata/
+build/
+Externals/
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x-1.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-20x20@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x-1.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-29x29@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x-1.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-40x40@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512x512@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-512x512@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-60x60@3x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@1x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-76x76@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png
--- a/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@2x-1.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-83.5x83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "AppIcon-512@2x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/src-tauri/gen/apple/Assets.xcassets/Contents.json
+++ b/src-tauri/gen/apple/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/src-tauri/gen/apple/ExportOptions.plist
+++ b/src-tauri/gen/apple/ExportOptions.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>method</key>
+    <string>development</string>
+</dict>
+</plist>
--- a/src-tauri/gen/apple/Podfile
+++ b/src-tauri/gen/apple/Podfile
@@ -0,0 +1,21 @@
+# Uncomment the next line to define a global platform for your project
+
+target 'yaak-app_iOS' do
+platform :ios, '13.0'
+  # Pods for yaak-app_iOS
+end
+
+target 'yaak-app_macOS' do
+platform :osx, '11.0'
+  # Pods for yaak-app_macOS
+end
+
+# Delete the deployment target for iOS and macOS, causing it to be inherited from the Podfile
+post_install do |installer|
+ installer.pods_project.targets.each do |target|
+  target.build_configurations.each do |config|
+   config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+   config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET'
+  end
+ end
+end
--- a/src-tauri/gen/apple/Sources/yaak-app/bindings/bindings.h
+++ b/src-tauri/gen/apple/Sources/yaak-app/bindings/bindings.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace ffi {
+    extern "C" {
+        void start_app();
+    }
+}
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gregory Schier	bb47fda7e1	Fix release targets	2024-05-09 15:38:27 -07:00
Gregory Schier	f98f541a3d	Don't commit .cargo	2024-05-09 10:17:35 -07:00
Gregory Schier	4ea943d7f1	Fix args	2024-05-09 09:35:39 -07:00
Gregory Schier	a6fac2460b	Update GH action	2024-05-09 09:33:47 -07:00
Gregory Schier	50410d262f	Try fix linux	2024-05-09 08:37:18 -07:00
Gregory Schier	388d227572	Fix env var in GH Action	2024-05-09 08:29:45 -07:00
Gregory Schier	d07e80cc19	Fix curl export tests	2024-05-09 08:18:06 -07:00
Gregory Schier	8d987cff31	Default .app/.dev/etc domains to https protos	2024-05-09 08:16:06 -07:00
Gregory Schier	c46e976932	Bump version for beta	2024-05-09 07:52:36 -07:00
Gregory Schier	e33f273d7b	Fix GRPC event.emit permissions	2024-05-09 07:45:00 -07:00
Gregory Schier	f16ced534c	Import from Curl	2024-05-09 07:31:52 -07:00
Gregory Schier	f05abf97a4	Package lock	2024-05-08 15:37:53 -07:00
Gregory Schier	71b06c5261	Slight refactor to copy-as-curl	2024-05-08 00:28:40 -07:00
Gregory Schier	6639b07568	Add rename request to context menu Closes #21	2024-05-08 00:08:18 -07:00
Gregory Schier	b196e51f1f	Copy as curl	2024-05-08 00:00:50 -07:00
Gregory Schier	edc4fe3d9a	Curl import (#24 )	2024-05-07 21:57:03 -07:00
Gregory Schier	74065a320c	Upgrade to Tauri 2.0 (#23 )	2024-05-04 14:14:19 -07:00
Gregory Schier	87946c6c9f	Fix horizontal scroll on GraphQL variables editor	2024-04-18 10:53:36 -07:00
Gregory Schier	4a58f73aa4	Oops	2024-04-02 10:11:37 +02:00
Gregory Schier	bd17650799	Postman text body import	2024-04-02 10:10:16 +02:00
Gregory Schier	db6a7dcabb	Bump version	2024-04-01 08:48:26 +02:00
Gregory Schier	00b1f90074	Separate floating sidebar hidden state	2024-03-22 10:43:10 -07:00
Gregory Schier	e292235792	Filtering for cmd palette	2024-03-22 10:42:45 -07:00
Gregory Schier	5f86802d88	Space between var placeholders and code fold cursor	2024-03-22 10:42:35 -07:00
Gregory Schier	acb7f2e49b	Fix Postman variable import	2024-03-22 10:40:51 -07:00
Gregory Schier	e2a15609bf	Adjust highlight color	2024-03-22 10:37:45 -07:00
Gregory Schier	aa3bfd78c4	Some scrolling tweaks	2024-03-20 17:27:47 -07:00
Gregory Schier	23c4971127	Fix URL bar buttons in expanded state	2024-03-20 16:17:05 -07:00
Gregory Schier	40669217fb	Bump version	2024-03-20 16:05:14 -07:00
Gregory Schier	8089ea87e8	Fix dialog height	2024-03-20 16:05:01 -07:00
Gregory Schier	9de24e3a40	Remove openOnHotKeyAction in favor of putting hotkey on the trigger button=	2024-03-20 15:56:39 -07:00
Gregory Schier	5afb8e7383	Use SQLite connect options	2024-03-20 13:33:11 -07:00
Gregory Schier	b3e3f22211	Pass workspace id to import	2024-03-20 07:30:59 -07:00
Gregory Schier	1ff6ff16b3	Handle import errors	2024-03-20 07:27:12 -07:00
Gregory Schier	b8a692f1a5	Postman bearer, global auth, global vars	2024-03-20 07:26:46 -07:00
Gregory Schier	5506cdd05f	Implement select for command palette	2024-03-19 17:24:57 -07:00
Gregory Schier	4180fecb4b	Tweak checkbox and autocomplete styles	2024-03-19 17:08:06 -07:00
Gregory Schier	fa257fdb18	Fix sidebar border	2024-03-19 16:44:37 -07:00
Gregory Schier	2da141ea16	Export multiple workspaces	2024-03-19 13:43:33 -07:00
Gregory Schier	1993361f87	Fix settings query store and analytics	2024-03-19 10:23:21 -07:00
Gregory Schier	a5dd3beb73	Start of command palette	2024-03-18 17:09:01 -07:00
Gregory Schier	17423f8c54	useRequests hook	2024-03-18 13:49:36 -07:00
Gregory Schier	8f495b9ade	Fix editor key events	2024-03-18 13:40:15 -07:00
Gregory Schier	46b9b758fe	Simple tests for Postman and Yaak importers	2024-03-18 13:40:00 -07:00
Gregory Schier	b0e84aac0c	Set filename on Multipart part	2024-03-18 13:24:27 -07:00
Gregory Schier	20de2aeacc	Fix GraphQL editor large variables quirk	2024-03-18 13:10:55 -07:00
Gregory Schier	7198534640	Fix postman import and import Insomnia gRPC	2024-03-18 08:18:04 -07:00
Gregory Schier	7e8ec36474	Better padding	2024-03-16 13:59:06 -07:00
Gregory Schier	52d1602d35	Remove debug log	2024-03-16 12:50:27 -07:00
Gregory Schier	e5731ceb1f	Custom content-type for multipart items	2024-03-16 12:49:17 -07:00
Gregory Schier	3ed5a47a83	Content menu on entire sidebar	2024-03-16 10:47:10 -07:00
Gregory Schier	262a29ca5d	Obfuscate environment variables	2024-03-16 10:42:46 -07:00
Gregory Schier	4a3e599128	Fix light mode text selection	2024-03-16 09:48:55 -07:00
Gregory Schier	7ebe844643	Stubbed out global commands helper	2024-03-16 09:46:11 -07:00
Gregory Schier	a49b72eebc	Fix deleting workspace staying on deleted workspace path	2024-03-15 13:07:02 -07:00
Gregory Schier	bba3afa0b7	Bump version	2024-03-10 18:15:00 -07:00
Gregory Schier	221e768b33	Fix recent workspaces	2024-03-10 17:42:25 -07:00
Gregory Schier	c2dc7e0f4a	Fix adding header if not exist	2024-03-10 17:10:16 -07:00
Gregory Schier	9e065c34ee	Remove completion debug blur thing	2024-03-10 16:46:18 -07:00
Gregory Schier	2f91d541c5	Adjust detected content-type header	2024-03-10 16:26:06 -07:00
Gregory Schier	948fd487ab	Clickable links in response viewer	2024-03-10 13:41:44 -07:00
Gregory Schier	ed6a5386a2	Better error handling for file not found	2024-03-10 11:02:32 -07:00
Gregory Schier	8a24c48fd3	Cancel file selection sets to undefined	2024-03-10 10:57:49 -07:00
Gregory Schier	d726a6f5bf	Binary file uploads and missing workspace empty state	2024-03-10 10:56:38 -07:00
Gregory Schier	8d2a2a8532	Fix GraphQL Header backend	2024-02-28 13:38:22 -08:00
Gregory Schier	b838a6ffc1	Fix GraphQL content type on creation, and placeholder	2024-02-28 13:04:17 -08:00
Gregory Schier	2174a91b64	Include default protoc includes	2024-02-28 09:45:11 -08:00
Gregory Schier	083f83ccab	Bump version	2024-02-28 08:51:34 -08:00
Gregory Schier	4f749be2e2	Fix dropdown arrow keys	2024-02-28 08:51:08 -08:00
Gregory Schier	cefdc3ecf3	Track GRPC	2024-02-28 07:32:05 -08:00
Gregory Schier	02960d2d64	Analytics ID	2024-02-28 07:27:19 -08:00
Gregory Schier	9e5226aa83	Analytics ID	2024-02-28 07:26:02 -08:00
Gregory Schier	63d7a44586	Remove Escape from hotkeys	2024-02-27 18:58:41 -08:00
Gregory Schier	c851dfe206	Fix sidebar focus	2024-02-27 10:33:20 -08:00
Gregory Schier	6adc15a249	Fix gap in dropdown menu items	2024-02-27 10:27:04 -08:00
Gregory Schier	9ac7aac296	Methods in recent dropdown	2024-02-27 10:20:35 -08:00
Gregory Schier	325d63e1b7	Many hotkey improvements	2024-02-27 10:10:38 -08:00
Gregory Schier	e639a77165	Info logs in build	2024-02-26 17:27:08 -08:00
Gregory Schier	c075efc752	Introspection tweak	2024-02-26 17:24:44 -08:00
Gregory Schier	c4f42f71c3	Tweak editor find/replace	2024-02-26 17:17:37 -08:00
Gregory Schier	535adfe200	Fix find/replace CM styling	2024-02-26 17:07:09 -08:00
Gregory Schier	85fa159f0d	Fix lint errors	2024-02-26 07:43:08 -08:00
Gregory Schier	fd2fe46c95	Autocomplete icons and transfer proto files on duplicate	2024-02-26 07:39:53 -08:00
Gregory Schier	6e52f35626	Prompt folder name on create	2024-02-26 07:14:27 -08:00
Gregory Schier	a0d1e7023d	Better creation from folder menu	2024-02-26 07:09:59 -08:00
Gregory Schier	97a2f00d59	Auto-fill link to changelog in release script	2024-02-25 18:42:04 -08:00
Gregory Schier	50ad4efad7	Protoc sidecar	2024-02-25 17:43:29 -08:00
Gregory Schier	79a3d9c8df	Fix deletion in sidebar	2024-02-25 12:56:57 -08:00
Gregory Schier	b8e20d885f	Fix create dropdown hotkey	2024-02-24 22:02:04 -08:00
Gregory Schier	752eb3dbd5	Try changing macOS version	2024-02-24 21:25:58 -08:00
Gregory Schier	616acdfb56	Bump some things	2024-02-24 21:23:02 -08:00
Gregory Schier	b2bcbababe	Fix response pane height	2024-02-24 19:31:59 -08:00
Gregory Schier	9f5a3ef96a	Don't build plugins	2024-02-24 18:58:51 -08:00
Gregory Schier	d2c5bdc3c8	Remove npm ci plugins	2024-02-24 18:28:07 -08:00
Gregory Schier	0d6899a12c	Check in built plugins again	2024-02-24 18:27:36 -08:00
Gregory Schier	1b25cb0c4c	Add pkg locks	2024-02-24 18:19:16 -08:00
Gregory Schier	783b7222df	Install plugins in CI	2024-02-24 16:29:22 -08:00
Gregory Schier	ff3165ab30	Bump version	2024-02-24 16:22:55 -08:00
Gregory Schier	9780dc88a1	Got json-schema autocomplete working again	2024-02-24 16:22:22 -08:00
Gregory Schier	e4f0d2a341	Proto files off model	2024-02-24 14:16:58 -08:00
Gregory Schier	bcf0ae159d	Better gRPC status on error	2024-02-24 12:41:43 -08:00
Gregory Schier	5664d41073	More analytics, and cancel requests	2024-02-24 11:30:07 -08:00
Gregory Schier	e75e6865ea	Hook up empty state buttons for first-launch experience	2024-02-23 16:34:19 -08:00
Gregory Schier	fd5b495b70	gRPC in import/export	2024-02-23 16:16:13 -08:00
Gregory Schier	16506d1ddd	Everything in messages now	2024-02-22 19:51:30 -08:00
Gregory Schier	e3016f7100	Format XML responses	2024-02-22 01:00:02 -08:00
Gregory Schier	766da4327c	Refactor into grpc events	2024-02-22 00:49:22 -08:00
Gregory Schier	6f389b0010	Fix split layout placeholder	2024-02-18 09:12:44 -08:00
Gregory Schier	007ea88edd	Add other body type	2024-02-18 08:59:14 -08:00
Gregory Schier	5409678855	Add metadata and squash migrations	2024-02-18 08:35:31 -08:00
Gregory Schier	4c6bd63b8b	Better environment edit dialog	2024-02-18 07:44:53 -08:00
Gregory Schier	8db80d2e97	Allow editing base environment	2024-02-18 00:14:47 -08:00
Gregory Schier	c80fca8063	Render gRPC message body	2024-02-18 00:14:26 -08:00
Gregory Schier	7384398813	gRPC authentication	2024-02-17 23:47:28 -08:00
Gregory Schier	b57ea8adeb	Even better dropdown filtering	2024-02-17 22:27:01 -08:00
Gregory Schier	8ff2caf3c3	Started gRPC tabs	2024-02-17 22:15:44 -08:00
Gregory Schier	a521b8f308	Better dropdown filtering	2024-02-17 22:03:42 -08:00
Gregory Schier	50ba167516	Prevent dragging folders into itself	2024-02-17 15:32:15 -08:00
Gregory Schier	cb102657ea	Fix deps	2024-02-17 15:20:13 -08:00
Gregory Schier	a7d9e2432b	Upgrade Vite deps and fix windows DnD	2024-02-17 14:57:12 -08:00
Gregory Schier	d842b168e6	Fix postman importer TS ref	2024-02-17 11:05:57 -08:00
Gregory Schier	870cb25980	Add more info to settings	2024-02-17 11:04:19 -08:00
Gregory Schier	fde0c5540b	Adjust placeholder error colors	2024-02-15 21:15:18 -08:00
Gregory Schier	2ec9a1c19d	Tweak tab padding	2024-02-15 16:38:14 -08:00
Gregory Schier	c2f5a3bf45	Responsive (scroll) workspace header	2024-02-15 16:30:08 -08:00
Gregory Schier	7c18eeae8c	Better button highlight border	2024-02-15 15:55:32 -08:00
Gregory Schier	d7a1b4b7bc	Refactor recentRequest/Env/Workspace	2024-02-15 15:14:18 -08:00
Gregory Schier	4566ede184	Better sidebar collapse, debuonce container uqeries, fix recent requests	2024-02-15 15:07:15 -08:00
Gregory Schier	f45c898be0	Better recent work/env/req logic	2024-02-13 17:21:54 -08:00
Gregory Schier	4e1700f8a4	Fix active environment on workspace change	2024-02-13 16:42:07 -08:00
Gregory Schier	f14311d14a	Active environment in query param	2024-02-13 16:32:31 -08:00
Gregory Schier	470a7e2278	Better variable placeholder styles	2024-02-13 16:32:17 -08:00
Gregory Schier	2d67be481d	Show GQL for graphql requests in sidebar	2024-02-13 16:32:00 -08:00
Gregory Schier	9f6ddb1558	Better highlight on JSON tree	2024-02-13 16:31:38 -08:00
Gregory Schier	853f07b9af	Cmd+n to open dropdown	2024-02-11 14:17:09 -08:00
Gregory Schier	0eb6358387	Tab-to-indent in editor	2024-02-11 14:16:36 -08:00
Gregory Schier	d43e045f25	Make editor variables more prominent	2024-02-11 14:16:25 -08:00
Gregory Schier	17432fca29	Fix dropdown open index	2024-02-11 14:16:11 -08:00
Gregory Schier	d5931660c2	Catch URL error when URL = "{{HOST}}"	2024-02-11 09:04:27 -08:00
Gregory Schier	cd7678b7a1	Grap gRPC status codes	2024-02-11 08:52:12 -08:00
Gregory Schier	706be1188b	Use basemsg	2024-02-11 08:29:57 -08:00
Gregory Schier	8989b61a13	Combine grpc handlers, fix duplicate	2024-02-10 10:41:45 -08:00
Gregory Schier	a997944f16	Fix response emit and sidebar flex	2024-02-09 16:16:02 -08:00
Gregory Schier	f8e8f5d3f2	Sidebar methods and fix model hooks	2024-02-09 16:09:24 -08:00
Gregory Schier	812e5238ac	Fix editor selection/cursor and lint errors	2024-02-09 14:32:58 -08:00
Gregory Schier	16d4f2952d	Remove built plugins from source control	2024-02-09 05:09:37 -08:00
Gregory Schier	ac9a6d5871	Merge branch 'grpc'	2024-02-09 05:07:45 -08:00
Gregory Schier	4fcf1df61f	Move plugins to build folder	2024-02-09 05:07:34 -08:00
Gregory Schier	394beb374e	gRPC Support (#20 )	2024-02-09 05:01:00 -08:00
Gregory Schier	ba4d1063e3	Better message serialization	2024-02-09 05:00:48 -08:00
Gregory Schier	2bd9b436e6	Working sidebar actions for grpc	2024-02-07 00:02:02 -08:00
Gregory Schier	915a59dec4	Change hotkey handling to capture phase	2024-02-06 23:44:10 -08:00
Gregory Schier	ae2b746cb2	Fix pool management	2024-02-06 23:26:24 -08:00
Gregory Schier	b04cff153b	Minor tweaks	2024-02-06 19:32:03 -08:00
Gregory Schier	bd8e71e567	gRPC schema from files!	2024-02-06 19:20:32 -08:00
Gregory Schier	562a36d616	Proto selection UI/models	2024-02-06 12:29:23 -08:00
Gregory Schier	c85a11edf1	Better reflect failure UI	2024-02-05 14:50:47 -08:00
Gregory Schier	ef7f942a8f	Async connection management	2024-02-05 11:29:27 -08:00
Gregory Schier	a7f2a86d71	Refactor model emit, and recent conn dropdown	2024-02-05 10:39:47 -08:00
Gregory Schier	bf90f84d16	db to app_handle!	2024-02-04 22:52:04 -08:00
Gregory Schier	4284aa2549	Single upserted_model event	2024-02-04 21:19:15 -08:00
Gregory Schier	60773cab53	Fix DB mutex deadlock	2024-02-04 21:17:05 -08:00
Gregory Schier	e2c17873ae	More messages	2024-02-04 19:08:31 -08:00
Gregory Schier	88982156ee	Client streaming working	2024-02-04 17:53:15 -08:00
Gregory Schier	722c8a1c6b	Bidirectional working	2024-02-04 14:10:38 -08:00
Gregory Schier	8c15274786	Messages are flowing!	2024-02-04 12:09:10 -08:00
Gregory Schier	1abba4980a	Use req/conn/msg models in unary/server	2024-02-04 11:57:12 -08:00
Gregory Schier	3a340999ec	Remove console log	2024-02-03 13:39:45 -08:00
Gregory Schier	b7261e77aa	Grpc layout use new models	2024-02-03 13:28:31 -08:00
Gregory Schier	23431b40e9	Show gRPC requests in sidebar	2024-02-03 13:08:24 -08:00
Gregory Schier	04f31cd4a7	gRPC models and tables	2024-02-03 11:14:42 -08:00
Gregory Schier	7d82a7e74a	Tiny fixes	2024-02-02 18:41:00 -08:00
Gregory Schier	d31255d987	Better formatting	2024-02-02 13:37:44 -08:00
Gregory Schier	e53693f605	A bit better handling of responses	2024-02-02 13:32:06 -08:00
Gregory Schier	67aa7b7268	Split layouts and things	2024-02-02 12:41:37 -08:00
Gregory Schier	e27ed9becc	bidi hacked!	2024-02-02 01:10:54 -08:00
Gregory Schier	22d21af3c2	Implement cancel	2024-02-02 00:18:37 -08:00
Gregory Schier	67000af7f9	Better connection management	2024-02-01 20:29:32 -08:00
Gregory Schier	b84c7ba50c	gRPC manager mostly working	2024-02-01 15:36:50 -08:00
Gregory Schier	a0b3f86462	Small refactor	2024-02-01 02:42:59 -08:00
Gregory Schier	6a8395660d	Refactor commands and DB	2024-02-01 02:29:24 -08:00
Gregory Schier	2c041fbac6	Some minor tweaks	2024-02-01 00:48:03 -08:00
Gregory Schier	1eed0e8f22	Revert response JSON tree	2024-02-01 00:38:57 -08:00
Gregory Schier	63a0ed273d	Even better styles	2024-02-01 00:36:49 -08:00
Gregory Schier	d0be5ca515	Styled it up a bit	2024-02-01 00:16:09 -08:00
Gregory Schier	b964c942d6	Merge remote-tracking branch 'origin/grpc' into grpc	2024-01-31 22:14:15 -08:00
Gregory Schier	a05fc5fd20	Hacky server streaming done	2024-01-31 22:14:08 -08:00
Gregory Schier	de183abd24	Hacky client streaming done	2024-01-31 22:13:46 -08:00
Gregory Schier	5c44df7b00	Initial frontend for gRPC UI	2024-01-30 16:43:54 -08:00
Gregory Schier	dbdce4cf9a	Hooked up test call from frontend!	2024-01-29 20:50:43 -08:00