@intuned/runtime-dev 1.0.6-cli-auth.0.0.11-test → 1.0.6-cli-auth.0.0.12-test

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

@@ -2,14 +2,11 @@
 "use strict";
 
 var _commander = require("commander");
-var fs = _interopRequireWildcard(require("fs-extra"));
 var _dotenv = _interopRequireDefault(require("dotenv"));
-var _path = _interopRequireDefault(require("path"));
 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 }; }
-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; }
 _dotenv.default.config({
   path: `.env`
 });
@@ -23,16 +20,7 @@ _commander.program.description("Create an auth session").option("-i, --input <in
     if (!createApiExists) {
       throw new Error("Auth session creation API not implemented, please create it in the auth sessions specified directory");
     }
-    let authSessionInput = {};
-    if (options.input) {
-      const inputFilePath = _path.default.resolve(process.cwd(), options.input);
-      if (!(await fs.exists(inputFilePath))) {
-        throw new Error(`Auth session input file not found at ${inputFilePath}`);
-      }
-      const authSessionInputFile = options.input;
-      const authSessionInputPath = _path.default.join(process.cwd(), authSessionInputFile);
-      authSessionInput = await fs.readJSON(authSessionInputPath);
-    }
+    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."));

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

@@ -1,19 +1,20 @@
 import { StorageState } from "../../common/contextStorageStateHelpers";
+import { AuthSessionMetadata } from "../../common/cli/types";
 export declare function isAuthEnabled(): Promise<boolean>;
 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 storeAuthSessionInstance(authSessionInstance: StorageState, customName?: string, authSessionInput?: Record<string, any>, shouldOverride?: boolean): Promise<string>;
 export declare function retrieveAuthSessionInstance(authSessionId: string, pathsOnly?: boolean): Promise<{
     authSessionInstanceStoragePath: string;
     authSessionInstanceMetadataPath: string;
     authSessionInstance?: undefined;
     metadata?: undefined;
 } | {
-    authSessionInstance: any;
-    metadata: any;
+    authSessionInstance: StorageState;
+    metadata: AuthSessionMetadata;
     authSessionInstanceStoragePath?: undefined;
     authSessionInstanceMetadataPath?: undefined;
 }>;

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

@@ -21,6 +21,7 @@ var _runApi = require("../../common/runApi");
 var _tsNodeImport = require("../common/tsNodeImport");
 var _promptly = require("promptly");
 var _utils = require("../../common/cli/utils");
+var _types = require("../../common/cli/types");
 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 }; }
@@ -61,7 +62,10 @@ async function runCheckApi(authSessionPath) {
     }, () => runCheckApiViaCLI(authSessionPath));
     return checkResult;
   } catch (error) {
-    throw new Error(`Error running the create API: ${error.message}`);
+    if (error.message === _types.CHECK_FAILED_ERROR_MESSAGE) {
+      return false;
+    }
+    throw new Error(`Error running the check API: ${error.message}`);
   }
 }
 async function runCreateApiViaCLI(authSessionInput) {
@@ -142,30 +146,39 @@ async function runCheckApiViaCLI(authSessionPath) {
   }
   return result;
 }
-async function storeAuthSessionInstance(authSessionInstance, customName, authSessionInput) {
+async function storeAuthSessionInstance(authSessionInstance, customName, authSessionInput, shouldOverride = false) {
   try {
     const authSessionsDirectoryPath = _path.default.join(process.cwd(), _constants.AUTH_SESSIONS_INSTANCES_FOLDER_NAME);
     await fs.ensureDir(authSessionsDirectoryPath);
     const authSessionInstanceId = customName ?? `auth-session-${Date.now()}`;
     const authSessionInstancePath = _path.default.join(authSessionsDirectoryPath, authSessionInstanceId);
+    const authSessionExists = await fs.pathExists(authSessionInstancePath);
     await fs.ensureDir(authSessionInstancePath);
     const authSessionInstanceStoragePath = _path.default.join(authSessionInstancePath, `auth-session.json`);
     await fs.writeJSON(authSessionInstanceStoragePath, authSessionInstance, {
       spaces: 2
     });
     const projectAuthConfig = await (0, _utils.getSettingIntunedJSON)("authSessions");
+    let existingMetadata = {};
+    const authSessionInstanceMetadataPath = _path.default.join(authSessionInstancePath, `metadata.json`);
+    if (authSessionExists && shouldOverride) {
+      try {
+        existingMetadata = await fs.readJSON(authSessionInstanceMetadataPath);
+      } catch (readError) {
+        existingMetadata = {};
+      }
+    }
     const authSessionMetadata = {
-      createdAt: new Date().toISOString(),
+      createdAt: existingMetadata.createdAt || new Date().toISOString(),
       updatedAt: new Date().toISOString(),
-      authSessionInput: authSessionInput ?? {},
+      authSessionInput: authSessionInput || existingMetadata.authSessionInput || {},
       authSessionId: authSessionInstanceId,
-      authSessionType: projectAuthConfig.type ?? "API",
+      authSessionType: projectAuthConfig.type ?? existingMetadata.authSessionType ?? "API",
       ...(projectAuthConfig.type === "MANUAL" && {
         recorderStartUrl: projectAuthConfig.startUrl,
         recorderEndUrl: projectAuthConfig.endUrl
       })
     };
-    const authSessionInstanceMetadataPath = _path.default.join(authSessionInstancePath, `metadata.json`);
     await fs.writeJSON(authSessionInstanceMetadataPath, authSessionMetadata, {
       spaces: 2
     });

package/dist/commands/run-api-cli/run-api.js

@@ -8,6 +8,7 @@ var _dotenv = _interopRequireDefault(require("dotenv"));
 var _utils = require("./utils");
 var _enums = require("../../runtime/enums");
 var _asyncLocalStorage = require("../../common/asyncLocalStorage");
+var _utils2 = require("../cli-auth-sessions/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 _dotenv.default.config({
   path: `.env`
@@ -17,6 +18,13 @@ _commander.program.name("intuned-run").description("Run an Intuned API with para
     if (!apiName) {
       throw new Error("API name is required, please provide it");
     }
+    const _isAuthEnabled = await (0, _utils2.isAuthEnabled)();
+    if (!_isAuthEnabled && options.authSession) {
+      throw new Error("Auth session is not enabled, enable it in Intuned.json to be able to use it");
+    }
+    if (_isAuthEnabled && !options.authSession) {
+      throw new Error("Auth session is enabled but no auth session provided, please provide it");
+    }
     const inputData = await (0, _utils.loadParameters)(options.parametersFile);
     const runId = (0, _nanoid.nanoid)();
     const {
@@ -27,7 +35,7 @@ _commander.program.name("intuned-run").description("Run an Intuned API with para
       extendedPayloads: [],
       runId
     }, () => (0, _utils.runApiViaCLI)(apiName, inputData, {
-      authSessionPath: options.authSession
+      authSession: options.authSession
     }));
     if (!result) {
       console.log(_chalk.default.yellow("No result returned from the API"));

package/dist/commands/run-api-cli/utils.d.ts

@@ -1,10 +1,8 @@
 import { Payload } from "../../runtime/export";
-import { ApiAuthSessionBehavior } from "../../common/cli/types";
 export declare function loadParameters(parametersFile: string): Promise<object | null>;
 export declare function writeResultToFile(runId: string, result: any, payloadToAppend?: Payload[]): Promise<void>;
 export declare function runApiViaCLI(apiName: string, inputData: object | null | undefined, options?: {
-    authSessionPath?: string;
-    authSessionsMode?: ApiAuthSessionBehavior;
+    authSession?: string;
 }): Promise<{
     result: any;
     payloadToAppend: Payload[] | undefined;

package/dist/commands/run-api-cli/utils.js

@@ -12,9 +12,7 @@ var _Logger = require("../../common/Logger");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _runApi = require("../../common/runApi");
 var _tsNodeImport = require("../common/tsNodeImport");
-var _utils = require("../../common/cli/utils");
-var _types = require("../../common/cli/types");
-var _utils2 = require("../cli-auth-sessions/utils");
+var _utils = require("../cli-auth-sessions/utils");
 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 }; }
@@ -64,32 +62,45 @@ async function writeResultToFile(runId, result, payloadToAppend) {
 }
 async function runApiViaCLI(apiName, inputData, options) {
   let authSessionPathToUse = null;
-  const authSessionsMode = (options === null || options === void 0 ? void 0 : options.authSessionsMode) ?? "PERFORM_CHECK_AND_REFRESH";
-  if (options !== null && options !== void 0 && options.authSessionPath) {
-    const authSessions = await (0, _utils.getSettingIntunedJSON)("authSessions");
-    if (authSessions.enabled) {
-      if (!options.authSessionPath) {
-        throw new Error("Auth session is enabled but no auth session provided");
-      }
-      authSessionPathToUse = options.authSessionPath;
-    } else {
-      if (options.authSessionPath) {
-        throw new Error("Auth session is not enabled but auth session provided. To use auth session please enable it in Intuned.json");
-      }
-    }
+  if (options !== null && options !== void 0 && options.authSession) {
+    const {
+      authSessionInstanceStoragePath
+    } = await (0, _utils.retrieveAuthSessionInstance)(options === null || options === void 0 ? void 0 : options.authSession, true);
+    authSessionPathToUse = authSessionInstanceStoragePath;
   }
-  if (authSessionsMode === _types.ApiAuthSessionBehavior.PERFORM_CHECK_AND_REFRESH && authSessionPathToUse) {
-    const checkApiExists = await (0, _utils2.ensureAuthApi)("check");
+  if (authSessionPathToUse) {
+    const checkApiExists = await (0, _utils.ensureAuthApi)("check");
     if (!checkApiExists) {
       throw new Error("Auth session check API not implemented, please create it in the auth sessions specified directory");
     }
-    const checkResult = await (0, _utils2.runCheckApiViaCLI)(authSessionPathToUse);
+    const checkResult = await (0, _utils.runCheckApiViaCLI)(authSessionPathToUse);
     if (!checkResult) {
       console.log(_chalk.default.yellow("Auth session check failed, trying to refresh it..."));
-      const createApiExists = await (0, _utils2.ensureAuthApi)("create");
+      const createApiExists = await (0, _utils.ensureAuthApi)("create");
       if (!createApiExists) {
         throw new Error("Auth session creation API not implemented, please create it in the auth sessions specified directory");
       }
+      const {
+        metadata
+      } = await (0, _utils.retrieveAuthSessionInstance)(authSessionPathToUse, true);
+      if ((metadata === null || metadata === void 0 ? void 0 : metadata.authSessionType) === "MANUAL") {
+        throw new Error("Expired Auth session is recorder-based, please provide a new one or refresh it manually");
+      }
+      const authSessionInput = (metadata === null || metadata === void 0 ? void 0 : metadata.authSessionInput) ?? {};
+      try {
+        const refresehAuthSessionInstance = await (0, _utils.runCreateApiViaCLI)(authSessionInput);
+        if (!refresehAuthSessionInstance) {
+          throw new Error("Failed to refresh auth session");
+        }
+        await (0, _utils.storeAuthSessionInstance)(refresehAuthSessionInstance, options === null || options === void 0 ? void 0 : options.authSession, authSessionInput, true);
+        const checkResult = await (0, _utils.runCheckApiViaCLI)(authSessionPathToUse);
+        if (!checkResult) {
+          throw new Error("Failed to refresh auth session");
+        }
+        console.log(_chalk.default.green("✓ Auth session refreshed successfully on this run"));
+      } catch (error) {
+        throw new Error(`Failed to refresh auth session: ${error.message}`);
+      }
     }
   }
   const runApiResult = await (0, _runApi.runApi)({

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

@@ -54,3 +54,14 @@ 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 type AuthSessionType = "API" | "MANUAL";
+export type AuthSessionMetadata = {
+    createdAt: string;
+    updatedAt: string;
+    authSessionInput: Record<string, any>;
+    authSessionId: string;
+    authSessionType: AuthSessionType;
+    recorderStartUrl?: string;
+    recorderEndUrl?: string;
+};

package/dist/common/cli/types.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.templateIds = exports.ApiAuthSessionBehavior = void 0;
+exports.templateIds = exports.CHECK_FAILED_ERROR_MESSAGE = exports.ApiAuthSessionBehavior = void 0;
 const templateIds = exports.templateIds = ["default", "empty", "linkedin-recorder", "api-auth-sessions", "nested-scheduling", "ai-extractors", "npm-auth-sessions"];
 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";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.0.6-cli-auth.0.0.11-test",
+  "version": "1.0.6-cli-auth.0.0.12-test",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",