feat: support global object aliases and timeout

packages/insomnia-smoke-test/tests/smoke/pre-request-script.test.ts

@@ -31,7 +31,7 @@ test.describe('test pre-request script execution', async () => {
             pm.environment.set('rendered', vals);
           `,
       context: {
-        pm: {
+        insomnia: {
           environment: {
             bool1: true,
             num1: 1,
@@ -102,7 +102,7 @@ test.describe('test pre-request script execution', async () => {
             pm.collectionVariables.set('rendered', vals);
           `,
       context: {
-        pm: {
+        insomnia: {
           collectionVariables: {
             bool1: true,
             num1: 1,
@@ -164,7 +164,7 @@ test.describe('test pre-request script execution', async () => {
             pm.variables.set('rendered', rendered);
           `,
       context: {
-        pm: {
+        insomnia: {
           globals: {
             bool: false,
             num: 1,
@@ -228,47 +228,6 @@ test.describe('test pre-request script execution', async () => {
         'requestName': '',
       },
     },
-    // {
-    //   id: 'simple test sendRequest and await/async',
-    //   code: `
-    //       let testResp;
-    //       try {
-    //         await new Promise(
-    //           resolve => {
-    //             pm.sendRequest(
-    //               'https://127.0.0.1:4010/pets/1',
-    //               (err, resp) => {
-    //                 testResp = resp;
-    //                 resolve();
-    //               }
-    //             );
-    //           }
-    //         );
-    //       } catch (e) {
-    //         pm.variables.set('resp.code', e);
-    //       }
-    //       pm.variables.set('resp.code', testResp.code);
-    //     `,
-    //   context: {
-    //     pm: {},
-    //   },
-    //   expectedResult: {
-    //     globals: {},
-    //     iterationData: {},
-    //     variables: {
-    //       'resp.code': 200,
-    //     },
-    //     environment: {},
-    //     collectionVariables: {},
-    //     info: {
-    //       'eventName': 'prerequest',
-    //       'iteration': 1,
-    //       'iterationCount': 1,
-    //       'requestId': '',
-    //       'requestName': '',
-    //     },
-    //   },
-    // },
     {
       id: 'requestInfo tests',
       code: `
@@ -279,7 +238,7 @@ test.describe('test pre-request script execution', async () => {
         const requestId = pm.info.requestId;
         `,
       context: {
-        pm: {
+        insomnia: {
           requestInfo: {
             eventName: 'prerequest',
             iteration: 1,
@@ -326,7 +285,7 @@ test.describe('test pre-request script execution', async () => {
         },
       );
 
-      // waiting for the process ready
+      // waiting for the hidden browser ready
       for (let i = 0; i < 120; i++) {
         const windows = app.windows();
         if (windows.length > originalWindowCount) {
@@ -372,8 +331,6 @@ test.describe('test pre-request script execution', async () => {
         await mainWindow.waitForTimeout(500);
       }
 
-      // await mainWindow.waitForTimeout(300000);
-
       if (localStorage) { // just for suppressing ts complaint
         console.log(localStorage[`test_error:${tc.id}`]);
         expect(JSON.parse(localStorage[`test_result:${tc.id}`])).toEqual(tc.expectedResult);

packages/insomnia/src/main/window-utils.ts

@@ -45,7 +45,7 @@ export function init() {
 
 export function createHiddenBrowserWindow() {
   hiddenBrowserWindow = new BrowserWindow({
-    show: false,
+    show: true,
     title: 'HiddenBrowserWindow',
     webPreferences: {
       sandbox: true,

packages/insomnia/src/renderers/hidden-browser-window/index.ts

@@ -1,50 +1,61 @@
-import { initPm } from './inso-object';
+import { initGlobalObject } from './inso-object';
 
-const executeAction = 'message-port:https://hidden.browser-window/execute';
+const executeAction = 'message-channel:https://hidden.browser-window/execute';
+const ErrorTimeout = 'execution timeout';
 
 async function init() {
     const channel = new MessageChannel();
-
     channel.port1.onmessage = async (ev: MessageEvent) => {
         const action = ev.data.action;
+        const timeout = ev.data.timeout ? ev.data.timeout : 3000;
 
-        if (action === executeAction || action === 'message-port:https://hidden.browser-window/debug') {
+        if (action === executeAction || action === 'message-channel:https://hidden.browser-window/debug') {
             try {
-                const getPm = new Function('pm', 'return pm;');
-                const rawPm = getPm(ev.data.options.context.pm);
-                const pm = initPm(rawPm);
+                const getRawGlobalObject = new Function('insomnia', 'return insomnia;');
+                const rawObject = getRawGlobalObject(ev.data.options.context.insomnia);
+                const insomniaObject = initGlobalObject(rawObject);
+
                 const AsyncFunction = (async () => { }).constructor;
-                const func = AsyncFunction(
-                    'pm',
-                    // TODO: support require function
-                    // TODO: support async/await
+                const executeScript = AsyncFunction(
+                    'insomnia',
                     `
-                        ${ev.data.options.code};
-                        return pm.toObject();
+                        return new Promise(async (resolve, reject) => {
+                            const $ = insomnia;
+                            const pm = insomnia;
+                            const alertTimeout = () => reject({ message: '${ErrorTimeout}' });
+                            const timeoutChecker = setTimeout(alertTimeout, ${timeout});
+
+                            ${ev.data.options.code};
+
+                            clearTimeout(timeoutChecker);
+                            resolve(insomnia.toObject());
+                        });
                     `
                 );
 
-                const result = await func(pm);
+                const result = await executeScript(
+                    insomniaObject,
+                );
+
                 channel.port1.postMessage({
-                    action: action === executeAction ? 'message-port:https://caller/respond' : 'message-port:https://caller/debug/respond',
+                    action: action === executeAction ? 'message-channel:https://caller/respond' : 'message-channel:https://caller/debug/respond',
                     id: action === executeAction ? undefined : ev.data.options.id,
                     result,
                 });
             } catch (e) {
                 const message = e.message;
-                const stacktrace = e.stacktrace;
 
                 channel.port1.postMessage({
-                    action: action === executeAction ? 'message-port:https://caller/respond' : 'message-port:https://caller/debug/respond',
+                    action: action === executeAction ? 'message-channel:https://caller/respond' : 'message-channel:https://caller/debug/respond',
                     id: action === executeAction ? undefined : ev.data.options.id,
-                    error: JSON.stringify({ message, stacktrace }),
+                    error: JSON.stringify({ message }),
                 });
             }
         } else {
             console.error(`unknown action ${ev.data}`);
         }
-    };
-
+    }
+        ;
     window.postMessage('message-event:https://preload/publish-port', '*', [channel.port2]);
 }
 

packages/insomnia/src/renderers/hidden-browser-window/inso-object.ts

@@ -1,4 +1,4 @@
-import { getHttpRequestSender, getIntepolator, HttpRequestSender, PmHttpRequest, PmHttpResponse } from './static-modules';
+import { getIntepolator } from './intepolator';
 
 export type EventName = 'prerequest' | 'test';
 class RequestInfo {
@@ -161,8 +161,6 @@ class InsomniaObject {
     public variables: Variables;
     public info: RequestInfo;
 
-    private httpRequestSender: HttpRequestSender = getHttpRequestSender();
-
     constructor(input: {
         globals: Environment;
         collectionVariables: Environment;
@@ -189,10 +187,6 @@ class InsomniaObject {
             info: this.info.toObject(),
         };
     };
-
-    sendRequest = async (req: string | PmHttpRequest, callback: (e?: Error, resp?: PmHttpResponse) => void) => {
-        return await this.httpRequestSender.sendRequest(req, callback);
-    };
 }
 
 interface RawObject {
@@ -203,7 +197,7 @@ interface RawObject {
     requestInfo?: object;
 }
 
-export function initPm(rawObj: RawObject) {
+export function initGlobalObject(rawObj: RawObject) {
     const globals = new Environment(rawObj.globals);
     const environment = new Environment(rawObj.environment);
     const collectionVariables = new Environment(rawObj.collectionVariables);

packages/insomnia/src/renderers/hidden-browser-window/intepolator.ts

@@ -0,0 +1,34 @@
+import { configure, type ConfigureOptions, type Environment as NunjuncksEnv } from 'nunjucks';
+
+class Intepolator {
+    private engine: NunjuncksEnv;
+
+    constructor(config: ConfigureOptions) {
+        this.engine = configure(config);
+    }
+
+    render = (template: string, context: object) => {
+        // TODO: handle timeout
+        // TODO: support plugin?
+        return this.engine.renderString(template, context);
+    };
+}
+
+const intepolator = new Intepolator({
+    autoescape: false,
+    // Don't escape HTML
+    throwOnUndefined: true,
+    // Strict mode
+    tags: {
+        blockStart: '{%',
+        blockEnd: '%}',
+        variableStart: '{{',
+        variableEnd: '}}',
+        commentStart: '{#',
+        commentEnd: '#}',
+    },
+});
+
+export function getIntepolator() {
+    return intepolator;
+}

packages/insomnia/src/ui/window-message-handlers.ts

@@ -16,14 +16,16 @@ class WindowMessageHandler {
         this.hiddenBrowserWindowPort = ev.ports[0];
 
         this.hiddenBrowserWindowPort.onmessage = ev => {
-            if (ev.data.action === 'message-port:https://caller/respond') {
+            if (ev.data.action === 'message-channel:https://caller/respond') {
                 // TODO: hook to UI and display result
                 console.log('[main] result from hidden browser window:', ev.data.result);
-            } else if (ev.data.action === 'message-port:https://caller/debug/respond') {
+            } else if (ev.data.action === 'message-channel:https://caller/debug/respond') {
                 if (ev.data.result) {
                     window.localStorage.setItem(`test_result:${ev.data.id}`, JSON.stringify(ev.data.result));
+                    console.log(ev.data.result);
                 } else {
                     window.localStorage.setItem(`test_error:${ev.data.id}`, JSON.stringify(ev.data.error));
+                    console.error(ev.data.error);
                 }
             } else {
                 console.error(`unknown action ${ev}`);
@@ -37,8 +39,9 @@ class WindowMessageHandler {
             return;
         }
 
+        console.info('sending script to hidden browser window');
         this.hiddenBrowserWindowPort.postMessage({
-            action: 'message-port:https://hidden.browser-window/debug',
+            action: 'message-channel:https://hidden.browser-window/debug',
             options: {
                 id: ev.data.id,
                 code: ev.data.code,