@intuned/runtime-dev 1.2.1-hooks.1 → 1.2.1-hooks.3

package/dist/common/asyncLocalStorage/index.d.ts

@@ -8,8 +8,8 @@ interface TimeoutInfo {
 }
 export interface InternalRunInfo extends RunInfo {
     extendedPayloads: Payload[];
-    cdpAddress?: string;
     timeoutInfo?: TimeoutInfo;
+    hookVars?: Record<string, any>;
     getAuthSessionParameters?: () => Promise<any>;
 }
 export declare function getExecutionContext(): InternalRunInfo | undefined;

package/dist/common/getPlaywrightConstructs.d.ts

@@ -10,13 +10,17 @@ interface GetPlaywrightConstructsOptions {
     headless?: boolean;
     storageState?: RunApiSession;
     downloadsPath: string;
-    importFunction?: ImportFunction;
+    hookOptions?: {
+        importFunction: ImportFunction;
+        apiName: string;
+        parameters: any;
+    };
 }
-export declare function getProductionPlaywrightConstructs({ proxy, headless, storageState, downloadsPath, importFunction, }: GetPlaywrightConstructsOptions): Promise<{
+export declare function getProductionPlaywrightConstructs({ proxy, headless, storageState, downloadsPath, hookOptions, }: GetPlaywrightConstructsOptions): Promise<{
     page: playwright.Page;
     context: playwright.BrowserContext;
 }>;
-export declare function getPlaywrightConstructsForMode(mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless", cdpAddress: string | undefined, authSession?: RunApiSession, importFunction?: ImportFunction): Promise<{
+export declare function getPlaywrightConstructsForMode(mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless", cdpAddress: string | undefined, authSession?: RunApiSession, hookOptions?: GetPlaywrightConstructsOptions["hookOptions"]): Promise<{
     page: playwright.Page;
     context: playwright.BrowserContext;
 }>;

package/dist/common/getPlaywrightConstructs.js

@@ -15,6 +15,9 @@ var _path = _interopRequireWildcard(require("path"));
 var _fileUtils = require("../commands/common/utils/fileUtils");
 var _waitOn = _interopRequireDefault(require("wait-on"));
 var _runtime = require("../runtime");
+var _asyncLocalStorage = require("./asyncLocalStorage");
+var _getPort = _interopRequireDefault(require("get-port"));
+var _promises = require("timers/promises");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -34,7 +37,11 @@ async function createUserDirWithPreferences() {
   return userDir;
 }
 async function loadInitializeContextHook(importFunction) {
+  console.log("Loading initializeContext hook");
   const result = await importFunction("hooks/initializeContext");
+  console.log({
+    result
+  });
   if (result.isErr()) {
     if (result.error.type === "not_found") {
       return null;
@@ -49,48 +56,63 @@ async function getProductionPlaywrightConstructs({
   headless = true,
   storageState,
   downloadsPath,
-  importFunction
+  hookOptions
 }) {
-  let context;
-  let page;
+  const extraArgs = [];
+  const port = await (0, _getPort.default)();
   let hook = null;
-  if (importFunction) {
-    hook = await loadInitializeContextHook(importFunction);
+  if (hookOptions) {
+    hook = await loadInitializeContextHook(hookOptions.importFunction);
   }
+  const userDataDir = await createUserDirWithPreferences();
   if (hook) {
-    ({
-      page,
-      context
-    } = await hook({
-      type: "launch",
-      proxy,
-      headless
-    }));
-  } else {
-    const extraArgs = ["--no-first-run", "--disable-sync", "--disable-translate", "--disable-features=TranslateUI", "--disable-features=NetworkService", "--lang=en"];
-    if (headless) {
-      extraArgs.push("--headless=new");
+    extraArgs.push(`--remote-debugging-port=${port}`);
+  }
+  const originalContext = await playwright.chromium.launchPersistentContext(userDataDir, {
+    headless,
+    viewport: null,
+    proxy,
+    downloadsPath,
+    args: extraArgs
+  });
+  const cdpAddress = `http://localhost:${port}`;
+  await (0, _promises.setTimeout)(3000);
+  originalContext.once("close", async () => {
+    try {
+      await (0, _fsExtra.rm)(userDataDir, {
+        recursive: true,
+        force: true,
+        retryDelay: 1000,
+        maxRetries: 5
+      });
+    } catch (error) {
+      console.error("Failed to remove user data dir", error);
     }
-    const userDataDir = await createUserDirWithPreferences();
-    context = await playwright.chromium.launchPersistentContext(userDataDir, {
-      headless,
-      viewport: null,
-      proxy,
-      downloadsPath
+  });
+  let page = originalContext.pages().at(0) ?? null;
+  let context = originalContext;
+  if (hookOptions && hook) {
+    const hookResult = await hook({
+      apiName: hookOptions.apiName,
+      apiParameters: hookOptions.parameters,
+      cdpAddress
     });
-    context.once("close", async () => {
-      try {
-        await (0, _fsExtra.rm)(userDataDir, {
-          recursive: true,
-          force: true,
-          retryDelay: 1000,
-          maxRetries: 5
-        });
-      } catch (error) {
-        console.error("Failed to remove user data dir", error);
+    if (hookResult !== null) {
+      ({
+        page,
+        context: context
+      } = hookResult);
+      const {
+        hookVars
+      } = hookResult;
+      const executionContext = (0, _asyncLocalStorage.getExecutionContext)();
+      if (hookVars && executionContext) {
+        executionContext.hookVars = hookVars;
       }
-    });
-    page = context.pages().at(0) ?? null;
+      context.once("close", async () => {
+        await originalContext.close();
+      });
+    }
   }
   if (storageState) {
     await loadSessionToContext({
@@ -113,26 +135,37 @@ async function getProductionPlaywrightConstructs({
     context
   };
 }
-async function getPlaywrightConstructsForMode(mode, cdpAddress, authSession, importFunction) {
-  let hook = null;
-  if (importFunction) {
-    hook = await loadInitializeContextHook(importFunction);
+async function getPlaywrightConstructsForMode(mode, cdpAddress, authSession, hookOptions) {
+  let context = null;
+  let page = null;
+  if (hookOptions && cdpAddress) {
+    const hook = await loadInitializeContextHook(hookOptions.importFunction);
+    if (hook) {
+      const hookResult = await hook({
+        cdpAddress,
+        apiName: hookOptions.apiName,
+        apiParameters: hookOptions.parameters
+      });
+      if (hookResult !== null) {
+        ({
+          page,
+          context
+        } = hookResult);
+        const {
+          hookVars
+        } = hookResult;
+        const executionContext = (0, _asyncLocalStorage.getExecutionContext)();
+        if (hookVars && executionContext) {
+          executionContext.hookVars = hookVars;
+        }
+      }
+    }
   }
   if (mode == "playwright-standalone") {
     if (!cdpAddress) {
       throw new Error("cdpAddress is required");
     }
-    let context;
-    let page = null;
-    if (hook) {
-      ({
-        context,
-        page
-      } = await hook({
-        type: "cdp",
-        cdpAddress
-      }));
-    } else {
+    if (!context) {
       ({
         context
       } = await getRemotePlaywrightContext(cdpAddress));

package/dist/common/runApi/index.js

@@ -129,7 +129,11 @@ async function* runApiGenerator({
         proxy,
         downloadsPath,
         storageState: auth?.session,
-        importFunction
+        hookOptions: {
+          apiName: automationFunction.name,
+          parameters: automationFunction.params,
+          importFunction
+        }
       }));
     } else {
       const {
@@ -139,7 +143,11 @@ async function* runApiGenerator({
       ({
         page,
         context
-      } = await (0, _getPlaywrightConstructs.getPlaywrightConstructsForMode)(mode, cdpAddress, auth?.session, importFunction));
+      } = await (0, _getPlaywrightConstructs.getPlaywrightConstructsForMode)(mode, cdpAddress, auth?.session, {
+        apiName: automationFunction.name,
+        parameters: automationFunction.params,
+        importFunction
+      }));
     }
     if (tracing.enabled) {
       await context.tracing.start({

package/dist/common/runApi/types.d.ts

@@ -687,13 +687,13 @@ export declare const runApiParametersSchema: z.ZodObject<{
         cdpAddress: z.ZodString;
         mode: z.ZodUnion<[z.ZodLiteral<"vanilla">, z.ZodLiteral<"playwright">, z.ZodLiteral<"playwright-standalone">, z.ZodLiteral<"playwright-headless">]>;
     }, "strip", z.ZodTypeAny, {
-        cdpAddress: string;
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
         environment: "cdp";
-    }, {
         cdpAddress: string;
+    }, {
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
         environment: "cdp";
+        cdpAddress: string;
     }>]>>;
     retrieveSession: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
@@ -716,9 +716,9 @@ export declare const runApiParametersSchema: z.ZodObject<{
             password: string;
         } | undefined;
     } | {
-        cdpAddress: string;
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
         environment: "cdp";
+        cdpAddress: string;
     };
     retrieveSession: boolean;
     auth?: {
@@ -811,9 +811,9 @@ export declare const runApiParametersSchema: z.ZodObject<{
             password: string;
         } | undefined;
     } | {
-        cdpAddress: string;
         mode: "vanilla" | "playwright" | "playwright-standalone" | "playwright-headless";
         environment: "cdp";
+        cdpAddress: string;
     } | undefined;
     retrieveSession?: boolean | undefined;
 }>;

package/dist/runtime/index.d.ts

@@ -6,4 +6,3 @@ export { RunError } from "./RunError";
 export { requestMultipleChoice, requestOTP } from "./requestMoreInfo";
 export type { RequestMoreInfoDetails } from "./requestMoreInfo";
 export { getDownloadDirectoryPath } from "./downloadDirectory";
-export { getCdpAddress } from "./getCdpAddress";

package/dist/runtime/index.js

@@ -27,12 +27,6 @@ Object.defineProperty(exports, "getAuthSessionParameters", {
     return _getAuthSessionParameters.getAuthSessionParameters;
   }
 });
-Object.defineProperty(exports, "getCdpAddress", {
-  enumerable: true,
-  get: function () {
-    return _getCdpAddress.getCdpAddress;
-  }
-});
 Object.defineProperty(exports, "getDownloadDirectoryPath", {
   enumerable: true,
   get: function () {
@@ -63,5 +57,4 @@ var _getAuthSessionParameters = require("./getAuthSessionParameters");
 var _runInfo = require("./runInfo");
 var _RunError = require("./RunError");
 var _requestMoreInfo = require("./requestMoreInfo");
-var _downloadDirectory = require("./downloadDirectory");
-var _getCdpAddress = require("./getCdpAddress");
+var _downloadDirectory = require("./downloadDirectory");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.2.1-hooks.1",
+  "version": "1.2.1-hooks.3",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",

package/dist/runtime/getCdpAddress.d.ts

@@ -1 +0,0 @@
-export declare function getCdpAddress(): string | undefined;

package/dist/runtime/getCdpAddress.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getCdpAddress = getCdpAddress;
-var _asyncLocalStorage = require("../common/asyncLocalStorage");
-function getCdpAddress() {
-  const context = (0, _asyncLocalStorage.getExecutionContext)();
-  return context?.cdpAddress;
-}