fix parsing to match previous tests

Kong · Jan 16, 2025 · a3c8e2d · a3c8e2d
1 parent b326878
commit a3c8e2d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/packages/insomnia/src/network/grpc/__tests__/parse-grpc-url.test.ts b/packages/insomnia/src/network/grpc/__tests__/parse-grpc-url.test.ts
@@ -11,6 +11,7 @@ describe('parseGrpcUrl', () => {
     expect(parseGrpcUrl(input)).toStrictEqual({
       url: expected,
       enableTls: false,
+      path: '',
     });
   });
 
@@ -22,6 +23,7 @@ describe('parseGrpcUrl', () => {
     expect(parseGrpcUrl(input)).toStrictEqual({
       url: expected,
       enableTls: true,
+      path: '',
     });
   });
 
@@ -33,13 +35,15 @@ describe('parseGrpcUrl', () => {
     expect(parseGrpcUrl(input)).toStrictEqual({
       url: expected,
       enableTls: false,
+      path: '',
     });
   });
 
   it.each([null, undefined, ''])('can handle falsey urls', input => {
     expect(parseGrpcUrl(input)).toStrictEqual({
       url: '',
       enableTls: false,
+      path: '',
     });
   });
 });
diff --git a/packages/insomnia/src/network/grpc/parse-grpc-url.ts b/packages/insomnia/src/network/grpc/parse-grpc-url.ts
@@ -2,13 +2,24 @@ export const parseGrpcUrl = (grpcUrl: string): { url: string; enableTls: boolean
   if (!grpcUrl) {
     return { url: '', enableTls: false, path: '' };
   }
-  const url = new URL(grpcUrl);
+  const lcUrl = grpcUrl.toLowerCase();
+  let url = {
+    protocol: 'grpc:',
+    hostname: lcUrl,
+    pathname: '',
+    port: undefined,
+  } as unknown as URL;
+  if (lcUrl.includes('://')) {
+    try {
+      url = new URL(grpcUrl.toLowerCase());
+    } catch (e) { }
+  }
   const result = {
-    url: url.host,
+    url: `${url.hostname}` + (url.port ? `:${url.port}` : ''),
     enableTls: false,
     path: url.pathname,
   };
-  if (url.protocol === 'grpcs:') {
+  if (url.protocol.toLowerCase() === 'grpcs:') {
     result.enableTls = true;
   }
   if (result.path === '/') {