@intuned/runtime-dev 1.2.1-hooks.12 → 1.2.1-hooks.13

package/dist/common/playwrightContext.d.ts

@@ -29,7 +29,8 @@ type WithPlaywrightContextParameters = {
     apiName: string;
     apiParameters: any;
 };
-export type WithPlaywrightContextWrappedFunction<R> = (context: playwright.BrowserContext, page: playwright.Page) => Promise<Ok<R, any> | Err<any, RunAutomationError>>;
+type WithPlaywrightContextWrappedFunctionReturn<R> = Ok<R, any> | Err<any, RunAutomationError>;
+export type WithPlaywrightContextWrappedFunction<R> = (context: playwright.BrowserContext, page: playwright.Page) => Promise<WithPlaywrightContextWrappedFunctionReturn<R>>;
 export declare function withPlaywrightContext<R>(options: {
     proxy?: Proxy;
     headless: boolean;

package/dist/common/playwrightContext.js

@@ -17,7 +17,8 @@ var _fileUtils = require("../commands/common/utils/fileUtils");
 var _waitOn = _interopRequireDefault(require("wait-on"));
 var _errors = require("./runApi/errors");
 var _neverthrow = require("neverthrow");
-var _initializeContextHook = require("./initializeContextHook");
+var _setupContextHook = require("./setupContextHook");
+var _portfinder = require("portfinder");
 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; }
@@ -70,10 +71,6 @@ async function launchChromium({
     downloadsPath,
     args: extraArgs
   });
-  if (cdpPort) {
-    const createdCdpAddress = getCdpAddress(cdpPort);
-    await waitOnCdpAddress(createdCdpAddress);
-  }
   context.once("close", async () => {
     try {
       await (0, _fsExtra.rm)(userDataDir, {
@@ -86,6 +83,10 @@ async function launchChromium({
       console.error("Failed to remove user data dir", error);
     }
   });
+  if (cdpPort) {
+    const createdCdpAddress = getCdpAddress(cdpPort);
+    await waitOnCdpAddress(createdCdpAddress);
+  }
   const page = context.pages().at(0) ?? (await context.newPage());
   return {
     page,
@@ -105,14 +106,14 @@ async function withPlaywrightContext({
   let context;
   let page;
   try {
-    const initializeContextHookResult = await (0, _initializeContextHook.loadInitializeContextHook)({
+    const setupContextHookResult = await (0, _setupContextHook.loadSetupContextHook)({
       importFunction
     });
-    if (initializeContextHookResult.isErr()) {
-      return initializeContextHookResult;
+    if (setupContextHookResult.isErr()) {
+      return setupContextHookResult;
     }
-    const initializeContextHook = initializeContextHookResult.value;
-    if (initializeContextHook === null) {
+    const setupContextHook = setupContextHookResult.value;
+    if (setupContextHook === null) {
       if (cdpAddress !== undefined) {
         ({
           page,
@@ -142,7 +143,9 @@ async function withPlaywrightContext({
         cdpAddress
       }));
     } else {
-      const port = 9222;
+      const port = await (0, _portfinder.getPort)({
+        port: 9222
+      });
       hookCdpUrl = getCdpAddress(port);
       ({
         context,
@@ -156,7 +159,7 @@ async function withPlaywrightContext({
     }
     let hookResult;
     try {
-      hookResult = await initializeContextHook({
+      hookResult = await setupContextHook({
         apiName,
         apiParameters,
         cdpUrl: hookCdpUrl
@@ -169,13 +172,30 @@ async function withPlaywrightContext({
     }
     const {
       page: newPage,
-      context: newContext
+      context: newContext,
+      cleanup
     } = hookResult;
+    let result;
     try {
-      return await fn(newContext, newPage ?? page);
-    } finally {
-      await newContext.close();
+      result = {
+        return: await fn(newContext, newPage ?? page)
+      };
+    } catch (e) {
+      result = {
+        throw: e
+      };
+    }
+    try {
+      await cleanup?.();
+    } catch (e) {
+      result = {
+        return: (0, _neverthrow.err)(new _errors.AutomationError(e))
+      };
+    }
+    if ("throw" in result) {
+      throw result.throw;
     }
+    return result.return;
   } finally {
     await context?.close();
   }

package/dist/common/{initializeContextHook.d.ts → setupContextHook.d.ts}

@@ -7,10 +7,11 @@ export type InitializeContextHookOptions = {
     apiParameters: any;
     cdpUrl: string;
 };
-export type InitializeContextHook = (options: InitializeContextHookOptions) => Promise<{
+export type SetupContextHook = (options: InitializeContextHookOptions) => Promise<{
     page: playwright.Page | null;
     context: playwright.BrowserContext;
+    cleanup: () => Promise<void>;
 } | null>;
-export declare function loadInitializeContextHook({ importFunction, }: {
+export declare function loadSetupContextHook({ importFunction, }: {
     importFunction: ImportFunction;
-}): Promise<Ok<InitializeContextHook | null, any> | Err<any, RunAutomationError>>;
+}): Promise<Ok<SetupContextHook | null, any> | Err<any, RunAutomationError>>;

package/dist/common/{initializeContextHook.js → setupContextHook.js}

@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadInitializeContextHook = loadInitializeContextHook;
+exports.loadSetupContextHook = loadSetupContextHook;
 var _importUsingImportFunction = require("./runApi/importUsingImportFunction");
-async function loadInitializeContextHook({
+const setupContextHookPath = "hooks/setupContext";
+async function loadSetupContextHook({
   importFunction
 }) {
   return await (0, _importUsingImportFunction.importUsingImportFunction)({
-    path: "hooks/initializeContext",
+    path: setupContextHookPath,
     importFunction
   });
 }

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export { extendPayload, extendTimeout, runInfo, RunError, getAuthSessionParameters, store, } from "./runtime";
+export { extendPayload, extendTimeout, runInfo, RunError, getAuthSessionParameters, attemptStore, } from "./runtime";
 export { runWithContext, getExecutionContext, } from "./common/asyncLocalStorage";
 export { getDownloadDirectoryPath } from "./runtime/downloadDirectory";

package/dist/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "RunError", {
     return _runtime.RunError;
   }
 });
+Object.defineProperty(exports, "attemptStore", {
+  enumerable: true,
+  get: function () {
+    return _runtime.attemptStore;
+  }
+});
 Object.defineProperty(exports, "extendPayload", {
   enumerable: true,
   get: function () {
@@ -51,12 +57,6 @@ Object.defineProperty(exports, "runWithContext", {
     return _asyncLocalStorage.runWithContext;
   }
 });
-Object.defineProperty(exports, "store", {
-  enumerable: true,
-  get: function () {
-    return _runtime.store;
-  }
-});
 var _runtime = require("./runtime");
 var _asyncLocalStorage = require("./common/asyncLocalStorage");
 var _downloadDirectory = require("./runtime/downloadDirectory");

package/dist/runtime/attemptStore.d.ts

@@ -0,0 +1,2 @@
+import { Store } from "./export";
+export declare const attemptStore: Store;

package/dist/runtime/{store.js → attemptStore.js}

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.store = void 0;
+exports.attemptStore = void 0;
 var _asyncLocalStorage = require("../common/asyncLocalStorage");
-const store = exports.store = Object.freeze({
+const attemptStore = exports.attemptStore = Object.freeze({
   get: key => {
     const context = (0, _asyncLocalStorage.getExecutionContext)();
     return context?.store ? context.store[key] : undefined;

package/dist/runtime/export.d.ts

@@ -223,4 +223,4 @@ export interface Store {
  * const missingData = store.get('nonexistent'); // undefined
  * ```
  */
-export declare const store: Store;
+export declare const attemptStore: Store;

package/dist/runtime/index.d.ts

@@ -1,6 +1,6 @@
 export { extendPayload } from "./extendPayload";
 export { extendTimeout } from "./extendTimeout";
-export { store } from "./store";
+export { attemptStore } from "./attemptStore";
 export { getAuthSessionParameters } from "./getAuthSessionParameters";
 export { runInfo } from "./runInfo";
 export { RunError } from "./RunError";

package/dist/runtime/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "RunError", {
     return _RunError.RunError;
   }
 });
+Object.defineProperty(exports, "attemptStore", {
+  enumerable: true,
+  get: function () {
+    return _attemptStore.attemptStore;
+  }
+});
 Object.defineProperty(exports, "extendPayload", {
   enumerable: true,
   get: function () {
@@ -39,15 +45,9 @@ Object.defineProperty(exports, "runInfo", {
     return _runInfo.runInfo;
   }
 });
-Object.defineProperty(exports, "store", {
-  enumerable: true,
-  get: function () {
-    return _store.store;
-  }
-});
 var _extendPayload = require("./extendPayload");
 var _extendTimeout = require("./extendTimeout");
-var _store = require("./store");
+var _attemptStore = require("./attemptStore");
 var _getAuthSessionParameters = require("./getAuthSessionParameters");
 var _runInfo = require("./runInfo");
 var _RunError = require("./RunError");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.2.1-hooks.12",
+  "version": "1.2.1-hooks.13",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
@@ -79,6 +79,7 @@
     "nanoid": "3",
     "neverthrow": "6.1.0",
     "playwright-extra": "4.3.6",
+    "portfinder": "^1.0.37",
     "prettier": "2.8.0",
     "promptly": "3.2.0",
     "rollup": "3.26.2",

package/dist/runtime/store.d.ts

@@ -1,2 +0,0 @@
-import { Store } from "./export";
-export declare const store: Store;