@intuned/runtime-dev 0.1.0-test.45 → 0.1.0-test.5

package/InterfaceTemplate/index.ts

@@ -0,0 +1 @@
+import * as _ from "@intuned/runtime/dist/commands/interface/run";

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/async.ts

@@ -40,63 +40,59 @@ export async function runEndpointAsync<_Parameters extends any[], _Result>(
   } catch (e: any) {
     console.error(`Error running ${requestId} in async mode:`, e);
     ({ status, body } = getErrorResponse(e));
+  } finally {
+    AsyncRunEndpointController.removeRequest(taskToken);
   }
 
+  // report result
+  console.log("Reporting result for", requestId);
   try {
-    // report result
-    console.log("Reporting result for", requestId);
-    try {
-      // `retry` will keep retrying any errors unless they are thrown through calling `bail`
-      await retry(
-        async (bail: (e: Error) => void) => {
-          const response = await callBackendFunctionWithToken(
-            "run/reportResult",
-            {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json",
-                "fly-instance-id": process.env.FLY_ALLOC_ID ?? "",
-              },
-              body: JSON.stringify({
-                status,
-                body,
-                startTime,
-                taskToken,
-              }),
-            }
-          ).catch((e) => {
-            const message = `Reporting result failed for ${requestId}, error: ${e.message}`;
-            console.error(message);
-            throw e;
-          });
-          if (!response.ok) {
-            // Do not retry unauthenticated, forbidden, not found or too large responses
-            if ([401, 403, 404, 413].includes(response.status)) {
-              const message = `Reporting result failed for ${requestId} (non-retryable), status ${response.status}`;
-              console.error(message);
-              bail(new Error(message));
-            }
-            // retry other errors (such as 502)
-            const message = `Reporting result failed for ${requestId}, status ${response.status}`;
-            console.error(message);
-            throw new Error(message);
+    // `retry` will keep retrying any errors unless they are thrown through calling `bail`
+    await retry(
+      async (bail: (e: Error) => void) => {
+        const response = await callBackendFunctionWithToken(
+          "run/reportResult",
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              "fly-instance-id": process.env.FLY_ALLOC_ID ?? "",
+            },
+            body: JSON.stringify({
+              status,
+              body,
+              startTime,
+              taskToken,
+            }),
           }
-
-          return response;
-        },
-        {
-          retries: 5,
-          factor: 2,
-          maxTimeout: 1000 * 60, // 1 minute
-          minTimeout: 1000 * 5, // 5 seconds
+        );
+        if (!response.ok) {
+          // Do not retry unauthenticated, forbidden, not found or too large responses
+          if ([401, 403, 404, 413].includes(response.status)) {
+            bail(
+              new Error(
+                `Reporting result failed for ${requestId} (non-retryable), status ${response.status}`
+              )
+            );
+          }
+          // retry other errors (such as 502)
+          throw new Error(
+            `Reporting result failed for ${requestId}, status ${response.status}`
+          );
         }
-      );
-      console.log("Reported result for", requestId);
-    } catch (e: any) {
-      // ignore
-    }
-  } finally {
-    AsyncRunEndpointController.removeRequest(taskToken);
+
+        return response;
+      },
+      {
+        retries: 5,
+        factor: 2,
+        maxTimeout: 1000 * 60, // 1 minute
+        minTimeout: 1000 * 5, // 5 seconds
+      }
+    );
+    console.log("Reported result for", requestId);
+  } catch (e: any) {
+    console.log(e?.message ?? `Reporting result failed for ${requestId}`);
   }
 
   await ShutdownController.instance.checkForShutdown();

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,
@@ -36,7 +35,7 @@ export async function checkAuthSession({
       name: "auth-sessions/check",
     },
     runOptions: {
-      environment: "standalone",
+      environment: "deployed",
       headless: isHeadless(),
       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,5 +1,5 @@
 import { authSessionsContextsStore } from "./store";
-import { getTraceFilePath, isHeadless, importModule } from "../../utils";
+import { getTraceFilePath, isHeadless } from "../../utils";
 import * as fs from "fs-extra";
 import { runApiGenerator } from "@intuned/runtime/dist/common/runApi";
 import type { RequestMoreInfoDetails } from "@intuned/runtime/dist/runtime";
@@ -54,7 +54,7 @@ export async function createAuthSession({
   >({
     automationFunction: {
       name: "auth-sessions/create",
-      params: parameters,
+      params: parameters ?? {},
     },
     tracing: saveTrace
       ? {
@@ -63,22 +63,24 @@ export async function createAuthSession({
         }
       : { enabled: false },
     runOptions: {
-      environment: "standalone",
+      environment: "deployed",
       headless,
       proxy,
     },
     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";
@@ -65,24 +61,23 @@ export async function runApi({
 
   const abortController = new AbortController();
 
-  backendFunctionsTokenManager.token = functionsToken;
   const resultWithTimeout = await waitWithExtendableTimeout({
     promise: runApiInternal({
       automationFunction: {
         name: `api/${functionName}`,
-        params,
+        params: params ?? {},
       },
-      auth: isAuthSessionEnabled
-        ? {
+      auth: !isAuthSessionEnabled
+        ? undefined
+        : {
             session: {
               type: "state",
               state: session,
             },
             runCheck: isAuthSessionEnabled,
-          }
-        : undefined,
+          },
       runOptions: {
-        environment: "standalone",
+        environment: "deployed",
         headless,
         proxy,
       },
@@ -92,8 +87,8 @@ export async function runApi({
             filePath: getTraceFilePath(runId, attemptNumber),
           }
         : { 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,50 +208,3 @@ export async function waitWithExtendableTimeout<T>({
     result: await promise,
   };
 }
-
-export async function importModule(path: string) {
-  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 };
 }