gRPC models and tables

src-tauri/.sqlx/query-02506ad41cc94cd937422ef1977a97174431f008a9fb4ce39667d587a858b876.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO folders (\n                id,\n                workspace_id,\n                folder_id,\n                name,\n                sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               sort_priority = excluded.sort_priority\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "02506ad41cc94cd937422ef1977a97174431f008a9fb4ce39667d587a858b876"
-}

src-tauri/.sqlx/query-11394af12419cca3be3a26dff9275514ea2a44504e3c7a568a9578c64b5713d1.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO http_requests (\n                id, workspace_id, folder_id, name, url, url_parameters, method, body, body_type,\n                authentication, authentication_type, headers, sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               method = excluded.method,\n               headers = excluded.headers,\n               body = excluded.body,\n               body_type = excluded.body_type,\n               authentication = excluded.authentication,\n               authentication_type = excluded.authentication_type,\n               url = excluded.url,\n               url_parameters = excluded.url_parameters,\n               sort_priority = excluded.sort_priority\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "11394af12419cca3be3a26dff9275514ea2a44504e3c7a568a9578c64b5713d1"
+}

src-tauri/.sqlx/query-12b265491d1ebba19e1ce8a660e458ffbcd8c0850aef16ba1f70e358623ac66a.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO workspaces (\n                id, name, description, variables, setting_request_timeout,\n                setting_follow_redirects, setting_validate_certificates\n             )\n            VALUES (?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               description = excluded.description,\n               variables = excluded.variables,\n               setting_request_timeout = excluded.setting_request_timeout,\n               setting_follow_redirects = excluded.setting_follow_redirects,\n               setting_validate_certificates = excluded.setting_validate_certificates\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "12b265491d1ebba19e1ce8a660e458ffbcd8c0850aef16ba1f70e358623ac66a"
+}

src-tauri/.sqlx/query-13cb883199e81966174e6fda9c252bf7213fe01b5346266c0a89dc0ac89eda64.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO environments (\n                id, workspace_id, name, variables\n            )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               variables = excluded.variables\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "13cb883199e81966174e6fda9c252bf7213fe01b5346266c0a89dc0ac89eda64"
+}

src-tauri/.sqlx/query-1ad8a2581417acb2d1b06fc2727a452230ff4ecbdfb5be54a034ec7c4fb1cabe.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO grpc_connections (\n                id, workspace_id, request_id, service, method\n            )\n            VALUES ( ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n                updated_at = CURRENT_TIMESTAMP,\n                service = excluded.service,\n                method = excluded.method\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "1ad8a2581417acb2d1b06fc2727a452230ff4ecbdfb5be54a034ec7c4fb1cabe"
+}

src-tauri/.sqlx/query-1ca8044e7eebe465e740623d4b5491e9fedc0e24a7bd3cc78ef8de795fdaef01.json

@@ -0,0 +1,62 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT id, model, workspace_id, request_id, created_at, updated_at, service, method\n            FROM grpc_connections\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "service",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 7,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "1ca8044e7eebe465e740623d4b5491e9fedc0e24a7bd3cc78ef8de795fdaef01"
+}

src-tauri/.sqlx/query-29d3bee45c4fca4c63231e1205edc708818737fe37137dbba6af2d784c3c0221.json

@@ -0,0 +1,62 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT id, model, workspace_id, request_id, created_at, updated_at, service, method\n            FROM grpc_connections\n            WHERE workspace_id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "service",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 7,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "29d3bee45c4fca4c63231e1205edc708818737fe37137dbba6af2d784c3c0221"
+}

src-tauri/.sqlx/query-2c9658a639c5e4994ae9c8ec30bd4e40a1945d640962991f879928619950ef62.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO http_responses (\n                id, request_id, workspace_id, elapsed, elapsed_headers, url, status, status_reason,\n                content_length, body_path, headers, version, remote_addr\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "2c9658a639c5e4994ae9c8ec30bd4e40a1945d640962991f879928619950ef62"
+}

src-tauri/.sqlx/query-35c9607291ee400e7696393bec7f4aa254a2dd163c4f79ea368ac6ee5f74c365.json

@@ -0,0 +1,86 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, sort_priority,\n                url, service, method, message\n            FROM grpc_requests\n            WHERE workspace_id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "folder_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "name",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "sort_priority",
+        "ordinal": 7,
+        "type_info": "Float"
+      },
+      {
+        "name": "url",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "service",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "message",
+        "ordinal": 11,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "35c9607291ee400e7696393bec7f4aa254a2dd163c4f79ea368ac6ee5f74c365"
+}

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-4a5fd6c81401ccafac64b05cb476da92cc30919d5bdb0a0226ea5e30d5b30c0f.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO http_requests (\n                id,\n                workspace_id,\n                folder_id,\n                name,\n                url,\n                url_parameters,\n                method,\n                body,\n                body_type,\n                authentication,\n                authentication_type,\n                headers,\n                sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               method = excluded.method,\n               headers = excluded.headers,\n               body = excluded.body,\n               body_type = excluded.body_type,\n               authentication = excluded.authentication,\n               authentication_type = excluded.authentication_type,\n               url = excluded.url,\n               url_parameters = excluded.url_parameters,\n               sort_priority = excluded.sort_priority\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "4a5fd6c81401ccafac64b05cb476da92cc30919d5bdb0a0226ea5e30d5b30c0f"
-}

src-tauri/.sqlx/query-4abfe0884ba046534dc6c255409c41ce287d7b0137726b8ca09870382a8b8300.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO grpc_messages (\n                id, workspace_id, request_id, connection_id, message\n            )\n            VALUES (?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n                updated_at = CURRENT_TIMESTAMP,\n                message = excluded.message\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "4abfe0884ba046534dc6c255409c41ce287d7b0137726b8ca09870382a8b8300"
+}

src-tauri/.sqlx/query-558e72df3c6f2635c6b3d52a199f9a5f7a3d82b379ff9af36645dcfb92548fdd.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                created_at,\n                updated_at,\n                folder_id,\n                name,\n                sort_priority\n            FROM folders\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, created_at, updated_at, folder_id, name, sort_priority\n            FROM folders\n            WHERE workspace_id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -58,5 +58,5 @@
       false
     ]
   },
-  "hash": "1428d25b6aa3d6ec55742a968571fa951da0406d7bb32408883c584eae7dd53c"
+  "hash": "558e72df3c6f2635c6b3d52a199f9a5f7a3d82b379ff9af36645dcfb92548fdd"
 }

src-tauri/.sqlx/query-573db23160de025e5c72efb90be7fff5e3ec4619b962d149fdd4d618fe02c680.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                method,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, url, method,\n                body_type, authentication_type, sort_priority,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -44,39 +44,39 @@
         "type_info": "Text"
       },
       {
-        "name": "url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>",
+        "name": "method",
         "ordinal": 8,
         "type_info": "Text"
       },
       {
-        "name": "method",
+        "name": "body_type",
         "ordinal": 9,
         "type_info": "Text"
       },
       {
-        "name": "body!: Json<HashMap<String, JsonValue>>",
+        "name": "authentication_type",
         "ordinal": 10,
         "type_info": "Text"
       },
       {
-        "name": "body_type",
+        "name": "sort_priority",
         "ordinal": 11,
-        "type_info": "Text"
+        "type_info": "Float"
       },
       {
-        "name": "authentication!: Json<HashMap<String, JsonValue>>",
+        "name": "url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>",
         "ordinal": 12,
         "type_info": "Text"
       },
       {
-        "name": "authentication_type",
+        "name": "body!: Json<HashMap<String, JsonValue>>",
         "ordinal": 13,
         "type_info": "Text"
       },
       {
-        "name": "sort_priority",
+        "name": "authentication!: Json<HashMap<String, JsonValue>>",
         "ordinal": 14,
-        "type_info": "Float"
+        "type_info": "Text"
       },
       {
         "name": "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>",
@@ -97,14 +97,14 @@
       false,
       false,
       false,
-      false,
+      true,
-      false,
       true,
       false,
-      true,
+      false,
+      false,
       false,
       false
     ]
   },
-  "hash": "6483f3ffeb90e019e9078d98bb831b8e4fbedfb45751d6cd33bd42e518b634dd"
+  "hash": "573db23160de025e5c72efb90be7fff5e3ec4619b962d149fdd4d618fe02c680"
 }

src-tauri/.sqlx/query-5765e9565a8b89c5bc2d72197e0e4a1093739e9abba69f6fe5527d453fab4db8.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                created_at,\n                updated_at,\n                name,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM environments\n            WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, created_at, updated_at, name,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM environments\n            WHERE id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -52,5 +52,5 @@
       false
     ]
   },
-  "hash": "689bcc92b914f50c14921faa796c07a256deb84c832fc3d90200b393fb159417"
+  "hash": "5765e9565a8b89c5bc2d72197e0e4a1093739e9abba69f6fe5527d453fab4db8"
 }

src-tauri/.sqlx/query-587aedf827b00bb706c35457a75b811317e66fc84ac0906bf5513d938121a078.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            UPDATE http_responses SET (\n                elapsed,\n                elapsed_headers,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body_path,\n                error,\n                headers,\n                version,\n                remote_addr,\n                updated_at\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 12
-    },
-    "nullable": []
-  },
-  "hash": "587aedf827b00bb706c35457a75b811317e66fc84ac0906bf5513d938121a078"
-}

src-tauri/.sqlx/query-612efa9ac45723dc604a88f5e7e288b4055fec4ba7d9102131bd255c037fa021.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                workspace_id,\n                name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, workspace_id, name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE workspace_id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -52,5 +52,5 @@
       false
     ]
   },
-  "hash": "f2ba4708d4a9ff9ce74c407a730040bd7883e9a5c0eb79ef0d8a6782a8eae299"
+  "hash": "612efa9ac45723dc604a88f5e7e288b4055fec4ba7d9102131bd255c037fa021"
 }

src-tauri/.sqlx/query-86a9d12d7b00217f3143671908c31c2c6a3c24774a505280dcba169eb5b6b0fb.json

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

src-tauri/.sqlx/query-8dfbae65ddec905ea3734448cc9f7029b6c78de227c6fa3a85d75d0a7f21e0e9.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                name,\n                description,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, name, description, setting_request_timeout,\n                setting_follow_redirects, setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces\n        ",
   "describe": {
     "columns": [
       {
@@ -70,5 +70,5 @@
       false
     ]
   },
-  "hash": "20cf0f8b71e600bc40ee204b60a12b2f3728178f3b8788d2e5cc92821b74d470"
+  "hash": "8dfbae65ddec905ea3734448cc9f7029b6c78de227c6fa3a85d75d0a7f21e0e9"
 }

src-tauri/.sqlx/query-9238f94c688d91f42627e5b73c627c514bab4039ab5edadc79b77dfdfd63b208.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO folders (\n                id, workspace_id, folder_id, name, sort_priority\n            )\n            VALUES (?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               folder_id = excluded.folder_id,\n               sort_priority = excluded.sort_priority\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 5
+    },
+    "nullable": []
+  },
+  "hash": "9238f94c688d91f42627e5b73c627c514bab4039ab5edadc79b77dfdfd63b208"
+}

src-tauri/.sqlx/query-9ba3f783238b77637ffded4171b2fbb5e5ad0be952a0d832448d65cc5f0effc1.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                name,\n                description,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces WHERE id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, name, description, setting_request_timeout,\n                setting_follow_redirects, setting_validate_certificates,\n                variables AS \"variables!: sqlx::types::Json<Vec<EnvironmentVariable>>\"\n            FROM workspaces WHERE id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -70,5 +70,5 @@
       false
     ]
   },
-  "hash": "e08fa4f9b2929f20a01d1dc43d6847a309d3e8c5b324df2d039d1c6e07e6eb2f"
+  "hash": "9ba3f783238b77637ffded4171b2fbb5e5ad0be952a0d832448d65cc5f0effc1"
 }

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

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO http_responses (\n                id,\n                request_id,\n                workspace_id,\n                elapsed,\n                elapsed_headers,\n                url,\n                status,\n                status_reason,\n                content_length,\n                body_path,\n                headers,\n                version,\n                remote_addr\n            )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 13
-    },
-    "nullable": []
-  },
-  "hash": "a1c9a862ca6a07476cb8e7d16d73bd109c070603396a890dc717e50020d006f5"
-}

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

@@ -0,0 +1,56 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT id, model, workspace_id, request_id, connection_id, created_at, message\n            FROM grpc_messages\n            WHERE workspace_id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "connection_id",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "message",
+        "ordinal": 6,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "a86d3e86c5638d5f666c0cbe26dd5b3e88c632c56c7c4f3f116a29867e41e6a2"
+}

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

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                created_at,\n                updated_at,\n                folder_id,\n                name,\n                sort_priority\n            FROM folders\n            WHERE workspace_id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, created_at, updated_at, folder_id, name, sort_priority\n            FROM folders\n            WHERE id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -58,5 +58,5 @@
       false
     ]
   },
-  "hash": "1517b0f86c841b5f1247bd40c3a9b38ab001d846a410b6e3cd36f9e844d50ddb"
+  "hash": "ae98a7b35a5cb80a4bcd04faa22545deac2a5e9bfb814b60191f16b98ed49796"
 }

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

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                theme,\n                appearance,\n                update_channel\n            FROM settings\n            WHERE id = 'default'\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, theme, appearance, update_channel\n            FROM settings\n            WHERE id = 'default'\n        ",
   "describe": {
     "columns": [
       {
@@ -52,5 +52,5 @@
       false
     ]
   },
-  "hash": "3b3fb6271340c6ec21a10b4f1b20502c86c425e0b53ac07692f8a4ed0be09335"
+  "hash": "b32994b09ae7a06eb0f031069d327e55127a5bce60cbb499b83d1701386a23cb"
 }

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

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO cookie_jars (\n                id, workspace_id, name, cookies\n             )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               cookies = excluded.cookies\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "b3fae40a793a6724dd2286a9ca4bc0a9c000a631ee0d751a9dc4f3e76de3d57c"
+}

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

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO cookie_jars (\n                id,\n                workspace_id,\n                name,\n                cookies\n             )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               cookies = excluded.cookies\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "b5ed4dc77f8cf21de1a06f146e47821bdb51fcfe747170bea41e7a366d736bda"
-}

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

@@ -0,0 +1,86 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, sort_priority,\n                url, service, method, message\n            FROM grpc_requests\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "folder_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 4,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "updated_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "name",
+        "ordinal": 6,
+        "type_info": "Text"
+      },
+      {
+        "name": "sort_priority",
+        "ordinal": 7,
+        "type_info": "Float"
+      },
+      {
+        "name": "url",
+        "ordinal": 8,
+        "type_info": "Text"
+      },
+      {
+        "name": "service",
+        "ordinal": 9,
+        "type_info": "Text"
+      },
+      {
+        "name": "method",
+        "ordinal": 10,
+        "type_info": "Text"
+      },
+      {
+        "name": "message",
+        "ordinal": 11,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "c5f9b12bca35fe65ae2a1625e7f09c7855ce107046113a45f6da2abcff41819f"
+}

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

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO workspaces (\n                id,\n                name,\n                description,\n                variables,\n                setting_request_timeout,\n                setting_follow_redirects,\n                setting_validate_certificates\n             )\n            VALUES (?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               description = excluded.description,\n               variables = excluded.variables,\n               setting_request_timeout = excluded.setting_request_timeout,\n               setting_follow_redirects = excluded.setting_follow_redirects,\n               setting_validate_certificates = excluded.setting_validate_certificates\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "cae4e905515ddea1ec2cd685020241f06b49719085a695b897ef8ad409d2cef2"
-}

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

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            INSERT INTO grpc_requests (\n                id, name, workspace_id, folder_id, sort_priority, url, service, method, message\n             )\n            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n                updated_at = CURRENT_TIMESTAMP,\n                name = excluded.name,\n                folder_id = excluded.folder_id,\n                sort_priority = excluded.sort_priority,\n                url = excluded.url,\n                service = excluded.service,\n                method = excluded.method,\n                message = excluded.message\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 9
+    },
+    "nullable": []
+  },
+  "hash": "d2dc9a652fe08623d70b8b0a2e6823d096e8cbcb9f06544ab245f41425335a25"
+}

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

@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n            INSERT INTO environments (\n                id,\n                workspace_id,\n                name,\n                variables\n            )\n            VALUES (?, ?, ?, ?)\n            ON CONFLICT (id) DO UPDATE SET\n               updated_at = CURRENT_TIMESTAMP,\n               name = excluded.name,\n               variables = excluded.variables\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "dcc2f405f8e29d0599d86bcde509187e9cc5fc647067eaa5c738cb24e2f081e5"
-}

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

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                workspace_id,\n                folder_id,\n                created_at,\n                updated_at,\n                name,\n                url,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                method,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                body_type,\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                authentication_type,\n                sort_priority,\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE workspace_id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, workspace_id, folder_id, created_at, updated_at, name, url,\n                url_parameters AS \"url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>\",\n                method, body_type, authentication_type, sort_priority,\n                body AS \"body!: Json<HashMap<String, JsonValue>>\",\n                authentication AS \"authentication!: Json<HashMap<String, JsonValue>>\",\n                headers AS \"headers!: sqlx::types::Json<Vec<HttpRequestHeader>>\"\n            FROM http_requests\n            WHERE workspace_id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -54,29 +54,29 @@
         "type_info": "Text"
       },
       {
-        "name": "body!: Json<HashMap<String, JsonValue>>",
+        "name": "body_type",
         "ordinal": 10,
         "type_info": "Text"
       },
       {
-        "name": "body_type",
+        "name": "authentication_type",
         "ordinal": 11,
         "type_info": "Text"
       },
       {
-        "name": "authentication!: Json<HashMap<String, JsonValue>>",
+        "name": "sort_priority",
         "ordinal": 12,
-        "type_info": "Text"
+        "type_info": "Float"
       },
       {
-        "name": "authentication_type",
+        "name": "body!: Json<HashMap<String, JsonValue>>",
         "ordinal": 13,
         "type_info": "Text"
       },
       {
-        "name": "sort_priority",
+        "name": "authentication!: Json<HashMap<String, JsonValue>>",
         "ordinal": 14,
-        "type_info": "Float"
+        "type_info": "Text"
       },
       {
         "name": "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>",
@@ -98,13 +98,13 @@
       false,
       false,
       false,
-      false,
+      true,
       true,
       false,
-      true,
+      false,
       false,
       false
     ]
   },
-  "hash": "7a7bc4df7e52ad3a987c97af8f43b46381e2cc16ba0c553713d0b6c64354eb39"
+  "hash": "e61c0dddb3e86d271cb9399faa4e4443342796cb72bdd43a821fae2994ae8e2f"
 }

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

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            UPDATE http_responses SET (\n                elapsed, elapsed_headers, url, status, status_reason, content_length, body_path,\n                error, headers, version, remote_addr, updated_at\n            ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 12
+    },
+    "nullable": []
+  },
+  "hash": "e7124f5570076bfd65985744f48d8e12cf29d6d243fffdd62ade2ab70c7bddda"
+}

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

@@ -0,0 +1,56 @@
+{
+  "db_name": "SQLite",
+  "query": "\n            SELECT id, model, workspace_id, request_id, connection_id, created_at, message\n            FROM grpc_messages\n            WHERE id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "model",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "workspace_id",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "request_id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "connection_id",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at",
+        "ordinal": 5,
+        "type_info": "Datetime"
+      },
+      {
+        "name": "message",
+        "ordinal": 6,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "f055a2b6ab6bc3fea115dbea3f287df833c9bb73cdf2fe38da21fe5f5f6ae639"
+}

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

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n            SELECT\n                id,\n                model,\n                created_at,\n                updated_at,\n                workspace_id,\n                name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE workspace_id = ?\n        ",
+  "query": "\n            SELECT\n                id, model, created_at, updated_at, workspace_id, name,\n                cookies AS \"cookies!: sqlx::types::Json<Vec<JsonValue>>\"\n            FROM cookie_jars WHERE id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -52,5 +52,5 @@
       false
     ]
   },
-  "hash": "cb939b45a715d91f7631dea6b2d1bdc59fb3dffbd44ff99bc15adb34ea7093f7"
+  "hash": "f5f20f3b37d932617499a0da50997edad59e4f5998b15c50ed6eae2e97064068"
 }

src-tauri/migrations/20240203164833_grpc.sql

@@ -0,0 +1,56 @@
+CREATE TABLE grpc_requests
+(
+    id            TEXT                               NOT NULL
+        PRIMARY KEY,
+    model         TEXT     DEFAULT 'grpc_request'    NOT NULL,
+    workspace_id  TEXT                               NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    folder_id     TEXT                               NULL
+        REFERENCES folders
+            ON DELETE CASCADE,
+    created_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    name          TEXT                               NOT NULL,
+    sort_priority REAL                               NOT NULL,
+    url           TEXT                               NOT NULL,
+    service       TEXT                               NULL,
+    method        TEXT                               NULL,
+    message       TEXT                               NOT NULL
+);
+
+CREATE TABLE grpc_connections
+(
+    id           TEXT                               NOT NULL
+        PRIMARY KEY,
+    model        TEXT     DEFAULT 'grpc_connection' NOT NULL,
+    workspace_id TEXT                               NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    request_id   TEXT                               NOT NULL
+        REFERENCES grpc_requests
+            ON DELETE CASCADE,
+    created_at   DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at   DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    service      TEXT                               NOT NULL,
+    method       TEXT                               NOT NULL
+);
+
+CREATE TABLE grpc_messages
+(
+    id            TEXT                               NOT NULL
+        PRIMARY KEY,
+    model         TEXT     DEFAULT 'grpc_message'    NOT NULL,
+    workspace_id  TEXT                               NOT NULL
+        REFERENCES workspaces
+            ON DELETE CASCADE,
+    request_id    TEXT                               NOT NULL
+        REFERENCES grpc_requests
+            ON DELETE CASCADE,
+    connection_id TEXT                               NOT NULL
+        REFERENCES grpc_connections
+            ON DELETE CASCADE,
+    created_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at    DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    message       TEXT                               NOT NULL
+);

src-tauri/src/main.rs

@@ -17,7 +17,7 @@ use std::str::FromStr;
 use ::http::uri::InvalidUri;
 use ::http::Uri;
 use fern::colors::ColoredLevelConfig;
-use futures::{Stream, StreamExt};
+use futures::StreamExt;
 use log::{debug, error, info, warn};
 use rand::random;
 use serde::Serialize;
@@ -46,7 +46,7 @@ use crate::models::{
     delete_environment, delete_folder, delete_request, delete_response, delete_workspace,
     duplicate_request, find_cookie_jars, find_environments, find_folders, find_requests,
     find_responses, find_workspaces, generate_id, get_cookie_jar, get_environment, get_folder,
-    get_key_value_raw, get_or_create_settings, get_request, get_response, get_workspace,
+    get_http_request, get_key_value_raw, get_or_create_settings, get_response, get_workspace,
     get_workspace_export_resources, set_key_value_raw, update_response_if_id, update_settings,
     upsert_cookie_jar, upsert_environment, upsert_folder, upsert_request, upsert_workspace,
     CookieJar, Environment, EnvironmentVariable, Folder, HttpRequest, HttpResponse, KeyValue,
@@ -138,8 +138,8 @@ async fn cmd_grpc_bidi_streaming(
     app_handle: AppHandle<Wry>,
     grpc_handle: State<'_, Mutex<GrpcManager>>,
 ) -> Result<String, String> {
-    let (in_msg_tx, mut in_msg_rx) = tauri::async_runtime::channel::<String>(16);
+    let (in_msg_tx, in_msg_rx) = tauri::async_runtime::channel::<String>(16);
-    let maybe_in_msg_tx = Mutex::new(Some(in_msg_tx.clone()));
+    let _maybe_in_msg_tx = Mutex::new(Some(in_msg_tx.clone()));
     let (cancelled_tx, mut cancelled_rx) = tokio::sync::watch::channel(false);
 
     let uri = safe_uri(endpoint).map_err(|e| e.to_string())?;
@@ -522,7 +522,7 @@ async fn cmd_send_request(
 ) -> Result<HttpResponse, String> {
     let db = &*db_state.lock().await;
 
-    let request = get_request(db, request_id)
+    let request = get_http_request(db, request_id)
         .await
         .expect("Failed to get request");
 
@@ -977,7 +977,7 @@ async fn cmd_get_request(
     db_state: State<'_, Mutex<Pool<Sqlite>>>,
 ) -> Result<HttpRequest, String> {
     let db = &*db_state.lock().await;
-    get_request(db, id).await.map_err(|e| e.to_string())
+    get_http_request(db, id).await.map_err(|e| e.to_string())
 }
 
 #[tauri::command]

src-tauri/src/models.rs

@@ -4,9 +4,9 @@ use std::fs;
 use log::error;
 use rand::distributions::{Alphanumeric, DistString};
 use serde::{Deserialize, Serialize};
-use sqlx::{Pool, Sqlite};
-use sqlx::types::{Json, JsonValue};
 use sqlx::types::chrono::NaiveDateTime;
+use sqlx::types::{Json, JsonValue};
+use sqlx::{Pool, Sqlite};
 use tauri::AppHandle;
 
 fn default_true() -> bool {
@@ -190,21 +190,19 @@ impl HttpResponse {
 
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
-pub struct GrpcEndpoint {
+pub struct GrpcRequest {
     pub id: String,
     pub model: String,
     pub workspace_id: String,
-    pub request_id: String,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
-    pub endpoint: String,
+    pub folder_id: Option<String>,
-}
+    pub name: String,
-
+    pub sort_priority: f64,
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+    pub url: String,
-#[serde(default, rename_all = "camelCase")]
+    pub service: Option<String>,
-pub struct GrpcMessage {
+    pub method: Option<String>,
-    pub created_at: NaiveDateTime,
+    pub message: String,
-    pub content: String,
 }
 
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -213,24 +211,23 @@ pub struct GrpcConnection {
     pub id: String,
     pub model: String,
     pub workspace_id: String,
-    pub grpc_endpoint_id: String,
     pub request_id: String,
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
-    pub messages: Json<Vec<GrpcMessage>>,
+    pub service: String,
+    pub method: String,
 }
 
-#[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "camelCase")]
-pub struct GrpcRequest {
+pub struct GrpcMessage {
     pub id: String,
     pub model: String,
     pub workspace_id: String,
-    pub grpc_endpoint_id: String,
-    pub grpc_connection_id: String,
     pub request_id: String,
+    pub connection_id: String,
     pub created_at: NaiveDateTime,
-    pub updated_at: NaiveDateTime,
+    pub message: String,
 }
 
 #[derive(sqlx::FromRow, Debug, Clone, Serialize, Deserialize, Default)]
@@ -363,15 +360,8 @@ pub async fn find_workspaces(db: &Pool<Sqlite>) -> Result<Vec<Workspace>, sqlx::
         Workspace,
         r#"
             SELECT
-                id,
+                id, model, created_at, updated_at, name, description, setting_request_timeout,
-                model,
+                setting_follow_redirects, setting_validate_certificates,
-                created_at,
-                updated_at,
-                name,
-                description,
-                setting_request_timeout,
-                setting_follow_redirects,
-                setting_validate_certificates,
                 variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
             FROM workspaces
         "#,
@@ -385,15 +375,8 @@ pub async fn get_workspace(db: &Pool<Sqlite>, id: &str) -> Result<Workspace, sql
         Workspace,
         r#"
             SELECT
-                id,
+                id, model, created_at, updated_at, name, description, setting_request_timeout,
-                model,
+                setting_follow_redirects, setting_validate_certificates,
-                created_at,
-                updated_at,
-                name,
-                description,
-                setting_request_timeout,
-                setting_follow_redirects,
-                setting_validate_certificates,
                 variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
             FROM workspaces WHERE id = ?
         "#,
@@ -427,12 +410,7 @@ pub async fn get_cookie_jar(db: &Pool<Sqlite>, id: &str) -> Result<CookieJar, sq
         CookieJar,
         r#"
             SELECT
-                id,
+                id, model, created_at, updated_at, workspace_id, name,
-                model,
-                created_at,
-                updated_at,
-                workspace_id,
-                name,
                 cookies AS "cookies!: sqlx::types::Json<Vec<JsonValue>>"
             FROM cookie_jars WHERE id = ?
         "#,
@@ -450,12 +428,7 @@ pub async fn find_cookie_jars(
         CookieJar,
         r#"
             SELECT
-                id,
+                id, model, created_at, updated_at, workspace_id, name,
-                model,
-                created_at,
-                updated_at,
-                workspace_id,
-                name,
                 cookies AS "cookies!: sqlx::types::Json<Vec<JsonValue>>"
             FROM cookie_jars WHERE workspace_id = ?
         "#,
@@ -481,6 +454,208 @@ pub async fn delete_cookie_jar(db: &Pool<Sqlite>, id: &str) -> Result<CookieJar,
     Ok(cookie_jar)
 }
 
+pub async fn upsert_grpc_request(
+    db: &Pool<Sqlite>,
+    request: &GrpcRequest,
+) -> Result<GrpcRequest, sqlx::Error> {
+    let id = match request.id.as_str() {
+        "" => generate_id(Some("gr")),
+        _ => request.id.to_string(),
+    };
+    let trimmed_name = request.name.trim();
+    sqlx::query!(
+        r#"
+            INSERT INTO grpc_requests (
+                id, name, workspace_id, folder_id, sort_priority, url, service, method, message
+             )
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT (id) DO UPDATE SET
+                updated_at = CURRENT_TIMESTAMP,
+                name = excluded.name,
+                folder_id = excluded.folder_id,
+                sort_priority = excluded.sort_priority,
+                url = excluded.url,
+                service = excluded.service,
+                method = excluded.method,
+                message = excluded.message
+        "#,
+        id,
+        trimmed_name,
+        request.workspace_id,
+        request.folder_id,
+        request.sort_priority,
+        request.url,
+        request.service,
+        request.method,
+        request.message,
+    )
+    .execute(db)
+    .await?;
+
+    get_grpc_request(db, &id).await
+}
+
+pub async fn get_grpc_request(db: &Pool<Sqlite>, id: &str) -> Result<GrpcRequest, sqlx::Error> {
+    sqlx::query_as!(
+        GrpcRequest,
+        r#"
+            SELECT
+                id, model, workspace_id, folder_id, created_at, updated_at, name, sort_priority,
+                url, service, method, message
+            FROM grpc_requests
+            WHERE id = ?
+        "#,
+        id,
+    )
+    .fetch_one(db)
+    .await
+}
+
+pub async fn list_grpc_requests(
+    db: &Pool<Sqlite>,
+    workspace_id: &str,
+) -> Result<Vec<GrpcRequest>, sqlx::Error> {
+    sqlx::query_as!(
+        GrpcRequest,
+        r#"
+            SELECT
+                id, model, workspace_id, folder_id, created_at, updated_at, name, sort_priority,
+                url, service, method, message
+            FROM grpc_requests
+            WHERE workspace_id = ?
+        "#,
+        workspace_id,
+    )
+    .fetch_all(db)
+    .await
+}
+
+pub async fn upsert_grpc_connection(
+    db: &Pool<Sqlite>,
+    connection: &GrpcConnection,
+) -> Result<GrpcConnection, sqlx::Error> {
+    let id = match connection.id.as_str() {
+        "" => generate_id(Some("gc")),
+        _ => connection.id.to_string(),
+    };
+    sqlx::query!(
+        r#"
+            INSERT INTO grpc_connections (
+                id, workspace_id, request_id, service, method
+            )
+            VALUES ( ?, ?, ?, ?, ?)
+            ON CONFLICT (id) DO UPDATE SET
+                updated_at = CURRENT_TIMESTAMP,
+                service = excluded.service,
+                method = excluded.method
+        "#,
+        id,
+        connection.workspace_id,
+        connection.request_id,
+        connection.service,
+        connection.method,
+    )
+    .execute(db)
+    .await?;
+
+    get_grpc_connection(db, &id).await
+}
+
+pub async fn get_grpc_connection(
+    db: &Pool<Sqlite>,
+    id: &str,
+) -> Result<GrpcConnection, sqlx::Error> {
+    sqlx::query_as!(
+        GrpcConnection,
+        r#"
+            SELECT id, model, workspace_id, request_id, created_at, updated_at, service, method
+            FROM grpc_connections
+            WHERE id = ?
+        "#,
+        id,
+    )
+    .fetch_one(db)
+    .await
+}
+
+pub async fn list_grpc_connections(
+    db: &Pool<Sqlite>,
+    workspace_id: &str,
+) -> Result<Vec<GrpcConnection>, sqlx::Error> {
+    sqlx::query_as!(
+        GrpcConnection,
+        r#"
+            SELECT id, model, workspace_id, request_id, created_at, updated_at, service, method
+            FROM grpc_connections
+            WHERE workspace_id = ?
+        "#,
+        workspace_id,
+    )
+    .fetch_all(db)
+    .await
+}
+
+pub async fn upsert_grpc_message(
+    db: &Pool<Sqlite>,
+    message: &GrpcMessage,
+) -> Result<GrpcMessage, sqlx::Error> {
+    let id = match message.id.as_str() {
+        "" => generate_id(Some("gm")),
+        _ => message.id.to_string(),
+    };
+    sqlx::query!(
+        r#"
+            INSERT INTO grpc_messages (
+                id, workspace_id, request_id, connection_id, message
+            )
+            VALUES (?, ?, ?, ?, ?)
+            ON CONFLICT (id) DO UPDATE SET
+                updated_at = CURRENT_TIMESTAMP,
+                message = excluded.message
+        "#,
+        id,
+        message.workspace_id,
+        message.request_id,
+        message.connection_id,
+        message.message,
+    )
+    .execute(db)
+    .await?;
+
+    crate::models::get_grpc_message(db, &id).await
+}
+
+pub async fn get_grpc_message(db: &Pool<Sqlite>, id: &str) -> Result<GrpcMessage, sqlx::Error> {
+    sqlx::query_as!(
+        GrpcMessage,
+        r#"
+            SELECT id, model, workspace_id, request_id, connection_id, created_at, message
+            FROM grpc_messages
+            WHERE id = ?
+        "#,
+        id,
+    )
+    .fetch_one(db)
+    .await
+}
+
+pub async fn list_grpc_messages(
+    db: &Pool<Sqlite>,
+    workspace_id: &str,
+) -> Result<Vec<GrpcMessage>, sqlx::Error> {
+    sqlx::query_as!(
+        GrpcMessage,
+        r#"
+            SELECT id, model, workspace_id, request_id, connection_id, created_at, message
+            FROM grpc_messages
+            WHERE workspace_id = ?
+        "#,
+        workspace_id,
+    )
+    .fetch_all(db)
+    .await
+}
+
 pub async fn upsert_cookie_jar(
     db: &Pool<Sqlite>,
     cookie_jar: &CookieJar,
@@ -493,10 +668,7 @@ pub async fn upsert_cookie_jar(
     sqlx::query!(
         r#"
             INSERT INTO cookie_jars (
-                id,
+                id, workspace_id, name, cookies
-                workspace_id,
-                name,
-                cookies
              )
             VALUES (?, ?, ?, ?)
             ON CONFLICT (id) DO UPDATE SET
@@ -553,13 +725,7 @@ async fn get_settings(db: &Pool<Sqlite>) -> Result<Settings, sqlx::Error> {
         Settings,
         r#"
             SELECT
-                id,
+                id, model, created_at, updated_at, theme, appearance, update_channel
-                model,
-                created_at,
-                updated_at,
-                theme,
-                appearance,
-                update_channel
             FROM settings
             WHERE id = 'default'
         "#,
@@ -593,9 +759,7 @@ pub async fn update_settings(
     sqlx::query!(
         r#"
             UPDATE settings SET (
-                theme,
+                theme, appearance, update_channel
-                appearance,
-                update_channel
             ) = (?, ?, ?) WHERE id = 'default';
         "#,
         settings.theme,
@@ -619,10 +783,7 @@ pub async fn upsert_environment(
     sqlx::query!(
         r#"
             INSERT INTO environments (
-                id,
+                id, workspace_id, name, variables
-                workspace_id,
-                name,
-                variables
             )
             VALUES (?, ?, ?, ?)
             ON CONFLICT (id) DO UPDATE SET
@@ -645,12 +806,7 @@ pub async fn get_environment(db: &Pool<Sqlite>, id: &str) -> Result<Environment,
         Environment,
         r#"
             SELECT
-                id,
+                id, model, workspace_id, created_at, updated_at, name,
-                model,
-                workspace_id,
-                created_at,
-                updated_at,
-                name,
                 variables AS "variables!: sqlx::types::Json<Vec<EnvironmentVariable>>"
             FROM environments
             WHERE id = ?
@@ -666,14 +822,7 @@ pub async fn get_folder(db: &Pool<Sqlite>, id: &str) -> Result<Folder, sqlx::Err
         Folder,
         r#"
             SELECT
-                id,
+                id, model, workspace_id, created_at, updated_at, folder_id, name, sort_priority
-                model,
-                workspace_id,
-                created_at,
-                updated_at,
-                folder_id,
-                name,
-                sort_priority
             FROM folders
             WHERE id = ?
         "#,
@@ -691,14 +840,7 @@ pub async fn find_folders(
         Folder,
         r#"
             SELECT
-                id,
+                id, model, workspace_id, created_at, updated_at, folder_id, name, sort_priority
-                model,
-                workspace_id,
-                created_at,
-                updated_at,
-                folder_id,
-                name,
-                sort_priority
             FROM folders
             WHERE workspace_id = ?
         "#,
@@ -733,11 +875,7 @@ pub async fn upsert_folder(db: &Pool<Sqlite>, r: Folder) -> Result<Folder, sqlx:
     sqlx::query!(
         r#"
             INSERT INTO folders (
-                id,
+                id, workspace_id, folder_id, name, sort_priority
-                workspace_id,
-                folder_id,
-                name,
-                sort_priority
             )
             VALUES (?, ?, ?, ?, ?)
             ON CONFLICT (id) DO UPDATE SET
@@ -759,7 +897,7 @@ pub async fn upsert_folder(db: &Pool<Sqlite>, r: Folder) -> Result<Folder, sqlx:
 }
 
 pub async fn duplicate_request(db: &Pool<Sqlite>, id: &str) -> Result<HttpRequest, sqlx::Error> {
-    let mut request = get_request(db, id).await?.clone();
+    let mut request = get_http_request(db, id).await?.clone();
     request.id = "".to_string();
     upsert_request(db, request).await
 }
@@ -776,19 +914,8 @@ pub async fn upsert_request(db: &Pool<Sqlite>, r: HttpRequest) -> Result<HttpReq
     sqlx::query!(
         r#"
             INSERT INTO http_requests (
-                id,
+                id, workspace_id, folder_id, name, url, url_parameters, method, body, body_type,
-                workspace_id,
+                authentication, authentication_type, headers, sort_priority
-                folder_id,
-                name,
-                url,
-                url_parameters,
-                method,
-                body,
-                body_type,
-                authentication,
-                authentication_type,
-                headers,
-                sort_priority
             )
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT (id) DO UPDATE SET
@@ -822,7 +949,7 @@ pub async fn upsert_request(db: &Pool<Sqlite>, r: HttpRequest) -> Result<HttpReq
     .execute(db)
     .await?;
 
-    get_request(db, &id).await
+    get_http_request(db, &id).await
 }
 
 pub async fn find_requests(
@@ -833,21 +960,11 @@ pub async fn find_requests(
         HttpRequest,
         r#"
             SELECT
-                id,
+                id, model, workspace_id, folder_id, created_at, updated_at, name, url,
-                model,
-                workspace_id,
-                folder_id,
-                created_at,
-                updated_at,
-                name,
-                url,
                 url_parameters AS "url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>",
-                method,
+                method, body_type, authentication_type, sort_priority,
                 body AS "body!: Json<HashMap<String, JsonValue>>",
-                body_type,
                 authentication AS "authentication!: Json<HashMap<String, JsonValue>>",
-                authentication_type,
-                sort_priority,
                 headers AS "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>"
             FROM http_requests
             WHERE workspace_id = ?
@@ -858,26 +975,16 @@ pub async fn find_requests(
     .await
 }
 
-pub async fn get_request(db: &Pool<Sqlite>, id: &str) -> Result<HttpRequest, sqlx::Error> {
+pub async fn get_http_request(db: &Pool<Sqlite>, id: &str) -> Result<HttpRequest, sqlx::Error> {
     sqlx::query_as!(
         HttpRequest,
         r#"
             SELECT
-                id,
+                id, model, workspace_id, folder_id, created_at, updated_at, name, url, method,
-                model,
+                body_type, authentication_type, sort_priority,
-                workspace_id,
-                folder_id,
-                created_at,
-                updated_at,
-                name,
-                url,
                 url_parameters AS "url_parameters!: sqlx::types::Json<Vec<HttpUrlParameter>>",
-                method,
                 body AS "body!: Json<HashMap<String, JsonValue>>",
-                body_type,
                 authentication AS "authentication!: Json<HashMap<String, JsonValue>>",
-                authentication_type,
-                sort_priority,
                 headers AS "headers!: sqlx::types::Json<Vec<HttpRequestHeader>>"
             FROM http_requests
             WHERE id = ?
@@ -889,7 +996,7 @@ pub async fn get_request(db: &Pool<Sqlite>, id: &str) -> Result<HttpRequest, sql
 }
 
 pub async fn delete_request(db: &Pool<Sqlite>, id: &str) -> Result<HttpRequest, sqlx::Error> {
-    let req = get_request(db, id).await?;
+    let req = get_http_request(db, id).await?;
 
     // DB deletes will cascade but this will delete the files
     delete_all_responses(db, id).await?;
@@ -922,25 +1029,14 @@ pub async fn create_response(
     version: Option<&str>,
     remote_addr: Option<&str>,
 ) -> Result<HttpResponse, sqlx::Error> {
-    let req = get_request(db, request_id).await?;
+    let req = get_http_request(db, request_id).await?;
     let id = generate_id(Some("rp"));
     let headers_json = Json(headers);
     sqlx::query!(
         r#"
             INSERT INTO http_responses (
-                id,
+                id, request_id, workspace_id, elapsed, elapsed_headers, url, status, status_reason,
-                request_id,
+                content_length, body_path, headers, version, remote_addr
-                workspace_id,
-                elapsed,
-                elapsed_headers,
-                url,
-                status,
-                status_reason,
-                content_length,
-                body_path,
-                headers,
-                version,
-                remote_addr
             )
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);
         "#,
@@ -1000,13 +1096,8 @@ pub async fn upsert_workspace(
     sqlx::query!(
         r#"
             INSERT INTO workspaces (
-                id,
+                id, name, description, variables, setting_request_timeout,
-                name,
+                setting_follow_redirects, setting_validate_certificates
-                description,
-                variables,
-                setting_request_timeout,
-                setting_follow_redirects,
-                setting_validate_certificates
              )
             VALUES (?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT (id) DO UPDATE SET
@@ -1040,18 +1131,8 @@ pub async fn update_response(
     sqlx::query!(
         r#"
             UPDATE http_responses SET (
-                elapsed,
+                elapsed, elapsed_headers, url, status, status_reason, content_length, body_path,
-                elapsed_headers,
+                error, headers, version, remote_addr, updated_at
-                url,
-                status,
-                status_reason,
-                content_length,
-                body_path,
-                error,
-                headers,
-                version,
-                remote_addr,
-                updated_at
             ) = (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) WHERE id = ?;
         "#,
         response.elapsed,