@intuned/runtime-dev 1.3.15-ts-helpers → 1.3.15-ts-helpers-fix1

package/dist/commands/intuned-cli/commands/run_authsession.command.d.ts

@@ -1,16 +1,16 @@
 import { Command } from "commander";
 export declare const baseRunAuthSessionCommandOptionsSchema: import("zod").ZodObject<{
     proxy: import("zod").ZodOptional<import("zod").ZodString>;
-    trace: import("zod").ZodDefault<import("zod").ZodBoolean>;
     timeout: import("zod").ZodEffects<import("zod").ZodEffects<import("zod").ZodDefault<import("zod").ZodString>, import("ms").StringValue, string | undefined>, number, string | undefined>;
+    trace: import("zod").ZodDefault<import("zod").ZodBoolean>;
     headless: import("zod").ZodDefault<import("zod").ZodBoolean>;
     keepBrowserOpen: import("zod").ZodDefault<import("zod").ZodBoolean>;
     cdpUrl: import("zod").ZodOptional<import("zod").ZodString>;
     checkAttempts: import("zod").ZodDefault<import("zod").ZodNumber>;
     createAttempts: import("zod").ZodDefault<import("zod").ZodNumber>;
 }, "strip", import("zod").ZodTypeAny, {
-    trace: boolean;
     timeout: number;
+    trace: boolean;
     headless: boolean;
     keepBrowserOpen: boolean;
     checkAttempts: number;
@@ -19,8 +19,8 @@ export declare const baseRunAuthSessionCommandOptionsSchema: import("zod").ZodOb
     cdpUrl?: string | undefined;
 }, {
     proxy?: string | undefined;
-    trace?: boolean | undefined;
     timeout?: string | undefined;
+    trace?: boolean | undefined;
     headless?: boolean | undefined;
     keepBrowserOpen?: boolean | undefined;
     cdpUrl?: string | undefined;

package/dist/commands/intuned-cli/commands/types.d.ts

@@ -17,8 +17,8 @@ export declare const baseCommandOptionsSchema: z.ZodObject<{
     keepBrowserOpen: z.ZodDefault<z.ZodBoolean>;
     cdpUrl: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
-    trace: boolean;
     timeout: number;
+    trace: boolean;
     headless: boolean;
     keepBrowserOpen: boolean;
     proxy?: string | undefined;

package/dist/common/extension/extensionsHelpers.d.ts

@@ -1,8 +1,11 @@
 import * as playwright from "playwright";
-import { CaptchaSolverSettingsWithRunContext } from "../settingsSchema";
+import { CaptchaSolverSettings, CaptchaSolverSettingsWithRunContext } from "../settingsSchema";
+export declare function resolveCaptchaSolverSettings(input?: unknown): Promise<CaptchaSolverSettings>;
+export declare function isIntunedExtensionLoaded(): boolean;
 export declare function buildExtensionsList(): string[];
 export declare function getIntunedExtensionPath(): string;
-export declare function isIntunedExtensionEnabled(): boolean;
+export declare function isIntunedExtensionEnabled(): Promise<boolean>;
 export declare function getIntunedExtensionWorker(context: playwright.BrowserContext): Promise<playwright.Worker | null>;
-export declare function getIntunedExtensionSettings(): Promise<CaptchaSolverSettingsWithRunContext>;
+export declare function getIntunedExtensionSettings(captchaSolverSettings: CaptchaSolverSettings): Promise<CaptchaSolverSettingsWithRunContext>;
+export declare function getIntunedCaptchaSolverSettings(): Promise<CaptchaSolverSettings>;
 export declare function setupIntunedExtension(): Promise<void>;

package/dist/common/extension/extensionsHelpers.js

@@ -4,10 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildExtensionsList = buildExtensionsList;
+exports.getIntunedCaptchaSolverSettings = getIntunedCaptchaSolverSettings;
 exports.getIntunedExtensionPath = getIntunedExtensionPath;
 exports.getIntunedExtensionSettings = getIntunedExtensionSettings;
 exports.getIntunedExtensionWorker = getIntunedExtensionWorker;
 exports.isIntunedExtensionEnabled = isIntunedExtensionEnabled;
+exports.isIntunedExtensionLoaded = isIntunedExtensionLoaded;
+exports.resolveCaptchaSolverSettings = resolveCaptchaSolverSettings;
 exports.setupIntunedExtension = setupIntunedExtension;
 var _settings = require("../../commands/common/utils/settings");
 var _settingsSchema = require("../settingsSchema");
@@ -21,6 +24,20 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const INTUNED_WORKER = "intunedWorker.js";
 const INTUNED_EXTENSION_SETTINGS_FILE_NAME = "intunedSettings.json";
 const INTUNED_CAPTCHA_EXTENSION_PORT_ENV_VAR = "INTUNED_CAPTCHA_EXTENSION_PORT";
+let captchaSolverSettings = null;
+async function getIntunedCaptchaExtensionPort() {
+  if (process.env.INTUNED_CAPTCHA_EXTENSION_PORT) {
+    return parseInt(process.env.INTUNED_CAPTCHA_EXTENSION_PORT, 10);
+  }
+  return await (0, _portfinder.getPort)({});
+}
+async function resolveCaptchaSolverSettings(input) {
+  const parsed = _settingsSchema.captchaSolverSettingsSchema.parse(input || {});
+  if (!parsed.port) {
+    parsed.port = await getIntunedCaptchaExtensionPort();
+  }
+  return parsed;
+}
 function getIntunedCaptchaExtensionPortFromEnv() {
   const raw = process.env[INTUNED_CAPTCHA_EXTENSION_PORT_ENV_VAR];
   if (!raw) return null;
@@ -30,9 +47,12 @@ function getIntunedCaptchaExtensionPortFromEnv() {
   }
   return parsed;
 }
+function isIntunedExtensionLoaded() {
+  return !!getIntunedExtensionPath();
+}
 function buildExtensionsList() {
   const extensionsList = [];
-  if (isIntunedExtensionEnabled()) {
+  if (isIntunedExtensionLoaded()) {
     const intunedExtensionPath = getIntunedExtensionPath();
     extensionsList.push(intunedExtensionPath);
   }
@@ -41,11 +61,16 @@ function buildExtensionsList() {
 function getIntunedExtensionPath() {
   return process.env.INTUNED_EXTENSION_PATH;
 }
-function isIntunedExtensionEnabled() {
-  return !!getIntunedExtensionPath();
+async function isIntunedExtensionEnabled() {
+  const path = getIntunedExtensionPath();
+  if (!path) {
+    return false;
+  }
+  const captchaSolverSettings = await getIntunedCaptchaSolverSettings();
+  return captchaSolverSettings.enabled;
 }
 async function getIntunedExtensionWorker(context) {
-  if (!isIntunedExtensionEnabled()) {
+  if (!(await isIntunedExtensionEnabled())) {
     return null;
   }
   let attemptCount = 0;
@@ -66,8 +91,7 @@ async function getIntunedExtensionWorker(context) {
   console.error("Failed to get intuned worker after 5 attmepts");
   return null;
 }
-async function getIntunedExtensionSettings() {
-  const settings = await (0, _settings.getSettings)();
+async function getIntunedExtensionSettings(captchaSolverSettings) {
   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}`];
@@ -94,28 +118,30 @@ async function getIntunedExtensionSettings() {
     };
   })();
   const baseUrl = process.env.INTUNED_API_BASE_URL ?? domain;
-  const port = getIntunedCaptchaExtensionPortFromEnv() ?? (await (0, _portfinder.getPort)({}));
   return {
-    ...(settings.captchaSolver ?? _settingsSchema.captchaSolverSettingsSchema.parse({})),
+    ...captchaSolverSettings,
     workspaceId,
     projectId,
     baseUrl,
-    authentication,
-    port
+    authentication
   };
 }
+async function getIntunedCaptchaSolverSettings() {
+  if (captchaSolverSettings) {
+    return captchaSolverSettings;
+  }
+  const settings = await (0, _settings.getSettings)();
+  captchaSolverSettings = await resolveCaptchaSolverSettings(settings.captchaSolver);
+  return captchaSolverSettings;
+}
 async function setupIntunedExtension() {
-  if (!isIntunedExtensionEnabled()) {
+  if (!(await isIntunedExtensionEnabled())) {
     return;
   }
   const intunedExtensionPath = getIntunedExtensionPath();
   const intunedExtensionSettingsPath = _path.default.join(intunedExtensionPath, INTUNED_EXTENSION_SETTINGS_FILE_NAME);
-  const settings = await getIntunedExtensionSettings();
-  if (!settings.enabled) {
-    return;
-  }
-  await (0, _intunedExtensionServer.setupIntunedExtensionServer)({
-    port: settings.port ?? 9000
-  });
-  await (0, _promises.writeFile)(intunedExtensionSettingsPath, JSON.stringify(settings));
+  const captchaSolverSettings = await getIntunedCaptchaSolverSettings();
+  await (0, _intunedExtensionServer.setupIntunedExtensionServer)(captchaSolverSettings);
+  const captchaSolverSettingsWithRunContext = await getIntunedExtensionSettings(captchaSolverSettings);
+  await (0, _promises.writeFile)(intunedExtensionSettingsPath, JSON.stringify(captchaSolverSettingsWithRunContext));
 }

package/dist/common/extension/intunedExtensionServer.d.ts

@@ -1,9 +1,9 @@
 import type * as playwright from "playwright";
 import { Captcha, CaptchaCallback, CaptchaStatus } from "./types";
+import { CaptchaSolverSettings } from "../settingsSchema";
 export declare class ExtensionServer {
     private tabs;
     private app;
-    isHealthy: boolean;
     constructor();
     private getOrCreateTab;
     handleUpsertCaptcha(captcha: Captcha): Promise<void>;
@@ -19,9 +19,6 @@ export declare class ExtensionServer {
     getTabId(page: playwright.Page): Promise<number>;
 }
 export declare function getIntunedExtensionServer(): ExtensionServer;
-export declare function setupIntunedExtensionServer({ port, host, }: {
-    port: number;
-    host?: string;
-}): Promise<void>;
+export declare function setupIntunedExtensionServer(captchaSolverSettings?: CaptchaSolverSettings): Promise<void>;
 export declare function cleanIntunedExtensionServer(): Promise<void>;
 export declare function getTabId(page: playwright.Page): Promise<number>;

package/dist/common/extension/intunedExtensionServer.js

@@ -10,6 +10,7 @@ exports.getTabId = getTabId;
 exports.setupIntunedExtensionServer = setupIntunedExtensionServer;
 var _fastify = _interopRequireDefault(require("fastify"));
 var _types = require("./types");
+var _extensionsHelpers = require("./extensionsHelpers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class TabCaptchaState {
   constructor(tabId) {
@@ -40,7 +41,6 @@ class TabCaptchaState {
 }
 class ExtensionServer {
   app = null;
-  isHealthy = false;
   constructor() {
     this.tabs = new Map();
   }
@@ -62,6 +62,7 @@ class ExtensionServer {
     if (this.app) {
       return;
     }
+    console.error(`Starting on port ${port}`);
     this.app = (0, _fastify.default)({
       logger: false,
       bodyLimit: 1_000_000
@@ -69,6 +70,7 @@ class ExtensionServer {
     this.app.post("/state", async (request, reply) => {
       try {
         const result = _types.captchaSchema.safeParse(request.body);
+        console.error(`Recieved call at /state`);
         if (!result.success) {
           return reply.code(400).send({
             error: "Invalid captcha payload",
@@ -94,13 +96,11 @@ class ExtensionServer {
       port,
       host
     });
-    this.isHealthy = true;
   }
   async stop() {
     if (!this.app) return;
     const toClose = this.app;
     this.app = null;
-    this.isHealthy = false;
     await toClose.close();
   }
   async getCaptchas(page, status) {
@@ -140,16 +140,15 @@ function getIntunedExtensionServer() {
   }
   return extensionServerSingleton;
 }
-async function setupIntunedExtensionServer({
-  port,
-  host
-}) {
+async function setupIntunedExtensionServer(captchaSolverSettings) {
+  if (!captchaSolverSettings) {
+    captchaSolverSettings = await (0, _extensionsHelpers.resolveCaptchaSolverSettings)();
+  }
   if (!extensionServerSingleton) {
     extensionServerSingleton = new ExtensionServer();
   }
   await extensionServerSingleton.start({
-    port,
-    host
+    port: captchaSolverSettings.port ?? 9000
   });
 }
 async function cleanIntunedExtensionServer() {

package/dist/common/launchBrowser.js

@@ -38,6 +38,9 @@ async function createUserDirWithPreferences() {
 }
 async function launchChromium(options) {
   if ("cdpAddress" in options) {
+    if (await (0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
+      await (0, _intunedExtensionServer.setupIntunedExtensionServer)();
+    }
     const browser = await playwright.chromium.connectOverCDP(options.cdpAddress);
     if (browser.contexts().length === 0) {
       throw new Error("No browser contexts found in the connected browser");
@@ -65,12 +68,17 @@ async function launchChromium(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)()) {
+  if ((0, _extensionsHelpers.isIntunedExtensionLoaded)()) {
     const extensionsList = (0, _extensionsHelpers.buildExtensionsList)();
     const extensions = extensionsList.join(",");
     extraArgs.push(`--disable-extensions-except=${extensions}`);
     extraArgs.push(`--load-extension=${extensions}`);
+  }
+  if (await (0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
     await (0, _extensionsHelpers.setupIntunedExtension)();
+    if (proxy) {
+      extraArgs.push('--proxy-bypass-list="<-loopback>"');
+    }
   }
   if (cdpPort) {
     extraArgs.push(`--remote-debugging-port=${cdpPort}`);
@@ -105,13 +113,15 @@ async function launchChromium(options) {
   });
   context.once("close", async () => {
     try {
-      await (0, _intunedExtensionServer.cleanIntunedExtensionServer)();
       await (0, _fsExtra.rm)(userDataDir, {
         recursive: true,
         force: true,
         retryDelay: 1000,
         maxRetries: 5
       });
+      if (await (0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
+        await (0, _intunedExtensionServer.cleanIntunedExtensionServer)();
+      }
     } catch (error) {
       console.error("Failed to remove user data dir", error);
     }
@@ -121,7 +131,7 @@ async function launchChromium(options) {
     await waitOnCdpAddress(createdCdpAddress);
   }
   const page = context.pages().at(0) ?? (await context.newPage());
-  if ((0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
+  if (await (0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
     await (0, _extensionsHelpers.getIntunedExtensionWorker)(context);
   }
   return {

package/dist/common/settingsSchema.d.ts

@@ -197,7 +197,8 @@ export declare const captchaSolverSettingsSchema: z.ZodDefault<z.ZodObject<{
         timeout?: number | undefined;
     } | undefined;
 }>>;
-export type CaptchaSolverSettingsWithRunContext = z.infer<typeof captchaSolverSettingsSchema> & {
+export type CaptchaSolverSettings = z.infer<typeof captchaSolverSettingsSchema>;
+export type CaptchaSolverSettingsWithRunContext = CaptchaSolverSettings & {
     workspaceId: string;
     projectId: string;
     baseUrl: string;

package/dist/runtime/captcha.js

@@ -20,6 +20,7 @@ async function withWaitForCaptchaSolve(callback, options) {
     settleDurationMs = 5_000,
     waitForNetworkSettled = true
   } = options;
+  console.error(`Starting captcha solve wait (timeout=${timeoutInMs}ms, settleDuration=${settleDurationMs}ms, waitForNetworkSettled=${waitForNetworkSettled})`);
   const extensionServer = (0, _intunedExtensionServer.getIntunedExtensionServer)();
   let settledResolve = null;
   let settledPromise = new Promise(resolve => {
@@ -39,21 +40,35 @@ async function withWaitForCaptchaSolve(callback, options) {
   const onCaptchaUpdate = async _captcha => {
     const solvingCaptchas = await extensionServer.getCaptchas(page, "solving");
     const errorCaptchas = await extensionServer.getCaptchas(page, "error");
+    console.error(`Captcha update received: solving=${solvingCaptchas.length}, errors=${errorCaptchas.length}`);
     if (solvingCaptchas.length > 0) {
       captchasAppeared = true;
+      console.error(`Captchas detected: ${solvingCaptchas.map(c => c.id).join(", ")}`);
     }
     if (errorCaptchas.length > 0) {
       error = errorCaptchas[0].error;
+      console.error(`Captcha error detected: ${error?.code}`);
       await maybeSettle();
       return;
     }
     if (solvingCaptchas.length === 0) {
+      console.error("No pending captchas, settling");
       await maybeSettle();
     }
   };
+  const result = await callback(page);
+  actionDone = true;
+  if (waitForNetworkSettled) {
+    try {
+      await page.waitForLoadState("networkidle");
+    } catch (err) {
+      console.error(`Failed to wait for networkidle. Error: ${err}`);
+    }
+  }
   const timeoutPromise = new Promise(resolve => {
     setTimeout(() => {
       isTimeout = true;
+      console.error("Captcha solve timeout reached");
       settledResolve?.();
       resolve();
     }, timeoutInMs);
@@ -61,33 +76,32 @@ async function withWaitForCaptchaSolve(callback, options) {
   await extensionServer.subscribe(page, onCaptchaUpdate);
   try {
     const initialPending = await getPendingCaptchas();
+    console.error(`Found ${initialPending.length} ongoing captchas`);
     if (initialPending.length > 0) {
       captchasAppeared = true;
     }
-    const result = await callback(page);
-    actionDone = true;
-    if (waitForNetworkSettled) {
-      try {
-        await page.waitForLoadState("networkidle");
-      } catch (err) {
-        console.error(`Failed to wait for networkidle. Error: ${err}`);
-      }
-    }
     await maybeSettle();
     let shouldContinue = true;
     while (shouldContinue) {
       await Promise.race([settledPromise, timeoutPromise]);
+      console.error(`Settled event received, waiting ${settleDurationMs}ms before checking`);
       await new Promise(r => setTimeout(r, settleDurationMs));
       if (error) {
+        console.error(`Raising captcha error: ${error.code}`);
         throw new _types.CaptchaSolveError(`CAPTCHA Solve Error: ${error.code}`, error);
       }
       const noPendingCaptchas = await hasNoPendingCaptchas();
+      const pending = await getPendingCaptchas();
+      console.error(`Check point: actionDone=${actionDone}, noPendingCaptchas=${noPendingCaptchas}, isTimeout=${isTimeout}, pendingCount=${pending.length}`);
       if (actionDone && noPendingCaptchas || isTimeout) {
         if (isTimeout && !noPendingCaptchas) {
+          console.error(`Timeout with ${pending.length} pending captchas`);
           throw new _types.TimeoutError("CAPTCHA Solve timed out with pending captchas.");
         }
+        console.error("Captcha solve completed successfully");
         shouldContinue = false;
       } else {
+        console.error(`Still have ${pending.length} pending captchas, waiting for more updates`);
         settledPromise = new Promise(resolve => {
           settledResolve = resolve;
         });
@@ -102,12 +116,14 @@ async function waitForCaptchaSolve(page, {
   timeoutInMs = 10_000,
   settleDurationMs = 5_000
 } = {}) {
+  console.error(`waitForCaptchaSolve called with timeout=${timeoutInMs}ms, settleDuration=${settleDurationMs}ms`);
   await withWaitForCaptchaSolve(async () => undefined, {
     page,
     timeoutInMs,
     settleDurationMs,
     waitForNetworkSettled: false
   });
+  console.error("waitForCaptchaSolve completed");
 }
 async function removeCaptchaEventListener(page, status, f) {
   const extensionServer = (0, _intunedExtensionServer.getIntunedExtensionServer)();
@@ -164,13 +180,13 @@ async function setAutoSolve(context, enabled) {
   `, enabled);
 }
 async function pauseCaptchaSolver(context) {
-  if (!(0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
+  if (!(await (0, _extensionsHelpers.isIntunedExtensionEnabled)())) {
     throw new Error("Intuned extension is not enabled. Cannot pause captcha solver.");
   }
   await setAutoSolve(context, false);
 }
 async function resumeCaptchaSolver(context) {
-  if (!(0, _extensionsHelpers.isIntunedExtensionEnabled)()) {
+  if (!(await (0, _extensionsHelpers.isIntunedExtensionEnabled)())) {
     throw new Error("Intuned extension is not enabled. Cannot resume captcha solver.");
   }
   await setAutoSolve(context, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.3.15-ts-helpers",
+  "version": "1.3.15-ts-helpers-fix1",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
@@ -70,7 +70,7 @@
     "commander": "14.0.0",
     "cross-fetch": "^4.0.0",
     "dotenv": "^16.3.1",
-    "fastify": "4.29.0",
+    "fastify": "4.29.1",
     "fs-extra": "^11.3.0",
     "image-size": "^1.1.1",
     "jsonc-parser": "^3.3.1",