Fix postman import and import Insomnia gRPC

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

@@ -6,10 +6,14 @@ export function isRequestGroup(obj) {
   return isJSObject(obj) && obj._type === 'request_group';
 }
 
-export function isRequest(obj) {
+export function isHttpRequest(obj) {
   return isJSObject(obj) && obj._type === 'request';
 }
 
+export function isGrpcRequest(obj) {
+  return isJSObject(obj) && obj._type === 'grpc_request';
+}
+
 export function isEnvironment(obj) {
   return isJSObject(obj) && obj._type === 'environment';
 }

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

@@ -0,0 +1,37 @@
+import { convertSyntax } from '../helpers/variables.js';
+
+/**
+ * Import an Insomnia GRPC request object.
+ * @param {Object} r - The request object to import.
+ * @param workspaceId - The workspace ID to use for the request.
+ * @param {number} sortPriority - The sort priority to use for the request.
+ */
+export function importGrpcRequest(r, workspaceId, sortPriority = 0) {
+  console.log('IMPORTING GRPC REQUEST', r._id, r.name, JSON.stringify(r, null, 2));
+
+  const parts = r.protoMethodName.split('/').filter((p) => p !== '');
+  const service = parts[0] ?? null;
+  const method = parts[1] ?? null;
+
+  return {
+    id: r._id,
+    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
+    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
+    workspaceId,
+    folderId: r.parentId === workspaceId ? null : r.parentId,
+    model: 'grpc_request',
+    sortPriority,
+    name: r.name,
+    url: convertSyntax(r.url),
+    service,
+    method,
+    message: r.body?.text ?? '',
+    metadata: (r.metadata ?? [])
+      .map(({ name, value, disabled }) => ({
+        enabled: !disabled,
+        name,
+        value,
+      }))
+      .filter(({ name, value }) => name !== '' || value !== ''),
+  };
+}

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

@@ -6,7 +6,7 @@ import { convertSyntax } from '../helpers/variables.js';
  * @param workspaceId - The workspace ID to use for the request.
  * @param {number} sortPriority - The sort priority to use for the request.
  */
-export function importRequest(r, workspaceId, sortPriority = 0) {
+export function importHttpRequest(r, workspaceId, sortPriority = 0) {
   console.log('IMPORTING REQUEST', r._id, r.name, JSON.stringify(r, null, 2));
 
   let bodyType = null;

plugins/importer-insomnia/src/index.js

@@ -1,17 +1,18 @@
-import { importEnvironment } from './importers/environment.js';
-import { importRequest } from './importers/request.js';
+import { importEnvironment } from './importers/environment';
+import { importHttpRequest } from './importers/httpRequest';
 import {
   isEnvironment,
   isJSObject,
-  isRequest,
+  isHttpRequest,
   isRequestGroup,
   isWorkspace,
+  isGrpcRequest,
 } from './helpers/types.js';
 import { parseVariables } from './helpers/variables.js';
 import { importFolder } from './importers/folder.js';
+import { importGrpcRequest } from './importers/grpcRequest';
 
 export function pluginHookImport(contents) {
-  console.log('RUNNING INSOMNIA');
   let parsed;
   try {
     parsed = JSON.parse(contents);
@@ -24,7 +25,8 @@ export function pluginHookImport(contents) {
 
   const resources = {
     workspaces: [],
-    requests: [],
+    httpRequests: [],
+    grpcRequests: [],
     environments: [],
     folders: [],
   };
@@ -57,8 +59,15 @@ export function pluginHookImport(contents) {
         if (isRequestGroup(child)) {
           resources.folders.push(importFolder(child, workspaceToImport._id));
           nextFolder(child._id);
-        } else if (isRequest(child)) {
-          resources.requests.push(importRequest(child, workspaceToImport._id, sortPriority++));
+        } else if (isHttpRequest(child)) {
+          resources.httpRequests.push(
+            importHttpRequest(child, workspaceToImport._id, sortPriority++),
+          );
+        } else if (isGrpcRequest(child)) {
+          console.log('GRPC', JSON.stringify(child, null, 1));
+          resources.grpcRequests.push(
+            importGrpcRequest(child, workspaceToImport._id, sortPriority++),
+          );
         }
       }
     };
@@ -68,7 +77,8 @@ export function pluginHookImport(contents) {
   }
 
   // Filter out any `null` values
-  resources.requests = resources.requests.filter(Boolean);
+  resources.httpRequests = resources.httpRequests.filter(Boolean);
+  resources.grpcRequests = resources.grpcRequests.filter(Boolean);
   resources.environments = resources.environments.filter(Boolean);
   resources.workspaces = resources.workspaces.filter(Boolean);