@intuned/runtime 1.3.15 → 1.3.17

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;
         });
@@ -164,13 +178,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,7 +1,8 @@
 {
   "name": "@intuned/runtime",
-  "version": "1.3.15",
+  "version": "1.3.17",
   "description": "Intuned runtime",
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "exports": {
     ".": "./dist/index.js",
     "./dist/runtime": "./dist/runtime/index.js",
@@ -70,18 +71,19 @@
     "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",
+    "ignore": "^7.0.5",
     "image-size": "^1.1.1",
     "jsonc-parser": "^3.3.1",
     "jsonwebtoken": "9.0.2",
     "lodash": "4.17.21",
     "milliparsec": "2.3.0",
-    "minimatch": "10.0.1",
     "nanoid": "3",
     "neverthrow": "6.1.0",
     "playwright-extra": "4.3.6",
     "portfinder": "^1.0.37",
+    "press-any-key": "^1.1.0",
     "prettier": "2.8.0",
     "promptly": "3.2.0",
     "prompts": "^2.4.2",

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

@@ -1 +0,0 @@
-export declare const initCommand: import("commander").Command;

package/dist/commands/intuned-cli/commands/init.command.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.initCommand = void 0;
-var _command = require("./command");
-var _helpers = require("../helpers");
-const initCommand = exports.initCommand = _command.program.command("init").description("Deprecated: Initialize a new Intuned project").allowExcessArguments(true).allowUnknownOption(true).action((0, _helpers.cliCommandWrapper)(undefined, undefined, async () => {
-  throw new _helpers.CLIError("^r^+The init command has been deprecated. Please use^ ^c^/npx create-intuned-project^ ^r^+instead.^:", {
-    autoColor: false
-  });
-}));

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

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.saveOrDeployOptionsSchema = exports.saveOrDeployArgsSchema = exports.saveCommand = void 0;
-var _command = require("./command");
-var _dotenv = _interopRequireDefault(require("dotenv"));
-var _save = require("../controller/save");
-var _helpers = require("../helpers");
-var _zod = require("zod");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-_dotenv.default.config({
-  path: `.env`
-});
-const saveOrDeployArgsSchema = exports.saveOrDeployArgsSchema = _zod.z.tuple([_zod.z.union([_zod.z.string(), _zod.z.undefined()])]);
-const saveOrDeployOptionsSchema = exports.saveOrDeployOptionsSchema = _zod.z.object({
-  workspaceId: _zod.z.string().optional(),
-  apiKey: _zod.z.string().optional()
-});
-const saveCommand = exports.saveCommand = _command.program.command("save").description("Save an Intuned project to the platform without deploying it").argument("[project-name]", "Name of the project to save").option("-w, --workspace-id <id>", "Your Intuned workspace ID").option("-k, --api-key <key>", "Your Intuned API key").action((0, _helpers.cliCommandWrapper)(saveOrDeployArgsSchema, saveOrDeployOptionsSchema, async ([projectName], options) => {
-  const {
-    isValid,
-    errorMessage
-  } = await (0, _save.validateIntunedProject)();
-  if (!isValid) {
-    const message = `^r^+Project to be saved is not a valid Intuned project:^:^R ${errorMessage}:\n`;
-    throw new _helpers.CLIError(message, {
-      autoColor: false
-    });
-  }
-  const _projectName = projectName || (await (0, _helpers.loadIntunedJson)()).projectName;
-  if (!_projectName) {
-    throw new _helpers.CLIError("Project name is required");
-  }
-  const projectNameValidation = (0, _save.validateProjectName)(_projectName);
-  if (!projectNameValidation.isValid) {
-    throw new _helpers.CLIError(projectNameValidation.errorMessage);
-  }
-  const auth = await (0, _helpers.getAuthCredentials)(options);
-  await (0, _save.runSaveProject)(_projectName, auth);
-}));

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

@@ -1,351 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.projectNameSchema = void 0;
-exports.runSaveProject = runSaveProject;
-exports.validateProjectName = exports.validateIntunedProject = void 0;
-var fs = _interopRequireWildcard(require("fs-extra"));
-var path = _interopRequireWildcard(require("path"));
-var _minimatch = require("minimatch");
-var _zod = require("zod");
-var _projectExclusions = _interopRequireDefault(require("../../common/projectExclusions"));
-var _constants = require("../constants");
-var _helpers = require("../helpers");
-var _lodash = require("lodash");
-var _uuid = require("uuid");
-var _terminal = require("../helpers/terminal");
-var _build = require("./build");
-var dotenv = _interopRequireWildcard(require("dotenv"));
-var _constants2 = require("../../../common/constants");
-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 saveProjectApiResponseSchema = _zod.z.string().transform((val, ctx) => {
-  try {
-    return JSON.parse(val);
-  } catch (e) {
-    ctx.addIssue({
-      code: _zod.z.ZodIssueCode.custom,
-      message: "Response is not valid JSON"
-    });
-    return _zod.z.NEVER;
-  }
-}).pipe(_zod.z.object({
-  id: _zod.z.string().uuid(),
-  enableFirstRunExperience: _zod.z.boolean().optional()
-}));
-async function runSaveProject(projectName, auth) {
-  const {
-    workspaceId,
-    apiKey
-  } = auth;
-  const baseUrl = (0, _helpers.getBaseUrl)();
-  const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/${projectName}`;
-  const headers = {
-    [_constants2.API_KEY_HEADER_NAME]: apiKey,
-    "Content-Type": "application/json"
-  };
-  const projectPath = process.cwd();
-  const codeTree = await convertProjectToCodeTree(projectPath);
-  const intunedSettingsFile = await (0, _helpers.getIntunedSettingsFile)();
-  codeTree["Intuned.json"] = {
-    file: {
-      contents: JSON.stringify(intunedSettingsFile.parse(await fs.readFile(intunedSettingsFile.path, "utf-8")))
-    }
-  };
-  codeTree["tsconfig.json"] = {
-    file: {
-      contents: JSON.stringify(_constants.tsConfigCli, null, 2)
-    }
-  };
-  const saveProjectPayload = {
-    codeTree,
-    platformType: "CLI",
-    language: "typescript"
-  };
-  const response = await fetch(url, {
-    headers,
-    method: "PUT",
-    body: JSON.stringify(saveProjectPayload)
-  });
-  if (!response.ok) {
-    if (response.status === 401) {
-      throw new _helpers.CLIError(`Invalid API key. Please check your API key and try again.`);
-    }
-    throw new _helpers.CLIError(`^r^+Invalid response from server\n^:^R${response.status} ${await response.text()}^:\n^r^+Project save failed^:\n`, {
-      autoColor: false
-    });
-  }
-  (0, _terminal.terminal)("^g^+Project saved successfully!^:\n");
-  const body = await response.text();
-  const parseResult = saveProjectApiResponseSchema.safeParse(body);
-  if (!parseResult.success) {
-    (0, _terminal.terminal)(`^yWarning: Could not parse save project response:^:\n`);
-    (0, _terminal.terminal)(body + "\n");
-    return;
-  }
-  const {
-    id: projectId,
-    enableFirstRunExperience
-  } = parseResult.data;
-  const dotEnvPath = path.join(projectPath, ".env");
-  if (!(await fs.exists(dotEnvPath))) {
-    await fs.writeFile(dotEnvPath, `${_constants2.PROJECT_ID_ENV_VAR_KEY}=${projectId}
-${_constants2.WORKSPACE_ID_ENV_VAR_KEY}=${workspaceId}
-${_constants2.API_KEY_ENV_VAR_KEY}=${apiKey}`);
-    (0, _terminal.terminal)(`^g^+Created .env file with project credentials.^:\n`);
-  }
-  const envContent = await fs.readFile(dotEnvPath, "utf-8");
-  const dotenvContent = dotenv.parse(envContent);
-  let contentToAppend = "";
-  if (!dotenvContent[_constants2.PROJECT_ID_ENV_VAR_KEY] || dotenvContent[_constants2.PROJECT_ID_ENV_VAR_KEY] !== projectId) {
-    contentToAppend += `\n${_constants2.PROJECT_ID_ENV_VAR_KEY}=${projectId}`;
-  }
-  if (!dotenvContent[_constants2.WORKSPACE_ID_ENV_VAR_KEY]) {
-    contentToAppend += `\n${_constants2.WORKSPACE_ID_ENV_VAR_KEY}=${workspaceId}`;
-  }
-  if (!dotenvContent[_constants2.API_KEY_ENV_VAR_KEY]) {
-    contentToAppend += `\n${_constants2.API_KEY_ENV_VAR_KEY}=${apiKey}`;
-  }
-  if (contentToAppend) {
-    await fs.appendFile(dotEnvPath, contentToAppend + "\n");
-    (0, _terminal.terminal)(`^g^+Updated .env file with project credentials.^:\n`);
-  }
-  return {
-    projectId,
-    enableFirstRunExperience
-  };
-}
-const projectNameSchema = exports.projectNameSchema = _zod.z.string().min(1, "Project Name is required").max(200, "Name must be 200 characters or less").regex(/^[a-z0-9]+(?:[-_][a-z0-9]+)*$/, "Name can only contain lowercase letters, numbers, hyphens, and underscores in between").refine(value => !_zod.z.string().uuid().safeParse(value).success, {
-  message: "Name cannot be a UUID"
-});
-const validateProjectName = projectName => {
-  const validation = projectNameSchema.safeParse(projectName);
-  if (!validation.success) {
-    return {
-      isValid: false,
-      errorMessage: validation.error.errors[0].message
-    };
-  }
-  return {
-    isValid: true
-  };
-};
-exports.validateProjectName = validateProjectName;
-const validateIntunedProject = async () => {
-  const currentDirectoryToSave = process.cwd();
-  const intunedSettingsFile = await (0, _helpers.getIntunedSettingsFile)();
-  const validationSteps = [{
-    name: "build",
-    check: async () => {
-      try {
-        const buildResult = await (0, _build.runBuild)();
-        if (!buildResult) {
-          return {
-            isValid: false,
-            errorMessage: "Build failed"
-          };
-        }
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: "Build failed"
-        };
-      }
-    }
-  }, {
-    name: intunedSettingsFile.name,
-    check: async () => {
-      try {
-        const intunedJsonPath = path.join(currentDirectoryToSave, intunedSettingsFile.name);
-        await fs.exists(intunedJsonPath);
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: `${intunedSettingsFile.name} file not found`
-        };
-      }
-    }
-  }, {
-    name: "api folder",
-    check: async () => {
-      try {
-        const apiFolderPath = path.join(currentDirectoryToSave, "api");
-        await fs.access(apiFolderPath);
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: "API folder not found"
-        };
-      }
-    }
-  }];
-  for (const step of validationSteps) {
-    const result = await step.check();
-    if (!result.isValid) {
-      return result;
-    }
-  }
-  return {
-    isValid: true
-  };
-};
-exports.validateIntunedProject = validateIntunedProject;
-function ignoreFilesByPattern(filePath, patterns, projectPath) {
-  const relativePath = path.relative(projectPath, filePath);
-  if (relativePath.startsWith("node_modules")) {
-    return true;
-  }
-  for (const pattern of patterns) {
-    if (!pattern || pattern.startsWith("#")) continue;
-    if (pattern.startsWith("!")) {
-      if ((0, _minimatch.minimatch)(relativePath, pattern.substring(1))) {
-        return false;
-      }
-    } else if ((0, _minimatch.minimatch)(relativePath, pattern)) {
-      return true;
-    }
-  }
-  return false;
-}
-function listFilesNotIgnored(projectPath, ignorePatterns) {
-  const results = [];
-  function traverseDirectory(dirPath) {
-    try {
-      const entries = fs.readdirSync(dirPath);
-      for (const entry of entries) {
-        const fullPath = path.join(dirPath, entry);
-        if (ignoreFilesByPattern(fullPath, ignorePatterns, projectPath)) {
-          continue;
-        }
-        try {
-          const stats = fs.statSync(fullPath);
-          if (stats.isDirectory()) {
-            traverseDirectory(fullPath);
-          } else if (stats.isFile()) {
-            results.push(path.relative(projectPath, fullPath));
-          }
-        } catch (error) {
-          (0, _terminal.terminal)(`^yWarning: Could not access ${fullPath}^:\n`);
-        }
-      }
-    } catch (error) {
-      (0, _terminal.terminal)(`^YWarning: Could not read directory ${dirPath}^:\n`);
-    }
-  }
-  traverseDirectory(projectPath);
-  return results;
-}
-async function convertProjectToCodeTree(projectPath) {
-  const filesToSave = listFilesNotIgnored(projectPath, _projectExclusions.default);
-  const filesToSaveText = "  " + filesToSave.join("\n  ");
-  (0, _terminal.terminal)("^CFiles to be saved:^:\n");
-  (0, _terminal.terminal)(filesToSaveText + "\n");
-  function readDirectory(dirPath) {
-    const tree = {};
-    try {
-      const entries = fs.readdirSync(dirPath);
-      for (const entry of entries) {
-        const entryPath = path.join(dirPath, entry);
-        if (ignoreFilesByPattern(entryPath, _projectExclusions.default, projectPath)) {
-          continue;
-        }
-        try {
-          const stats = fs.statSync(entryPath);
-          if (stats.isFile()) {
-            try {
-              const content = fs.readFileSync(entryPath, "utf-8");
-              tree[entry] = {
-                file: {
-                  contents: content
-                }
-              };
-            } catch (error) {
-              (0, _terminal.terminal)(`^yWarning: Could not read file ${entryPath}^:\n`);
-            }
-          } else if (stats.isDirectory()) {
-            const subTree = readDirectory(entryPath);
-            if (Object.keys(subTree).length > 0) {
-              tree[entry] = {
-                directory: subTree
-              };
-            }
-          }
-        } catch (error) {
-          (0, _terminal.terminal)(`^yWarning: Could not access ${entryPath}^:\n`);
-        }
-      }
-    } catch (error) {
-      (0, _terminal.terminal)(`^YWarning: Could not read directory ${dirPath}^:\n`);
-    }
-    return tree;
-  }
-  const tree = readDirectory(projectPath);
-  mapToIDEParams(tree);
-  return tree;
-}
-function mapToIDEParams(tree) {
-  if (!tree) {
-    return;
-  }
-  if (!tree["parameters"] || "file" in tree["parameters"]) {
-    return;
-  }
-  const apiParametersMap = {};
-  const cliParameters = Object.keys(tree["parameters"].directory);
-  const ____testParameters = {
-    directory: {}
-  };
-  for (const parameterKey of cliParameters) {
-    const parameter = tree["parameters"].directory[parameterKey];
-    if ("directory" in parameter) {
-      continue;
-    }
-    if ((0, _lodash.isEmpty)(parameter.file.contents)) {
-      continue;
-    }
-    const parameterPayload = JSON.parse(parameter.file.contents);
-    if (!parameterPayload["__api-name"]) {
-      continue;
-    }
-    const api = parameterPayload["__api-name"];
-    const {
-      "__api-name": _,
-      ...parameterValue
-    } = parameterPayload;
-    const testParameter = {
-      name: parameterKey.replace(".json", ""),
-      lastUsed: false,
-      id: (0, _uuid.v4)(),
-      value: JSON.stringify(parameterValue)
-    };
-    if (!apiParametersMap[api]) {
-      apiParametersMap[api] = [];
-    }
-    apiParametersMap[api].push(testParameter);
-  }
-  for (const api in apiParametersMap) {
-    if (apiParametersMap[api].length > 0) {
-      apiParametersMap[api][apiParametersMap[api].length - 1].lastUsed = true;
-    }
-    ____testParameters.directory[`${api}.json`] = {
-      file: {
-        contents: JSON.stringify(apiParametersMap[api], null, 2)
-      }
-    };
-  }
-  delete tree["parameters"];
-  tree["____testParameters"] = ____testParameters;
-  return;
-}