[INS-1821] - import/export websocket requests

packages/insomnia/src/common/constants.ts

@@ -561,6 +561,7 @@ export const WORKSPACE_ID_KEY = '__WORKSPACE_ID__';
 export const BASE_ENVIRONMENT_ID_KEY = '__BASE_ENVIRONMENT_ID__';
 export const EXPORT_TYPE_REQUEST = 'request';
 export const EXPORT_TYPE_GRPC_REQUEST = 'grpc_request';
+export const EXPORT_TYPE_WEBSOCKET_REQUEST = 'websocket_request';
 export const EXPORT_TYPE_REQUEST_GROUP = 'request_group';
 export const EXPORT_TYPE_UNIT_TEST_SUITE = 'unit_test_suite';
 export const EXPORT_TYPE_UNIT_TEST = 'unit_test';

packages/insomnia/src/common/export.ts

@@ -14,6 +14,7 @@ import { isRequest } from '../models/request';
 import { isRequestGroup } from '../models/request-group';
 import { isUnitTest } from '../models/unit-test';
 import { isUnitTestSuite } from '../models/unit-test-suite';
+import { isWebSocketRequest } from '../models/websocket-request';
 import { isWorkspace, Workspace } from '../models/workspace';
 import { resetKeys } from '../sync/ignore-keys';
 import { SegmentEvent, trackSegmentEvent } from './analytics';
@@ -28,6 +29,7 @@ import {
   EXPORT_TYPE_REQUEST_GROUP,
   EXPORT_TYPE_UNIT_TEST,
   EXPORT_TYPE_UNIT_TEST_SUITE,
+  EXPORT_TYPE_WEBSOCKET_REQUEST,
   EXPORT_TYPE_WORKSPACE,
   getAppVersion,
 } from './constants';
@@ -188,6 +190,7 @@ export async function exportRequestsData(
           isUnitTestSuite(d) ||
           isUnitTest(d) ||
           isRequest(d) ||
+          isWebSocketRequest(d) ||
           isGrpcRequest(d) ||
           isRequestGroup(d) ||
           isProtoFile(d) ||
@@ -231,6 +234,9 @@ export async function exportRequestsData(
       } else if (isGrpcRequest(d)) {
         // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_GRPC_REQUEST;
+      } else if (isWebSocketRequest(d)) {
+        // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
+        d._type = EXPORT_TYPE_WEBSOCKET_REQUEST;
       } else if (isProtoFile(d)) {
         // @ts-expect-error -- TSCONVERSION maybe this needs to be added to the upstream type?
         d._type = EXPORT_TYPE_PROTO_FILE;

packages/insomnia/src/main/network/websocket.ts

@@ -197,6 +197,7 @@ async function createWebSocketConnection(
         elapsedTime: performance.now() - start,
         timelinePath,
         bodyPath: responseBodyPath,
+        // NOTE: required for legacy zip workaround
         bodyCompression: null,
       };
       const settings = await models.settings.getOrCreate();

packages/insomnia/src/models/index.ts

@@ -9,6 +9,7 @@ import {
   EXPORT_TYPE_REQUEST_GROUP,
   EXPORT_TYPE_UNIT_TEST,
   EXPORT_TYPE_UNIT_TEST_SUITE,
+  EXPORT_TYPE_WEBSOCKET_REQUEST,
   EXPORT_TYPE_WORKSPACE,
 } from '../common/constants';
 import { generateId, pluralize } from '../common/misc';
@@ -210,6 +211,7 @@ export async function initModel<T extends BaseModel>(type: string, ...sources: R
 
 export const MODELS_BY_EXPORT_TYPE: Record<string, any> = {
   [EXPORT_TYPE_REQUEST]: request,
+  [EXPORT_TYPE_WEBSOCKET_REQUEST]: websocketRequest,
   [EXPORT_TYPE_GRPC_REQUEST]: grpcRequest,
   [EXPORT_TYPE_REQUEST_GROUP]: requestGroup,
   [EXPORT_TYPE_UNIT_TEST_SUITE]: unitTestSuite,

packages/insomnia/src/ui/components/export-requests/request-row.tsx

@@ -1,14 +1,16 @@
 import React, { FC, SyntheticEvent, useCallback } from 'react';
 
 import { GrpcRequest, isGrpcRequest } from '../../../models/grpc-request';
-import type { Request } from '../../../models/request';
+import { isRequest, Request } from '../../../models/request';
+import { isWebSocketRequest, WebSocketRequest } from '../../../models/websocket-request';
 import { GrpcTag } from '../tags/grpc-tag';
 import { MethodTag } from '../tags/method-tag';
+import { WebSocketTag } from '../tags/websocket-tag';
 
 interface Props {
   handleSetItemSelected: (...args: any[]) => any;
   isSelected: boolean;
-  request: Request | GrpcRequest;
+  request: Request | WebSocketRequest | GrpcRequest;
 }
 
 export const RequestRow: FC<Props> = ({
@@ -27,7 +29,9 @@ export const RequestRow: FC<Props> = ({
           <input type="checkbox" checked={isSelected} onChange={onChange} />
         </div>
         <button className="wide">
-          {isGrpcRequest(request) ? <GrpcTag /> : <MethodTag method={request.method} />}
+          {isRequest(request) ? <MethodTag method={request.method} /> : null}
+          {isGrpcRequest(request) ? <GrpcTag /> : null}
+          {isWebSocketRequest(request) ? <WebSocketTag /> : null}
           <span className="inline-block">{request.name}</span>
         </button>
       </div>

packages/insomnia/src/ui/components/export-requests/tree.tsx

@@ -2,6 +2,7 @@ import React, { FC } from 'react';
 
 import { isGrpcRequest } from '../../../models/grpc-request';
 import { isRequest } from '../../../models/request';
+import { isWebSocketRequest } from '../../../models/websocket-request';
 import type { Node } from '../modals/export-requests-modal';
 import { RequestGroupRow } from './request-group-row';
 import { RequestRow } from './request-row';
@@ -18,7 +19,7 @@ export const Tree: FC<Props> = ({ root, handleSetRequestGroupCollapsed, handleSe
       return null;
     }
 
-    if (isRequest(node.doc) || isGrpcRequest(node.doc)) {
+    if (isRequest(node.doc) || isWebSocketRequest(node.doc) || isGrpcRequest(node.doc)) {
       return (
         <RequestRow
           key={node.doc._id}

packages/insomnia/src/ui/components/modals/export-requests-modal.tsx

@@ -8,6 +8,7 @@ import * as models from '../../../models';
 import { GrpcRequest, isGrpcRequest } from '../../../models/grpc-request';
 import { isRequest, Request } from '../../../models/request';
 import { isRequestGroup, RequestGroup } from '../../../models/request-group';
+import { isWebSocketRequest, WebSocketRequest } from '../../../models/websocket-request';
 import { RootState } from '../../redux/modules';
 import { exportRequestsToFile } from '../../redux/modules/global';
 import { selectSidebarChildren } from '../../redux/sidebar-selectors';
@@ -18,7 +19,7 @@ import { ModalHeader } from '../base/modal-header';
 import { Tree } from '../export-requests/tree';
 
 export interface Node {
-  doc: Request | GrpcRequest | RequestGroup;
+  doc: Request | WebSocketRequest | GrpcRequest | RequestGroup;
   children: Node[];
   collapsed: boolean;
   totalRequests: number;
@@ -67,7 +68,7 @@ export class ExportRequestsModalClass extends PureComponent<Props, State> {
   }
 
   getSelectedRequestIds(node: Node): string[] {
-    const docIsRequest = isRequest(node.doc) || isGrpcRequest(node.doc);
+    const docIsRequest = isRequest(node.doc) || isWebSocketRequest(node.doc) || isGrpcRequest(node.doc);
 
     if (docIsRequest && node.selectedRequests === node.totalRequests) {
       return [node.doc._id];
@@ -117,7 +118,7 @@ export class ExportRequestsModalClass extends PureComponent<Props, State> {
     let totalRequests = children
       .map(child => child.totalRequests)
       .reduce((acc, totalRequests) => acc + totalRequests, 0);
-    const docIsRequest = isRequest(item.doc) || isGrpcRequest(item.doc);
+    const docIsRequest = isRequest(item.doc) || isWebSocketRequest(item.doc) || isGrpcRequest(item.doc);
 
     if (docIsRequest) {
       totalRequests++;