@intuned/runtime 1.3.5 → 1.3.7

package/dist/commands/auth-sessions/load.js

@@ -5,6 +5,7 @@ var _commander = require("commander");
 var _playwrightContext = require("../../common/playwrightContext");
 var _settings = require("../common/utils/settings");
 var _dotenv = _interopRequireDefault(require("dotenv"));
+var _neverthrow = require("neverthrow");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 _dotenv.default.config({
   path: `.env`
@@ -17,15 +18,17 @@ _commander.program.description("load auth session to browser").option("--cdpAddr
   if (!setting.authSessions.enabled) {
     throw new Error("Auth session is not enabled");
   }
-  const {
-    context
-  } = await (0, _playwrightContext.getRemotePlaywrightContext)(cdpAddress);
-  await (0, _playwrightContext.loadSessionToContext)({
-    context,
-    session: {
-      type: "file",
-      path: authSessionPath
-    }
+  await (0, _playwrightContext.withPlaywrightContext)({
+    cdpAddress
+  }, async context => {
+    await (0, _playwrightContext.loadSessionToContext)({
+      context,
+      session: {
+        type: "file",
+        path: authSessionPath
+      }
+    });
+    return (0, _neverthrow.ok)({});
   });
   process.exit(0);
 });

package/dist/commands/intuned-cli/controller/__test__/authSession.test.js

@@ -6,7 +6,7 @@ var _helpers = require("../../helpers");
 var _neverthrow = require("neverthrow");
 var _runApi = require("../../../../common/runApi");
 var _browser = require("../../helpers/browser");
-var _playwrightContext = require("../../../../common/playwrightContext");
+var _launchBrowser = require("../../../../common/launchBrowser");
 var _promises = require("timers/promises");
 const _checkPassedResult = (0, _neverthrow.ok)({
   result: true
@@ -48,7 +48,7 @@ _vitest.vi.mock("timers/promises", () => ({
 _vitest.vi.mock("../../../../common/contextStorageStateHelpers", () => ({
   getStorageState: _vitest.vi.fn()
 }));
-_vitest.vi.mock("../../../../common/playwrightContext", () => ({
+_vitest.vi.mock("../../../../common/launchBrowser", () => ({
   launchChromium: _vitest.vi.fn()
 }));
 _vitest.vi.mock("../../../../common/runApi", async importOriginal => {
@@ -947,7 +947,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         pages: _vitest.vi.fn().mockReturnValue([mockPage]),
         close: _vitest.vi.fn()
       };
-      _vitest.vi.mocked(_playwrightContext.launchChromium).mockResolvedValue({
+      _vitest.vi.mocked(_launchBrowser.launchChromium).mockResolvedValue({
         context: mockContext,
         page: mockPage
       });
@@ -964,7 +964,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
     });
     afterEach(() => {
       _vitest.vi.mocked(_runApi.runApi).mockReset();
-      _vitest.vi.mocked(_playwrightContext.launchChromium).mockReset();
+      _vitest.vi.mocked(_launchBrowser.launchChromium).mockReset();
       _vitest.vi.useRealTimers();
     });
     (0, _vitest.it)("launches browser with app mode", async () => {
@@ -976,7 +976,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         headless: false,
         keepBrowserOpen: false
       });
-      (0, _vitest.expect)(_playwrightContext.launchChromium).toHaveBeenCalledWith(_vitest.expect.objectContaining({
+      (0, _vitest.expect)(_launchBrowser.launchChromium).toHaveBeenCalledWith(_vitest.expect.objectContaining({
         appModeInitialUrl: "startUrl"
       }));
     });

package/dist/commands/intuned-cli/controller/authSession.js

@@ -16,7 +16,7 @@ var _constants = require("../../../common/constants");
 var _tsNodeImport = require("../../common/tsNodeImport");
 var _terminal = require("../helpers/terminal");
 var _browser = require("../helpers/browser");
-var _playwrightContext = require("../../../common/playwrightContext");
+var _launchBrowser = require("../../../common/launchBrowser");
 var _promises = require("timers/promises");
 var _contextStorageStateHelpers = require("../../../common/contextStorageStateHelpers");
 async function executeRunValidateAuthSessionCLI({
@@ -382,7 +382,7 @@ async function recordAuthSession({
   const {
     context,
     page
-  } = await (0, _playwrightContext.launchChromium)({
+  } = await (0, _launchBrowser.launchChromium)({
     headless: false,
     proxy,
     appModeInitialUrl: startUrl

package/dist/commands/intuned-cli/controller/save.js

@@ -152,32 +152,6 @@ const validateIntunedProject = async () => {
         };
       }
     }
-  }, {
-    name: "package.json",
-    check: async () => {
-      try {
-        const packageJsonPath = path.join(currentDirectoryToSave, "package.json");
-        await fs.exists(packageJsonPath);
-        const packageJson = JSON.parse(await fs.readFile(packageJsonPath, {
-          encoding: "utf-8"
-        }));
-        const userCodePlaywrightVersion = packageJson.dependencies?.playwright;
-        if (userCodePlaywrightVersion !== _constants.CURRENT_PLAYWRIGHT_VERSION) {
-          return {
-            isValid: false,
-            errorMessage: `Playwright version mismatch: expected ${_constants.CURRENT_PLAYWRIGHT_VERSION}, found ${userCodePlaywrightVersion || "none"}`
-          };
-        }
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: "Package.json file not found or cannot be read"
-        };
-      }
-    }
   }, {
     name: intunedSettingsFile.name,
     check: async () => {

package/dist/commands/intuned-cli/helpers/__test__/browser.test.js

@@ -2,7 +2,7 @@
 
 var _vitest = require("vitest");
 var _browser = require("../browser");
-var _playwrightContext = require("../../../../common/playwrightContext");
+var _launchBrowser = require("../../../../common/launchBrowser");
 function getTerminal() {
   return new Proxy(() => ({}), {
     get: () => getTerminal(),
@@ -15,7 +15,7 @@ _vitest.vi.mock("fs-extra", () => ({
 _vitest.vi.mock("portfinder", () => ({
   getPort: _vitest.vi.fn().mockResolvedValue(1234)
 }));
-_vitest.vi.mock("../../../../common/playwrightContext", () => ({
+_vitest.vi.mock("../../../../common/launchBrowser", () => ({
   launchChromium: _vitest.vi.fn().mockImplementation(async () => ({
     context: {
       close: _vitest.vi.fn().mockResolvedValue(undefined)
@@ -60,7 +60,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
         headless: false,
         proxy: "proxy"
       });
-      (0, _vitest.expect)(_playwrightContext.launchChromium).toHaveBeenCalledWith({
+      (0, _vitest.expect)(_launchBrowser.launchChromium).toHaveBeenCalledWith({
         headless: false,
         cdpPort: 1234,
         proxy: "proxy"
@@ -78,7 +78,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
       });
       const firstContext = (0, _browser._getContextForTest)();
       (0, _vitest.expect)(firstContext).not.toBeNull();
-      (0, _vitest.expect)(_playwrightContext.launchChromium).toHaveBeenCalledTimes(1);
+      (0, _vitest.expect)(_launchBrowser.launchChromium).toHaveBeenCalledTimes(1);
       await (0, _browser.getCLIRunOptions)({
         keepBrowserOpen: true,
         headless: false,
@@ -87,7 +87,7 @@ _vitest.vi.mock("../../helpers", async importOriginal => {
       const secondContext = (0, _browser._getContextForTest)();
       (0, _vitest.expect)(secondContext).not.toBeNull();
       (0, _vitest.expect)(firstContext).not.toBe(secondContext);
-      (0, _vitest.expect)(_playwrightContext.launchChromium).toHaveBeenCalledTimes(2);
+      (0, _vitest.expect)(_launchBrowser.launchChromium).toHaveBeenCalledTimes(2);
     });
     (0, _vitest.it)("keeps context open until explicitly closed", async () => {
       await (0, _browser.getCLIRunOptions)({

package/dist/commands/intuned-cli/helpers/browser.js

@@ -7,7 +7,7 @@ exports._getContextForTest = _getContextForTest;
 exports.closeCliBrowser = closeCliBrowser;
 exports.getCLIRunOptions = getCLIRunOptions;
 exports.isCliBrowserLaunched = isCliBrowserLaunched;
-var _playwrightContext = require("../../../common/playwrightContext");
+var _launchBrowser = require("../../../common/launchBrowser");
 var _portfinder = require("portfinder");
 var _proxy = require("./proxy");
 let context = null;
@@ -35,7 +35,7 @@ async function getCLIRunOptions({
   const port = await (0, _portfinder.getPort)({});
   ({
     context
-  } = await (0, _playwrightContext.launchChromium)({
+  } = await (0, _launchBrowser.launchChromium)({
     headless,
     proxy: proxy ? (0, _proxy.parseUrlProxy)(proxy) : undefined,
     cdpPort: port

package/dist/common/extensionsHelpers.d.ts

@@ -1,15 +1,8 @@
 import * as playwright from "playwright";
-import { CaptchaSolverSettings } from "./settingsSchema";
-type CaptchaSolverSettingsWithRunContext = CaptchaSolverSettings & {
-    workspaceId: string;
-    projectId: string;
-    baseUrl: string;
-    token?: string;
-};
+import { CaptchaSolverSettingsWithRunContext } from "./settingsSchema";
 export declare function buildExtensionsList(): string[];
 export declare function getIntunedExtensionPath(): string;
 export declare function isIntunedExtensionEnabled(): boolean;
 export declare function getIntunedExtensionWorker(context: playwright.BrowserContext): Promise<playwright.Worker | null>;
 export declare function getIntunedExtensionSettings(): Promise<CaptchaSolverSettingsWithRunContext>;
 export declare function setupIntunedExtension(): Promise<void>;
-export {};

package/dist/common/extensionsHelpers.js

@@ -56,18 +56,17 @@ async function getIntunedExtensionWorker(context) {
 }
 async function getIntunedExtensionSettings() {
   const settings = await (0, _settings.getSettings)();
-  const captchaSolverSettings = settings.captchaSolver ?? _settingsSchema.captchaSolverSettingsSchema.parse({});
   const [domain, workspaceId, projectId] = [process.env.FUNCTIONS_DOMAIN, process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY], process.env.INTUNED_INTEGRATION_ID ?? process.env[_constants.PROJECT_ID_ENV_VAR_KEY]];
   if (!domain || !workspaceId || !projectId) {
     const missingEnvVars = [domain && "FUNCTIONS_DOMAIN", workspaceId && _constants.WORKSPACE_ID_ENV_VAR_KEY, projectId && `INTUNED_INTEGRATION_ID OR ${_constants.PROJECT_ID_ENV_VAR_KEY}`];
     throw new Error(`Missing required environment variables: ${missingEnvVars}`);
   }
   return {
-    ...captchaSolverSettings,
-    baseUrl: domain,
-    token: _jwtTokenManager.backendFunctionsTokenManager.token,
+    ...(settings.captchaSolver ?? _settingsSchema.captchaSolverSettingsSchema.parse({})),
     workspaceId,
-    projectId
+    projectId,
+    baseUrl: domain,
+    token: _jwtTokenManager.backendFunctionsTokenManager.token
   };
 }
 async function setupIntunedExtension() {

package/dist/common/launchBrowser.d.ts

@@ -0,0 +1,25 @@
+import * as playwright from "playwright";
+export interface Proxy {
+    server: string;
+    username: string;
+    password: string;
+}
+export type LaunchBrowserResult = {
+    page: playwright.Page;
+    context: playwright.BrowserContext;
+};
+export type LaunchChromiumStandaloneOptions = {
+    proxy?: Proxy;
+    headless: boolean;
+    downloadsPath?: string;
+    cdpPort?: number;
+    appModeInitialUrl?: string;
+    executablePath?: string;
+};
+export type LaunchChromiumCdpOptions = {
+    cdpAddress: string;
+};
+export declare function launchChromium(options: LaunchChromiumStandaloneOptions): Promise<LaunchBrowserResult>;
+export declare function launchChromium(options: LaunchChromiumCdpOptions): Promise<LaunchBrowserResult>;
+export declare function launchBrowser(options: Omit<LaunchChromiumStandaloneOptions, "executablePath"> | LaunchChromiumCdpOptions): Promise<LaunchBrowserResult>;
+export declare function getLocalCdpAddress(port: number): string;

package/dist/common/launchBrowser.js

@@ -0,0 +1,172 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLocalCdpAddress = getLocalCdpAddress;
+exports.launchBrowser = launchBrowser;
+exports.launchChromium = launchChromium;
+var playwright = _interopRequireWildcard(require("playwright"));
+var _fsExtra = _interopRequireWildcard(require("fs-extra"));
+var fs = _fsExtra;
+var _path = require("path");
+var _waitOn = _interopRequireDefault(require("wait-on"));
+var _child_process = require("child_process");
+var _extensionsHelpers = require("./extensionsHelpers");
+var _util = require("util");
+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; }
+const execAsync = (0, _util.promisify)(_child_process.exec);
+async function createUserDirWithPreferences() {
+  const playwrightTempDir = await (0, _fsExtra.mkdtemp)("/tmp/pw-");
+  const userDir = (0, _path.join)(playwrightTempDir, "userdir");
+  const defaultDir = (0, _path.join)(userDir, "Default");
+  await (0, _fsExtra.mkdir)(defaultDir, {
+    recursive: true
+  });
+  const preferences = {
+    plugins: {
+      always_open_pdf_externally: true
+    }
+  };
+  await (0, _fsExtra.writeFile)((0, _path.join)(defaultDir, "Preferences"), JSON.stringify(preferences));
+  return userDir;
+}
+async function launchChromium(options) {
+  if ("cdpAddress" in options) {
+    const browser = await playwright.chromium.connectOverCDP(options.cdpAddress);
+    if (browser.contexts().length === 0) {
+      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();
+    }
+    return {
+      page,
+      context
+    };
+  }
+  const {
+    headless,
+    appModeInitialUrl,
+    cdpPort,
+    proxy,
+    downloadsPath
+  } = options;
+  let {
+    executablePath
+  } = options;
+  const defaultArgsToIgnore = ["--disable-extensions", "--disable-component-extensions-with-background-pages", "--disable-background-networking", "--disable-backgrounding-occluded-windows", "--disable-background-timer-throttling"];
+  const extraArgs = [];
+  const userDataDir = await createUserDirWithPreferences();
+  if ((0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
+    const extensionsList = (0, _extensionsHelpers.buildExtensionsList)();
+    const extensions = extensionsList.join(",");
+    extraArgs.push(`--disable-extensions-except=${extensions}`);
+    extraArgs.push(`--load-extension=${extensions}`);
+    await (0, _extensionsHelpers.setupIntunedExtension)();
+  }
+  if (cdpPort) {
+    extraArgs.push(`--remote-debugging-port=${cdpPort}`);
+  }
+  if (headless) {
+    defaultArgsToIgnore.push("--headless=old");
+    extraArgs.push("--headless=new");
+  }
+  if (appModeInitialUrl) {
+    extraArgs.push(`--app=${appModeInitialUrl}`);
+  }
+  if (executablePath) {
+    executablePath = await fs.realpath(executablePath);
+    if (!(await fs.exists(executablePath))) {
+      console.log(`Warning: Executable path ${executablePath} does not exist. Falling back to default.`);
+      executablePath = undefined;
+    }
+  }
+  const context = await playwright.chromium.launchPersistentContext(userDataDir, {
+    executablePath,
+    headless,
+    viewport: null,
+    proxy,
+    downloadsPath,
+    args: extraArgs,
+    ignoreDefaultArgs: defaultArgsToIgnore
+  });
+  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 (cdpPort) {
+    const createdCdpAddress = getLocalCdpAddress(cdpPort);
+    await waitOnCdpAddress(createdCdpAddress);
+  }
+  const page = context.pages().at(0) ?? (await context.newPage());
+  if ((0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
+    await (0, _extensionsHelpers.getIntunedExtensionWorker)(context);
+  }
+  return {
+    page,
+    context
+  };
+}
+async function launchBrowser(options) {
+  if ("cdpAddress" in options) {
+    return launchChromium(options);
+  }
+  const browserType = getBrowserType();
+  switch (browserType) {
+    case "chromium":
+      {
+        return launchChromium(options);
+      }
+    case "brave":
+      {
+        const braveExecutablePath = await getBraveExecutablePath();
+        return launchChromium({
+          ...options,
+          executablePath: braveExecutablePath
+        });
+      }
+  }
+}
+function getBrowserType() {
+  if (process.env.BROWSER_TYPE === "brave") {
+    return "brave";
+  }
+  return "chromium";
+}
+async function getBraveExecutablePath() {
+  const {
+    stdout
+  } = await execAsync("which brave-browser-stable");
+  const bravePath = stdout.trim();
+  if (bravePath.length === 0) {
+    throw new Error("Brave browser not found");
+  }
+  return bravePath;
+}
+function getLocalCdpAddress(port) {
+  return `http://localhost:${port}`;
+}
+async function waitOnCdpAddress(cdpAddress) {
+  const cdpAddressWithoutProtocol = cdpAddress.replace("http://", "").replace("https://", "").replace("localhost", "127.0.0.1");
+  await (0, _waitOn.default)({
+    resources: [`http-get://${cdpAddressWithoutProtocol}/json/version`],
+    delay: 100,
+    interval: 100,
+    timeout: 5000,
+    tcpTimeout: 1000,
+    window: 1000
+  });
+}

package/dist/common/playwrightContext.d.ts

@@ -3,27 +3,7 @@ import { RunAutomationError } from "./runApi/errors";
 import type { RunApiSession } from "./runApi/types";
 import { Err, Ok } from "neverthrow";
 import { type ImportFunction } from "./runApi/importUsingImportFunction";
-export interface Proxy {
-    server: string;
-    username: string;
-    password: string;
-}
-export declare function launchChromium(options: {
-    proxy?: Proxy;
-    headless: boolean;
-    downloadsPath?: string;
-    cdpPort?: number;
-    appModeInitialUrl?: string;
-}): Promise<{
-    page: playwright.Page;
-    context: playwright.BrowserContext;
-}>;
-export declare function launchChromium(options: {
-    cdpAddress: string;
-}): Promise<{
-    page: playwright.Page;
-    context: playwright.BrowserContext;
-}>;
+import { type Proxy } from "./launchBrowser";
 export declare const browserScriptsFile: string;
 type WithPlaywrightContextParameters = {
     importFunction: ImportFunction;
@@ -48,8 +28,4 @@ export declare function loadSessionToContext({ context, session, }: {
     context: playwright.BrowserContext;
     session: RunApiSession;
 }): Promise<void>;
-export declare function getRemotePlaywrightContext(cdpAddress: string): Promise<{
-    browser: playwright.Browser;
-    context: playwright.BrowserContext;
-}>;
 export {};

package/dist/common/playwrightContext.js

@@ -4,116 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.browserScriptsFile = void 0;
-exports.getRemotePlaywrightContext = getRemotePlaywrightContext;
-exports.launchChromium = launchChromium;
 exports.loadSessionToContext = loadSessionToContext;
 exports.withPlaywrightContext = withPlaywrightContext;
-var playwright = _interopRequireWildcard(require("playwright"));
-var _fsExtra = _interopRequireWildcard(require("fs-extra"));
-var fs = _fsExtra;
 var _contextStorageStateHelpers = require("./contextStorageStateHelpers");
-var _path = _interopRequireWildcard(require("path"));
+var _path = _interopRequireDefault(require("path"));
+var fs = _interopRequireWildcard(require("fs-extra"));
 var _fileUtils = require("../commands/common/utils/fileUtils");
-var _waitOn = _interopRequireDefault(require("wait-on"));
 var _errors = require("./runApi/errors");
 var _neverthrow = require("neverthrow");
 var _setupContextHook = require("./setupContextHook");
 var _portfinder = require("portfinder");
-var _extensionsHelpers = require("./extensionsHelpers");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+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; }
-async function createUserDirWithPreferences() {
-  const playwrightTempDir = await (0, _fsExtra.mkdtemp)("/tmp/pw-");
-  const userDir = (0, _path.join)(playwrightTempDir, "userdir");
-  const defaultDir = (0, _path.join)(userDir, "Default");
-  await (0, _fsExtra.mkdir)(defaultDir, {
-    recursive: true
-  });
-  const preferences = {
-    plugins: {
-      always_open_pdf_externally: true
-    }
-  };
-  await (0, _fsExtra.writeFile)((0, _path.join)(defaultDir, "Preferences"), JSON.stringify(preferences));
-  return userDir;
-}
-async function launchChromium({
-  proxy,
-  headless = true,
-  downloadsPath,
-  cdpAddress,
-  cdpPort,
-  appModeInitialUrl
-}) {
-  if (cdpAddress) {
-    const browser = await playwright.chromium.connectOverCDP(cdpAddress);
-    if (browser.contexts().length === 0) {
-      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();
-    }
-    return {
-      page,
-      context
-    };
-  }
-  const defaultArgsToIgnore = ["--disable-extensions", "--disable-component-extensions-with-background-pages", "--disable-background-networking", "--disable-backgrounding-occluded-windows", "--disable-background-timer-throttling"];
-  const extraArgs = [];
-  const userDataDir = await createUserDirWithPreferences();
-  if ((0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
-    const extensionsList = (0, _extensionsHelpers.buildExtensionsList)();
-    const extensions = extensionsList.join(",");
-    extraArgs.push(`--disable-extensions-except=${extensions}`);
-    extraArgs.push(`--load-extension=${extensions}`);
-    await (0, _extensionsHelpers.setupIntunedExtension)();
-  }
-  if (cdpPort) {
-    extraArgs.push(`--remote-debugging-port=${cdpPort}`);
-  }
-  if (headless) {
-    defaultArgsToIgnore.push("--headless=old");
-    extraArgs.push("--headless=new");
-  }
-  if (appModeInitialUrl) {
-    extraArgs.push(`--app=${appModeInitialUrl}`);
-  }
-  const context = await playwright.chromium.launchPersistentContext(userDataDir, {
-    headless,
-    viewport: null,
-    proxy,
-    downloadsPath,
-    args: extraArgs,
-    ignoreDefaultArgs: defaultArgsToIgnore
-  });
-  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 (cdpPort) {
-    const createdCdpAddress = getLocalCdpAddress(cdpPort);
-    await waitOnCdpAddress(createdCdpAddress);
-  }
-  const page = context.pages().at(0) ?? (await context.newPage());
-  if ((0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
-    await (0, _extensionsHelpers.getIntunedExtensionWorker)(context);
-  }
-  return {
-    page,
-    context
-  };
-}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const browserScriptsFile = exports.browserScriptsFile = _path.default.join(__dirname, "./assets/browser_scripts.js");
 async function withPlaywrightContext({
   cdpAddress,
@@ -139,14 +43,14 @@ async function withPlaywrightContext({
         ({
           page,
           context
-        } = await launchChromium({
+        } = await (0, _launchBrowser.launchBrowser)({
           cdpAddress
         }));
       } else {
         ({
           page,
           context
-        } = await launchChromium({
+        } = await (0, _launchBrowser.launchBrowser)({
           proxy,
           headless,
           downloadsPath
@@ -160,18 +64,18 @@ async function withPlaywrightContext({
       ({
         context,
         page
-      } = await launchChromium({
+      } = await (0, _launchBrowser.launchBrowser)({
         cdpAddress
       }));
     } else {
       const port = await (0, _portfinder.getPort)({
         port: 9222
       });
-      hookCdpUrl = getLocalCdpAddress(port);
+      hookCdpUrl = (0, _launchBrowser.getLocalCdpAddress)(port);
       ({
         context,
         page
-      } = await launchChromium({
+      } = await (0, _launchBrowser.launchBrowser)({
         proxy,
         headless,
         downloadsPath,
@@ -237,42 +141,4 @@ async function loadSessionToContext({
     sessionToLoad = await fs.readJson(fullPath);
   }
   await (0, _contextStorageStateHelpers.setStorageState)(context, sessionToLoad);
-}
-function getLocalCdpAddress(port) {
-  return `http://localhost:${port}`;
-}
-async function waitOnCdpAddress(cdpAddress) {
-  const cdpAddressWithoutProtocol = cdpAddress.replace("http://", "").replace("https://", "").replace("localhost", "127.0.0.1");
-  await (0, _waitOn.default)({
-    resources: [`http-get://${cdpAddressWithoutProtocol}/json/version`],
-    delay: 100,
-    interval: 100,
-    timeout: 5000,
-    tcpTimeout: 1000,
-    window: 1000
-  });
-}
-async function getRemotePlaywrightContext(cdpAddress) {
-  const playwright = await Promise.resolve().then(() => _interopRequireWildcard(require("playwright")));
-  let browser = null;
-  if (!cdpAddress) {
-    throw new Error("cdpAddress is required");
-  }
-  try {
-    await waitOnCdpAddress(cdpAddress);
-  } catch (error) {
-    console.error("Failed to connect to the browser");
-    process.exit(128 + 9);
-  }
-  try {
-    browser = await playwright.chromium.connectOverCDP(cdpAddress);
-  } catch (e) {
-    console.log(e);
-    throw new Error("failed to connect to the browser");
-  }
-  const context = browser.contexts()[0];
-  return {
-    browser,
-    context
-  };
 }

package/dist/common/settingsSchema.d.ts

@@ -1,10 +1,6 @@
 import * as z from "zod";
 export declare const captchaSolverSettingsSchema: z.ZodDefault<z.ZodObject<{
     enabled: z.ZodDefault<z.ZodBoolean>;
-    workspaceId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    projectId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    baseUrl: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-    token: z.ZodNullable<z.ZodOptional<z.ZodString>>;
     cloudflare: z.ZodOptional<z.ZodObject<{
         enabled: z.ZodBoolean;
     }, "strip", z.ZodTypeAny, {
@@ -93,7 +89,7 @@ export declare const captchaSolverSettingsSchema: z.ZodDefault<z.ZodObject<{
         inputLocators: string[];
         labelLocators: string[];
     }>>;
-    settings: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+    settings: z.ZodDefault<z.ZodObject<{
         autoSolve: z.ZodDefault<z.ZodBoolean>;
         solveDelay: z.ZodDefault<z.ZodNumber>;
         maxRetries: z.ZodDefault<z.ZodNumber>;
@@ -108,7 +104,7 @@ export declare const captchaSolverSettingsSchema: z.ZodDefault<z.ZodObject<{
         solveDelay?: number | undefined;
         maxRetries?: number | undefined;
         timeout?: number | undefined;
-    }>>>;
+    }>>;
 }, "strip", z.ZodTypeAny, {
     enabled: boolean;
     settings: {
@@ -117,10 +113,6 @@ export declare const captchaSolverSettingsSchema: z.ZodDefault<z.ZodObject<{
         maxRetries: number;
         timeout: number;
     };
-    workspaceId?: string | null | undefined;
-    projectId?: string | null | undefined;
-    baseUrl?: string | null | undefined;
-    token?: string | null | undefined;
     cloudflare?: {
         enabled: boolean;
     } | undefined;
@@ -159,10 +151,6 @@ export declare const captchaSolverSettingsSchema: z.ZodDefault<z.ZodObject<{
     } | undefined;
 }, {
     enabled?: boolean | undefined;
-    workspaceId?: string | null | undefined;
-    projectId?: string | null | undefined;
-    baseUrl?: string | null | undefined;
-    token?: string | null | undefined;
     cloudflare?: {
         enabled: boolean;
     } | undefined;
@@ -206,7 +194,12 @@ export declare const captchaSolverSettingsSchema: z.ZodDefault<z.ZodObject<{
         timeout?: number | undefined;
     } | undefined;
 }>>;
-export type CaptchaSolverSettings = z.infer<typeof captchaSolverSettingsSchema>;
+export type CaptchaSolverSettingsWithRunContext = z.infer<typeof captchaSolverSettingsSchema> & {
+    workspaceId: string;
+    projectId: string;
+    baseUrl: string;
+    token?: string;
+};
 export declare const settingsSchema: z.ZodObject<{
     authSessions: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         enabled: z.ZodBoolean;
@@ -217,10 +210,6 @@ export declare const settingsSchema: z.ZodObject<{
     }>>>;
     captchaSolver: z.ZodOptional<z.ZodDefault<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodBoolean>;
-        workspaceId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-        projectId: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-        baseUrl: z.ZodNullable<z.ZodOptional<z.ZodString>>;
-        token: z.ZodNullable<z.ZodOptional<z.ZodString>>;
         cloudflare: z.ZodOptional<z.ZodObject<{
             enabled: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
@@ -309,7 +298,7 @@ export declare const settingsSchema: z.ZodObject<{
             inputLocators: string[];
             labelLocators: string[];
         }>>;
-        settings: z.ZodDefault<z.ZodOptional<z.ZodObject<{
+        settings: z.ZodDefault<z.ZodObject<{
             autoSolve: z.ZodDefault<z.ZodBoolean>;
             solveDelay: z.ZodDefault<z.ZodNumber>;
             maxRetries: z.ZodDefault<z.ZodNumber>;
@@ -324,7 +313,7 @@ export declare const settingsSchema: z.ZodObject<{
             solveDelay?: number | undefined;
             maxRetries?: number | undefined;
             timeout?: number | undefined;
-        }>>>;
+        }>>;
     }, "strip", z.ZodTypeAny, {
         enabled: boolean;
         settings: {
@@ -333,10 +322,6 @@ export declare const settingsSchema: z.ZodObject<{
             maxRetries: number;
             timeout: number;
         };
-        workspaceId?: string | null | undefined;
-        projectId?: string | null | undefined;
-        baseUrl?: string | null | undefined;
-        token?: string | null | undefined;
         cloudflare?: {
             enabled: boolean;
         } | undefined;
@@ -375,10 +360,6 @@ export declare const settingsSchema: z.ZodObject<{
         } | undefined;
     }, {
         enabled?: boolean | undefined;
-        workspaceId?: string | null | undefined;
-        projectId?: string | null | undefined;
-        baseUrl?: string | null | undefined;
-        token?: string | null | undefined;
         cloudflare?: {
             enabled: boolean;
         } | undefined;
@@ -434,10 +415,6 @@ export declare const settingsSchema: z.ZodObject<{
             maxRetries: number;
             timeout: number;
         };
-        workspaceId?: string | null | undefined;
-        projectId?: string | null | undefined;
-        baseUrl?: string | null | undefined;
-        token?: string | null | undefined;
         cloudflare?: {
             enabled: boolean;
         } | undefined;
@@ -481,10 +458,6 @@ export declare const settingsSchema: z.ZodObject<{
     } | undefined;
     captchaSolver?: {
         enabled?: boolean | undefined;
-        workspaceId?: string | null | undefined;
-        projectId?: string | null | undefined;
-        baseUrl?: string | null | undefined;
-        token?: string | null | undefined;
         cloudflare?: {
             enabled: boolean;
         } | undefined;

package/dist/common/settingsSchema.js

@@ -28,10 +28,6 @@ const captchaSolverSolveSettingsSchema = z.object({
 });
 const captchaSolverSettingsSchema = exports.captchaSolverSettingsSchema = z.object({
   enabled: z.boolean().default(false),
-  workspaceId: z.string().optional().nullable(),
-  projectId: z.string().optional().nullable(),
-  baseUrl: z.string().optional().nullable(),
-  token: z.string().optional().nullable(),
   cloudflare: baseCaptchaSchema.optional(),
   googleRecaptchaV2: baseCaptchaSchema.optional(),
   googleRecaptchaV3: baseCaptchaSchema.optional(),
@@ -42,7 +38,7 @@ const captchaSolverSettingsSchema = exports.captchaSolverSettingsSchema = z.obje
   lemin: baseCaptchaSchema.optional(),
   customCaptcha: customCaptchaSchema.optional(),
   text: textCaptchaSchema.optional(),
-  settings: captchaSolverSolveSettingsSchema.optional().default({})
+  settings: captchaSolverSolveSettingsSchema.default(captchaSolverSolveSettingsSchema.parse({}))
 }).default({});
 const authSessionsSchema = z.object({
   enabled: z.boolean()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",