@intuned/runtime-dev 0.1.0-test.30 → 0.1.0-test.31

package/WebTemplate/controllers/runApi/helpers.ts

@@ -65,6 +65,7 @@ export async function runApi({
 
   const abortController = new AbortController();
 
+  backendFunctionsTokenManager.token = functionsToken;
   const resultWithTimeout = await waitWithExtendableTimeout({
     promise: runApiInternal({
       automationFunction: {
@@ -91,7 +92,6 @@ export async function runApi({
             filePath: getTraceFilePath(runId, attemptNumber),
           }
         : { enabled: false },
-      functionsToken,
       abortSignal: abortController.signal,
       importFunction: importModule,
     }),

package/dist/commands/interface/run.js

@@ -18,6 +18,7 @@ const startRunApiSchema = _zod.default.object({
   type: _zod.default.literal("start"),
   parameters: _runApi.runApiParametersSchema.extend({
     retrieveSession: _zod.default.boolean(),
+    functionsToken: _zod.default.string().optional(),
     context: _zod.default.object({
       jobId: _zod.default.string().optional(),
       jobRunId: _zod.default.string().optional(),
@@ -73,7 +74,9 @@ function main(importFunction) {
     const jsonUnixSocket = new _unixSocket.JSONUnixSocket(client);
     async function runGeneratorAndSendResult(next) {
       const _generator = generator;
-      if (_generator == null) return;
+      if (_generator == null) return {
+        done: true
+      };
       const result = await (0, _asyncLocalStorage.runWithContext)(context, () => _generator.next(next));
       if (result.done) {
         const resultToSend = result.value.isOk() ? result.value.value : result.value.error.json;
@@ -83,14 +86,15 @@ function main(importFunction) {
           result: resultToSend,
           success
         });
-        return true;
       } else {
         jsonUnixSocket.sendJSON({
           type: "yield",
           result: result.value
         });
-        return false;
       }
+      return {
+        done: result.done ?? false
+      };
     }
     for await (const data of jsonUnixSocket.receiveJSON()) {
       const inputParseResult = inputSchema.safeParse(data);
@@ -99,7 +103,7 @@ function main(importFunction) {
         jsonUnixSocket.sendJSON({
           type: "done",
           result: {
-            error: "InvalidInput",
+            error: "InternalInvalidInputError",
             message: "Invalid input",
             details: {
               errors: inputParseResult.error.errors
@@ -120,12 +124,12 @@ function main(importFunction) {
         break;
       }
       if (input.type === "start") {
-        const gen = (0, _runApi.runApiGenerator)({
+        _jwtTokenManager.backendFunctionsTokenManager.token = input.parameters.functionsToken;
+        generator = (0, _runApi.runApiGenerator)({
           ...input.parameters,
           abortSignal: abortController.signal,
           importFunction
         });
-        generator = gen;
         context = {
           extendedPayloads: [],
           runEnvironment: input.parameters.runOptions.environment === "deployed" ? _enums.RunEnvironment.DEPLOYED : _enums.RunEnvironment.IDE,
@@ -141,7 +145,10 @@ function main(importFunction) {
           ...(input.parameters.context ?? {}),
           proxy: getProxyUrlFromRunOptions(input.parameters.runOptions)
         };
-        if (await runGeneratorAndSendResult()) {
+        const {
+          done
+        } = await runGeneratorAndSendResult();
+        if (done) {
           break;
         }
         continue;
@@ -150,7 +157,10 @@ function main(importFunction) {
         if (!generator) {
           throw new Error("generator not started");
         }
-        if (await runGeneratorAndSendResult(input.parameters.value)) {
+        const {
+          done
+        } = await runGeneratorAndSendResult(input.parameters.value);
+        if (done) {
           break;
         }
         continue;

package/dist/common/runApi/index.js

@@ -15,7 +15,6 @@ var _downloadDirectory = require("../../runtime/downloadDirectory");
 var _asyncLocalStorage = require("../asyncLocalStorage");
 var _fsExtra = _interopRequireWildcard(require("fs-extra"));
 var fs = _fsExtra;
-var _jwtTokenManager = require("../jwtTokenManager");
 var _contextStorageStateHelpers = require("../contextStorageStateHelpers");
 var _neverthrow = require("neverthrow");
 var _errors = require("./errors.js");
@@ -57,10 +56,8 @@ async function* runApiGenerator({
     automationFunction,
     runOptions,
     tracing,
-    auth,
-    functionsToken
+    auth
   } = _types.runApiParametersSchema.parse(input);
-  _jwtTokenManager.backendFunctionsTokenManager.token = functionsToken;
   let page;
   let context;
   let downloadsPath;

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

@@ -125,7 +125,6 @@ export declare const runApiSessionSchema: z.ZodDiscriminatedUnion<"type", [z.Zod
     };
 }>]>;
 export declare const runApiParametersSchema: z.ZodObject<{
-    functionsToken: z.ZodOptional<z.ZodString>;
     automationFunction: z.ZodObject<{
         name: z.ZodString;
         params: z.ZodOptional<z.ZodAny>;
@@ -383,7 +382,6 @@ export declare const runApiParametersSchema: z.ZodObject<{
         cdpAddress: string;
     };
     retrieveSession: boolean;
-    functionsToken?: string | undefined;
     auth?: {
         session: {
             type: "file";
@@ -419,7 +417,6 @@ export declare const runApiParametersSchema: z.ZodObject<{
         name: string;
         params?: any;
     };
-    functionsToken?: string | undefined;
     tracing?: {
         enabled: false;
     } | {

package/dist/common/runApi/types.js

@@ -14,7 +14,6 @@ const runApiSessionSchema = exports.runApiSessionSchema = _zod.default.discrimin
   state: _zod.default.custom(v => v)
 })]);
 const runApiParametersSchema = exports.runApiParametersSchema = _zod.default.object({
-  functionsToken: _zod.default.string().optional(),
   automationFunction: _zod.default.object({
     name: _zod.default.string(),
     params: _zod.default.any().optional()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "0.1.0-test.30",
+  "version": "0.1.0-test.31",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",

package/playwright.config.js

@@ -1,43 +0,0 @@
-import { defineConfig, devices } from "@intuned/playwright-test";
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-    testDir: "./e2e-tests",
-    /* Run tests in files in parallel */
-    fullyParallel: true,
-    /* Fail the build on CI if you accidentally left test.only in the source code. */
-    forbidOnly: !!process.env.CI,
-    /* Retry on CI only */
-    retries: process.env.CI ? 2 : 0,
-    /* Opt out of parallel tests on CI. */
-    workers: process.env.CI ? 1 : undefined,
-    /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-    reporter: "html",
-    /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-    use: {
-        /* Base URL to use in actions like `await page.goto('/')`. */
-        // baseURL: 'http://127.0.0.1:3000',
-        /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-        trace: "on-first-retry",
-        // headless: false,
-    },
-    /* Configure projects for major browsers */
-    projects: [
-        {
-            name: "chromium",
-            use: { ...devices["Desktop Chrome"] },
-        },
-    ],
-    /* Run your local dev server before starting the tests */
-    // webServer: {
-    //   command: 'npm run start',
-    //   url: 'http://127.0.0.1:3000',
-    //   reuseExistingServer: !process.env.CI,
-    // },
-});

package/preserve-dynamic-imports.js

@@ -1,16 +0,0 @@
-module.exports = function ({ template }) {
-  return {
-    visitor: {
-      CallExpression(path) {
-        if (path.node.callee.type === "Import") {
-          const buildRequire = template(`Promise.resolve(require(ARGUMENT))`);
-          path.replaceWith(
-            buildRequire({
-              ARGUMENT: path.node.arguments[0],
-            })
-          );
-        }
-      },
-    },
-  };
-};

package/vite.config.js

@@ -1,16 +0,0 @@
-import { defineConfig } from "vite";
-import macros from "vite-plugin-babel-macros";
-require('dotenv').config();
-export default defineConfig({
-    test: {
-        reporters: ['verbose', "html"],
-        outputFile: { html: './reports/html/index.html' },
-        testTimeout: 30000,
-        env: {
-            RUN_ENVIRONMENT: "AUTHORING",
-        }
-    },
-    plugins: [
-        macros(),
-    ],
-});