@intuned/runtime-dev 0.0.1-testing.0 → 0.1.0-test.0

package/InterfaceTemplate/index.ts

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

package/Intuned.json

@@ -0,0 +1,5 @@
+{
+  "authSessions": {
+    "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,11 +1,8 @@
-import { getDownloadDirectoryPath } from "@intuned/runtime";
-import { getProductionPlaywrightConstructs } from "@intuned/runtime";
-import { checkAuthSessionWithRetries, isHeadless } from "../../utils";
-import * as fs from "fs-extra";
 import { readJSON } from "fs-extra";
+import { isHeadless } from "../../utils";
+import { runApi } from "@intuned/runtime/dist/common/runApi";
 
 export async function checkAuthSession({
-  mode,
   proxy,
   session,
 }: {
@@ -33,36 +30,33 @@ export async function checkAuthSession({
     };
   }
 
-  if (mode !== "async") {
-    return {
-      status: 400,
-      body: {
-        error: "Invalid Request",
-        message: "only async mode is supported",
+  const result = await runApi<boolean>({
+    automationFunction: {
+      name: "auth-sessions/check",
+    },
+    runOptions: {
+      environment: "deployed",
+      headless: isHeadless(),
+      proxy,
+    },
+    auth: {
+      session: {
+        type: "state",
+        state: session,
       },
+      runCheck: false,
+    },
+  });
+  if (result.isErr()) {
+    return {
+      status: 500,
+      body: result.error,
     };
   }
-
-  const downloadsPath = getDownloadDirectoryPath();
-  const headless = isHeadless();
-  const { page, context } = await getProductionPlaywrightConstructs({
-    headless,
-    proxy,
-    downloadsPath,
-    storageState: session,
-  });
-
-  const authSessionCheckResult = await checkAuthSessionWithRetries(
-    page,
-    context,
-    2
-  );
-
-  await fs.remove(downloadsPath);
   return {
     status: 200,
     body: {
-      result: authSessionCheckResult,
+      result: result.value.result,
     },
   };
 }

package/WebTemplate/controllers/authSessions/create.ts

@@ -1,15 +1,12 @@
 import { authSessionsContextsStore } from "./store";
-import { AUTH_SESSIONS_FOLDER_NAME } from "@intuned/runtime/dist/common/constants";
-import { getDownloadDirectoryPath } from "@intuned/runtime";
-import { getProductionPlaywrightConstructs } from "@intuned/runtime";
-import { callFunction, getTraceFilePath, isHeadless } from "../../utils";
+import { getTraceFilePath, isHeadless } from "../../utils";
 import * as fs from "fs-extra";
-import { getContextStorageState } from "@intuned/runtime/dist/common/contextStorageStateHelpers";
+import { runApiGenerator } from "@intuned/runtime/dist/common/runApi";
+import type { RequestMoreInfoDetails } from "@intuned/runtime/dist/runtime";
 
 export async function createAuthSession({
   parameters,
   operationId,
-  mode,
   proxy,
   saveTrace,
 }: {
@@ -36,16 +33,6 @@ export async function createAuthSession({
     };
   }
 
-  if (mode !== "async") {
-    return {
-      status: 400,
-      body: {
-        error: "Invalid Request",
-        message: "only async mode is supported",
-      },
-    };
-  }
-
   if (authSessionsContextsStore.has(operationId)) {
     return {
       status: 400,
@@ -56,73 +43,61 @@ export async function createAuthSession({
       },
     };
   }
-  const downloadsPath = getDownloadDirectoryPath();
   const headless = isHeadless();
-  const { page, context } = await getProductionPlaywrightConstructs({
-    headless,
-    proxy,
-    downloadsPath,
-  });
-
-  try {
-    if (saveTrace) {
-      try {
-        await context.tracing.start({ screenshots: true, snapshots: true });
-      } catch (error) {
-        console.error("Error starting trace", error);
-      }
-    }
 
-    const operationGenerator = await callFunction(
-      AUTH_SESSIONS_FOLDER_NAME,
-      "create",
-      [parameters ?? {}, page, context]
-    );
+  const abortController = new AbortController();
 
-    await fs.remove(downloadsPath);
+  const createGenerator = runApiGenerator<
+    void,
+    RequestMoreInfoDetails,
+    unknown
+  >({
+    automationFunction: {
+      name: "auth-sessions/create",
+      params: parameters ?? {},
+    },
+    tracing: saveTrace
+      ? {
+          enabled: true,
+          filePath: getTraceFilePath(operationId),
+        }
+      : { enabled: false },
+    runOptions: {
+      environment: "deployed",
+      headless,
+      proxy,
+    },
+    abortSignal: abortController.signal,
+    retrieveSession: true,
+  });
 
-    const result = await operationGenerator.next();
+  const result = await createGenerator.next();
 
-    if (result.done) {
-      if (saveTrace) {
-        try {
-          const traceFilePath = getTraceFilePath(operationId);
-          await context.tracing.stop({ path: traceFilePath });
-        } catch (error) {
-          console.error("Error stopping trace", error);
-        }
-      }
-      const fullSessionState = await getContextStorageState(context);
-      await context.close();
+  if (result.done) {
+    const r = result.value;
 
+    if (r.isErr()) {
       return {
-        status: 200,
-        body: { ...fullSessionState, status: 200 },
+        status: 500,
+        body: r.error,
       };
     }
 
-    authSessionsContextsStore.set(operationId, {
-      done: false,
-      generator: operationGenerator,
-      context,
-      requestInfo: result.value,
-      saveTrace,
-    });
-
     return {
       status: 200,
-      body: result.value,
+      body: { ...r.value.session, status: 200 },
     };
-  } catch (e) {
-    if (saveTrace) {
-      try {
-        const traceFilePath = getTraceFilePath(operationId);
-        await context.tracing.stop({ path: traceFilePath });
-      } catch (error) {
-        console.error("Error stopping trace", error);
-      }
-    }
-
-    throw e;
   }
+
+  authSessionsContextsStore.set(operationId, {
+    done: false,
+    generator: createGenerator,
+    requestInfo: result.value,
+    abortController,
+  });
+
+  return {
+    status: 200,
+    body: result.value,
+  };
 }

package/WebTemplate/controllers/authSessions/index.ts

@@ -10,7 +10,7 @@ export const {
 } = makeEndpointControllers({
   requestId: (req) => `createAuthSession ${req.body.operationId}`,
   handler: createAuthSession,
-  parameters: (req) => [req.body],
+  parameters: (req): [any] => [req.body],
 });
 
 export const {
@@ -19,7 +19,7 @@ export const {
 } = makeEndpointControllers({
   requestId: "checkAuthSession",
   handler: checkAuthSession,
-  parameters: (req) => [req.body],
+  parameters: (req): [any] => [req.body],
 });
 
 export const {
@@ -28,7 +28,7 @@ export const {
 } = makeEndpointControllers({
   requestId: (req) => `killAuthSessionOperation ${req.body.operationId}`,
   handler: killAuthSessionOperation,
-  parameters: (req) => [req.body],
+  parameters: (req): [any] => [req.body],
 });
 
 export const {
@@ -37,5 +37,5 @@ export const {
 } = makeEndpointControllers({
   requestId: (req) => `resumeAuthSessionOperation ${req.body.operationId}`,
   handler: resumeAuthSessionOperation,
-  parameters: (req) => [req.body],
+  parameters: (req): [any] => [req.body],
 });

package/WebTemplate/controllers/authSessions/killOperation.ts

@@ -19,7 +19,7 @@ export async function killAuthSessionOperation({
   }
 
   try {
-    await operation.context.browser()?.close();
+    operation.abortController.abort();
     authSessionsContextsStore.delete(operationId);
 
     return { status: 200, body: { done: true } };

package/WebTemplate/controllers/authSessions/resumeOperation.ts

@@ -1,6 +1,4 @@
 import { authSessionsContextsStore } from "./store";
-import { getContextStorageState } from "@intuned/runtime/dist/common/contextStorageStateHelpers";
-import { getTraceFilePath } from "../../utils";
 
 export async function resumeAuthSessionOperation({
   operationId,
@@ -20,61 +18,39 @@ export async function resumeAuthSessionOperation({
     };
   }
 
-  try {
-    if (
-      operation.requestInfo.requestType === "multiple_choice" &&
-      !operation.requestInfo.choices.includes(input)
-    ) {
-      return {
-        status: 400,
-        body: {
-          error: "Invalid Request",
-          message: "input does not match any of the choices",
-        },
-      };
-    }
-
-    const result = await operation.generator.next(input);
+  if (
+    operation.requestInfo.requestType === "multiple_choice" &&
+    !operation.requestInfo.choices.includes(input)
+  ) {
+    return {
+      status: 400,
+      body: {
+        error: "Invalid Request",
+        message: "input does not match any of the choices",
+      },
+    };
+  }
 
-    authSessionsContextsStore.set(operationId, {
-      done: result.done,
-      generator: operation.generator,
-      context: operation.context,
-      requestInfo: result.value,
-      saveTrace: operation.saveTrace,
-    });
+  const result = await operation.generator.next(input);
 
-    if (result.done) {
-      if (operation.saveTrace) {
-        try {
-          const traceFilePath = getTraceFilePath(operationId);
-          await operation.context.tracing.stop({ path: traceFilePath });
-        } catch (error) {
-          console.error("Error stopping trace", error);
-        }
-      }
-      const storageState = await getContextStorageState(operation.context);
-      await operation.context.browser()?.close();
-      authSessionsContextsStore.delete(operationId);
-      return {
-        status: 200,
-        body: storageState,
-      };
+  if (result.done) {
+    authSessionsContextsStore.delete(operationId);
+    if (result.value.isErr()) {
+      return result.value.error.apiResponse;
     }
-
     return {
       status: 200,
-      body: result.value,
+      body: result.value.value.session,
     };
-  } catch (e) {
-    if (operation.saveTrace) {
-      try {
-        const traceFilePath = getTraceFilePath(operationId);
-        await operation.context.tracing.stop({ path: traceFilePath });
-      } catch (error) {
-        console.error("Error stopping trace", error);
-      }
-    }
-    throw e;
   }
+
+  authSessionsContextsStore.set(operationId, {
+    ...operation,
+    requestInfo: result.value,
+  });
+
+  return {
+    status: 200,
+    body: result.value,
+  };
 }

package/WebTemplate/controllers/authSessions/store.ts

@@ -1,14 +1,19 @@
-//@ts-ignore
-import { RequestMoreInfoDetails } from "@intuned/sdk/dist/common/requestMoreInfo";
-import { BrowserContext } from "@intuned/playwright-core";
+import type { RequestMoreInfoDetails } from "@intuned/runtime/dist/runtime";
+import type {
+  RunApiResult,
+  RunApiResultWithSessionOk,
+} from "@intuned/runtime/dist/common/runApi";
 
 export const authSessionsContextsStore = new Map<
   string,
   {
     done: boolean | undefined;
-    generator: AsyncGenerator<any, void, unknown>;
-    context: BrowserContext;
+    generator: AsyncGenerator<
+      RequestMoreInfoDetails,
+      RunApiResult<void, RunApiResultWithSessionOk>,
+      string
+    >;
     requestInfo: RequestMoreInfoDetails;
-    saveTrace: boolean;
+    abortController: AbortController;
   }
 >();