@intuned/runtime 1.3.16 → 1.3.17

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

@@ -10,6 +10,8 @@ var _browser = require("./browser");
 var _errors = require("./errors");
 var _zod = require("zod");
 var _validation = require("./validation");
+var _pressAnyKey = _interopRequireDefault(require("press-any-key"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function cliCommandWrapper(argsSchema, optionsSchema, fn) {
   return async (...input) => {
     let keepBrowserOpen = false;
@@ -61,6 +63,14 @@ function cliCommandWrapper(argsSchema, optionsSchema, fn) {
 async function waitForUserInput() {
   if (!(0, _browser.isCliBrowserLaunched)()) return;
   if (!_terminal.terminalStdout.isTTY) return;
-  (0, _terminal.terminal)("Press Enter to continue...");
-  await _terminal.terminal.inputField().promise;
+  (0, _terminal.terminal)("Press any key to continue...");
+  try {
+    await (0, _pressAnyKey.default)("", {
+      ctrlC: "reject",
+      hideMessage: true
+    });
+  } catch {
+    throw new _errors.AbortedCLIError();
+  }
+  (0, _terminal.terminal)("\n");
 }

package/dist/commands/intuned-cli/main.js

@@ -3,9 +3,10 @@
 var _dotenv = _interopRequireDefault(require("dotenv"));
 var _constants = require("../../common/constants");
 var _backend = require("./helpers/backend");
-var _commands = require("./commands");
-var _helpers = require("./helpers");
+var _intunedJson = require("../../common/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; }
 require("../../common/binStartupScript");
 _dotenv.default.config({
   path: `.env`
@@ -15,9 +16,21 @@ process.env.RUN_ENVIRONMENT = "AUTHORING";
 if (!process.env.FUNCTIONS_DOMAIN) {
   process.env.FUNCTIONS_DOMAIN = (0, _backend.getBaseUrl)().replace(/\/$/, "");
 }
-_commands.program.configureHelp({
-  sortSubcommands: true
-});
-void (0, _helpers.withCLIContext)(async () => {
-  _commands.program.parse(process.argv);
-});
+void (async () => {
+  const intunedJson = await (0, _intunedJson.loadIntunedJson)();
+  if (intunedJson.isOk() && intunedJson.value.workspaceId) {
+    process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY] = intunedJson.value.workspaceId;
+  }
+  const {
+    program
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands")));
+  const {
+    withCLIContext
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require("./helpers/context")));
+  await withCLIContext(async () => {
+    program.configureHelp({
+      sortSubcommands: true
+    });
+    program.parse(process.argv);
+  });
+})();

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

@@ -1,17 +1,45 @@
-export interface FileSystemTree {
-    [name: string]: DirectoryNode | FileNode;
-}
-export interface DirectoryNode {
-    directory: FileSystemTree;
-}
-export interface FileNode {
+import { z } from "zod";
+declare const fileNodeSchema: z.ZodObject<{
+    file: z.ZodObject<{
+        contents: z.ZodUnion<[z.ZodString, z.ZodType<Uint8Array, z.ZodTypeDef, Uint8Array>]>;
+    }, "strip", z.ZodTypeAny, {
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
+    }, {
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
+    }>;
+}, "strip", z.ZodTypeAny, {
     file: {
-        /**
-         * The contents of the file, either as a UTF-8 string or as raw binary.
-         */
-        contents: string | Uint8Array;
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
     };
-}
+}, {
+    file: {
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
+    };
+}>;
+export type FileNode = z.infer<typeof fileNodeSchema>;
+export type DirectoryNode = {
+    directory: {
+        [key: string]: FileNode | DirectoryNode;
+    };
+};
+export declare const fileSystemTreeSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodType<DirectoryNode, z.ZodTypeDef, DirectoryNode>, z.ZodObject<{
+    file: z.ZodObject<{
+        contents: z.ZodUnion<[z.ZodString, z.ZodType<Uint8Array, z.ZodTypeDef, Uint8Array>]>;
+    }, "strip", z.ZodTypeAny, {
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
+    }, {
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
+    }>;
+}, "strip", z.ZodTypeAny, {
+    file: {
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
+    };
+}, {
+    file: {
+        contents: (string | Uint8Array) & (string | Uint8Array | undefined);
+    };
+}>]>>;
+export type FileSystemTree = z.infer<typeof fileSystemTreeSchema>;
 export interface AuthCredentials {
     workspaceId: string;
     apiKey: string;
@@ -20,7 +48,7 @@ export declare enum ApiAuthSessionBehavior {
     PERFORM_CHECK_AND_REFRESH = "PERFORM_CHECK_AND_REFRESH",
     SKIP_CHECK_AND_REFRESH = "SKIP_CHECK_AND_REFRESH"
 }
-export declare const CHECK_FAILED_ERROR_MESSAGE = "Auth session check failed";
+export declare const CHECK_FAILED_ERROR_MESSAGE = "AuthSession check failed";
 export type AuthSessionType = "API" | "MANUAL";
 export type AuthSessionMetadata = {
     createdAt: string;
@@ -39,3 +67,4 @@ export interface SessionStorageState {
         value: string;
     }[];
 }
+export {};

package/dist/commands/intuned-cli/types.js

@@ -3,10 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CHECK_FAILED_ERROR_MESSAGE = exports.ApiAuthSessionBehavior = void 0;
+exports.fileSystemTreeSchema = exports.CHECK_FAILED_ERROR_MESSAGE = exports.ApiAuthSessionBehavior = void 0;
+var _zod = require("zod");
+const fileNodeSchema = _zod.z.object({
+  file: _zod.z.object({
+    contents: _zod.z.union([_zod.z.string(), _zod.z.instanceof(Uint8Array)])
+  })
+});
+const directoryNodeSchema = _zod.z.lazy(() => _zod.z.object({
+  directory: fileSystemTreeSchema
+}));
+const fileSystemTreeSchema = exports.fileSystemTreeSchema = _zod.z.record(_zod.z.union([directoryNodeSchema, fileNodeSchema]));
 let ApiAuthSessionBehavior = exports.ApiAuthSessionBehavior = function (ApiAuthSessionBehavior) {
   ApiAuthSessionBehavior["PERFORM_CHECK_AND_REFRESH"] = "PERFORM_CHECK_AND_REFRESH";
   ApiAuthSessionBehavior["SKIP_CHECK_AND_REFRESH"] = "SKIP_CHECK_AND_REFRESH";
   return ApiAuthSessionBehavior;
 }({});
-const CHECK_FAILED_ERROR_MESSAGE = exports.CHECK_FAILED_ERROR_MESSAGE = "Auth session check failed";
+const CHECK_FAILED_ERROR_MESSAGE = exports.CHECK_FAILED_ERROR_MESSAGE = "AuthSession check failed";

package/dist/common/backendFunctions/getAuthSessionParameters.js

@@ -19,7 +19,7 @@ async function getAuthSessionParameters() {
   }
   const authSessionId = context.authSessionId;
   if ((0, _isNil.default)(authSessionId)) {
-    throw new Error("Auth sessions are not enabled");
+    throw new Error("AuthSessions are not enabled");
   }
   const response = await (0, _jwtTokenManager.callBackendFunctionWithToken)(`auth-session/${authSessionId}/parameters`, {
     method: "GET"

package/dist/common/intunedJson.js

@@ -15,6 +15,7 @@ var JSONC = _interopRequireWildcard(require("jsonc-parser"));
 var YAML = _interopRequireWildcard(require("yaml"));
 var TOML = _interopRequireWildcard(require("smol-toml"));
 var _neverthrow = require("neverthrow");
+var _formatZodError = require("./formatZodError");
 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 }; }
@@ -66,8 +67,7 @@ async function loadIntunedJson() {
   }
   const parseResult = intunedJsonSchema.safeParse(intunedJson);
   if (!parseResult.success) {
-    const formattedError = parseResult.error.errors.map(e => `- ${e.path.join(".")}: ${e.message}`).join("\n");
-    return (0, _neverthrow.err)(`${settingsFile.name} is not valid:\n${formattedError}\nPlease fix the errors and try again.`);
+    return (0, _neverthrow.err)(`${settingsFile.name} is not valid:\n${(0, _formatZodError.formatZodError)(parseResult.error)}\nPlease fix the errors and try again.`);
   }
   return (0, _neverthrow.ok)(parseResult.data);
 }

package/dist/common/jwtTokenManager.js

@@ -76,7 +76,7 @@ class JwtTokenManager {
       headers
     });
     if (result.status === 401 && process.env[_constants.CLI_ENV_VAR_KEY] === "true") {
-      console.warn("Unauthorized backend function call - make sure to save your project to Intuned to set up the correct API credentials");
+      console.warn("Unauthorized backend function call - make sure to provision your project to Intuned to set up the correct API credentials.\n" + "Run 'intuned provision' or see https://docs.intunedhq.com/docs/05-references/cli#provision-project for more information.");
     }
     return result;
   }
@@ -97,7 +97,7 @@ class JwtTokenManager {
       return `${domain}/api/${workspaceId}/functions/${projectId}`;
     } catch (e) {
       if (process.env[_constants.CLI_ENV_VAR_KEY] === "true") {
-        throw new Error(`API credentials not set - make sure to save your project to Intuned to set up the correct API credentials.\nOriginal error: ${e.message}`);
+        throw new Error(`API credentials not set - make sure to provision your project to Intuned to set up the correct API credentials.\n` + `Run 'intuned provision' or see https://docs.intunedhq.com/docs/05-references/cli#provision-project for more information.\n` + `Original error: ${e.message}`);
       }
     }
   }

package/dist/common/launchBrowser.d.ts

@@ -1,4 +1,5 @@
 import * as playwright from "playwright";
+import { Result } from "neverthrow";
 export interface Proxy {
     server: string;
     username: string;
@@ -24,6 +25,7 @@ export declare function launchChromium(options: LaunchChromiumCdpOptions): Promi
 export declare function getBrowserExecutablePath(): Promise<string | undefined>;
 export declare function launchBrowser(options: Omit<LaunchChromiumStandaloneOptions, "executablePath"> | LaunchChromiumCdpOptions): Promise<LaunchBrowserResult>;
 export declare function getLocalCdpAddress(port: number): string;
+export declare function getCdpWebSocketUrl(cdpAddress: string): Promise<Result<string, string>>;
 export declare function getHeadlessUserAgent({ executablePath, args, ignoreDefaultArgs, }: {
     executablePath?: string;
     args?: string[];

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,6 +18,8 @@ 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");
 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; }
@@ -173,6 +176,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.js

@@ -71,7 +71,6 @@ async function withPlaywrightContext({
       const port = await (0, _portfinder.getPort)({
         port: 9222
       });
-      hookCdpUrl = (0, _launchBrowser.getLocalCdpAddress)(port);
       ({
         context,
         page
@@ -81,9 +80,16 @@ 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,

package/dist/common/runApi/errors.js

@@ -92,7 +92,7 @@ class AuthCheckFailedError extends RunAutomationError {
     super();
     this.code = authCheckFailedErrorCode;
     this.statusCode = 401;
-    this.message = "auth session check failed";
+    this.message = "AuthSession check failed";
     this.wrapped = true;
   }
 }

package/dist/common/runApi/index.js

@@ -141,7 +141,7 @@ async function runApi({
       (0, _cleanEnvironmentVariables.cleanEnvironmentVariables)();
       const automationFunctionParameters = [...(params !== undefined ? [params] : []), page, context];
       try {
-        const automationFunctionResult = await automationFunction(...automationFunctionParameters);
+        const [automationFunctionResult] = await Promise.all([automationFunction(...automationFunctionParameters)]);
         const MAX_RESULT_SIZE_BYTES = 2 * 1024 * 1024;
         const resultSizeInBytes = getObjectSizeInBytes(automationFunctionResult);
         if (resultSizeInBytes > MAX_RESULT_SIZE_BYTES) {
@@ -193,7 +193,7 @@ async function checkAuthSessionWithRetries(page, context, checkFn, retries = 3)
     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);

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@intuned/runtime",
-  "version": "1.3.16",
+  "version": "1.3.17",
   "description": "Intuned runtime",
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "exports": {
     ".": "./dist/index.js",
     "./dist/runtime": "./dist/runtime/index.js",
@@ -72,16 +73,17 @@
     "dotenv": "^16.3.1",
     "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);
-}));