Fix release targets

Closes #21

.github/workflows/ci-js.yml

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

.github/workflows/ci-rust.yml

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

.github/workflows/release.yml

@@ -3,6 +3,8 @@ on:
   push:
     tags: [ v* ]
 
+permissions: write-all
+
 jobs:
   build-artifacts:
     permissions:
@@ -21,39 +23,34 @@ jobs:
           - platform: 'windows-latest'
             args: ''
     runs-on: ${{ matrix.platform }}
+
     steps:
       - uses: actions/checkout@v4
       - name: setup node
         uses: actions/setup-node@v4
         with:
           node-version: lts/*
+
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
         with:
           # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
-      - uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
+
       - name: install dependencies (ubuntu only)
         if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          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 lint
-        run: npm run lint
+
       - name: Run tests
         run: npm test
+
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -27,5 +27,4 @@ dist-ssr
 *.sqlite
 *.sqlite-*
 
-.cargo
-plugins/**/build
+.cargo

.run/Build Desktop.run.xml

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

.tauriignore

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

index.html

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

package.json

@@ -1,12 +1,12 @@
 {
-  "name": "yaak",
+  "name": "yaak-app",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "start": "npm run tauri-dev:desktop",
+    "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 --force-ip-prompt --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",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@codemirror/commands": "^6.2.1",
-    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/lang-javascript": "^6.1.4",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-xml": "^6.0.2",
     "@codemirror/language": "^6.6.0",
@@ -39,7 +39,10 @@
     "@lezer/lr": "^1.3.3",
     "@react-hook/resize-observer": "^1.2.6",
     "@tailwindcss/container-queries": "^0.1.0",
-    "@tanstack/react-query": "^5.35.5",
+    "@tanstack/query-sync-storage-persister": "^4.27.1",
+    "@tanstack/react-query": "^4.28.0",
+    "@tanstack/react-query-devtools": "^4.28.0",
+    "@tanstack/react-query-persist-client": "^4.28.0",
     "@tauri-apps/api": ">=2.0.0-beta.0",
     "@tauri-apps/plugin-clipboard-manager": "^2.1.0-beta.1",
     "@tauri-apps/plugin-dialog": ">=2.0.0-beta.0",
@@ -52,7 +55,6 @@
     "codemirror": "^6.0.1",
     "codemirror-json-schema": "^0.6.1",
     "date-fns": "^3.3.1",
-    "fast-fuzzy": "^1.12.0",
     "focus-trap-react": "^10.1.1",
     "format-graphql": "^1.4.0",
     "framer-motion": "^9.0.4",
@@ -65,7 +67,6 @@
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",
     "react-helmet-async": "^1.3.0",
-    "react-pdf": "^9.0.0",
     "react-router-dom": "^6.8.1",
     "react-use": "^17.4.0",
     "slugify": "^1.6.6",
@@ -75,7 +76,6 @@
   },
   "devDependencies": {
     "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",
-    "@tanstack/react-query-devtools": "^5.35.5",
     "@tauri-apps/cli": ">=2.0.0-beta.0",
     "@types/node": "^18.7.10",
     "@types/papaparse": "^5.3.7",
@@ -103,9 +103,8 @@
     "prettier": "^2.8.4",
     "react-devtools": "^4.27.2",
     "tailwindcss": "^3.2.7",
-    "typescript": "^5.4.5",
+    "typescript": "^5.3.3",
     "vite": "^5.0.0",
-    "vite-plugin-static-copy": "^1.0.5",
     "vite-plugin-svgr": "^4.2.0",
     "vite-plugin-top-level-await": "^1.4.1",
     "vitest": "^1.3.0"

plugins/exporter-curl/src/index.ts

@@ -2,7 +2,7 @@ import { HttpRequest } from '../../../src-web/lib/models';
 
 const NEWLINE = '\\\n ';
 
-export function pluginHookExport(_: any, request: Partial<HttpRequest>) {
+export function pluginHookExport(request: Partial<HttpRequest>) {
   const xs = ['curl'];
 
   // Add method and URL all on first line

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

@@ -1,12 +1,10 @@
 import { describe, expect, test } from 'vitest';
 import { pluginHookExport } from '../src';
 
-const ctx = {};
-
 describe('exporter-curl', () => {
   test('Exports GET with params', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         urlParameters: [
           { name: 'a', value: 'aaa' },
@@ -20,7 +18,7 @@ describe('exporter-curl', () => {
   });
   test('Exports POST with url form data', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         method: 'POST',
         bodyType: 'application/x-www-form-urlencoded',
@@ -39,7 +37,7 @@ describe('exporter-curl', () => {
 
   test('Exports PUT with multipart form', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         method: 'PUT',
         bodyType: 'multipart/form-data',
@@ -64,7 +62,7 @@ describe('exporter-curl', () => {
 
   test('Exports JSON body', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         method: 'POST',
         bodyType: 'application/json',
@@ -82,29 +80,9 @@ describe('exporter-curl', () => {
     );
   });
 
-  test('Exports multi-line JSON body', () => {
-    expect(
-      pluginHookExport(ctx, {
-        url: 'https://yaak.app',
-        method: 'POST',
-        bodyType: 'application/json',
-        body: {
-          text: `{"foo":"bar",\n"baz":"qux"}`,
-        },
-        headers: [{ name: 'Content-Type', value: 'application/json' }],
-      }),
-    ).toEqual(
-      [
-        `curl -X POST 'https://yaak.app'`,
-        `--header 'Content-Type: application/json'`,
-        `--data-raw $'{"foo":"bar",\n"baz":"qux"}'`,
-      ].join(` \\\n  `),
-    );
-  });
-
   test('Exports headers', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         headers: [
           { name: 'a', value: 'aaa' },
           { name: 'b', value: 'bbb', enabled: true },
@@ -116,7 +94,7 @@ describe('exporter-curl', () => {
 
   test('Basic auth', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         authenticationType: 'basic',
         authentication: {
@@ -129,7 +107,7 @@ describe('exporter-curl', () => {
 
   test('Broken basic auth', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         authenticationType: 'basic',
         authentication: {},
@@ -139,7 +117,7 @@ describe('exporter-curl', () => {
 
   test('Digest auth', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         authenticationType: 'digest',
         authentication: {
@@ -152,7 +130,7 @@ describe('exporter-curl', () => {
 
   test('Bearer auth', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         authenticationType: 'bearer',
         authentication: {
@@ -164,7 +142,7 @@ describe('exporter-curl', () => {
 
   test('Broken bearer auth', () => {
     expect(
-      pluginHookExport(ctx, {
+      pluginHookExport({
         url: 'https://yaak.app',
         authenticationType: 'bearer',
         authentication: {

plugins/exporter-curl/vite.config.js

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

plugins/filter-jsonpath/src/index.js

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

plugins/filter-jsonpath/vite.config.js

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

plugins/filter-xpath/src/index.js

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

plugins/filter-xpath/vite.config.js

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

plugins/importer-curl/src/index.ts

@@ -43,7 +43,7 @@ type Pair = string | boolean;
 
 type PairsByName = Record<string, Pair[]>;
 
-export function pluginHookImport(_: any, rawData: string) {
+export function pluginHookImport(rawData: string) {
   if (!rawData.match(/^\s*curl /)) {
     return null;
   }
@@ -52,7 +52,7 @@ export function pluginHookImport(_: any, rawData: string) {
 
   // Replace non-escaped newlines with semicolons to make parsing easier
   // NOTE: This is really slow in debug build but fast in release mode
-  const normalizedData = rawData.replace(/\ncurl/g, '; curl');
+  const normalizedData = rawData.replace(/([^\\])\n/g, '$1; ');
 
   let currentCommand: ParseEntry[] = [];
 
@@ -137,6 +137,8 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
   // 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();
     }
@@ -184,7 +186,7 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
   urlParameters =
     search?.split('&').map((p) => {
       const v = splitOnce(p, '=');
-      return { name: v[0] ?? '', value: v[1] ?? '', enabled: true };
+      return { name: v[0] ?? '', value: v[1] ?? '' };
     }) ?? [];
 
   url = baseUrl ?? urlArg;
@@ -212,13 +214,11 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
       return {
         name: (name ?? '').trim().replace(/;$/, ''),
         value: '',
-        enabled: true,
       };
     }
     return {
       name: (name ?? '').trim(),
       value: value.trim(),
-      enabled: true,
     };
   });
 
@@ -245,7 +245,6 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
     headers.push({
       name: 'Cookie',
       value: cookieHeaderValue,
-      enabled: true,
     });
   }
 
@@ -289,17 +288,12 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
   ) {
     bodyType = mimeType ?? 'application/x-www-form-urlencoded';
     body = {
-      form: dataParameters.map((parameter) => ({
+      params: dataParameters.map((parameter) => ({
         ...parameter,
         name: decodeURIComponent(parameter.name || ''),
         value: decodeURIComponent(parameter.value || ''),
       })),
     };
-    headers.push({
-      name: 'Content-Type',
-      value: 'application/x-www-form-urlencoded',
-      enabled: true,
-    });
   } else if (dataParameters.length > 0) {
     bodyType =
       mimeType === 'application/json' || mimeType === 'text/xml' || mimeType === 'text/plain'
@@ -315,20 +309,13 @@ export function importCommand(parseEntries: ParseEntry[], workspaceId: string) {
     body = {
       form: formDataParams,
     };
-    if (mimeType == null) {
-      headers.push({
-        name: 'Content-Type',
-        value: 'multipart/form-data',
-        enabled: true,
-      });
-    }
   }
 
   // Method
   let method = getPairValue(pairsByName, '', ['X', 'request']).toUpperCase();
 
   if (method === '' && body) {
-    method = 'text' in body || 'form' in body ? 'POST' : 'GET';
+    method = 'text' in body || 'params' in body ? 'POST' : 'GET';
   }
 
   const request: ExportResources['httpRequests'][0] = {
@@ -357,7 +344,6 @@ const pairsToDataParameters = (keyedPairs: PairsByName) => {
     value: string;
     contentType?: string;
     filePath?: string;
-    enabled?: boolean;
   }[] = [];
 
   for (const flagName of DATA_FLAGS) {
@@ -377,13 +363,11 @@ const pairsToDataParameters = (keyedPairs: PairsByName) => {
           name: name ?? '',
           value: '',
           filePath: p.slice(1),
-          enabled: true,
         });
       } else {
         dataParameters.push({
           name: name ?? '',
           value: flagName === 'data-urlencode' ? encodeURIComponent(value ?? '') : value ?? '',
-          enabled: true,
         });
       }
     }

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

@@ -2,11 +2,9 @@ import { describe, expect, test } from 'vitest';
 import { HttpRequest, Model, Workspace } from '../../../src-web/lib/models';
 import { pluginHookImport } from '../src';
 
-const ctx = {};
-
 describe('importer-curl', () => {
   test('Imports basic GET', () => {
-    expect(pluginHookImport(ctx, 'curl https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -19,7 +17,7 @@ describe('importer-curl', () => {
   });
 
   test('Explicit URL', () => {
-    expect(pluginHookImport(ctx, 'curl --url https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --url https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -32,7 +30,7 @@ describe('importer-curl', () => {
   });
 
   test('Missing URL', () => {
-    expect(pluginHookImport(ctx, 'curl -X POST')).toEqual({
+    expect(pluginHookImport('curl -X POST')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -45,7 +43,7 @@ describe('importer-curl', () => {
   });
 
   test('URL between', () => {
-    expect(pluginHookImport(ctx, 'curl -v https://yaak.app -X POST')).toEqual({
+    expect(pluginHookImport('curl -v https://yaak.app -X POST')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -59,7 +57,7 @@ describe('importer-curl', () => {
   });
 
   test('Random flags', () => {
-    expect(pluginHookImport(ctx, 'curl --random -Z -Y -S --foo https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --random -Z -Y -S --foo https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -72,7 +70,7 @@ describe('importer-curl', () => {
   });
 
   test('Imports --request method', () => {
-    expect(pluginHookImport(ctx, 'curl --request POST https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --request POST https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -86,7 +84,7 @@ describe('importer-curl', () => {
   });
 
   test('Imports -XPOST method', () => {
-    expect(pluginHookImport(ctx, 'curl -XPOST --request POST https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl -XPOST --request POST https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -101,10 +99,7 @@ describe('importer-curl', () => {
 
   test('Imports multiple requests', () => {
     expect(
-      pluginHookImport(
-        ctx,
-        'curl \\\n  https://yaak.app\necho "foo"\ncurl example.com;curl foo.com',
-      ),
+      pluginHookImport('curl \\\n  https://yaak.app\necho "foo"\ncurl example.com;curl foo.com'),
     ).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
@@ -119,7 +114,7 @@ describe('importer-curl', () => {
 
   test('Imports form data', () => {
     expect(
-      pluginHookImport(ctx, 'curl -X POST -F "a=aaa" -F b=bbb" -F f=@filepath https://yaak.app'),
+      pluginHookImport('curl -X POST -F "a=aaa" -F b=bbb" -F f=@filepath https://yaak.app'),
     ).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
@@ -127,13 +122,6 @@ describe('importer-curl', () => {
           baseRequest({
             method: 'POST',
             url: 'https://yaak.app',
-            headers: [
-              {
-                name: 'Content-Type',
-                value: 'multipart/form-data',
-                enabled: true,
-              },
-            ],
             bodyType: 'multipart/form-data',
             body: {
               form: [
@@ -149,7 +137,7 @@ describe('importer-curl', () => {
   });
 
   test('Imports data params as form url-encoded', () => {
-    expect(pluginHookImport(ctx, 'curl -d a -d b -d c=ccc https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl -d a -d b -d c=ccc https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -157,18 +145,11 @@ describe('importer-curl', () => {
             method: 'POST',
             url: 'https://yaak.app',
             bodyType: 'application/x-www-form-urlencoded',
-            headers: [
-              {
-                name: 'Content-Type',
-                value: 'application/x-www-form-urlencoded',
-                enabled: true,
-              },
-            ],
             body: {
-              form: [
-                { name: 'a', value: '', enabled: true },
-                { name: 'b', value: '', enabled: true },
-                { name: 'c', value: 'ccc', enabled: true },
+              params: [
+                { name: 'a', value: '' },
+                { name: 'b', value: '' },
+                { name: 'c', value: 'ccc' },
               ],
             },
           }),
@@ -179,7 +160,7 @@ describe('importer-curl', () => {
 
   test('Imports data params as text', () => {
     expect(
-      pluginHookImport(ctx, 'curl -H Content-Type:text/plain -d a -d b -d c=ccc https://yaak.app'),
+      pluginHookImport('curl -H Content-Type:text/plain -d a -d b -d c=ccc https://yaak.app'),
     ).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
@@ -187,7 +168,7 @@ describe('importer-curl', () => {
           baseRequest({
             method: 'POST',
             url: 'https://yaak.app',
-            headers: [{ name: 'Content-Type', value: 'text/plain', enabled: true }],
+            headers: [{ name: 'Content-Type', value: 'text/plain' }],
             bodyType: 'text/plain',
             body: { text: 'a&b&c=ccc' },
           }),
@@ -196,31 +177,9 @@ describe('importer-curl', () => {
     });
   });
 
-  test('Imports multi-line JSON', () => {
-    expect(
-      pluginHookImport(
-        ctx,
-        `curl -H Content-Type:application/json -d $'{\n  "foo":"bar"\n}' https://yaak.app`,
-      ),
-    ).toEqual({
-      resources: {
-        workspaces: [baseWorkspace()],
-        httpRequests: [
-          baseRequest({
-            method: 'POST',
-            url: 'https://yaak.app',
-            headers: [{ name: 'Content-Type', value: 'application/json', enabled: true }],
-            bodyType: 'application/json',
-            body: { text: '{\n  "foo":"bar"\n}' },
-          }),
-        ],
-      },
-    });
-  });
-
   test('Imports multiple headers', () => {
     expect(
-      pluginHookImport(ctx, 'curl -H Foo:bar --header Name -H AAA:bbb -H :ccc https://yaak.app'),
+      pluginHookImport('curl -H Foo:bar --header Name -H AAA:bbb -H :ccc https://yaak.app'),
     ).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
@@ -228,10 +187,10 @@ describe('importer-curl', () => {
           baseRequest({
             url: 'https://yaak.app',
             headers: [
-              { name: 'Name', value: '', enabled: true },
-              { name: 'Foo', value: 'bar', enabled: true },
-              { name: 'AAA', value: 'bbb', enabled: true },
-              { name: '', value: 'ccc', enabled: true },
+              { name: 'Name', value: '' },
+              { name: 'Foo', value: 'bar' },
+              { name: 'AAA', value: 'bbb' },
+              { name: '', value: 'ccc' },
             ],
           }),
         ],
@@ -240,7 +199,7 @@ describe('importer-curl', () => {
   });
 
   test('Imports basic auth', () => {
-    expect(pluginHookImport(ctx, 'curl --user user:pass https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --user user:pass https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -258,7 +217,7 @@ describe('importer-curl', () => {
   });
 
   test('Imports digest auth', () => {
-    expect(pluginHookImport(ctx, 'curl --digest --user user:pass https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --digest --user user:pass https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
@@ -276,13 +235,13 @@ describe('importer-curl', () => {
   });
 
   test('Imports cookie as header', () => {
-    expect(pluginHookImport(ctx, 'curl --cookie "foo=bar" https://yaak.app')).toEqual({
+    expect(pluginHookImport('curl --cookie "foo=bar" https://yaak.app')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
           baseRequest({
             url: 'https://yaak.app',
-            headers: [{ name: 'Cookie', value: 'foo=bar', enabled: true }],
+            headers: [{ name: 'Cookie', value: 'foo=bar' }],
           }),
         ],
       },
@@ -290,15 +249,15 @@ describe('importer-curl', () => {
   });
 
   test('Imports query params from the URL', () => {
-    expect(pluginHookImport(ctx, 'curl "https://yaak.app?foo=bar&baz=a%20a"')).toEqual({
+    expect(pluginHookImport('curl "https://yaak.app?foo=bar&baz=a%20a"')).toEqual({
       resources: {
         workspaces: [baseWorkspace()],
         httpRequests: [
           baseRequest({
             url: 'https://yaak.app',
             urlParameters: [
-              { name: 'foo', value: 'bar', enabled: true },
-              { name: 'baz', value: 'a%20a', enabled: true },
+              { name: 'foo', value: 'bar' },
+              { name: 'baz', value: 'a%20a' },
             ],
           }),
         ],

plugins/importer-curl/vite.config.js

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

plugins/importer-insomnia/package-lock.json

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

plugins/importer-insomnia/package.json

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

plugins/importer-insomnia/src/index.ts

@@ -5,7 +5,6 @@ import {
   HttpRequest,
   Workspace,
 } from '../../../src-web/lib/models';
-import '../../../src-web/plugin/runtime.d.ts';
 
 type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
 
@@ -17,17 +16,12 @@ export interface ExportResources {
   folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
 }
 
-export function pluginHookImport(ctx: YaakContext, contents: string) {
-  let parsed: any;
-
+export function pluginHookImport(contents: string) {
+  let parsed;
   try {
     parsed = JSON.parse(contents);
-  } catch (e) {}
-
-  try {
-    parsed = parsed ?? YAML.parse(contents);
   } catch (e) {
-    console.log('FAILED', e);
+    return;
   }
 
   if (!isJSObject(parsed)) return;

plugins/importer-insomnia/vite.config.js

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

plugins/importer-postman/src/index.ts

@@ -13,11 +13,7 @@ interface ExportResources {
   folders: AtLeast<Folder, 'name' | 'id' | 'model' | 'workspaceId'>[];
 }
 
-export function pluginHookImport(
-  ctx: any,
-  contents: string,
-): { resources: ExportResources } | undefined {
-  console.log('CTX', ctx);
+export function pluginHookImport(contents: string): { resources: ExportResources } | undefined {
   const root = parseJSONToRecord(contents);
   if (root == null) return;
 
@@ -184,7 +180,6 @@ function importBody(rawBody: any): Pick<HttpRequest, 'body' | 'bodyType' | 'head
           f.src != null
             ? {
                 enabled: !f.disabled,
-                contentType: f.contentType ?? null,
                 name: f.key ?? '',
                 file: f.src ?? '',
               }
@@ -249,7 +244,6 @@ function convertTemplateSyntax<T>(obj: T): T {
 }
 
 const idCount: Partial<Record<Model['model'], number>> = {};
-
 function generateId(model: Model['model']): string {
   idCount[model] = (idCount[model] ?? -1) + 1;
   return `GENERATE_ID::${model.toUpperCase()}_${idCount[model]}`;

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

@@ -23,7 +23,7 @@ describe('importer-postman', () => {
   for (const fixture of fixtures) {
     test('Imports ' + fixture, () => {
       const contents = fs.readFileSync(path.join(p, fixture), 'utf-8');
-      const imported = pluginHookImport({}, contents);
+      const imported = pluginHookImport(contents);
       const folder0 = newId('folder');
       const folder1 = newId('folder');
       expect(imported).toEqual({

plugins/importer-postman/vite.config.js

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

plugins/importer-yaak/src/index.ts

@@ -1,4 +1,4 @@
-export function pluginHookImport(ctx: any, contents: string) {
+export function pluginHookImport(contents: string) {
   let parsed;
   try {
     parsed = JSON.parse(contents);
@@ -18,7 +18,7 @@ export function pluginHookImport(ctx: any, contents: string) {
   // Migrate v1 to v2 -- changes requests to httpRequests
   if ('requests' in parsed.resources) {
     parsed.resources.httpRequests = parsed.resources.requests;
-    delete parsed.resources['requests'];
+    delete parsed.resources.requests;
   }
 
   return { resources: parsed.resources }; // Should already be in the correct format

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

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

plugins/importer-yaak/vite.config.js

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

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

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

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

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

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

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

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

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

src-tauri/Cargo.toml

@@ -1,14 +1,18 @@
-workspace = { members = ["grpc", "templates"] }
+workspace = { members = ["grpc"] }
 
 [package]
 name = "yaak-app"
 version = "0.0.0"
+description = "A network protocol testing utility app"
+authors = ["Gregory Schier"]
+license = "MIT"
+repository = "https://github.com/gschier/yaak-app"
 edition = "2021"
 
 # Produce a library for mobile support
 [lib]
 name = "tauri_app_lib"
-crate-type = ["staticlib", "cdylib", "lib"]
+crate-type = ["staticlib", "cdylib", "rlib"]
 
 [profile.release]
 strip = true  # Automatically strip symbols from the binary.
@@ -24,35 +28,36 @@ cocoa = "0.25.0"
 openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work
 
 [dependencies]
-grpc = { path = "./grpc" }
-templates = { path = "./templates" }
-anyhow = "1.0.86"
 base64 = "0.22.0"
+boa_engine = { version = "0.18.0", features = ["annex-b"] }
+boa_runtime = { version = "0.18.0" }
 chrono = { version = "0.4.31", features = ["serde"] }
-datetime = "0.5.2"
-deno_ast = { version = "0.39.0", features = ["transpiling"] }
-deno_console = "0.155.0"
-deno_core = { version = "0.284.0" }
-hex_color = "3.0.0"
-http = "1"
-log = "0.4.21"
+futures = "0.3.26"
+http = "0.2.8"
 rand = "0.8.5"
-regex = "1.10.2"
-reqwest = { version = "0.12.4", features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "native-tls-alpn"] }
-reqwest_cookie_store = "0.8.0"
-serde = { version = "1.0.198", features = ["derive"] }
-serde_json = { version = "1.0.116", features = ["raw_value"] }
-serde_yaml = "0.9.34"
+reqwest = { version = "0.11.23", features = ["multipart", "cookies", "gzip", "brotli", "deflate"] }
+cookie = { version = "0.18.0" }
+serde = { version = "1.0.195", features = ["derive"] }
+serde_json = { version = "1.0.111", features = ["raw_value"] }
 sqlx = { version = "0.7.4", features = ["sqlite", "runtime-tokio-rustls", "json", "chrono", "time"] }
-tauri = { version = "2.0.0-beta", features = ["devtools", "protocol-asset"] }
-tauri-plugin-clipboard-manager = "2.1.0-beta"
-tauri-plugin-dialog = "2.0.0-beta"
-tauri-plugin-fs = "2.0.0-beta"
-tauri-plugin-log = { version = "2.0.0-beta", features = ["colored"] }
-tauri-plugin-os = "2.0.0-beta"
-tauri-plugin-shell = "2.0.0-beta"
-tauri-plugin-updater = "2.0.0-beta"
-tauri-plugin-window-state = "2.0.0-beta"
+tauri = { version = "2.0.0-beta.17", features = [
+    "config-toml",
+    "devtools",
+] }
+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"
+grpc = { path = "./grpc" }
 tokio-stream = "0.1.15"
-uuid = "1.7.0"
+regex = "1.10.2"

src-tauri/capabilities/capabilities.json

@@ -10,7 +10,6 @@
     "os:allow-os-type",
     "event:allow-emit",
     "clipboard-manager:allow-write-text",
-    "clipboard-manager:allow-read-text",
     "dialog:allow-open",
     "dialog:allow-save",
     "event:allow-listen",
@@ -39,18 +38,14 @@
         }
       ]
     },
-    "webview:allow-set-webview-zoom",
     "window:allow-close",
     "window:allow-is-fullscreen",
     "window:allow-maximize",
     "window:allow-minimize",
-    "window:allow-toggle-maximize",
     "window:allow-set-decorations",
     "window:allow-set-title",
     "window:allow-start-dragging",
     "window:allow-unmaximize",
-    "window:allow-theme",
-    "clipboard-manager:allow-read-text",
-    "clipboard-manager:allow-write-text"
+    "clipboard-manager:default"
   ]
 }

src-tauri/gen/apple/.gitignore

@@ -0,0 +1,3 @@
+xcuserdata/
+build/
+Externals/

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"
+  }
+}

src-tauri/gen/apple/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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>

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

src-tauri/gen/apple/Sources/yaak-app/bindings/bindings.h

@@ -0,0 +1,8 @@
+#pragma once
+
+namespace ffi {
+    extern "C" {
+        void start_app();
+    }
+}
+

src-tauri/gen/apple/Sources/yaak-app/main.mm

@@ -0,0 +1,6 @@
+#include "bindings/bindings.h"
+
+int main(int argc, char * argv[]) {
+	ffi::start_app();
+	return 0;
+}

src-tauri/gen/apple/project.yml

@@ -0,0 +1,90 @@
+name: yaak-app
+options:
+  bundleIdPrefix: app.yaak
+  deploymentTarget:
+    iOS: 13.0
+fileGroups: [../../src]
+configs:
+  debug: debug
+  release: release
+settingGroups:
+  app:
+    base:
+      PRODUCT_NAME: Yaak
+      PRODUCT_BUNDLE_IDENTIFIER: app.yaak.yaak-app
+      DEVELOPMENT_TEAM: 7PU3P6ELJ8
+targetTemplates:
+  app:
+    type: application
+    sources:
+      - path: Sources
+    scheme:
+      environmentVariables:
+        RUST_BACKTRACE: full
+        RUST_LOG: info
+    settings:
+      groups: [app]
+targets:
+  yaak-app_iOS:
+    type: application
+    platform: iOS
+    sources:
+      - path: Sources
+      - path: Assets.xcassets
+      - path: Externals
+      - path: yaak-app_iOS
+      - path: assets
+        buildPhase: resources
+        type: folder
+    info:
+      path: yaak-app_iOS/Info.plist
+      properties:
+        LSRequiresIPhoneOS: true
+        UILaunchStoryboardName: LaunchScreen
+        UIRequiredDeviceCapabilities: [arm64, metal]
+        UISupportedInterfaceOrientations:
+          - UIInterfaceOrientationPortrait
+          - UIInterfaceOrientationLandscapeLeft
+          - UIInterfaceOrientationLandscapeRight
+        UISupportedInterfaceOrientations~ipad:
+          - UIInterfaceOrientationPortrait
+          - UIInterfaceOrientationPortraitUpsideDown
+          - UIInterfaceOrientationLandscapeLeft
+          - UIInterfaceOrientationLandscapeRight
+        CFBundleShortVersionString: 2024.3.10
+        CFBundleVersion: 2024.3.10
+    entitlements:
+      path: yaak-app_iOS/yaak-app_iOS.entitlements
+    scheme:
+      environmentVariables:
+        RUST_BACKTRACE: full
+        RUST_LOG: info
+    settings:
+      base:
+        ENABLE_BITCODE: false
+        ARCHS: [arm64, arm64-sim]
+        VALID_ARCHS: arm64  arm64-sim 
+        LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
+        LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
+        LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
+        ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
+        EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
+        EXCLUDED_ARCHS[sdk=iphoneos*]: arm64-sim x86_64
+      groups: [app]
+    dependencies:
+      - framework: libapp_lib.a
+        embed: false
+      - sdk: CoreGraphics.framework
+      - sdk: Metal.framework
+      - sdk: MetalKit.framework
+      - sdk: QuartzCore.framework
+      - sdk: Security.framework
+      - sdk: UIKit.framework
+      - sdk: WebKit.framework
+    preBuildScripts:
+      - script: node tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths "${FRAMEWORK_SEARCH_PATHS:?}" --header-search-paths "${HEADER_SEARCH_PATHS:?}" --gcc-preprocessor-definitions "${GCC_PREPROCESSOR_DEFINITIONS:-}" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}
+        name: Build Rust Code
+        basedOnDependencyAnalysis: false
+        outputFiles:
+          - $(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a
+          - $(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a

src-tauri/gen/apple/yaak-app.xcodeproj/project.pbxproj

@@ -0,0 +1,481 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 54;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		0AC23E163631EF3775908406 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDEF0D2E01608E7F464F71B6 /* WebKit.framework */; };
+		1B1BFDF8BC345D0D980E4427 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF0B8CF73BE8166011E2CEAB /* QuartzCore.framework */; };
+		36588BE1A75B386BB2FEDAC5 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A93A95F6B2F31FA92AA099E0 /* MetalKit.framework */; };
+		38E2C1B0E9FCC9A5FDE8876D /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF2908761467DF191C2A8939 /* Metal.framework */; };
+		8D518C1A67069BD7D339D055 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F34A96C5084EFDF1802A634 /* CoreGraphics.framework */; };
+		8DF67739DC49E577EB0FAE3F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 396F45DCFBE2C71866817528 /* Assets.xcassets */; };
+		A1D932F0E7399066AD07DC6D /* libapp_lib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 75D938BE0FA8770BA965AE1E /* libapp_lib.a */; };
+		AF0EEC868306E1D1C85994D0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5BF2E39256494269E65F8E /* Security.framework */; };
+		BE9FFDF51EB7DEBF707BB39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5415A3F2D217A47DD3BA40B3 /* UIKit.framework */; };
+		F0627C04787F4E187EF416F4 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 2A615609009B3AE2728043E4 /* assets */; };
+		FEE5934F5FFB0FBE10883AF2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = C754460F1DAF2D414038A7EA /* main.mm */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		106BE62BE01A35403424018C /* main.rs */ = {isa = PBXFileReference; path = main.rs; sourceTree = "<group>"; };
+		14F240DAC31C5C52D7B4BB96 /* window_ext.rs */ = {isa = PBXFileReference; path = window_ext.rs; sourceTree = "<group>"; };
+		1B5226A88D8B805E878524C8 /* updates.rs */ = {isa = PBXFileReference; path = updates.rs; sourceTree = "<group>"; };
+		1F34A96C5084EFDF1802A634 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		1F5A647F82A24722F3C830BB /* plugin.rs */ = {isa = PBXFileReference; path = plugin.rs; sourceTree = "<group>"; };
+		2A615609009B3AE2728043E4 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; };
+		396F45DCFBE2C71866817528 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		53872C1120171EDC4A6DFEDD /* analytics.rs */ = {isa = PBXFileReference; path = analytics.rs; sourceTree = "<group>"; };
+		5415A3F2D217A47DD3BA40B3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		5C1B6610F62B56E1947BEBBD /* http.rs */ = {isa = PBXFileReference; path = http.rs; sourceTree = "<group>"; };
+		6286C385ABAD2E04237679D7 /* yaak-app_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "yaak-app_iOS.entitlements"; sourceTree = "<group>"; };
+		75D938BE0FA8770BA965AE1E /* libapp_lib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libapp_lib.a; sourceTree = "<group>"; };
+		7B5BF2E39256494269E65F8E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		A2CC02313D71CECB68031D53 /* grpc.rs */ = {isa = PBXFileReference; path = grpc.rs; sourceTree = "<group>"; };
+		A6DA9B210723CA84891876F8 /* bindings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bindings.h; sourceTree = "<group>"; };
+		A93A95F6B2F31FA92AA099E0 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
+		C754460F1DAF2D414038A7EA /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
+		D69BFB768591FDEEF65198EE /* yaak-app_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "yaak-app_iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		DDDE197D9C6BC5680EEEEA00 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+		DF2908761467DF191C2A8939 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
+		DF45D08D97DE587CABF9537E /* window_menu.rs */ = {isa = PBXFileReference; path = window_menu.rs; sourceTree = "<group>"; };
+		E1E84E267D81D6437901B1C6 /* render.rs */ = {isa = PBXFileReference; path = render.rs; sourceTree = "<group>"; };
+		E964D3637BAED49E34B91739 /* models.rs */ = {isa = PBXFileReference; path = models.rs; sourceTree = "<group>"; };
+		EDEF0D2E01608E7F464F71B6 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		EF0B8CF73BE8166011E2CEAB /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		FB34CB48BB9F25D49F80D513 /* lib.rs */ = {isa = PBXFileReference; path = lib.rs; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D8E8888B0F3E4411B98AE8EE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A1D932F0E7399066AD07DC6D /* libapp_lib.a in Frameworks */,
+				8D518C1A67069BD7D339D055 /* CoreGraphics.framework in Frameworks */,
+				38E2C1B0E9FCC9A5FDE8876D /* Metal.framework in Frameworks */,
+				36588BE1A75B386BB2FEDAC5 /* MetalKit.framework in Frameworks */,
+				1B1BFDF8BC345D0D980E4427 /* QuartzCore.framework in Frameworks */,
+				AF0EEC868306E1D1C85994D0 /* Security.framework in Frameworks */,
+				BE9FFDF51EB7DEBF707BB39A /* UIKit.framework in Frameworks */,
+				0AC23E163631EF3775908406 /* WebKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0844ACEFE550685042AC6029 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				D69BFB768591FDEEF65198EE /* yaak-app_iOS.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6D0B6FF641B88DAF74C78B00 /* Externals */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Externals;
+			sourceTree = "<group>";
+		};
+		8A07575CB8654BB9107F9A32 /* bindings */ = {
+			isa = PBXGroup;
+			children = (
+				A6DA9B210723CA84891876F8 /* bindings.h */,
+			);
+			path = bindings;
+			sourceTree = "<group>";
+		};
+		8F0B46911FBEF2B246BE3385 /* yaak-app */ = {
+			isa = PBXGroup;
+			children = (
+				C754460F1DAF2D414038A7EA /* main.mm */,
+				8A07575CB8654BB9107F9A32 /* bindings */,
+			);
+			path = "yaak-app";
+			sourceTree = "<group>";
+		};
+		90E982C0E9B45CBAAE66E16D /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1F34A96C5084EFDF1802A634 /* CoreGraphics.framework */,
+				75D938BE0FA8770BA965AE1E /* libapp_lib.a */,
+				DF2908761467DF191C2A8939 /* Metal.framework */,
+				A93A95F6B2F31FA92AA099E0 /* MetalKit.framework */,
+				EF0B8CF73BE8166011E2CEAB /* QuartzCore.framework */,
+				7B5BF2E39256494269E65F8E /* Security.framework */,
+				5415A3F2D217A47DD3BA40B3 /* UIKit.framework */,
+				EDEF0D2E01608E7F464F71B6 /* WebKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		C88F9D29DC52F052255C35A3 = {
+			isa = PBXGroup;
+			children = (
+				2A615609009B3AE2728043E4 /* assets */,
+				396F45DCFBE2C71866817528 /* Assets.xcassets */,
+				6D0B6FF641B88DAF74C78B00 /* Externals */,
+				EBC83899FBFA4A3D0A92837F /* Sources */,
+				F3A6B45E25E23922AB1BDB34 /* src */,
+				D49CF68C9105CE84E2084C14 /* yaak-app_iOS */,
+				90E982C0E9B45CBAAE66E16D /* Frameworks */,
+				0844ACEFE550685042AC6029 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		D49CF68C9105CE84E2084C14 /* yaak-app_iOS */ = {
+			isa = PBXGroup;
+			children = (
+				DDDE197D9C6BC5680EEEEA00 /* Info.plist */,
+				6286C385ABAD2E04237679D7 /* yaak-app_iOS.entitlements */,
+			);
+			path = "yaak-app_iOS";
+			sourceTree = "<group>";
+		};
+		EBC83899FBFA4A3D0A92837F /* Sources */ = {
+			isa = PBXGroup;
+			children = (
+				8F0B46911FBEF2B246BE3385 /* yaak-app */,
+			);
+			path = Sources;
+			sourceTree = "<group>";
+		};
+		F3A6B45E25E23922AB1BDB34 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				53872C1120171EDC4A6DFEDD /* analytics.rs */,
+				A2CC02313D71CECB68031D53 /* grpc.rs */,
+				5C1B6610F62B56E1947BEBBD /* http.rs */,
+				FB34CB48BB9F25D49F80D513 /* lib.rs */,
+				106BE62BE01A35403424018C /* main.rs */,
+				E964D3637BAED49E34B91739 /* models.rs */,
+				1F5A647F82A24722F3C830BB /* plugin.rs */,
+				E1E84E267D81D6437901B1C6 /* render.rs */,
+				1B5226A88D8B805E878524C8 /* updates.rs */,
+				14F240DAC31C5C52D7B4BB96 /* window_ext.rs */,
+				DF45D08D97DE587CABF9537E /* window_menu.rs */,
+			);
+			name = src;
+			path = ../../src;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		7C3E2AC18A0A227C2DF356E2 /* yaak-app_iOS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C05E07AE7C7B25CACFADCDD4 /* Build configuration list for PBXNativeTarget "yaak-app_iOS" */;
+			buildPhases = (
+				5454ED506FC51D41C81A0318 /* Build Rust Code */,
+				C3495A2849227C6276D3876E /* Sources */,
+				E148188313FB67F061AB4E59 /* Resources */,
+				D8E8888B0F3E4411B98AE8EE /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "yaak-app_iOS";
+			productName = "yaak-app_iOS";
+			productReference = D69BFB768591FDEEF65198EE /* yaak-app_iOS.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		A8F6206BC76F061F1FEFD439 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
+				TargetAttributes = {
+					7C3E2AC18A0A227C2DF356E2 = {
+						DevelopmentTeam = 7PU3P6ELJ8;
+					};
+				};
+			};
+			buildConfigurationList = 24EF8D1B948FFF6B275FB0F4 /* Build configuration list for PBXProject "yaak-app" */;
+			compatibilityVersion = "Xcode 14.0";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				Base,
+				en,
+			);
+			mainGroup = C88F9D29DC52F052255C35A3;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				7C3E2AC18A0A227C2DF356E2 /* yaak-app_iOS */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		E148188313FB67F061AB4E59 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8DF67739DC49E577EB0FAE3F /* Assets.xcassets in Resources */,
+				F0627C04787F4E187EF416F4 /* assets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		5454ED506FC51D41C81A0318 /* Build Rust Code */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Build Rust Code";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a",
+				"$(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libapp_lib.a",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "node tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		C3495A2849227C6276D3876E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FEE5934F5FFB0FBE10883AF2 /* main.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		35D1DB294FFD067C835186C7 /* debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+			};
+			name = debug;
+		};
+		368BB1E364597E7675463634 /* release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ARCHS = (
+					arm64,
+					"arm64-sim",
+				);
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = "yaak-app_iOS/yaak-app_iOS.entitlements";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = 7PU3P6ELJ8;
+				ENABLE_BITCODE = NO;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\".\"",
+				);
+				INFOPLIST_FILE = "yaak-app_iOS/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "app.yaak.yaak-app";
+				PRODUCT_NAME = Yaak;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "arm64  arm64-sim";
+			};
+			name = release;
+		};
+		45382E89556BF93E8D1F1C2D /* debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ARCHS = (
+					arm64,
+					"arm64-sim",
+				);
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_ENTITLEMENTS = "yaak-app_iOS/yaak-app_iOS.entitlements";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = 7PU3P6ELJ8;
+				ENABLE_BITCODE = NO;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\".\"",
+				);
+				INFOPLIST_FILE = "yaak-app_iOS/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = "app.yaak.yaak-app";
+				PRODUCT_NAME = Yaak;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALID_ARCHS = "arm64  arm64-sim";
+			};
+			name = debug;
+		};
+		ABD0A3DD3D5C66C839496F44 /* release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
+			};
+			name = release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		24EF8D1B948FFF6B275FB0F4 /* Build configuration list for PBXProject "yaak-app" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				35D1DB294FFD067C835186C7 /* debug */,
+				ABD0A3DD3D5C66C839496F44 /* release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = debug;
+		};
+		C05E07AE7C7B25CACFADCDD4 /* Build configuration list for PBXNativeTarget "yaak-app_iOS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				45382E89556BF93E8D1F1C2D /* debug */,
+				368BB1E364597E7675463634 /* release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = A8F6206BC76F061F1FEFD439 /* Project object */;
+}

src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

src-tauri/gen/apple/yaak-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,10 @@
+<?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>BuildSystemType</key>
+	<string>Original</string>
+	<key>DisableBuildSystemDeprecationDiagnostic</key>
+	<true/>
+</dict>
+</plist>

src-tauri/gen/apple/yaak-app.xcodeproj/xcshareddata/xcschemes/yaak-app_iOS.xcscheme

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+               BuildableName = "Yaak.app"
+               BlueprintName = "yaak-app_iOS"
+               ReferencedContainer = "container:yaak-app.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "NO">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+            BuildableName = "Yaak.app"
+            BlueprintName = "yaak-app_iOS"
+            ReferencedContainer = "container:yaak-app.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "RUST_BACKTRACE"
+            value = "full"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "RUST_LOG"
+            value = "info"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+            BuildableName = "Yaak.app"
+            BlueprintName = "yaak-app_iOS"
+            ReferencedContainer = "container:yaak-app.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "RUST_BACKTRACE"
+            value = "full"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "RUST_LOG"
+            value = "info"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "release"
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7C3E2AC18A0A227C2DF356E2"
+            BuildableName = "Yaak.app"
+            BlueprintName = "yaak-app_iOS"
+            ReferencedContainer = "container:yaak-app.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "RUST_BACKTRACE"
+            value = "full"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "RUST_LOG"
+            value = "info"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

src-tauri/gen/apple/yaak-app_iOS/Info.plist

@@ -0,0 +1,44 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2024.3.10</string>
+	<key>CFBundleVersion</key>
+	<string>2024.3.10</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+		<string>metal</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

src-tauri/gen/apple/yaak-app_iOS/yaak-app_iOS.entitlements

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

src-tauri/gen/schemas/capabilities.json

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

src-tauri/gen/schemas/desktop-schema.json

@@ -2216,13 +2216,6 @@
                         "shell:allow-open"
                       ]
                     },
-                    {
-                      "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:allow-spawn"
-                      ]
-                    },
                     {
                       "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
                       "type": "string",
@@ -2251,13 +2244,6 @@
                         "shell:deny-open"
                       ]
                     },
-                    {
-                      "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:deny-spawn"
-                      ]
-                    },
                     {
                       "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
                       "type": "string",
@@ -5337,13 +5323,6 @@
             "shell:allow-open"
           ]
         },
-        {
-          "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:allow-spawn"
-          ]
-        },
         {
           "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
           "type": "string",
@@ -5372,13 +5351,6 @@
             "shell:deny-open"
           ]
         },
-        {
-          "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:deny-spawn"
-          ]
-        },
         {
           "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
           "type": "string",
@@ -5561,13 +5533,6 @@
             "updater:allow-check"
           ]
         },
-        {
-          "description": "updater:allow-download -> Enables the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-download"
-          ]
-        },
         {
           "description": "updater:allow-download-and-install -> Enables the download_and_install command without any pre-configured scope.",
           "type": "string",
@@ -5575,13 +5540,6 @@
             "updater:allow-download-and-install"
           ]
         },
-        {
-          "description": "updater:allow-install -> Enables the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-install"
-          ]
-        },
         {
           "description": "updater:deny-check -> Denies the check command without any pre-configured scope.",
           "type": "string",
@@ -5589,13 +5547,6 @@
             "updater:deny-check"
           ]
         },
-        {
-          "description": "updater:deny-download -> Denies the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-download"
-          ]
-        },
         {
           "description": "updater:deny-download-and-install -> Denies the download_and_install command without any pre-configured scope.",
           "type": "string",
@@ -5603,13 +5554,6 @@
             "updater:deny-download-and-install"
           ]
         },
-        {
-          "description": "updater:deny-install -> Denies the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-install"
-          ]
-        },
         {
           "description": "webview:default -> Default permissions for the plugin.",
           "type": "string",
@@ -5953,13 +5897,6 @@
             "window:allow-minimize"
           ]
         },
-        {
-          "description": "window:allow-monitor-from-point -> Enables the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:allow-monitor-from-point"
-          ]
-        },
         {
           "description": "window:allow-outer-position -> Enables the outer_position command without any pre-configured scope.",
           "type": "string",
@@ -6394,13 +6331,6 @@
             "window:deny-minimize"
           ]
         },
-        {
-          "description": "window:deny-monitor-from-point -> Denies the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:deny-monitor-from-point"
-          ]
-        },
         {
           "description": "window:deny-outer-position -> Denies the outer_position command without any pre-configured scope.",
           "type": "string",

src-tauri/gen/schemas/macOS-schema.json

@@ -2216,13 +2216,6 @@
                         "shell:allow-open"
                       ]
                     },
-                    {
-                      "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:allow-spawn"
-                      ]
-                    },
                     {
                       "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
                       "type": "string",
@@ -2251,13 +2244,6 @@
                         "shell:deny-open"
                       ]
                     },
-                    {
-                      "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-                      "type": "string",
-                      "enum": [
-                        "shell:deny-spawn"
-                      ]
-                    },
                     {
                       "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
                       "type": "string",
@@ -5337,13 +5323,6 @@
             "shell:allow-open"
           ]
         },
-        {
-          "description": "shell:allow-spawn -> Enables the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:allow-spawn"
-          ]
-        },
         {
           "description": "shell:allow-stdin-write -> Enables the stdin_write command without any pre-configured scope.",
           "type": "string",
@@ -5372,13 +5351,6 @@
             "shell:deny-open"
           ]
         },
-        {
-          "description": "shell:deny-spawn -> Denies the spawn command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "shell:deny-spawn"
-          ]
-        },
         {
           "description": "shell:deny-stdin-write -> Denies the stdin_write command without any pre-configured scope.",
           "type": "string",
@@ -5561,13 +5533,6 @@
             "updater:allow-check"
           ]
         },
-        {
-          "description": "updater:allow-download -> Enables the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-download"
-          ]
-        },
         {
           "description": "updater:allow-download-and-install -> Enables the download_and_install command without any pre-configured scope.",
           "type": "string",
@@ -5575,13 +5540,6 @@
             "updater:allow-download-and-install"
           ]
         },
-        {
-          "description": "updater:allow-install -> Enables the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:allow-install"
-          ]
-        },
         {
           "description": "updater:deny-check -> Denies the check command without any pre-configured scope.",
           "type": "string",
@@ -5589,13 +5547,6 @@
             "updater:deny-check"
           ]
         },
-        {
-          "description": "updater:deny-download -> Denies the download command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-download"
-          ]
-        },
         {
           "description": "updater:deny-download-and-install -> Denies the download_and_install command without any pre-configured scope.",
           "type": "string",
@@ -5603,13 +5554,6 @@
             "updater:deny-download-and-install"
           ]
         },
-        {
-          "description": "updater:deny-install -> Denies the install command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "updater:deny-install"
-          ]
-        },
         {
           "description": "webview:default -> Default permissions for the plugin.",
           "type": "string",
@@ -5953,13 +5897,6 @@
             "window:allow-minimize"
           ]
         },
-        {
-          "description": "window:allow-monitor-from-point -> Enables the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:allow-monitor-from-point"
-          ]
-        },
         {
           "description": "window:allow-outer-position -> Enables the outer_position command without any pre-configured scope.",
           "type": "string",
@@ -6394,13 +6331,6 @@
             "window:deny-minimize"
           ]
         },
-        {
-          "description": "window:deny-monitor-from-point -> Denies the monitor_from_point command without any pre-configured scope.",
-          "type": "string",
-          "enum": [
-            "window:deny-monitor-from-point"
-          ]
-        },
         {
           "description": "window:deny-outer-position -> Denies the outer_position command without any pre-configured scope.",
           "type": "string",

src-tauri/grpc/Cargo.toml

@@ -14,9 +14,11 @@ serde = { version = "1.0.196", features = ["derive"] }
 serde_json = "1.0.113"
 prost-reflect = { version = "0.12.0", features = ["serde", "derive"] }
 log = "0.4.20"
+once_cell = { version = "1.19.0", features = [] }
 anyhow = "1.0.79"
 hyper = { version = "0.14" }
 hyper-rustls = { version = "0.24.0", features = ["http2"] }
+protoc-bin-vendored = "3.0.0"
 uuid = { version = "1.7.0", features = ["v4"] }
-tauri = { version = "2.0.0-beta" }
-tauri-plugin-shell = "2.0.0-beta"
+tauri = { version = "2.0.0-beta.16" }
+tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }

src-tauri/grpc/src/manager.rs

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

src-tauri/macos/entitlements.plist

@@ -1,14 +1,10 @@
 <?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>
-        <!-- Enable for v8 execution -->
-        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-        <true/>
-
-        <!--    Re-enable for sandboxing. Currently disabled because auto-updater doesn't work with sandboxing.-->
-        <!--    <key>com.apple.security.app-sandbox</key> <true/>-->
-        <!--    <key>com.apple.security.files.user-selected.read-write</key> <true/>-->
-        <!--    <key>com.apple.security.network.client</key> <true/>-->
-    </dict>
+<dict>
+<!--    Re-enable for sandboxing. Currently disabled because auto-updater doesn't work with sandboxing.-->
+<!--    <key>com.apple.security.app-sandbox</key> <true/>-->
+<!--    <key>com.apple.security.files.user-selected.read-write</key> <true/>-->
+<!--    <key>com.apple.security.network.client</key> <true/>-->
+</dict>
 </plist>

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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.mjs","sources":["../../../plugins/exporter-curl/src/index.ts"],"sourcesContent":["import { HttpRequest } from '../../../src-web/lib/models';\n\nconst NEWLINE = '\\\\\\n ';\n\nexport function pluginHookExport(_: any, request: Partial<HttpRequest>) {\n  const xs = ['curl'];\n\n  // Add method and URL all on first line\n  if (request.method) xs.push('-X', request.method);\n  if (request.url) xs.push(quote(request.url));\n\n  xs.push(NEWLINE);\n\n  // Add URL params\n  for (const p of (request.urlParameters ?? []).filter(onlyEnabled)) {\n    xs.push('--url-query', quote(`${p.name}=${p.value}`));\n    xs.push(NEWLINE);\n  }\n\n  // Add headers\n  for (const h of (request.headers ?? []).filter(onlyEnabled)) {\n    xs.push('--header', quote(`${h.name}: ${h.value}`));\n    xs.push(NEWLINE);\n  }\n\n  // Add form params\n  if (Array.isArray(request.body?.form)) {\n    const flag = request.bodyType === 'multipart/form-data' ? '--form' : '--data';\n    for (const p of (request.body?.form ?? []).filter(onlyEnabled)) {\n      if (p.file) {\n        let v = `${p.name}=@${p.file}`;\n        v += p.contentType ? `;type=${p.contentType}` : '';\n        xs.push(flag, v);\n      } else {\n        xs.push(flag, quote(`${p.name}=${p.value}`));\n      }\n      xs.push(NEWLINE);\n    }\n  } else if (typeof request.body?.text === 'string') {\n    // --data-raw $'...' to do special ANSI C quoting\n    xs.push('--data-raw', `$${quote(request.body.text)}`);\n    xs.push(NEWLINE);\n  }\n\n  // Add basic/digest authentication\n  if (request.authenticationType === 'basic' || request.authenticationType === 'digest') {\n    if (request.authenticationType === 'digest') xs.push('--digest');\n    xs.push(\n      '--user',\n      quote(`${request.authentication?.username ?? ''}:${request.authentication?.password ?? ''}`),\n    );\n    xs.push(NEWLINE);\n  }\n\n  // Add bearer authentication\n  if (request.authenticationType === 'bearer') {\n    xs.push('--header', quote(`Authorization: Bearer ${request.authentication?.token ?? ''}`));\n    xs.push(NEWLINE);\n  }\n\n  // Remove trailing newline\n  if (xs[xs.length - 1] === NEWLINE) {\n    xs.splice(xs.length - 1, 1);\n  }\n\n  return xs.join(' ');\n}\n\nfunction quote(arg: string): string {\n  const escaped = arg.replace(/'/g, \"\\\\'\");\n  return `'${escaped}'`;\n}\n\nfunction onlyEnabled(v: { name?: string; enabled?: boolean }): boolean {\n  return v.enabled !== false && !!v.name;\n}\n"],"names":["NEWLINE","pluginHookExport","_","request","_a","_b","_c","_d","_e","_f","xs","quote","p","onlyEnabled","h","flag","v","arg"],"mappings":"AAEA,MAAMA,IAAU;AAAA;AAEA,SAAAC,EAAiBC,GAAQC,GAA+B;AAFxE,MAAAC,GAAAC,GAAAC,GAAAC,GAAAC,GAAAC;AAGQ,QAAAC,IAAK,CAAC,MAAM;AAGlB,EAAIP,EAAQ,UAAWO,EAAA,KAAK,MAAMP,EAAQ,MAAM,GAC5CA,EAAQ,OAAKO,EAAG,KAAKC,EAAMR,EAAQ,GAAG,CAAC,GAE3CO,EAAG,KAAKV,CAAO;AAGf,aAAWY,MAAMT,EAAQ,iBAAiB,IAAI,OAAOU,CAAW;AAC3D,IAAAH,EAAA,KAAK,eAAeC,EAAM,GAAGC,EAAE,IAAI,IAAIA,EAAE,KAAK,EAAE,CAAC,GACpDF,EAAG,KAAKV,CAAO;AAIjB,aAAWc,MAAMX,EAAQ,WAAW,IAAI,OAAOU,CAAW;AACrD,IAAAH,EAAA,KAAK,YAAYC,EAAM,GAAGG,EAAE,IAAI,KAAKA,EAAE,KAAK,EAAE,CAAC,GAClDJ,EAAG,KAAKV,CAAO;AAIjB,MAAI,MAAM,SAAQI,IAAAD,EAAQ,SAAR,gBAAAC,EAAc,IAAI,GAAG;AACrC,UAAMW,IAAOZ,EAAQ,aAAa,wBAAwB,WAAW;AAC1D,eAAAS,QAAMP,IAAAF,EAAQ,SAAR,gBAAAE,EAAc,SAAQ,CAAI,GAAA,OAAOQ,CAAW,GAAG;AAC9D,UAAID,EAAE,MAAM;AACV,YAAII,IAAI,GAAGJ,EAAE,IAAI,KAAKA,EAAE,IAAI;AAC5B,QAAAI,KAAKJ,EAAE,cAAc,SAASA,EAAE,WAAW,KAAK,IAC7CF,EAAA,KAAKK,GAAMC,CAAC;AAAA,MAAA;AAEZ,QAAAN,EAAA,KAAKK,GAAMJ,EAAM,GAAGC,EAAE,IAAI,IAAIA,EAAE,KAAK,EAAE,CAAC;AAE7C,MAAAF,EAAG,KAAKV,CAAO;AAAA,IACjB;AAAA,EACS;AAAA,IAAA,SAAOM,IAAAH,EAAQ,SAAR,gBAAAG,EAAc,SAAS,aAEpCI,EAAA,KAAK,cAAc,IAAIC,EAAMR,EAAQ,KAAK,IAAI,CAAC,EAAE,GACpDO,EAAG,KAAKV,CAAO;AAIjB,UAAIG,EAAQ,uBAAuB,WAAWA,EAAQ,uBAAuB,cACvEA,EAAQ,uBAAuB,YAAUO,EAAG,KAAK,UAAU,GAC5DA,EAAA;AAAA,IACD;AAAA,IACAC,EAAM,KAAGJ,IAAAJ,EAAQ,mBAAR,gBAAAI,EAAwB,aAAY,EAAE,MAAIC,IAAAL,EAAQ,mBAAR,gBAAAK,EAAwB,aAAY,EAAE,EAAE;AAAA,EAAA,GAE7FE,EAAG,KAAKV,CAAO,IAIbG,EAAQ,uBAAuB,aAC9BO,EAAA,KAAK,YAAYC,EAAM,2BAAyBF,IAAAN,EAAQ,mBAAR,gBAAAM,EAAwB,UAAS,EAAE,EAAE,CAAC,GACzFC,EAAG,KAAKV,CAAO,IAIbU,EAAGA,EAAG,SAAS,CAAC,MAAMV,KACxBU,EAAG,OAAOA,EAAG,SAAS,GAAG,CAAC,GAGrBA,EAAG,KAAK,GAAG;AACpB;AAEA,SAASC,EAAMM,GAAqB;AAElC,SAAO,IADSA,EAAI,QAAQ,MAAM,KAAK,CACrB;AACpB;AAEA,SAASJ,EAAYG,GAAkD;AACrE,SAAOA,EAAE,YAAY,MAAS,CAAC,CAACA,EAAE;AACpC;"}

src-tauri/plugins/filter-jsonpath/index.mjs

@@ -1,15 +1,15 @@
 var Xe = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function Nt(ce) {
-  return ce && ce.__esModule && Object.prototype.hasOwnProperty.call(ce, "default") ? ce.default : ce;
+function Nt(le) {
+  return le && le.__esModule && Object.prototype.hasOwnProperty.call(le, "default") ? le.default : le;
 }
-function Be(ce) {
-  throw new Error('Could not dynamically require "' + ce + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
+function Be(le) {
+  throw new Error('Could not dynamically require "' + le + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
 }
 var Ve = { exports: {} };
 /*! jsonpath 1.1.1 */
-(function(ce, Ne) {
+(function(le, Ne) {
   (function(T) {
-    ce.exports = T();
+    le.exports = T();
   })(function() {
     return function T(L, B, v) {
       function y(E, d) {
@@ -1131,7 +1131,7 @@ var Ve = { exports: {} };
         function Ze() {
           var e = [], t;
           for (t = i, O("["); !_("]"); )
-            _(",") ? (N(), e.push(null)) : (e.push(le()), _("]") || O(","));
+            _(",") ? (N(), e.push(null)) : (e.push(ce()), _("]") || O(","));
           return N(), n.markEnd(n.createArrayExpression(e), t);
         }
         function _e(e, t) {
@@ -1145,11 +1145,11 @@ var Ve = { exports: {} };
         function et() {
           var e, t, u, l, C, x;
           if (e = i, x = i, e.type === y.Identifier)
-            return u = De(), e.value === "get" && !_(":") ? (t = De(), O("("), O(")"), l = _e([]), n.markEnd(n.createProperty("get", t, l), x)) : e.value === "set" && !_(":") ? (t = De(), O("("), e = i, e.type !== y.Identifier ? (O(")"), G(e, a.UnexpectedToken, e.value), l = _e([])) : (C = [ye()], O(")"), l = _e(C, e)), n.markEnd(n.createProperty("set", t, l), x)) : (O(":"), l = le(), n.markEnd(n.createProperty("init", u, l), x));
+            return u = De(), e.value === "get" && !_(":") ? (t = De(), O("("), O(")"), l = _e([]), n.markEnd(n.createProperty("get", t, l), x)) : e.value === "set" && !_(":") ? (t = De(), O("("), e = i, e.type !== y.Identifier ? (O(")"), G(e, a.UnexpectedToken, e.value), l = _e([])) : (C = [ye()], O(")"), l = _e(C, e)), n.markEnd(n.createProperty("set", t, l), x)) : (O(":"), l = ce(), n.markEnd(n.createProperty("init", u, l), x));
           if (e.type === y.EOF || e.type === y.Punctuator)
             pe(e);
           else
-            return t = De(), O(":"), l = le(), n.markEnd(n.createProperty("init", t, l), x);
+            return t = De(), O(":"), l = ce(), n.markEnd(n.createProperty("init", t, l), x);
         }
         function tt() {
           var e = [], t, u, l, C, x = {}, j = String, W;
@@ -1184,7 +1184,7 @@ var Ve = { exports: {} };
         function je() {
           var e = [];
           if (O("("), !_(")"))
-            for (; r < h && (e.push(le()), !_(")")); )
+            for (; r < h && (e.push(ce()), !_(")")); )
               O(",");
           return O(")"), e;
         }
@@ -1300,17 +1300,17 @@ var Ve = { exports: {} };
         }
         function st() {
           var e, t, u, l, C;
-          return C = i, e = at(), _("?") && (N(), t = p.allowIn, p.allowIn = !0, u = le(), p.allowIn = t, O(":"), l = le(), e = n.createConditionalExpression(e, u, l), n.markEnd(e, C)), e;
+          return C = i, e = at(), _("?") && (N(), t = p.allowIn, p.allowIn = !0, u = ce(), p.allowIn = t, O(":"), l = ce(), e = n.createConditionalExpression(e, u, l), n.markEnd(e, C)), e;
         }
-        function le() {
+        function ce() {
           var e, t, u, l, C;
-          return e = i, C = i, l = t = st(), Ye() && (be(t) || G({}, a.InvalidLHSInAssignment), c && t.type === E.Identifier && J(t.name) && G(e, a.StrictLHSAssignment), e = N(), u = le(), l = n.markEnd(n.createAssignmentExpression(e.value, t, u), C)), l;
+          return e = i, C = i, l = t = st(), Ye() && (be(t) || G({}, a.InvalidLHSInAssignment), c && t.type === E.Identifier && J(t.name) && G(e, a.StrictLHSAssignment), e = N(), u = ce(), l = n.markEnd(n.createAssignmentExpression(e.value, t, u), C)), l;
         }
         function te() {
           var e, t = i;
-          if (e = le(), _(",")) {
+          if (e = ce(), _(",")) {
             for (e = n.createSequenceExpression([e]); r < h && _(","); )
-              N(), e.expressions.push(le());
+              N(), e.expressions.push(ce());
             n.markEnd(e, t);
           }
           return e;
@@ -1330,7 +1330,7 @@ var Ve = { exports: {} };
         }
         function lt(e) {
           var t = null, u, l;
-          return l = i, u = ye(), c && J(u.name) && G({}, a.StrictVarName), e === "const" ? (O("="), t = le()) : _("=") && (N(), t = le()), n.markEnd(n.createVariableDeclarator(u, t), l);
+          return l = i, u = ye(), c && J(u.name) && G({}, a.StrictVarName), e === "const" ? (O("="), t = ce()) : _("=") && (N(), t = ce()), n.markEnd(n.createVariableDeclarator(u, t), l);
         }
         function Te(e) {
           var t = [];
@@ -3176,17 +3176,16 @@ Expecting ` + se.join(", ") + ", got '" + (this.terminals_[w] || w) + "'" : ie =
 })(Ve);
 var Pt = Ve.exports;
 const Lt = /* @__PURE__ */ Nt(Pt);
-function Rt(ce, Ne, T) {
-  let L;
+function Rt(le, Ne) {
+  let T;
   try {
-    L = JSON.parse(T);
+    T = JSON.parse(Ne);
   } catch {
     return;
   }
-  const B = Lt.query(L, Ne);
-  return { filtered: JSON.stringify(B, null, 2) };
+  const L = Lt.query(T, le);
+  return { filtered: JSON.stringify(L, null, 2) };
 }
 export {
   Rt as pluginHookResponseFilter
 };
-//# sourceMappingURL=index.mjs.map

src-tauri/plugins/filter-xpath/index.mjs

@@ -6116,11 +6116,10 @@ Tr.__DOMHandler = Dr;
 Tr.normalizeLineEndings = Rt;
 Tr.DOMParser = _t;
 var Cu = Tr.DOMParser;
-function yu(t, u, n) {
-  const s = new Cu().parseFromString(n, "text/xml");
-  return { filtered: `${Qt.select(u, s)}` };
+function yu(t, u) {
+  const n = new Cu().parseFromString(u, "text/xml");
+  return { filtered: `${Qt.select(t, n)}` };
 }
 export {
   yu as pluginHookResponseFilter
 };
-//# sourceMappingURL=index.mjs.map

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

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

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

@@ -1,184 +1,179 @@
-function O(e, o) {
-  let n;
+function A(e) {
+  let a;
   try {
-    n = JSON.parse(o);
+    a = JSON.parse(e);
   } catch {
-  }
-  try {
-    n = n ?? YAML.parse(o);
-  } catch (a) {
-    console.log("FAILED", a);
-  }
-  if (!f(n) || !Array.isArray(n.resources))
     return;
-  const t = {
+  }
+  if (!c(a) || !Array.isArray(a.resources))
+    return;
+  const n = {
     workspaces: [],
     httpRequests: [],
     grpcRequests: [],
     environments: [],
     folders: []
-  }, i = n.resources.filter(_);
-  for (const a of i) {
-    const s = n.resources.find(
-      (l) => y(l) && l.parentId === a._id
+  }, o = a.resources.filter(_);
+  for (const r of o) {
+    const l = a.resources.find(
+      (i) => w(i) && i.parentId === r._id
     );
-    t.workspaces.push({
-      id: p(a._id),
-      createdAt: new Date(i.created ?? Date.now()).toISOString().replace("Z", ""),
-      updatedAt: new Date(i.updated ?? Date.now()).toISOString().replace("Z", ""),
+    n.workspaces.push({
+      id: d(r._id),
+      createdAt: new Date(o.created ?? Date.now()).toISOString().replace("Z", ""),
+      updatedAt: new Date(o.updated ?? Date.now()).toISOString().replace("Z", ""),
       model: "workspace",
-      name: a.name,
-      variables: s ? h(s.data) : []
+      name: r.name,
+      variables: l ? h(l.data) : []
     });
-    const d = n.resources.filter(
-      (l) => y(l) && l.parentId === (s == null ? void 0 : s._id)
+    const p = a.resources.filter(
+      (i) => w(i) && i.parentId === (l == null ? void 0 : l._id)
     );
-    t.environments.push(
-      ...d.map((l) => b(l, a._id))
+    n.environments.push(
+      ...p.map((i) => b(i, r._id))
     );
-    const c = (l) => {
-      const w = n.resources.filter((u) => u.parentId === l);
-      let r = 0;
-      for (const u of w)
-        D(u) ? (t.folders.push(I(u, a._id)), c(u._id)) : v(u) ? t.httpRequests.push(
-          g(u, a._id, r++)
-        ) : q(u) && t.grpcRequests.push(
-          S(u, a._id, r++)
+    const s = (i) => {
+      const f = a.resources.filter((t) => t.parentId === i);
+      let m = 0;
+      for (const t of f)
+        D(t) ? (n.folders.push(I(t, r._id)), s(t._id)) : v(t) ? n.httpRequests.push(
+          g(t, r._id, m++)
+        ) : q(t) && n.grpcRequests.push(
+          S(t, r._id, m++)
         );
     };
-    c(a._id);
+    s(r._id);
   }
-  return t.httpRequests = t.httpRequests.filter(Boolean), t.grpcRequests = t.grpcRequests.filter(Boolean), t.environments = t.environments.filter(Boolean), t.workspaces = t.workspaces.filter(Boolean), { resources: t };
+  return n.httpRequests = n.httpRequests.filter(Boolean), n.grpcRequests = n.grpcRequests.filter(Boolean), n.environments = n.environments.filter(Boolean), n.workspaces = n.workspaces.filter(Boolean), { resources: n };
 }
-function b(e, o) {
+function b(e, a) {
   return {
-    id: p(e._id),
+    id: d(e._id),
     createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""),
     updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""),
-    workspaceId: p(o),
+    workspaceId: d(a),
     model: "environment",
     name: e.name,
-    variables: Object.entries(e.data).map(([n, t]) => ({
+    variables: Object.entries(e.data).map(([n, o]) => ({
       enabled: !0,
       name: n,
-      value: `${t}`
+      value: `${o}`
     }))
   };
 }
-function I(e, o) {
+function I(e, a) {
   return {
-    id: p(e._id),
+    id: d(e._id),
     createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""),
     updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""),
-    folderId: e.parentId === o ? null : p(e.parentId),
-    workspaceId: p(o),
+    folderId: e.parentId === a ? null : d(e.parentId),
+    workspaceId: d(a),
     model: "folder",
     name: e.name
   };
 }
-function S(e, o, n = 0) {
-  var s;
-  const t = e.protoMethodName.split("/").filter((d) => d !== ""), i = t[0] ?? null, a = t[1] ?? null;
+function S(e, a, n = 0) {
+  var p;
+  const o = e.protoMethodName.split("/").filter((s) => s !== ""), r = o[0] ?? null, l = o[1] ?? null;
   return {
-    id: p(e._id),
+    id: d(e._id),
     createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""),
     updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""),
-    workspaceId: p(o),
-    folderId: e.parentId === o ? null : p(e.parentId),
+    workspaceId: d(a),
+    folderId: e.parentId === a ? null : d(e.parentId),
     model: "grpc_request",
     sortPriority: n,
     name: e.name,
-    url: m(e.url),
-    service: i,
-    method: a,
-    message: ((s = e.body) == null ? void 0 : s.text) ?? "",
-    metadata: (e.metadata ?? []).map((d) => ({
-      enabled: !d.disabled,
-      name: d.name ?? "",
-      value: d.value ?? ""
-    })).filter(({ name: d, value: c }) => d !== "" || c !== "")
+    url: u(e.url),
+    service: r,
+    method: l,
+    message: ((p = e.body) == null ? void 0 : p.text) ?? "",
+    metadata: (e.metadata ?? []).map((s) => ({
+      enabled: !s.disabled,
+      name: s.name ?? "",
+      value: s.value ?? ""
+    })).filter(({ name: s, value: i }) => s !== "" || i !== "")
   };
 }
-function g(e, o, n = 0) {
-  var d, c, l, w;
-  let t = null, i = {};
-  e.body.mimeType === "application/octet-stream" ? (t = "binary", i = { filePath: e.body.fileName ?? "" }) : ((d = e.body) == null ? void 0 : d.mimeType) === "application/x-www-form-urlencoded" ? (t = "application/x-www-form-urlencoded", i = {
-    form: (e.body.params ?? []).map((r) => ({
-      enabled: !r.disabled,
-      name: r.name ?? "",
-      value: r.value ?? ""
+function g(e, a, n = 0) {
+  var s, i, f, m;
+  let o = null, r = {};
+  e.body.mimeType === "application/octet-stream" ? (o = "binary", r = { filePath: e.body.fileName ?? "" }) : ((s = e.body) == null ? void 0 : s.mimeType) === "application/x-www-form-urlencoded" ? (o = "application/x-www-form-urlencoded", r = {
+    form: (e.body.params ?? []).map((t) => ({
+      enabled: !t.disabled,
+      name: t.name ?? "",
+      value: t.value ?? ""
     }))
-  }) : ((c = e.body) == null ? void 0 : c.mimeType) === "multipart/form-data" ? (t = "multipart/form-data", i = {
-    form: (e.body.params ?? []).map((r) => ({
-      enabled: !r.disabled,
-      name: r.name ?? "",
-      value: r.value ?? "",
-      file: r.fileName ?? null
+  }) : ((i = e.body) == null ? void 0 : i.mimeType) === "multipart/form-data" ? (o = "multipart/form-data", r = {
+    form: (e.body.params ?? []).map((t) => ({
+      enabled: !t.disabled,
+      name: t.name ?? "",
+      value: t.value ?? "",
+      file: t.fileName ?? null
     }))
-  }) : ((l = e.body) == null ? void 0 : l.mimeType) === "application/graphql" ? (t = "graphql", i = { text: m(e.body.text ?? "") }) : ((w = e.body) == null ? void 0 : w.mimeType) === "application/json" && (t = "application/json", i = { text: m(e.body.text ?? "") });
-  let a = null, s = {};
-  return e.authentication.type === "bearer" ? (a = "bearer", s = {
-    token: m(e.authentication.token)
-  }) : e.authentication.type === "basic" && (a = "basic", s = {
-    username: m(e.authentication.username),
-    password: m(e.authentication.password)
+  }) : ((f = e.body) == null ? void 0 : f.mimeType) === "application/graphql" ? (o = "graphql", r = { text: u(e.body.text ?? "") }) : ((m = e.body) == null ? void 0 : m.mimeType) === "application/json" && (o = "application/json", r = { text: u(e.body.text ?? "") });
+  let l = null, p = {};
+  return e.authentication.type === "bearer" ? (l = "bearer", p = {
+    token: u(e.authentication.token)
+  }) : e.authentication.type === "basic" && (l = "basic", p = {
+    username: u(e.authentication.username),
+    password: u(e.authentication.password)
   }), {
-    id: p(e._id),
+    id: d(e._id),
     createdAt: new Date(e.created ?? Date.now()).toISOString().replace("Z", ""),
     updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace("Z", ""),
-    workspaceId: p(o),
-    folderId: e.parentId === o ? null : p(e.parentId),
+    workspaceId: d(a),
+    folderId: e.parentId === a ? null : d(e.parentId),
     model: "http_request",
     sortPriority: n,
     name: e.name,
-    url: m(e.url),
-    body: i,
-    bodyType: t,
-    authentication: s,
-    authenticationType: a,
+    url: u(e.url),
+    body: r,
+    bodyType: o,
+    authentication: p,
+    authenticationType: l,
     method: e.method,
-    headers: (e.headers ?? []).map((r) => ({
-      enabled: !r.disabled,
-      name: r.name ?? "",
-      value: r.value ?? ""
-    })).filter(({ name: r, value: u }) => r !== "" || u !== "")
+    headers: (e.headers ?? []).map((t) => ({
+      enabled: !t.disabled,
+      name: t.name ?? "",
+      value: t.value ?? ""
+    })).filter(({ name: t, value: y }) => t !== "" || y !== "")
   };
 }
 function h(e) {
-  return Object.entries(e).map(([o, n]) => ({
+  return Object.entries(e).map(([a, n]) => ({
     enabled: !0,
-    name: o,
+    name: a,
     value: `${n}`
   }));
 }
-function m(e) {
-  return A(e) ? e.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : e;
+function u(e) {
+  return O(e) ? e.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : e;
 }
 function _(e) {
-  return f(e) && e._type === "workspace";
+  return c(e) && e._type === "workspace";
 }
 function D(e) {
-  return f(e) && e._type === "request_group";
+  return c(e) && e._type === "request_group";
 }
 function v(e) {
-  return f(e) && e._type === "request";
+  return c(e) && e._type === "request";
 }
 function q(e) {
-  return f(e) && e._type === "grpc_request";
+  return c(e) && e._type === "grpc_request";
 }
-function y(e) {
-  return f(e) && e._type === "environment";
+function w(e) {
+  return c(e) && e._type === "environment";
 }
-function f(e) {
+function c(e) {
   return Object.prototype.toString.call(e) === "[object Object]";
 }
-function A(e) {
+function O(e) {
   return Object.prototype.toString.call(e) === "[object String]";
 }
-function p(e) {
+function d(e) {
   return e.startsWith("GENERATE_ID::") ? e : `GENERATE_ID::${e}`;
 }
 export {
-  O as pluginHookImport
+  A as pluginHookImport
 };
-//# sourceMappingURL=index.mjs.map

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

@@ -1,73 +1,72 @@
-const _ = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", C = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json", O = [C, _];
-function v(e, t) {
-  var w;
-  console.log("CTX", e);
-  const a = q(t);
-  if (a == null)
+const S = "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", _ = "https://schema.getpostman.com/json/collection/v2.0.0/collection.json", O = [_, S];
+function v(e) {
+  var g;
+  const t = k(e);
+  if (t == null)
     return;
-  const s = i(a.info);
-  if (!O.includes(s.schema) || !Array.isArray(a.item))
+  const o = i(t.info);
+  if (!O.includes(o.schema) || !Array.isArray(t.item))
     return;
-  const u = k(a.auth), n = {
+  const u = A(t.auth), s = {
     workspaces: [],
     environments: [],
     httpRequests: [],
     folders: []
-  }, p = {
+  }, n = {
     model: "workspace",
-    id: b("workspace"),
-    name: s.name || "Postman Import",
-    description: s.description || "",
-    variables: ((w = a.variable) == null ? void 0 : w.map((r) => ({
+    id: h("workspace"),
+    name: o.name || "Postman Import",
+    description: o.description || "",
+    variables: ((g = t.variable) == null ? void 0 : g.map((r) => ({
       name: r.key,
       value: r.value
     }))) ?? []
   };
-  n.workspaces.push(p);
-  const g = (r, d = null) => {
+  s.workspaces.push(n);
+  const T = (r, p = null) => {
     if (typeof r.name == "string" && Array.isArray(r.item)) {
-      const o = {
+      const a = {
         model: "folder",
-        workspaceId: p.id,
-        id: b("folder"),
+        workspaceId: n.id,
+        id: h("folder"),
         name: r.name,
-        folderId: d
+        folderId: p
       };
-      n.folders.push(o);
+      s.folders.push(a);
       for (const l of r.item)
-        g(l, o.id);
+        T(l, a.id);
     } else if (typeof r.name == "string" && "request" in r) {
-      const o = i(r.request), l = j(o.body), A = k(o.auth), m = A.authenticationType == null ? u : A, S = {
+      const a = i(r.request), l = j(a.body), w = A(a.auth), d = w.authenticationType == null ? u : w, q = {
         model: "http_request",
-        id: b("http_request"),
-        workspaceId: p.id,
-        folderId: d,
+        id: h("http_request"),
+        workspaceId: n.id,
+        folderId: p,
         name: r.name,
-        method: o.method || "GET",
-        url: typeof o.url == "string" ? o.url : i(o.url).raw,
+        method: a.method || "GET",
+        url: typeof a.url == "string" ? a.url : i(a.url).raw,
         body: l.body,
         bodyType: l.bodyType,
-        authentication: m.authentication,
-        authenticationType: m.authenticationType,
+        authentication: d.authentication,
+        authenticationType: d.authenticationType,
         headers: [
           ...l.headers,
-          ...m.headers,
-          ...f(o.header).map((y) => ({
-            name: y.key,
-            value: y.value,
-            enabled: !y.disabled
+          ...d.headers,
+          ...b(a.header).map((m) => ({
+            name: m.key,
+            value: m.value,
+            enabled: !m.disabled
           }))
         ]
       };
-      n.httpRequests.push(S);
+      s.httpRequests.push(q);
     } else
-      console.log("Unknown item", r, d);
+      console.log("Unknown item", r, p);
   };
-  for (const r of a.item)
-    g(r);
-  return { resources: T(n) };
+  for (const r of t.item)
+    T(r);
+  return { resources: f(s) };
 }
-function k(e) {
+function A(e) {
   const t = i(e);
   return "basic" in t ? {
     headers: [],
@@ -85,7 +84,7 @@ function k(e) {
   } : { headers: [], authenticationType: null, authentication: {} };
 }
 function j(e) {
-  var a, s, c, u;
+  var o, c, u, s;
   const t = i(e);
   return "graphql" in t ? {
     headers: [
@@ -98,7 +97,7 @@ function j(e) {
     bodyType: "graphql",
     body: {
       text: JSON.stringify(
-        { query: t.graphql.query, variables: q(t.graphql.variables) },
+        { query: t.graphql.query, variables: k(t.graphql.variables) },
         null,
         2
       )
@@ -113,7 +112,7 @@ function j(e) {
     ],
     bodyType: "application/x-www-form-urlencoded",
     body: {
-      form: f(t.urlencoded).map((n) => ({
+      form: b(t.urlencoded).map((n) => ({
         enabled: !n.disabled,
         name: n.key ?? "",
         value: n.value ?? ""
@@ -129,10 +128,9 @@ function j(e) {
     ],
     bodyType: "multipart/form-data",
     body: {
-      form: f(t.formdata).map(
+      form: b(t.formdata).map(
         (n) => n.src != null ? {
           enabled: !n.disabled,
-          contentType: n.contentType ?? null,
           name: n.key ?? "",
           file: n.src ?? ""
         } : {
@@ -146,17 +144,17 @@ function j(e) {
     headers: [
       {
         name: "Content-Type",
-        value: ((s = (a = t.options) == null ? void 0 : a.raw) == null ? void 0 : s.language) === "json" ? "application/json" : "",
+        value: ((c = (o = t.options) == null ? void 0 : o.raw) == null ? void 0 : c.language) === "json" ? "application/json" : "",
         enabled: !0
       }
     ],
-    bodyType: ((u = (c = t.options) == null ? void 0 : c.raw) == null ? void 0 : u.language) === "json" ? "application/json" : "other",
+    bodyType: ((s = (u = t.options) == null ? void 0 : u.raw) == null ? void 0 : s.language) === "json" ? "application/json" : "other",
     body: {
       text: t.raw ?? ""
     }
   } : { headers: [], bodyType: null, body: {} };
 }
-function q(e) {
+function k(e) {
   try {
     return i(JSON.parse(e));
   } catch {
@@ -166,19 +164,18 @@ function q(e) {
 function i(e) {
   return Object.prototype.toString.call(e) === "[object Object]" ? e : {};
 }
-function f(e) {
+function b(e) {
   return Object.prototype.toString.call(e) === "[object Array]" ? e : [];
 }
-function T(e) {
-  return typeof e == "string" ? e.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : Array.isArray(e) && e != null ? e.map(T) : typeof e == "object" && e != null ? Object.fromEntries(
-    Object.entries(e).map(([t, a]) => [t, T(a)])
+function f(e) {
+  return typeof e == "string" ? e.replace(/{{\s*(_\.)?([^}]+)\s*}}/g, "${[$2]}") : Array.isArray(e) && e != null ? e.map(f) : typeof e == "object" && e != null ? Object.fromEntries(
+    Object.entries(e).map(([t, o]) => [t, f(o)])
   ) : e;
 }
-const h = {};
-function b(e) {
-  return h[e] = (h[e] ?? -1) + 1, `GENERATE_ID::${e.toUpperCase()}_${h[e]}`;
+const y = {};
+function h(e) {
+  return y[e] = (y[e] ?? -1) + 1, `GENERATE_ID::${e.toUpperCase()}_${y[e]}`;
 }
 export {
   v as pluginHookImport
 };
-//# sourceMappingURL=index.mjs.map

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

@@ -1,18 +1,17 @@
-function u(r, t) {
+function u(r) {
   let e;
   try {
-    e = JSON.parse(t);
+    e = JSON.parse(r);
   } catch {
     return;
   }
-  if (!(!s(e) || !("yaakSchema" in e)))
+  if (!(!t(e) || !("yaakSchema" in e)))
     return "requests" in e.resources && (e.resources.httpRequests = e.resources.requests, delete e.resources.requests), { resources: e.resources };
 }
-function s(r) {
+function t(r) {
   return Object.prototype.toString.call(r) === "[object Object]";
 }
 export {
-  s as isJSObject,
+  t as isJSObject,
   u as pluginHookImport
 };
-//# sourceMappingURL=index.mjs.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.mjs","sources":["../../../plugins/importer-yaak/src/index.ts"],"sourcesContent":["export function pluginHookImport(ctx: any, contents: string) {\n  let parsed;\n  try {\n    parsed = JSON.parse(contents);\n  } catch (err) {\n    return undefined;\n  }\n\n  if (!isJSObject(parsed)) {\n    return undefined;\n  }\n\n  const isYaakExport = 'yaakSchema' in parsed;\n  if (!isYaakExport) {\n    return;\n  }\n\n  // Migrate v1 to v2 -- changes requests to httpRequests\n  if ('requests' in parsed.resources) {\n    parsed.resources.httpRequests = parsed.resources.requests;\n    delete parsed.resources['requests'];\n  }\n\n  return { resources: parsed.resources }; // Should already be in the correct format\n}\n\nexport function isJSObject(obj: any) {\n  return Object.prototype.toString.call(obj) === '[object Object]';\n}\n"],"names":["pluginHookImport","ctx","contents","parsed","isJSObject","obj"],"mappings":"AAAgB,SAAAA,EAAiBC,GAAUC,GAAkB;AACvD,MAAAC;AACA,MAAA;AACO,IAAAA,IAAA,KAAK,MAAMD,CAAQ;AAAA,UAChB;AACL;AAAA,EACT;AAOA,MALI,GAACE,EAAWD,CAAM,KAKlB,EADiB,gBAAgBA;AAMjC,WAAA,cAAcA,EAAO,cAChBA,EAAA,UAAU,eAAeA,EAAO,UAAU,UAC1C,OAAAA,EAAO,UAAU,WAGnB,EAAE,WAAWA,EAAO;AAC7B;AAEO,SAASC,EAAWC,GAAU;AACnC,SAAO,OAAO,UAAU,SAAS,KAAKA,CAAG,MAAM;AACjD;"}

src-tauri/src/analytics.rs

@@ -1,6 +1,6 @@
 use std::fmt::Display;
 
-use log::{debug, info};
+use log::warn;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sqlx::types::JsonValue;
@@ -11,15 +11,11 @@ use crate::models::{
     generate_id, get_key_value_int, get_key_value_string, set_key_value_int, set_key_value_string,
 };
 
-const NAMESPACE: &str = "analytics";
-const NUM_LAUNCHES_KEY: &str = "num_launches";
-
 // serializable
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum AnalyticsResource {
     App,
-    Appearance,
     CookieJar,
     Dialog,
     Environment,
@@ -30,10 +26,9 @@ pub enum AnalyticsResource {
     HttpRequest,
     HttpResponse,
     KeyValue,
-    Setting,
     Sidebar,
-    Theme,
     Workspace,
+    Setting,
 }
 
 impl AnalyticsResource {
@@ -98,19 +93,20 @@ pub struct LaunchEventInfo {
     pub num_launches: i32,
 }
 
-pub async fn track_launch_event(app: &AppHandle) -> LaunchEventInfo {
+pub async fn track_launch_event(app_handle: &AppHandle) -> LaunchEventInfo {
+    let namespace = "analytics";
     let last_tracked_version_key = "last_tracked_version";
 
     let mut info = LaunchEventInfo::default();
 
-    info.num_launches = get_num_launches(app).await + 1;
+    info.num_launches = get_key_value_int(app_handle, namespace, "num_launches", 0).await + 1;
     info.previous_version =
-        get_key_value_string(app, NAMESPACE, last_tracked_version_key, "").await;
-    info.current_version = app.package_info().version.to_string();
+        get_key_value_string(app_handle, namespace, last_tracked_version_key, "").await;
+    info.current_version = app_handle.package_info().version.to_string();
 
     if info.previous_version.is_empty() {
         track_event(
-            app,
+            app_handle,
             AnalyticsResource::App,
             AnalyticsAction::LaunchFirst,
             None,
@@ -120,10 +116,10 @@ pub async fn track_launch_event(app: &AppHandle) -> LaunchEventInfo {
         info.launched_after_update = info.current_version != info.previous_version;
         if info.launched_after_update {
             track_event(
-                app,
+                app_handle,
                 AnalyticsResource::App,
                 AnalyticsAction::LaunchUpdate,
-                Some(json!({ NUM_LAUNCHES_KEY: info.num_launches })),
+                Some(json!({ "num_launches": info.num_launches })),
             )
             .await;
         }
@@ -131,23 +127,23 @@ pub async fn track_launch_event(app: &AppHandle) -> LaunchEventInfo {
 
     // Track a launch event in all cases
     track_event(
-        app,
+        app_handle,
         AnalyticsResource::App,
         AnalyticsAction::Launch,
-        Some(json!({ NUM_LAUNCHES_KEY: info.num_launches })),
+        Some(json!({ "num_launches": info.num_launches })),
     )
     .await;
 
     // Update key values
 
     set_key_value_string(
-        app,
-        NAMESPACE,
+        app_handle,
+        namespace,
         last_tracked_version_key,
         info.current_version.as_str(),
     )
     .await;
-    set_key_value_int(app, NAMESPACE, NUM_LAUNCHES_KEY, info.num_launches).await;
+    set_key_value_int(app_handle, namespace, "num_launches", info.num_launches).await;
 
     info
 }
@@ -189,12 +185,15 @@ pub async fn track_event(
 
     // Disable analytics actual sending in dev
     if is_dev() {
-        debug!("track: {}", event);
+        // debug!("track: {} {} {:?}", event, attributes_json, params);
         return;
     }
 
     if let Err(e) = req.send().await {
-        info!("Error sending analytics event: {}", e);
+        warn!(
+            "Error sending analytics event: {} {} {} {:?}",
+            e, event, attributes_json, params,
+        );
     }
 }
 
@@ -243,7 +242,3 @@ async fn get_id(app_handle: &AppHandle) -> String {
         id
     }
 }
-
-pub async fn get_num_launches(app: &AppHandle) -> i32 {
-    get_key_value_int(app, NAMESPACE, NUM_LAUNCHES_KEY, 0).await
-}

src-tauri/src/deno.rs

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

src-tauri/src/deno_ops.rs

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