@intuned/runtime 1.1.5 → 1.2.0

package/dist/common/runApi/index.js

@@ -150,20 +150,23 @@ async function* runApiGenerator({
     }
     (0, _cleanEnvironmentVariables.cleanEnvironmentVariables)();
     if (checkFn !== undefined) {
-      console.log("Running auth check");
-      const authCheckResult = await checkAuthSessionWithRetries(page, context, checkFn, 2);
-      if (authCheckResult.isErr()) {
-        const error = authCheckResult.error;
-        if (["APINotFoundError", "InvalidAPIError"].includes(error.code)) {
-          return (0, _neverthrow.err)(new _errors.InvalidCheckError(`Auth session check function failed`, error));
+      try {
+        console.log("Running auth check");
+        const authCheckResult = await checkAuthSessionWithRetries(page, context, checkFn, 2);
+        if (authCheckResult.isErr()) {
+          const error = authCheckResult.error;
+          if (["APINotFoundError", "InvalidAPIError"].includes(error.code)) {
+            return (0, _neverthrow.err)(new _errors.InvalidCheckError(`Auth session check function failed`, error));
+          }
+          return authCheckResult;
         }
-        return authCheckResult;
-      }
-      if (!authCheckResult.value) {
+        if (!authCheckResult.value) {
+          return (0, _neverthrow.err)(new _errors.AuthCheckFailedError());
+        }
+      } catch (error) {
         return (0, _neverthrow.err)(new _errors.AuthCheckFailedError());
       }
     }
-    console.log("Running automation");
     const automationFunctionParameters = [...(automationFunction.params !== undefined ? [automationFunction.params] : []), page, context];
     let result;
     if (importedModule.type === "async-generator") {

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

@@ -25,15 +25,146 @@ export interface RunAutomationResponse {
     status: number;
     body: RunAutomationResult;
 }
+export declare const runApiStorageStateSchema: z.ZodObject<{
+    cookies: z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        value: z.ZodString;
+        domain: z.ZodString;
+        path: z.ZodString;
+        expires: z.ZodNumber;
+        httpOnly: z.ZodBoolean;
+        secure: z.ZodBoolean;
+        sameSite: z.ZodEnum<["Strict", "Lax", "None"]>;
+    }, "strip", z.ZodTypeAny, {
+        value: string;
+        name: string;
+        path: string;
+        domain: string;
+        expires: number;
+        httpOnly: boolean;
+        secure: boolean;
+        sameSite: "Strict" | "Lax" | "None";
+    }, {
+        value: string;
+        name: string;
+        path: string;
+        domain: string;
+        expires: number;
+        httpOnly: boolean;
+        secure: boolean;
+        sameSite: "Strict" | "Lax" | "None";
+    }>, "many">;
+    origins: z.ZodArray<z.ZodObject<{
+        origin: z.ZodString;
+        localStorage: z.ZodArray<z.ZodObject<{
+            name: z.ZodString;
+            value: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            value: string;
+            name: string;
+        }, {
+            value: string;
+            name: string;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        origin: string;
+        localStorage: {
+            value: string;
+            name: string;
+        }[];
+    }, {
+        origin: string;
+        localStorage: {
+            value: string;
+            name: string;
+        }[];
+    }>, "many">;
+    sessionStorage: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        origin: z.ZodString;
+        sessionStorage: z.ZodArray<z.ZodObject<{
+            name: z.ZodString;
+            value: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            value: string;
+            name: string;
+        }, {
+            value: string;
+            name: string;
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        sessionStorage: {
+            value: string;
+            name: string;
+        }[];
+        origin: string;
+    }, {
+        sessionStorage: {
+            value: string;
+            name: string;
+        }[];
+        origin: string;
+    }>, "many">>;
+}, "strip", z.ZodTypeAny, {
+    cookies: {
+        value: string;
+        name: string;
+        path: string;
+        domain: string;
+        expires: number;
+        httpOnly: boolean;
+        secure: boolean;
+        sameSite: "Strict" | "Lax" | "None";
+    }[];
+    origins: {
+        origin: string;
+        localStorage: {
+            value: string;
+            name: string;
+        }[];
+    }[];
+    sessionStorage?: {
+        sessionStorage: {
+            value: string;
+            name: string;
+        }[];
+        origin: string;
+    }[] | undefined;
+}, {
+    cookies: {
+        value: string;
+        name: string;
+        path: string;
+        domain: string;
+        expires: number;
+        httpOnly: boolean;
+        secure: boolean;
+        sameSite: "Strict" | "Lax" | "None";
+    }[];
+    origins: {
+        origin: string;
+        localStorage: {
+            value: string;
+            name: string;
+        }[];
+    }[];
+    sessionStorage?: {
+        sessionStorage: {
+            value: string;
+            name: string;
+        }[];
+        origin: string;
+    }[] | undefined;
+}>;
+export type RunApiStorageState = z.input<typeof runApiStorageStateSchema>;
 export declare const runApiSessionSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"file">;
     path: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    type: "file";
     path: string;
-}, {
     type: "file";
+}, {
     path: string;
+    type: "file";
 }>, z.ZodObject<{
     type: z.ZodLiteral<"state">;
     state: z.ZodOptional<z.ZodNullable<z.ZodObject<{
@@ -255,11 +386,11 @@ export declare const runApiParametersSchema: z.ZodObject<{
             type: z.ZodLiteral<"file">;
             path: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            type: "file";
             path: string;
-        }, {
             type: "file";
+        }, {
             path: string;
+            type: "file";
         }>, z.ZodObject<{
             type: z.ZodLiteral<"state">;
             state: z.ZodOptional<z.ZodNullable<z.ZodObject<{
@@ -452,8 +583,8 @@ export declare const runApiParametersSchema: z.ZodObject<{
         runCheck: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         session: {
-            type: "file";
             path: string;
+            type: "file";
         } | {
             type: "state";
             state?: {
@@ -486,8 +617,8 @@ export declare const runApiParametersSchema: z.ZodObject<{
         runCheck: boolean;
     }, {
         session: {
-            type: "file";
             path: string;
+            type: "file";
         } | {
             type: "state";
             state?: {
@@ -592,8 +723,8 @@ export declare const runApiParametersSchema: z.ZodObject<{
     retrieveSession: boolean;
     auth?: {
         session: {
-            type: "file";
             path: string;
+            type: "file";
         } | {
             type: "state";
             state?: {
@@ -638,8 +769,8 @@ export declare const runApiParametersSchema: z.ZodObject<{
     } | undefined;
     auth?: {
         session: {
-            type: "file";
             path: string;
+            type: "file";
         } | {
             type: "state";
             state?: {
@@ -703,6 +834,6 @@ export type RunApiResultOk<R = any> = {
     extendedPayloads?: Payload[];
 };
 export type RunApiResultWithSessionOk<R = any> = RunApiResultOk<R> & {
-    session: StorageState;
+    session: RunApiStorageState;
 };
 export type RunApiResult<R = any, FullResult extends RunApiResultOk<R> = RunApiResultOk<R>> = Result<FullResult, RunAutomationError>;

package/dist/common/runApi/types.js

@@ -3,40 +3,41 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.runApiSessionSchema = exports.runApiParametersSchema = void 0;
+exports.runApiStorageStateSchema = exports.runApiSessionSchema = exports.runApiParametersSchema = void 0;
 var _zod = _interopRequireDefault(require("zod"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const runApiStorageStateSchema = exports.runApiStorageStateSchema = _zod.default.object({
+  cookies: _zod.default.array(_zod.default.object({
+    name: _zod.default.string(),
+    value: _zod.default.string(),
+    domain: _zod.default.string(),
+    path: _zod.default.string(),
+    expires: _zod.default.number(),
+    httpOnly: _zod.default.boolean(),
+    secure: _zod.default.boolean(),
+    sameSite: _zod.default.enum(["Strict", "Lax", "None"])
+  })),
+  origins: _zod.default.array(_zod.default.object({
+    origin: _zod.default.string(),
+    localStorage: _zod.default.array(_zod.default.object({
+      name: _zod.default.string(),
+      value: _zod.default.string()
+    }))
+  })),
+  sessionStorage: _zod.default.array(_zod.default.object({
+    origin: _zod.default.string(),
+    sessionStorage: _zod.default.array(_zod.default.object({
+      name: _zod.default.string(),
+      value: _zod.default.string()
+    }))
+  })).optional()
+});
 const runApiSessionSchema = exports.runApiSessionSchema = _zod.default.discriminatedUnion("type", [_zod.default.object({
   type: _zod.default.literal("file"),
   path: _zod.default.string()
 }), _zod.default.object({
   type: _zod.default.literal("state"),
-  state: _zod.default.object({
-    cookies: _zod.default.array(_zod.default.object({
-      name: _zod.default.string(),
-      value: _zod.default.string(),
-      domain: _zod.default.string(),
-      path: _zod.default.string(),
-      expires: _zod.default.number(),
-      httpOnly: _zod.default.boolean(),
-      secure: _zod.default.boolean(),
-      sameSite: _zod.default.enum(["Strict", "Lax", "None"])
-    })),
-    origins: _zod.default.array(_zod.default.object({
-      origin: _zod.default.string(),
-      localStorage: _zod.default.array(_zod.default.object({
-        name: _zod.default.string(),
-        value: _zod.default.string()
-      }))
-    })),
-    sessionStorage: _zod.default.array(_zod.default.object({
-      origin: _zod.default.string(),
-      sessionStorage: _zod.default.array(_zod.default.object({
-        name: _zod.default.string(),
-        value: _zod.default.string()
-      }))
-    })).optional()
-  }).nullable().optional()
+  state: runApiStorageStateSchema.nullable().optional()
 })]);
 const runApiParametersSchema = exports.runApiParametersSchema = _zod.default.object({
   automationFunction: _zod.default.object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
@@ -29,6 +29,7 @@
     "intuned-auth-session-refresh": "vite-node ./src/commands/auth/run-refresh.ts",
     "intuned-auth-session-load": "vite-node ./src/commands/auth/load.ts",
     "intuned-ts-check": "yarn prepublishOnly && vite-node ./src/commands/ts-check.ts",
+    "intuned": "vite-node ./src/commands/intuned-cli/main.ts",
     "build": "rm -rf dist && tsc -p tsconfig.json  && yarn copy-dts && babel src --out-dir dist --extensions '.ts' &&  cp -r ./src/common/assets dist/common/assets",
     "test": "vitest run",
     "test:watch": "vitest",
@@ -50,12 +51,7 @@
     "intuned-browser-start": "./bin/intuned-browser-start",
     "intuned-browser-save-state": "./bin/intuned-browser-save-state",
     "intuned-ts-check": "./bin/intuned-ts-check",
-    "init": "./bin/init",
-    "run-api": "./bin/run-api",
-    "deploy": "./bin/deploy",
-    "cli-build": "./bin/cli-build",
-    "create-auth-session": "./bin/create-auth-session",
-    "check-auth-session": "./bin/check-auth-session"
+    "intuned": "./bin/intuned"
   },
   "dependencies": {
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
@@ -70,7 +66,7 @@
     "applicationinsights": "2.9.2",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "^4.1.2",
-    "commander": "^11.0.0",
+    "commander": "14.0.0",
     "cross-fetch": "^4.0.0",
     "dotenv": "^16.3.1",
     "fs-extra": "^11.3.0",
@@ -87,6 +83,7 @@
     "promptly": "3.2.0",
     "rollup": "3.26.2",
     "source-map": "0.7.4",
+    "terminal-kit": "^3.1.2",
     "ts-morph": "21.0.1",
     "ts-node": "10.9.1",
     "tslib": "2.6.0",
@@ -105,7 +102,9 @@
     "@ngneat/falso": "^7.2.0",
     "@types/jest": "^29.5.3",
     "@types/jsdom": "^21.1.1",
+    "@types/ms": "^2.1.0",
     "@types/promptly": "^3.0.4",
+    "@types/terminal-kit": "^2.5.7",
     "@types/wait-on": "^5.3.4",
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^7.5.0",
@@ -119,6 +118,7 @@
     "eslint-plugin-deprecation": "^1.3.3",
     "eslint-plugin-prettier": "^4.2.1",
     "msw": "^2.1.2",
+    "playwright": "1.44.1",
     "typedoc": "^0.25.13",
     "typedoc-plugin-frontmatter": "^1.0.0",
     "typedoc-plugin-markdown": "^4.0.2",

package/tsconfig.json

@@ -12,7 +12,8 @@
     "sourceMap": false,
     "declaration": true,
     "emitDeclarationOnly": false,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "types": ["vitest/globals"]
   },
   "include": [
     "src/**/*.ts",

package/bin/check-auth-session

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../dist/commands/cli-auth-sessions/check.js");

package/bin/cli-build

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../dist/commands/cli-build/cli-build.js");

package/bin/create-auth-session

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../dist/commands/cli-auth-sessions/create.js");

package/bin/deploy

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../dist/commands/deploy/deploy.js");

package/bin/init

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../dist/commands/init/init.js");

package/bin/run-api

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require("../dist/commands/run-api-cli/run-api.js");

package/dist/commands/cli-auth-sessions/check.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/commands/cli-auth-sessions/check.js

@@ -1,40 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-var _commander = require("commander");
-var _dotenv = _interopRequireDefault(require("dotenv"));
-var _utils = require("./utils");
-var _chalk = _interopRequireDefault(require("chalk"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-_dotenv.default.config({
-  path: `.env`
-});
-_commander.program.description("Check an auth session, if it is still valid or not").argument("<auth-session>", "Name/id of the auth session instance to use").action(async authSession => {
-  try {
-    if (!authSession) {
-      throw new Error("Auth session instance is required, provide an ID/name for it");
-    }
-    const _isAuthEnabled = await (0, _utils.isAuthEnabled)();
-    if (!_isAuthEnabled) {
-      throw new Error("Auth session is not enabled, enable it in Intuned.json to be able to use it");
-    }
-    const checkApiExists = await (0, _utils.ensureAuthApi)("check");
-    if (!checkApiExists) {
-      throw new Error("Auth check API not implemented, please create it in the auth sessions specified directory");
-    }
-    const {
-      authSessionInstanceStoragePath
-    } = await (0, _utils.retrieveAuthSessionInstance)(authSession, true);
-    const checkResult = await (0, _utils.runCheckApi)(authSessionInstanceStoragePath);
-    if (checkResult) {
-      console.log(_chalk.default.green("✓ Auth session checked successfully"));
-    } else {
-      console.log(_chalk.default.red("✗ Auth session is not valid, check failed"));
-    }
-  } catch (error) {
-    console.error(_chalk.default.red(`Failed to check auth session: ${error.message}`));
-  } finally {
-    process.exit(0);
-  }
-});
-_commander.program.parse(process.argv);

package/dist/commands/cli-auth-sessions/create.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/commands/cli-auth-sessions/create.js

@@ -1,53 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-var _commander = require("commander");
-var _dotenv = _interopRequireDefault(require("dotenv"));
-var _utils = require("./utils");
-var _chalk = _interopRequireDefault(require("chalk"));
-var _utils2 = require("../run-api-cli/utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-_dotenv.default.config({
-  path: `.env`
-});
-_commander.program.description("Create an auth session").argument("[auth-session-name]", "Name/id of the auth session instance to use (optional)").option("-i, --input <input>", "Auth session input parameters file").action(async (authSessionName, options) => {
-  try {
-    const _isAuthEnabled = await (0, _utils.isAuthEnabled)();
-    if (!_isAuthEnabled) {
-      throw new Error("Auth session is not enabled, enable it in Intuned.json to be able to use it");
-    }
-    const authType = await (0, _utils.getAuthType)();
-    let authSessionInstancePath;
-    if (authType === "MANUAL") {
-      const recorderConfig = await (0, _utils.ensureRecorderURLs)();
-      const {
-        startUrl,
-        endUrl
-      } = recorderConfig;
-      console.log(_chalk.default.blue("Starting auth session recorder..."));
-      const session = await (0, _utils.recordAuthSession)(startUrl, endUrl);
-      authSessionInstancePath = await (0, _utils.storeAuthSessionInstance)(session, authSessionName, {});
-    } else {
-      const createApiExists = await (0, _utils.ensureAuthApi)("create");
-      if (!createApiExists) {
-        throw new Error("Auth session create API not implemented, please create it in the auth sessions specified directory");
-      }
-      const authSessionInput = (await (0, _utils2.loadParameters)(options?.input)) ?? {};
-      const session = await (0, _utils.runCreateApi)(authSessionInput);
-      if (!session) {
-        console.error(_chalk.default.red("Failed to create auth session."));
-        process.exit(1);
-      }
-      authSessionInstancePath = await (0, _utils.storeAuthSessionInstance)(session, authSessionName, authSessionInput);
-    }
-    console.log(_chalk.default.green("✓ Auth session created successfully!"));
-    if (authSessionInstancePath) {
-      console.log(_chalk.default.underline.green.white(`🔒 Auth session instance and metadata stored at ${authSessionInstancePath}`));
-    }
-  } catch (error) {
-    console.error(_chalk.default.red(`Failed to create auth session: ${error.message}`));
-  } finally {
-    process.exit(0);
-  }
-});
-_commander.program.parse(process.argv);

package/dist/commands/cli-auth-sessions/utils.d.ts

@@ -1,28 +0,0 @@
-import { StorageState } from "../../common/contextStorageStateHelpers";
-import { AuthSessionMetadata, AuthSessionType } from "../../common/cli/types";
-import * as playwright from "playwright-core";
-export declare function isAuthEnabled(): Promise<boolean>;
-export declare function getAuthType(): Promise<AuthSessionType>;
-export declare function ensureRecorderURLs(): Promise<{
-    startUrl: string;
-    endUrl: string;
-}>;
-export declare function ensureAuthApi(operation: "create" | "check"): Promise<boolean>;
-export declare function runCreateApi(authSessionInput: Record<string, any>): Promise<StorageState>;
-export declare function runCheckApi(authSessionPath: string): Promise<boolean>;
-export declare function runCreateApiViaCLI(authSessionInput: Record<string, any>): Promise<StorageState>;
-export declare function runCheckApiViaCLI(authSessionPath: string): Promise<boolean>;
-export declare function storeAuthSessionInstance(authSessionInstance: StorageState, customName?: string, authSessionInput?: Record<string, any>): Promise<string>;
-export declare function retrieveAuthSessionInstance(authSessionId: string, pathsOnly?: boolean): Promise<{
-    authSessionInstanceStoragePath: string;
-    authSessionInstanceMetadataPath: string;
-    authSessionInstance?: undefined;
-    metadata?: undefined;
-} | {
-    authSessionInstance: StorageState;
-    metadata: AuthSessionMetadata;
-    authSessionInstanceStoragePath?: undefined;
-    authSessionInstanceMetadataPath?: undefined;
-}>;
-export declare function getStorageState(context: playwright.BrowserContext): Promise<StorageState>;
-export declare function recordAuthSession(startUrl: string, endUrl: string): Promise<StorageState>;