@intuned/runtime-dev 0.1.0-test.2 → 0.1.0-test.21

package/Intuned.json

@@ -1,5 +1,5 @@
 {
   "authSessions": {
-    "enabled": true
+    "enabled": false
   }
 }

package/WebTemplate/api.ts

@@ -33,109 +33,107 @@ import {
 } from "./headers";
 import { FEATURES } from "./features";
 
-export function registerApiEndpoints() {
-  if (!isJobRunMachine()) {
-    app.use((req, _, next) => {
-      const runId = req.headers[RUN_ID_HEADER] as string;
-      const jobId = req.headers[JOB_ID_HEADER] as string;
-      const jobRunId = req.headers[JOB_RUN_ID_HEADER] as string;
-      const queueId = req.headers[QUEUE_ID_HEADER] as string;
-      const proxy = req?.body?.proxy
-        ? (proxyToUrl(req.body.proxy as ProxyConfig) as string)
-        : undefined;
-      const contextData = {
-        runId: runId ?? "",
-        jobId,
-        jobRunId,
-        queueId,
-        proxy,
-        ...(req?.body?.executionContext ?? {}),
-      };
-      runWithContext(contextData, next);
-    });
-
-    app.get(
-      "/api/protected/health",
-      accessKeyValidatorMiddleware,
-      async (req, res) => {
-        res.status(200).json({ status: "ok" });
-      }
-    );
+if (!isJobRunMachine()) {
+  app.use((req, _, next) => {
+    const runId = req.headers[RUN_ID_HEADER] as string;
+    const jobId = req.headers[JOB_ID_HEADER] as string;
+    const jobRunId = req.headers[JOB_RUN_ID_HEADER] as string;
+    const queueId = req.headers[QUEUE_ID_HEADER] as string;
+    const proxy = req?.body?.proxy
+      ? (proxyToUrl(req.body.proxy as ProxyConfig) as string)
+      : undefined;
+    const contextData = {
+      runId: runId ?? "",
+      jobId,
+      jobRunId,
+      queueId,
+      proxy,
+      ...(req?.body?.executionContext ?? {}),
+    };
+    runWithContext(contextData, next);
+  });
 
-    app.post(
-      "/api/auth-session/create",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(createAuthSessionController)
-    );
+  app.get(
+    "/api/protected/health",
+    accessKeyValidatorMiddleware,
+    async (req, res) => {
+      res.status(200).json({ status: "ok" });
+    }
+  );
 
-    app.post(
-      "/api/auth-session-async/create",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(createAuthSessionAsyncController)
-    );
+  app.post(
+    "/api/auth-session/create",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(createAuthSessionController)
+  );
 
-    app.post(
-      "/api/auth-session/check",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(checkAuthSessionController)
-    );
+  app.post(
+    "/api/auth-session-async/create",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(createAuthSessionAsyncController)
+  );
 
-    app.post(
-      "/api/auth-session-async/check",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(checkAuthSessionAsyncController)
-    );
+  app.post(
+    "/api/auth-session/check",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(checkAuthSessionController)
+  );
 
-    app.post(
-      "/api/auth-session/kill",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(killAuthSessionOperationController)
-    );
+  app.post(
+    "/api/auth-session-async/check",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(checkAuthSessionAsyncController)
+  );
 
-    app.post(
-      "/api/auth-session/resume",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(resumeAuthSessionOperationController)
-    );
+  app.post(
+    "/api/auth-session/kill",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(killAuthSessionOperationController)
+  );
 
-    app.post(
-      "/api/auth-session-async/resume",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(resumeAuthSessionOperationAsyncController)
-    );
+  app.post(
+    "/api/auth-session/resume",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(resumeAuthSessionOperationController)
+  );
 
-    app.post(
-      "/api/run/*",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(runApiController)
-    );
+  app.post(
+    "/api/auth-session-async/resume",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(resumeAuthSessionOperationAsyncController)
+  );
 
-    app.post(
-      "/api/run-async/start/*",
-      accessKeyValidatorMiddleware,
-      errorRetryMiddleware(runApiAsyncController) // todo: this probably needs changing
-    );
+  app.post(
+    "/api/run/*",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(runApiController)
+  );
 
-    app.get(
-      "/api/run-async/count",
-      accessKeyValidatorMiddleware,
-      getActiveAsyncEndpointController
-    );
+  app.post(
+    "/api/run-async/start/*",
+    accessKeyValidatorMiddleware,
+    errorRetryMiddleware(runApiAsyncController) // todo: this probably needs changing
+  );
 
-    app.post(
-      "/api/trace/upload/:runId",
-      accessKeyValidatorMiddleware,
-      uploadTraceController
-    );
+  app.get(
+    "/api/run-async/count",
+    accessKeyValidatorMiddleware,
+    getActiveAsyncEndpointController
+  );
 
-    app.post(
-      "/api/trace/delete/:runId",
-      accessKeyValidatorMiddleware,
-      deleteTraceController
-    );
-  }
+  app.post(
+    "/api/trace/upload/:runId",
+    accessKeyValidatorMiddleware,
+    uploadTraceController
+  );
 
-  app.get("/api/features", accessKeyValidatorMiddleware, async (_, res) => {
-    res.status(200).json({ features: FEATURES });
-  });
+  app.post(
+    "/api/trace/delete/:runId",
+    accessKeyValidatorMiddleware,
+    deleteTraceController
+  );
 }
+
+app.get("/api/features", accessKeyValidatorMiddleware, async (_, res) => {
+  res.status(200).json({ features: FEATURES });
+});

package/WebTemplate/controllers/authSessions/check.ts

@@ -1,6 +1,7 @@
 import { readJSON } from "fs-extra";
 import { isHeadless } from "../../utils";
 import { runApi } from "@intuned/runtime/dist/common/runApi";
+import { importModule } from "../../utils";
 
 export async function checkAuthSession({
   proxy,
@@ -32,7 +33,7 @@ export async function checkAuthSession({
 
   const result = await runApi<boolean>({
     automationFunction: {
-      name: "auth-sessions/check",
+      module: await importModule("auth-sessions/check"),
     },
     runOptions: {
       environment: "deployed",
@@ -48,10 +49,7 @@ export async function checkAuthSession({
     },
   });
   if (result.isErr()) {
-    return {
-      status: 500,
-      body: result.error,
-    };
+    return result.error.apiResponse;
   }
   return {
     status: 200,

package/WebTemplate/controllers/authSessions/create.ts

@@ -1,5 +1,5 @@
 import { authSessionsContextsStore } from "./store";
-import { getTraceFilePath, isHeadless } from "../../utils";
+import { getTraceFilePath, isHeadless, importModule } from "../../utils";
 import * as fs from "fs-extra";
 import { runApiGenerator } from "@intuned/runtime/dist/common/runApi";
 import type { RequestMoreInfoDetails } from "@intuned/runtime/dist/runtime";
@@ -53,8 +53,8 @@ export async function createAuthSession({
     unknown
   >({
     automationFunction: {
-      name: "auth-sessions/create",
-      params: parameters ?? {},
+      module: await importModule("auth-sessions/create"),
+      params: parameters,
     },
     tracing: saveTrace
       ? {
@@ -77,10 +77,7 @@ export async function createAuthSession({
     const r = result.value;
 
     if (r.isErr()) {
-      return {
-        status: 500,
-        body: r.error,
-      };
+      return r.error.apiResponse;
     }
 
     return {

package/WebTemplate/controllers/runApi/helpers.ts

@@ -1,4 +1,8 @@
-import { getTraceFilePath, waitWithExtendableTimeout } from "../../utils";
+import {
+  getTraceFilePath,
+  importModule,
+  waitWithExtendableTimeout,
+} from "../../utils";
 import * as fs from "fs-extra";
 import { getExecutionContext } from "@intuned/runtime";
 import { backendFunctionsTokenManager } from "@intuned/runtime/dist/common/jwtTokenManager";
@@ -64,18 +68,18 @@ export async function runApi({
   const resultWithTimeout = await waitWithExtendableTimeout({
     promise: runApiInternal({
       automationFunction: {
-        name: `api/${functionName}`,
-        params: params ?? {},
+        module: await importModule(`api/${functionName}`),
+        params,
       },
-      auth: !isAuthSessionEnabled
-        ? undefined
-        : {
+      auth: isAuthSessionEnabled
+        ? {
             session: {
               type: "state",
               state: session,
             },
             runCheck: isAuthSessionEnabled,
-          },
+          }
+        : undefined,
       runOptions: {
         environment: "deployed",
         headless,

package/WebTemplate/index.playwright.ts

@@ -6,52 +6,42 @@ import { getExecutionContext } from "@intuned/runtime";
 import { app } from "./app";
 import { RUN_ID_HEADER } from "./headers";
 import { ShutdownController } from "./shutdown";
-import { registerApiEndpoints } from "./api";
-import { runJobsLoop } from "./jobs";
-import { isJobRunMachine } from "./utils";
 
-void main();
+const port = process.env.PORT ? parseInt(process.env.PORT) : 4000;
 
-async function main() {
-  const port = process.env.PORT ? parseInt(process.env.PORT) : 4000;
+initializeAppInsights();
 
-  initializeAppInsights();
-
-  app.use((req, res, next) => {
-    // Cleanup after the response is sent
-    res.on("finish", () => {
-      console.log("finished", req.headers[RUN_ID_HEADER]);
-      void ShutdownController.instance.checkForShutdown();
-    });
-
-    next();
-  });
-
-  registerApiEndpoints();
-  if (isJobRunMachine()) {
-    console.log("Running in job v3 mode");
-    void runJobsLoop();
-  }
-
-  const server = app.listen(port, () => {
-    // when deployed on flyio, the server will be turned on and
-    // will shutdown after the specified time in TIME_TO_SHUTDOWN env variable
-    ShutdownController.initialize(server);
+app.use((req, res, next) => {
+  // Cleanup after the response is sent
+  res.on("finish", () => {
+    console.log("finished", req.headers[RUN_ID_HEADER]);
     void ShutdownController.instance.checkForShutdown();
-    console.log(`Server is running on port ${port}`);
   });
 
-  process.on("unhandledRejection", (reason, promise) => {
-    const telemetryClient = getTelemetryClient();
-    console.error("Unhandled Rejection at:", promise, "reason:", reason);
-    const context = getExecutionContext();
-    telemetryClient?.trackEvent({
-      name: "UNHANDLED_REJECTION",
-      properties: {
-        runId: context?.runId,
-        promise,
-        reason,
-      },
-    });
+  next();
+});
+
+export * from "./api";
+export * from "./jobs";
+
+const server = app.listen(port, () => {
+  // when deployed on flyio, the server will be turned on and
+  // will shutdown after the specified time in TIME_TO_SHUTDOWN env variable
+  ShutdownController.initialize(server);
+  void ShutdownController.instance.checkForShutdown();
+  console.log(`Server is running on port ${port}`);
+});
+
+process.on("unhandledRejection", (reason, promise) => {
+  const telemetryClient = getTelemetryClient();
+  console.error("Unhandled Rejection at:", promise, "reason:", reason);
+  const context = getExecutionContext();
+  telemetryClient?.trackEvent({
+    name: "UNHANDLED_REJECTION",
+    properties: {
+      runId: context?.runId,
+      promise,
+      reason,
+    },
   });
-}
+});

package/WebTemplate/jobs.ts

@@ -6,7 +6,13 @@ import {
   RUN_ID_HEADER,
   SHOULD_SHUTDOWN_HEADER,
 } from "./headers";
-import { getErrorResponse, isHeadless, ProxyConfig, proxyToUrl } from "./utils";
+import {
+  getErrorResponse,
+  isHeadless,
+  isJobRunMachine,
+  ProxyConfig,
+  proxyToUrl,
+} from "./utils";
 import {
   callBackendFunctionWithToken,
   backendFunctionsTokenManager,
@@ -26,6 +32,11 @@ type JobPayload = {
   traceSignedUrl?: string;
 };
 
+if (isJobRunMachine()) {
+  console.log("Running in job v3 mode");
+  void jobsV3();
+}
+
 async function runApiInContext(
   jobPayload: JobPayload
 ): Promise<Awaited<ReturnType<typeof runApi>>> {
@@ -72,7 +83,7 @@ async function runApiInContext(
   }
 }
 
-export async function runJobsLoop() {
+async function jobsV3() {
   await reportReady();
   const initialDelay = 1000;
   let delay = initialDelay;

package/WebTemplate/utils.ts

@@ -1,7 +1,7 @@
 import * as playwright from "@intuned/playwright-core";
 import { Handler, Response } from "@tinyhttp/app";
 import * as path from "path";
-import { getExecutionContext } from "@intuned/runtime/dist/common/asyncLocalStorage";
+import { getExecutionContext } from "@intuned/runtime";
 import { setTimeout } from "timers/promises";
 
 export class FunctionNotFoundError extends Error {
@@ -208,3 +208,53 @@ export async function waitWithExtendableTimeout<T>({
     result: await promise,
   };
 }
+
+export async function importModule(path: string) {
+  // cleanup environment variables before running the user code
+  // cleanEnvironmentVariables();
+
+  const [folderName, ...functionNameParts] = path.split("/");
+  const functionNameDepth = functionNameParts.length;
+
+  // string literals should be inline
+  // currently we support only 5 levels of depth
+  // rollup dynamic import does not support multiple levels of dynamic imports so we need to specify the possible paths explicitly
+  try {
+    let imported: any = undefined;
+    switch (functionNameDepth) {
+      case 1:
+        imported = await import(`./${folderName}/${functionNameParts[0]}.ts`);
+        break;
+      case 2:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}.ts`
+        );
+        break;
+      case 3:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}.ts`
+        );
+        break;
+      case 4:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}.ts`
+        );
+        break;
+      case 5:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}/${functionNameParts[4]}.ts`
+        );
+        break;
+      default:
+        throw new Error(
+          "intuned supports maximum 5 levels of depth in the api folder"
+        );
+    }
+    return imported;
+  } catch (error: any) {
+    if (error.message.includes("Unknown variable dynamic import")) {
+      throw new FunctionNotFoundError("", path);
+    }
+    throw error;
+  }
+}

package/api/test2.ts

@@ -1,8 +1,7 @@
 import { Page, BrowserContext } from "@intuned/playwright-core";
-import { extendTimeout } from "../src/runtime/extendTimeout";
-import { requestOTP } from "../src/runtime/requestMoreInfo";
+import { extendTimeout, extendPayload } from "../src/runtime";
 
-export default async function* test2(
+export default async function test2(
   { n }: { n?: number },
   page: Page,
   context: BrowserContext
@@ -10,8 +9,6 @@ export default async function* test2(
   await page.goto("https://wikipedia.org/");
   await page.waitForTimeout(1000);
 
-  yield requestOTP("Please enter the OTP");
-
   const titles: string[] = [];
 
   for (let i = 0; i < (n ?? 2); i++) {
@@ -21,5 +18,10 @@ export default async function* test2(
     extendTimeout();
   }
 
+  extendPayload({
+    api: "test",
+    parameters: {},
+  });
+
   return { titles };
 }

package/auth-sessions/check.ts

@@ -5,5 +5,7 @@ export default async function check(
   _context: BrowserContext
 ): Promise<boolean> {
   await page.goto("https://setcookie.net");
-  return (await page.locator("ul li code").all()).length > 0;
+  const result = (await page.locator("ul li code").all()).length > 0;
+  console.log("Check result", result);
+  return result;
 }

package/auth-sessions/create.ts

@@ -15,16 +15,16 @@ export default async function* create(
   await page.locator("#value").fill("password");
   await page.locator("input[type=submit]").click();
 
-  console.log("Received", yield requestOTP("Enter useless otp"));
-  console.log(
-    "Received",
-    yield requestMultipleChoice("Choose the correct answer", [
-      "A",
-      "B",
-      "C",
-      "D",
-    ])
-  );
+  // console.log("Received", yield requestOTP("Enter useless otp"));
+  // console.log(
+  //   "Received",
+  //   yield requestMultipleChoice("Choose the correct answer", [
+  //     "A",
+  //     "B",
+  //     "C",
+  //     "D",
+  //   ])
+  // );
 
   await page.goto("http://www.sharonminsuk.com/code/storage-test.html");
   await page.locator("#local").fill("intuned");

package/bin/intuned-api-run

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/api/run.js");
+void import("../dist/commands/api/run.js");

package/bin/intuned-auth-session-check

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/auth-sessions/run-check.js");
+void import("../dist/commands/auth-sessions/run-check.js");

package/bin/intuned-auth-session-create

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/auth-sessions/run-create.js");
+void import("../dist/commands/auth-sessions/run-create.js");

package/bin/intuned-auth-session-load

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/auth-sessions/load.js");
+void import("../dist/commands/auth-sessions/load.js");

package/bin/intuned-auth-session-refresh

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/auth-sessions/run-refresh.js");
+void import("../dist/commands/auth-sessions/run-refresh.js");

package/bin/intuned-browser-save-state

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/browser/save-state.js");
+void import("../dist/commands/browser/save-state.js");

package/bin/intuned-browser-start

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/browser/start-browser.js");
+void import("../dist/commands/browser/start-browser.js");

package/bin/intuned-build

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/build.js");
+void import("../dist/commands/build.js");

package/bin/intuned-ts-check

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/ts-check.js");
+void import("../dist/commands/ts-check.js");

package/dist/commands/api/run.js

@@ -16,6 +16,8 @@ var _Logger = require("../../common/Logger");
 var _nanoid = require("nanoid");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _runApi = require("../../common/runApi");
+var _tsNodeImport = require("../common/tsNodeImport");
+var _fileUtils = require("../common/utils/fileUtils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 && Object.prototype.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; }
@@ -36,10 +38,12 @@ async function executeCLI(apiName, mode, inputData, options) {
       throw new Error("Auth session is not enabled but auth session provided. To use auth session please enable it in Intuned.json");
     }
   }
+  const apiFilePath = (0, _fileUtils.getFullPathInProject)("api", `${apiName}.ts`);
+  const runApiModule = await (0, _tsNodeImport.tsNodeImport)(apiFilePath);
   const runApiResult = await (0, _runApi.runApi)({
     automationFunction: {
-      name: `api/${apiName}`,
-      params: inputData ?? {}
+      module: runApiModule,
+      params: inputData
     },
     auth: authSessionPathToUse ? {
       session: {

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

@@ -8,6 +8,7 @@ var _settings = require("../common/utils/settings");
 var _dotenv = _interopRequireDefault(require("dotenv"));
 var _constants = require("../../common/constants");
 var _runApi = require("../../common/runApi");
+var _tsNodeImport = require("../common/tsNodeImport");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 && Object.prototype.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; }
@@ -26,9 +27,10 @@ _commander.program.description("run auth session check").option("--cdpAddress <c
   if (!fs.exists(checkFilePath)) {
     throw new Error("auth session check file not found");
   }
+  const checkModule = await (0, _tsNodeImport.tsNodeImport)(checkFilePath);
   const runApiResult = await (0, _runApi.runApi)({
     automationFunction: {
-      name: `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`
+      module: checkModule
     },
     runOptions: {
       environment: "ide",