@intuned/runtime-dev 1.3.17-ws.0 → 1.3.17

package/dist/common/launchBrowser.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBrowserExecutablePath = getBrowserExecutablePath;
+exports.getCdpWebSocketUrl = getCdpWebSocketUrl;
 exports.getHeadlessUserAgent = getHeadlessUserAgent;
 exports.getLocalCdpAddress = getLocalCdpAddress;
 exports.launchBrowser = launchBrowser;
@@ -17,9 +18,11 @@ var _child_process = require("child_process");
 var _extensionsHelpers = require("./extension/extensionsHelpers");
 var _intunedExtensionServer = require("./extension/intunedExtensionServer");
 var _util = require("util");
+var _neverthrow = require("neverthrow");
+var _zod = require("zod");
+var _intunedJson = require("./intunedJson");
 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; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const execAsync = (0, _util.promisify)(_child_process.exec);
 async function createUserDirWithPreferences() {
   const playwrightTempDir = await (0, _fsExtra.mkdtemp)("/tmp/pw-");
@@ -46,9 +49,22 @@ async function launchChromium(options) {
       throw new Error("No browser contexts found in the connected browser");
     }
     const context = browser.contexts()[0];
-    let page = context.pages().at(0);
-    if (!page) {
-      page = await context.newPage();
+    let page = context.pages().at(0) ?? (await context.newPage());
+    const targetId = options.cdpTargetId;
+    if (targetId) {
+      for (const p of context.pages()) {
+        let cdp = null;
+        try {
+          cdp = await context.newCDPSession(p);
+          const result = await cdp.send("Target.getTargetInfo");
+          if (result.targetInfo.targetId === targetId) {
+            page = p;
+            break;
+          }
+        } catch (error) {} finally {
+          await cdp?.detach();
+        }
+      }
     }
     return {
       page,
@@ -139,7 +155,21 @@ async function launchChromium(options) {
     context
   };
 }
+async function getIntunedBrowserExecutablePath() {
+  const intunedPath = process.env.INTUNED_BROWSER_PATH;
+  if (intunedPath && (await fs.exists(intunedPath))) {
+    return intunedPath;
+  }
+  return undefined;
+}
 async function getBrowserExecutablePath() {
+  const stealthConfig = await (0, _intunedJson.getStealthModeConfig)();
+  if (stealthConfig.enabled && stealthConfig.type === "intunedBrowser") {
+    const intunedPath = await getIntunedBrowserExecutablePath();
+    if (intunedPath) {
+      return intunedPath;
+    }
+  }
   const browserType = getBrowserType();
   if (browserType === "brave") {
     return await getBraveExecutablePath();
@@ -173,6 +203,31 @@ async function getBraveExecutablePath() {
 function getLocalCdpAddress(port) {
   return `http://localhost:${port}`;
 }
+async function getCdpWebSocketUrl(cdpAddress) {
+  let response;
+  try {
+    response = await fetch(`${cdpAddress}/json/version`);
+  } catch (error) {
+    return (0, _neverthrow.err)(`Failed to fetch CDP version from ${cdpAddress}: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  if (!response.ok) {
+    return (0, _neverthrow.err)(`Failed to get CDP WebSocket URL from ${cdpAddress}: ${response.status} ${response.statusText}`);
+  }
+  let data;
+  try {
+    data = await response.json();
+  } catch (error) {
+    return (0, _neverthrow.err)(`Invalid CDP version response from ${cdpAddress}: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  const cdpJsonVersionResponseSchema = _zod.z.object({
+    webSocketDebuggerUrl: _zod.z.string().url()
+  });
+  const parseResult = cdpJsonVersionResponseSchema.safeParse(data);
+  if (!parseResult.success) {
+    return (0, _neverthrow.err)(`Invalid CDP version response from ${cdpAddress}: ${JSON.stringify(parseResult.error.format())}`);
+  }
+  return (0, _neverthrow.ok)(parseResult.data.webSocketDebuggerUrl);
+}
 async function waitOnCdpAddress(cdpAddress) {
   const cdpAddressWithoutProtocol = cdpAddress.replace("http://", "").replace("https://", "").replace("localhost", "127.0.0.1");
   await (0, _waitOn.default)({

package/dist/common/playwrightContext.d.ts

@@ -1,10 +1,7 @@
-import * as playwright from "playwright";
-import { RunAutomationError } from "./runApi/errors";
-import type { RunApiSession } from "./runApi/types";
+import type * as playwright from "playwright";
 import { Err, Ok } from "neverthrow";
-import { type ImportFunction } from "./runApi/importUsingImportFunction";
 import { type Proxy } from "./launchBrowser";
-export declare const browserScriptsFile: string;
+import { ImportFunction, RunAutomationError, RunApiSession } from "@intuned/runtime-interface";
 type WithPlaywrightContextParameters = {
     importFunction: ImportFunction;
     apiName: string;
@@ -23,6 +20,7 @@ export declare function withPlaywrightContext<R>(options: {
 } & WithPlaywrightContextParameters, fn: WithPlaywrightContextWrappedFunction<R>): Promise<Ok<R, any> | Err<any, RunAutomationError>>;
 export declare function withPlaywrightContext<R>(options: {
     cdpAddress: string;
+    cdpTargetId?: string;
 } & WithPlaywrightContextParameters, fn: WithPlaywrightContextWrappedFunction<R>): Promise<Ok<R, any> | Err<any, RunAutomationError>>;
 export declare function loadSessionToContext({ context, session, }: {
     context: playwright.BrowserContext;

package/dist/common/playwrightContext.js

@@ -3,24 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.browserScriptsFile = void 0;
 exports.loadSessionToContext = loadSessionToContext;
 exports.withPlaywrightContext = withPlaywrightContext;
 var _contextStorageStateHelpers = require("./contextStorageStateHelpers");
-var _path = _interopRequireDefault(require("path"));
 var fs = _interopRequireWildcard(require("fs-extra"));
 var _fileUtils = require("../commands/common/utils/fileUtils");
-var _errors = require("./runApi/errors");
 var _neverthrow = require("neverthrow");
 var _setupContextHook = require("./setupContextHook");
 var _portfinder = require("portfinder");
 var _launchBrowser = require("./launchBrowser");
-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; }
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const browserScriptsFile = exports.browserScriptsFile = _path.default.join(__dirname, "./assets/browser_scripts.js");
+var _runtimeInterface = require("../vendor/runtime-interface");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 async function withPlaywrightContext({
   cdpAddress,
+  cdpTargetId,
   proxy,
   headless = true,
   downloadsPath,
@@ -44,7 +40,8 @@ async function withPlaywrightContext({
           page,
           context
         } = await (0, _launchBrowser.launchBrowser)({
-          cdpAddress
+          cdpAddress,
+          cdpTargetId
         }));
       } else {
         ({
@@ -65,13 +62,13 @@ async function withPlaywrightContext({
         context,
         page
       } = await (0, _launchBrowser.launchBrowser)({
-        cdpAddress
+        cdpAddress,
+        cdpTargetId
       }));
     } else {
       const port = await (0, _portfinder.getPort)({
         port: 9222
       });
-      hookCdpUrl = (0, _launchBrowser.getLocalCdpAddress)(port);
       ({
         context,
         page
@@ -81,16 +78,23 @@ async function withPlaywrightContext({
         downloadsPath,
         cdpPort: port
       }));
+      hookCdpUrl = (0, _launchBrowser.getLocalCdpAddress)(port);
     }
     let hookResult;
     try {
+      const wsUrlResult = await (0, _launchBrowser.getCdpWebSocketUrl)(hookCdpUrl);
+      if (wsUrlResult.isOk()) {
+        hookCdpUrl = wsUrlResult.value;
+      } else {
+        throw new Error(wsUrlResult.error);
+      }
       hookResult = await setupContextHook({
         apiName: apiName,
         apiParameters: apiParameters,
         cdpUrl: hookCdpUrl
       });
     } catch (error) {
-      return (0, _neverthrow.err)(new _errors.AutomationError(error));
+      return (0, _neverthrow.err)(new _runtimeInterface.AutomationError(error));
     }
     if (!hookResult) {
       return await fn(context, page);
@@ -114,7 +118,7 @@ async function withPlaywrightContext({
       await cleanup?.();
     } catch (e) {
       result = {
-        return: (0, _neverthrow.err)(new _errors.AutomationError(e))
+        return: (0, _neverthrow.err)(new _runtimeInterface.AutomationError(e))
       };
     }
     if ("throw" in result) {

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

@@ -1,7 +1,5 @@
 import { Result } from "neverthrow";
-import { RunAutomationError } from "./errors";
-import { ExtendedRunApiParameters } from "./types";
-export type ImportFunction = ExtendedRunApiParameters["importFunction"];
+import { ImportFunction, RunAutomationError } from "@intuned/runtime-interface";
 export declare function importUsingImportFunction<_ReturnType = any>({ path, allowGenerators, importFunction, }: {
     path: string;
     importFunction: ImportFunction;

package/dist/common/runApi/importUsingImportFunction.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.importUsingImportFunction = importUsingImportFunction;
 var _neverthrow = require("neverthrow");
-var _errors = require("./errors");
+var _runtimeInterface = require("../../vendor/runtime-interface");
 async function importUsingImportFunction({
   path,
   allowGenerators = true,
@@ -15,17 +15,17 @@ async function importUsingImportFunction({
     const importedResult = await importFunction(path);
     if (importedResult.isErr()) {
       if (importedResult.error.type === "not_found") {
-        return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
+        return (0, _neverthrow.err)(new _runtimeInterface.ApiNotFoundError(path));
       }
-      return (0, _neverthrow.err)(new _errors.AutomationError(importedResult.error.error));
+      return (0, _neverthrow.err)(new _runtimeInterface.AutomationError(importedResult.error.error));
     }
     const imported = importedResult.value;
     if (!imported || !imported.default || !imported.default.constructor) {
-      return (0, _neverthrow.err)(new _errors.InvalidApiError(`${path} does not have a default export`));
+      return (0, _neverthrow.err)(new _runtimeInterface.InvalidApiError(`${path} does not have a default export`));
     }
     if (imported.default.constructor.name === "AsyncGeneratorFunction") {
       if (!allowGenerators) {
-        return (0, _neverthrow.err)(new _errors.InvalidApiError(`${path} default export must be an async function`));
+        return (0, _neverthrow.err)(new _runtimeInterface.InvalidApiError(`${path} default export must be an async function`));
       }
       return (0, _neverthrow.ok)(async (...args) => {
         const generator = imported.default(...args);
@@ -39,8 +39,8 @@ async function importUsingImportFunction({
     if (imported.default.constructor.name === "AsyncFunction") {
       return (0, _neverthrow.ok)(imported.default);
     }
-    return (0, _neverthrow.err)(new _errors.InvalidApiError(`${path} default export must be an async function`));
+    return (0, _neverthrow.err)(new _runtimeInterface.InvalidApiError(`${path} default export must be an async function`));
   } catch (error) {
-    return (0, _neverthrow.err)(new _errors.AutomationError(error));
+    return (0, _neverthrow.err)(new _runtimeInterface.AutomationError(error));
   }
 }

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

@@ -1,11 +1,8 @@
 import { Result } from "neverthrow";
-import { RunAutomationError } from "./errors";
-import { Page, BrowserContext } from "playwright";
-import { ExtendedRunApiParameters, RunApiResult, RunApiResultWithSessionOk } from "./types";
-export * from "./types";
-export * from "./errors";
+import type { Page, BrowserContext } from "playwright";
+import { ExtendedRunApiParameters, RunApiResult, RunApiResultWithSessionOk, RunAutomationError } from "@intuned/runtime-interface";
 export declare function runApi<ResultType = any>(input: ExtendedRunApiParameters & {
     retrieveSession: true;
-}): Promise<RunApiResult<ResultType, RunApiResultWithSessionOk>>;
+}): Promise<RunApiResult<ResultType, RunApiResultWithSessionOk<ResultType>>>;
 export declare function runApi<ResultType = any>(input: ExtendedRunApiParameters): Promise<RunApiResult<ResultType>>;
 export declare function checkAuthSessionWithRetries(page: Page, context: BrowserContext, checkFn: (..._: any) => Promise<boolean>, retries?: number): Promise<Result<boolean, RunAutomationError>>;

package/dist/common/runApi/index.js

@@ -3,49 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  runApi: true,
-  checkAuthSessionWithRetries: true
-};
 exports.checkAuthSessionWithRetries = checkAuthSessionWithRetries;
 exports.runApi = runApi;
 var _downloadDirectory = require("../../runtime/downloadDirectory");
 var _asyncLocalStorage = require("../asyncLocalStorage");
 var _fsExtra = _interopRequireWildcard(require("fs-extra"));
 var fs = _fsExtra;
-var _contextStorageStateHelpers = require("../contextStorageStateHelpers");
 var _neverthrow = require("neverthrow");
-var _errors = require("./errors");
-Object.keys(_errors).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _errors[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _errors[key];
-    }
-  });
-});
 var _constants = require("../constants");
 var _playwrightContext = require("../playwrightContext");
-var _types = require("./types");
-Object.keys(_types).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _types[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _types[key];
-    }
-  });
-});
 var _formatZodError = require("../formatZodError");
 var _cleanEnvironmentVariables = require("../cleanEnvironmentVariables");
 var _importUsingImportFunction = require("./importUsingImportFunction");
-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; }
+var _runtimeInterface = require("../../vendor/runtime-interface");
+var _contextStorageStateHelpers = require("../contextStorageStateHelpers");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function getObjectSizeInBytes(obj) {
   try {
     return new TextEncoder().encode(JSON.stringify(obj)).length;
@@ -60,9 +32,9 @@ async function runApi({
   ...input
 }) {
   let traceStarted = false;
-  const inputParseResult = _types.runApiParametersSchema.safeParse(input);
+  const inputParseResult = _runtimeInterface.runApiParametersSchema.safeParse(input);
   if (!inputParseResult.success) {
-    return (0, _neverthrow.err)(new _errors.InternalInvalidInputError("Input validation failed", (0, _formatZodError.formatZodError)(inputParseResult.error)));
+    return (0, _neverthrow.err)(new _runtimeInterface.InternalInvalidInputError("Input validation failed", (0, _formatZodError.formatZodError)(inputParseResult.error)));
   }
   const {
     automationFunction: {
@@ -92,7 +64,7 @@ async function runApi({
     if (auth && auth.session.type === "state") {
       const state = auth.session.state;
       if (state === undefined || state === null) {
-        return (0, _neverthrow.err)(new _errors.AuthRequiredError());
+        return (0, _neverthrow.err)(new _runtimeInterface.AuthRequiredError());
       }
     }
     const playwrightContextParameters = {
@@ -122,13 +94,9 @@ async function runApi({
           context,
           session: auth.session
         });
-      }
-      const scriptContent = await fs.readFile(_playwrightContext.browserScriptsFile, "utf-8");
-      await context.addInitScript({
-        content: scriptContent
-      });
-      for (const page of context.pages()) {
-        await page.evaluate(scriptContent);
+        if (intunedContext && auth.parameters) {
+          intunedContext.getAuthSessionParameters = async () => auth.parameters;
+        }
       }
       if (tracing.enabled) {
         await context.tracing.start({
@@ -141,19 +109,28 @@ async function runApi({
       (0, _cleanEnvironmentVariables.cleanEnvironmentVariables)();
       const automationFunctionParameters = [...(params !== undefined ? [params] : []), page, context];
       try {
-        const automationFunctionResult = await automationFunction(...automationFunctionParameters);
+        const automationFunctionResult = await Promise.race([automationFunction(...automationFunctionParameters), abortPromise]);
+        if (automationFunctionResult === abortSymbol) {
+          return (0, _neverthrow.err)(new _runtimeInterface.AbortedError());
+        }
         const MAX_RESULT_SIZE_BYTES = 2 * 1024 * 1024;
         const resultSizeInBytes = getObjectSizeInBytes(automationFunctionResult);
         if (resultSizeInBytes > MAX_RESULT_SIZE_BYTES) {
-          return (0, _neverthrow.err)(new _errors.ResultTooBigError(resultSizeInBytes, MAX_RESULT_SIZE_BYTES));
+          return (0, _neverthrow.err)(new _runtimeInterface.ResultTooBigError(resultSizeInBytes, MAX_RESULT_SIZE_BYTES));
+        }
+        if (retrieveSession) {
+          return (0, _neverthrow.ok)({
+            result: automationFunctionResult,
+            extendedPayloads: intunedContext?.extendedPayloads,
+            session: await (0, _contextStorageStateHelpers.getStorageState)(context)
+          });
         }
         return (0, _neverthrow.ok)({
           result: automationFunctionResult,
-          extendedPayloads: intunedContext?.extendedPayloads,
-          session: retrieveSession ? await (0, _contextStorageStateHelpers.getStorageState)(context) : undefined
+          extendedPayloads: intunedContext?.extendedPayloads
         });
       } catch (error) {
-        return (0, _neverthrow.err)(new _errors.AutomationError(error));
+        return (0, _neverthrow.err)(new _runtimeInterface.AutomationError(error));
       } finally {
         await saveTraceIfNeeded({
           errorMessage: "failed to save trace"
@@ -178,22 +155,19 @@ async function runApi({
     } else {
       return await (0, _playwrightContext.withPlaywrightContext)({
         cdpAddress: runOptions.cdpAddress,
+        cdpTargetId: runOptions.cdpTargetId,
         ...playwrightContextParameters
       }, runAutomationWithContext);
     }
   }
-  const result = await Promise.race([await runAutomation(), abortPromise]);
-  if (result === abortSymbol) {
-    return (0, _neverthrow.err)(new _errors.AbortedError());
-  }
-  return result;
+  return await runAutomation();
 }
 async function checkAuthSessionWithRetries(page, context, checkFn, retries = 3) {
   if (retries === 0) {
     return (0, _neverthrow.ok)(false);
   }
   let tryNumber = 0;
-  console.log("Checking auth session with retries", `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
+  console.log("Checking AuthSession with retries", `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
   while (retries > tryNumber) {
     const result = await checkFn(page, context);
     if (result) return (0, _neverthrow.ok)(true);