@intuned/runtime-dev 0.1.0-test.28 → 0.1.0-test.3

package/Intuned.json

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

package/WebTemplate/api.ts

@@ -33,107 +33,109 @@ import {
 } from "./headers";
 import { FEATURES } from "./features";
 
-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);
-  });
+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" });
-    }
-  );
+    app.get(
+      "/api/protected/health",
+      accessKeyValidatorMiddleware,
+      async (req, res) => {
+        res.status(200).json({ status: "ok" });
+      }
+    );
 
-  app.post(
-    "/api/auth-session/create",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(createAuthSessionController)
-  );
+    app.post(
+      "/api/auth-session/create",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(createAuthSessionController)
+    );
 
-  app.post(
-    "/api/auth-session-async/create",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(createAuthSessionAsyncController)
-  );
+    app.post(
+      "/api/auth-session-async/create",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(createAuthSessionAsyncController)
+    );
 
-  app.post(
-    "/api/auth-session/check",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(checkAuthSessionController)
-  );
+    app.post(
+      "/api/auth-session/check",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(checkAuthSessionController)
+    );
 
-  app.post(
-    "/api/auth-session-async/check",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(checkAuthSessionAsyncController)
-  );
+    app.post(
+      "/api/auth-session-async/check",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(checkAuthSessionAsyncController)
+    );
 
-  app.post(
-    "/api/auth-session/kill",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(killAuthSessionOperationController)
-  );
+    app.post(
+      "/api/auth-session/kill",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(killAuthSessionOperationController)
+    );
 
-  app.post(
-    "/api/auth-session/resume",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(resumeAuthSessionOperationController)
-  );
+    app.post(
+      "/api/auth-session/resume",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(resumeAuthSessionOperationController)
+    );
 
-  app.post(
-    "/api/auth-session-async/resume",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(resumeAuthSessionOperationAsyncController)
-  );
+    app.post(
+      "/api/auth-session-async/resume",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(resumeAuthSessionOperationAsyncController)
+    );
 
-  app.post(
-    "/api/run/*",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(runApiController)
-  );
+    app.post(
+      "/api/run/*",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(runApiController)
+    );
 
-  app.post(
-    "/api/run-async/start/*",
-    accessKeyValidatorMiddleware,
-    errorRetryMiddleware(runApiAsyncController) // todo: this probably needs changing
-  );
+    app.post(
+      "/api/run-async/start/*",
+      accessKeyValidatorMiddleware,
+      errorRetryMiddleware(runApiAsyncController) // todo: this probably needs changing
+    );
 
-  app.get(
-    "/api/run-async/count",
-    accessKeyValidatorMiddleware,
-    getActiveAsyncEndpointController
-  );
+    app.get(
+      "/api/run-async/count",
+      accessKeyValidatorMiddleware,
+      getActiveAsyncEndpointController
+    );
 
-  app.post(
-    "/api/trace/upload/:runId",
-    accessKeyValidatorMiddleware,
-    uploadTraceController
-  );
+    app.post(
+      "/api/trace/upload/:runId",
+      accessKeyValidatorMiddleware,
+      uploadTraceController
+    );
 
-  app.post(
-    "/api/trace/delete/:runId",
-    accessKeyValidatorMiddleware,
-    deleteTraceController
-  );
-}
+    app.post(
+      "/api/trace/delete/:runId",
+      accessKeyValidatorMiddleware,
+      deleteTraceController
+    );
+  }
 
-app.get("/api/features", accessKeyValidatorMiddleware, async (_, res) => {
-  res.status(200).json({ features: FEATURES });
-});
+  app.get("/api/features", accessKeyValidatorMiddleware, async (_, res) => {
+    res.status(200).json({ features: FEATURES });
+  });
+}

package/WebTemplate/controllers/authSessions/check.ts

@@ -1,7 +1,6 @@
 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,
@@ -47,10 +46,12 @@ export async function checkAuthSession({
       },
       runCheck: false,
     },
-    importFunction: importModule,
   });
   if (result.isErr()) {
-    return result.error.apiResponse;
+    return {
+      status: 500,
+      body: result.error,
+    };
   }
   return {
     status: 200,

package/WebTemplate/controllers/authSessions/create.ts

@@ -1,11 +1,7 @@
 import { authSessionsContextsStore } from "./store";
-import { getTraceFilePath, isHeadless, importModule } from "../../utils";
+import { getTraceFilePath, isHeadless } from "../../utils";
 import * as fs from "fs-extra";
-import {
-  runApiGenerator,
-  type RunApiResult,
-  type RunApiResultWithSessionOk,
-} from "@intuned/runtime/dist/common/runApi";
+import { runApiGenerator } from "@intuned/runtime/dist/common/runApi";
 import type { RequestMoreInfoDetails } from "@intuned/runtime/dist/runtime";
 
 export async function createAuthSession({
@@ -58,7 +54,7 @@ export async function createAuthSession({
   >({
     automationFunction: {
       name: "auth-sessions/create",
-      params: parameters,
+      params: parameters ?? {},
     },
     tracing: saveTrace
       ? {
@@ -73,16 +69,18 @@ export async function createAuthSession({
     },
     abortSignal: abortController.signal,
     retrieveSession: true,
-    importFunction: importModule,
   });
 
   const result = await createGenerator.next();
 
-  if (result.done === true) {
+  if (result.done) {
     const r = result.value;
 
     if (r.isErr()) {
-      return r.error.apiResponse;
+      return {
+        status: 500,
+        body: r.error,
+      };
     }
 
     return {

package/WebTemplate/controllers/authSessions/resumeOperation.ts

@@ -33,7 +33,7 @@ export async function resumeAuthSessionOperation({
 
   const result = await operation.generator.next(input);
 
-  if (result.done === true) {
+  if (result.done) {
     authSessionsContextsStore.delete(operationId);
     if (result.value.isErr()) {
       return result.value.error.apiResponse;

package/WebTemplate/controllers/runApi/helpers.ts

@@ -1,8 +1,4 @@
-import {
-  getTraceFilePath,
-  importModule,
-  waitWithExtendableTimeout,
-} from "../../utils";
+import { getTraceFilePath, waitWithExtendableTimeout } from "../../utils";
 import * as fs from "fs-extra";
 import { getExecutionContext } from "@intuned/runtime";
 import { backendFunctionsTokenManager } from "@intuned/runtime/dist/common/jwtTokenManager";
@@ -69,17 +65,17 @@ export async function runApi({
     promise: runApiInternal({
       automationFunction: {
         name: `api/${functionName}`,
-        params,
+        params: params ?? {},
       },
-      auth: isAuthSessionEnabled
-        ? {
+      auth: !isAuthSessionEnabled
+        ? undefined
+        : {
             session: {
               type: "state",
               state: session,
             },
             runCheck: isAuthSessionEnabled,
-          }
-        : undefined,
+          },
       runOptions: {
         environment: "deployed",
         headless,
@@ -93,7 +89,6 @@ export async function runApi({
         : { enabled: false },
       functionsToken,
       abortSignal: abortController.signal,
-      importFunction: importModule,
     }),
     initialTimeout: requestTimeout,
     abortController,

package/WebTemplate/index.playwright.ts

@@ -6,42 +6,52 @@ 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";
 
-const port = process.env.PORT ? parseInt(process.env.PORT) : 4000;
+void main();
 
-initializeAppInsights();
+async function main() {
+  const port = process.env.PORT ? parseInt(process.env.PORT) : 4000;
 
-app.use((req, res, next) => {
-  // Cleanup after the response is sent
-  res.on("finish", () => {
-    console.log("finished", req.headers[RUN_ID_HEADER]);
+  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);
     void ShutdownController.instance.checkForShutdown();
+    console.log(`Server is running on port ${port}`);
   });
 
-  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,
-    },
+  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,13 +6,7 @@ import {
   RUN_ID_HEADER,
   SHOULD_SHUTDOWN_HEADER,
 } from "./headers";
-import {
-  getErrorResponse,
-  isHeadless,
-  isJobRunMachine,
-  ProxyConfig,
-  proxyToUrl,
-} from "./utils";
+import { getErrorResponse, isHeadless, ProxyConfig, proxyToUrl } from "./utils";
 import {
   callBackendFunctionWithToken,
   backendFunctionsTokenManager,
@@ -32,11 +26,6 @@ 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>>> {
@@ -83,7 +72,7 @@ async function runApiInContext(
   }
 }
 
-async function jobsV3() {
+export async function runJobsLoop() {
   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";
+import { getExecutionContext } from "@intuned/runtime/dist/common/asyncLocalStorage";
 import { setTimeout } from "timers/promises";
 
 export class FunctionNotFoundError extends Error {
@@ -208,53 +208,3 @@ 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,7 +1,8 @@
 import { Page, BrowserContext } from "@intuned/playwright-core";
-import { extendTimeout, extendPayload } from "../src/runtime";
+import { extendTimeout } from "../src/runtime/extendTimeout";
+import { requestOTP } from "../src/runtime/requestMoreInfo";
 
-export default async function test2(
+export default async function* test2(
   { n }: { n?: number },
   page: Page,
   context: BrowserContext
@@ -9,6 +10,8 @@ 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++) {
@@ -18,10 +21,5 @@ export default async function test2(
     extendTimeout();
   }
 
-  extendPayload({
-    api: "test",
-    parameters: {},
-  });
-
   return { titles };
 }

package/auth-sessions/check.ts

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

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
-void import("../dist/commands/api/run.js");
+require("../dist/commands/api/run.js");

package/bin/intuned-auth-session-check

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

package/bin/intuned-auth-session-create

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

package/bin/intuned-auth-session-load

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

package/bin/intuned-auth-session-refresh

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

package/bin/intuned-browser-save-state

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

package/bin/intuned-browser-start

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

package/bin/intuned-build

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

package/bin/intuned-ts-check

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

package/dist/commands/api/run.js

@@ -16,7 +16,6 @@ var _Logger = require("../../common/Logger");
 var _nanoid = require("nanoid");
 var _chalk = _interopRequireDefault(require("chalk"));
 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; }
@@ -40,7 +39,7 @@ async function executeCLI(apiName, mode, inputData, options) {
   const runApiResult = await (0, _runApi.runApi)({
     automationFunction: {
       name: `api/${apiName}`,
-      params: inputData
+      params: inputData ?? {}
     },
     auth: authSessionPathToUse ? {
       session: {
@@ -53,8 +52,7 @@ async function executeCLI(apiName, mode, inputData, options) {
       environment: "ide",
       cdpAddress: options.cdpAddress,
       mode
-    },
-    importFunction: _tsNodeImport.tsNodeImport
+    }
   });
   if (runApiResult.isErr()) {
     if (runApiResult.error instanceof _runApi.AutomationError) {