@intuned/runtime-dev 1.0.2-abort.2 → 1.0.4-refactor.0

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# UNRELEASED
+
+-
+
+# 1.0.3
+
+- Fix node-fetch builds (used in deprecated `downloadFile` SDK functions).

package/dist/commands/build.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/commands/build.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 "use strict";
 
 var _commander = require("commander");
@@ -61,7 +60,7 @@ async function build(outfile, mode, template) {
         if (isThirdPartyWarning(warning)) return;
         warn(warning);
       },
-      external: ["@intuned/playwright", "@intuned/playwright-core", "jsdom", "canvas", "pdfjs-dist", "pdf-to-png-converter", "crypto", "applicationinsights", "fingerprint-generator", "fingerprint-injector"]
+      external: ["@intuned/playwright", "@intuned/playwright-core", "jsdom", "canvas", "pdfjs-dist", "pdf-to-png-converter", "crypto", "applicationinsights", "fingerprint-generator", "fingerprint-injector", "node-fetch"]
     });
     console.log(`📦 Building ${outfile}`);
     const outfileFolder = path.dirname(outfile);

package/dist/commands/interface/run.js

@@ -15,7 +15,6 @@ var _unixSocket = require("../common/utils/unixSocket");
 var _promises = require("timers/promises");
 var _jwtTokenManager = require("../../common/jwtTokenManager");
 var _formatZodError = require("../../common/formatZodError");
-var _stream = require("stream");
 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; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -61,116 +60,133 @@ function runAutomationCLI(importFunction) {
     let generator = null;
     const abortController = new AbortController();
     client.on("error", err => {
-      var _generator2;
-      void ((_generator2 = generator) === null || _generator2 === void 0 ? void 0 : _generator2.throw(err).catch(() => undefined));
+      var _generator;
+      void ((_generator = generator) === null || _generator === void 0 ? void 0 : _generator.throw(err).catch(() => undefined));
     });
     process.on("SIGINT", () => {
-      var _generator3;
-      void ((_generator3 = generator) === null || _generator3 === void 0 ? void 0 : _generator3.throw(new Error("Interrupted")).catch(() => undefined));
+      var _generator2;
+      void ((_generator2 = generator) === null || _generator2 === void 0 ? void 0 : _generator2.throw(new Error("Interrupted")).catch(() => undefined));
       client.end();
       process.exit(1);
     });
     process.on("SIGTERM", () => {
-      var _generator4;
-      void ((_generator4 = generator) === null || _generator4 === void 0 ? void 0 : _generator4.throw(new Error("Interrupted")).catch(() => undefined));
+      var _generator3;
+      void ((_generator3 = generator) === null || _generator3 === void 0 ? void 0 : _generator3.throw(new Error("Interrupted")).catch(() => undefined));
       client.end();
       process.exit(1);
     });
     const jsonUnixSocket = new _unixSocket.JSONUnixSocket(client);
-    async function runGeneratorAndSendResult(next) {
-      const _generator = generator;
-      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;
-        const success = result.value.isOk();
-        jsonUnixSocket.sendJSON({
-          type: "done",
-          result: resultToSend,
-          success
+    const messagesGenerator = jsonUnixSocket.receiveJSON();
+    async function receiveMessages() {
+      const data = await messagesGenerator.next();
+      if (data.done) {
+        return;
+      }
+      const inputParseResult = inputSchema.safeParse(data.value);
+      if (!inputParseResult.success) {
+        console.error("Validation error:", (0, _formatZodError.formatZodError)(inputParseResult.error));
+        return {
+          type: "error",
+          error: new _runApi.InternalInvalidInputError("Invalid input", (0, _formatZodError.formatZodError)(inputParseResult.error))
+        };
+      }
+      const input = inputParseResult.data;
+      return input;
+    }
+    let resultPromise = null;
+    async function handleMessage(input) {
+      if (input.type === "abort") {
+        abortController.abort();
+        return;
+      }
+      if (input.type === "tokenUpdate") {
+        _jwtTokenManager.backendFunctionsTokenManager.token = input.parameters.functionsToken;
+        return;
+      }
+      if (input.type === "start") {
+        generator = (0, _runApi.runApiGenerator)({
+          ...input.parameters,
+          abortSignal: abortController.signal,
+          importFunction
+        });
+        context = {
+          extendedPayloads: [],
+          runEnvironment: input.parameters.runOptions.environment === "standalone" ? _enums.RunEnvironment.DEPLOYED : _enums.RunEnvironment.IDE,
+          timeoutInfo: {
+            extendTimeoutCallback: async () => {
+              if (Date.now() - timeoutTimestamp < throttleTime) return;
+              timeoutTimestamp = Date.now();
+              jsonUnixSocket.sendJSON({
+                type: "extend"
+              });
+            }
+          },
+          ...(input.parameters.context ?? {}),
+          proxy: getProxyUrlFromRunOptions(input.parameters.runOptions)
+        };
+        _jwtTokenManager.backendFunctionsTokenManager.token = input.parameters.functionsToken;
+        resultPromise = (0, _asyncLocalStorage.runWithContext)(context, async () => {
+          return await generator.next();
+        });
+      }
+      if (input.type === "next") {
+        if (!generator) {
+          throw new Error("generator not started");
+        }
+        resultPromise = (0, _asyncLocalStorage.runWithContext)(context, async () => {
+          return await generator.next(input.parameters.value);
         });
-      } else {
+      }
+    }
+    async function handleResult(generatorResult) {
+      if (!generatorResult.done) {
         jsonUnixSocket.sendJSON({
           type: "yield",
-          result: result.value
+          result: generatorResult.value
         });
+        return;
       }
-      return {
-        done: result.done ?? false
-      };
+      const result = generatorResult.value;
+      const success = result.isOk();
+      const resultToSend = success ? result.value : result.error.json;
+      jsonUnixSocket.sendJSON({
+        type: "done",
+        result: resultToSend,
+        success
+      });
     }
-    const stream = new _stream.PassThrough({
-      objectMode: true
-    });
-    async function messagesLoop() {
-      for await (const data of jsonUnixSocket.receiveJSON()) {
-        const inputParseResult = inputSchema.safeParse(data);
-        if (!inputParseResult.success) {
-          console.error("Validation error:", (0, _formatZodError.formatZodError)(inputParseResult.error));
+    let receiveMessagesPromise = receiveMessages();
+    while (true) {
+      const messageOrResult = await Promise.race([receiveMessagesPromise.then(message => ({
+        type: "message",
+        message
+      })), ...(resultPromise ? [resultPromise.then(result => ({
+        type: "result",
+        result
+      }))] : [])]);
+      if (messageOrResult.type === "message") {
+        const {
+          message
+        } = messageOrResult;
+        if (message === undefined) {
+          break;
+        }
+        if (message.type === "error") {
           jsonUnixSocket.sendJSON({
             type: "done",
-            result: new _runApi.InternalInvalidInputError("Invalid input", (0, _formatZodError.formatZodError)(inputParseResult.error)).json,
+            result: message.error.json,
             success: false
           });
           break;
         }
-        const input = inputParseResult.data;
-        if (input.type === "abort") {
-          abortController.abort();
-          break;
-        }
-        if (input.type === "tokenUpdate") {
-          _jwtTokenManager.backendFunctionsTokenManager.token = input.parameters.functionsToken;
-          continue;
-        }
-        if (input.type === "start") {
-          _jwtTokenManager.backendFunctionsTokenManager.token = input.parameters.functionsToken;
-          generator = (0, _runApi.runApiGenerator)({
-            ...input.parameters,
-            abortSignal: abortController.signal,
-            importFunction
-          });
-          context = {
-            extendedPayloads: [],
-            runEnvironment: input.parameters.runOptions.environment === "standalone" ? _enums.RunEnvironment.DEPLOYED : _enums.RunEnvironment.IDE,
-            timeoutInfo: {
-              extendTimeoutCallback: async () => {
-                if (Date.now() - timeoutTimestamp < throttleTime) return;
-                timeoutTimestamp = Date.now();
-                jsonUnixSocket.sendJSON({
-                  type: "extend"
-                });
-              }
-            },
-            ...(input.parameters.context ?? {}),
-            proxy: getProxyUrlFromRunOptions(input.parameters.runOptions)
-          };
-          stream.write({});
-          continue;
-        }
-        if (input.type === "next") {
-          if (!generator) {
-            throw new Error("generator not started");
-          }
-          stream.write({
-            value: input.parameters.value
-          });
-          continue;
-        }
+        await handleMessage(message);
+        receiveMessagesPromise = receiveMessages();
+        continue;
       }
-      stream.end();
-      client.end();
-    }
-    void messagesLoop();
-    for await (const {
-      value
-    } of stream) {
       const {
-        done
-      } = await runGeneratorAndSendResult(value);
-      if (done) break;
+        result
+      } = messageOrResult;
+      await handleResult(result);
     }
     if (!client.closed) {
       client.end();

package/dist/commands/interface/run2.d.ts

@@ -0,0 +1 @@
+export declare function runAutomationCLI(importFunction?: (path: string) => Promise<any>): void;

package/dist/commands/interface/run2.js

@@ -0,0 +1,210 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.runAutomationCLI = runAutomationCLI;
+var _commander = require("commander");
+var _dotenv = _interopRequireDefault(require("dotenv"));
+var _asyncLocalStorage = require("../../common/asyncLocalStorage");
+var net = _interopRequireWildcard(require("net"));
+var _zod = _interopRequireDefault(require("zod"));
+var _runApi = require("../../common/runApi");
+var _enums = require("../../runtime/enums");
+var _unixSocket = require("../common/utils/unixSocket");
+var _promises = require("timers/promises");
+var _jwtTokenManager = require("../../common/jwtTokenManager");
+var _formatZodError = require("../../common/formatZodError");
+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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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(),
+      runId: _zod.default.string().optional(),
+      queueId: _zod.default.string().optional()
+    }).optional()
+  })
+});
+const nextRunApiSchema = _zod.default.object({
+  type: _zod.default.literal("next"),
+  parameters: _zod.default.object({
+    value: _zod.default.string()
+  })
+});
+const abortRunApiSchema = _zod.default.object({
+  type: _zod.default.literal("abort"),
+  parameters: _zod.default.object({}).optional()
+});
+const tokenUpdateSchema = _zod.default.object({
+  type: _zod.default.literal("tokenUpdate"),
+  parameters: _zod.default.object({
+    functionsToken: _zod.default.string()
+  })
+});
+const inputSchema = _zod.default.union([startRunApiSchema, nextRunApiSchema, abortRunApiSchema, tokenUpdateSchema]);
+_dotenv.default.config({
+  path: `.env`
+});
+function runAutomationCLI(importFunction) {
+  _commander.program.description("run user automation and communicate using unix socket").argument("<socket-path>", "path to unix socket").action(async socketPath => {
+    let context;
+    const throttleTime = 60 * 1000;
+    let timeoutTimestamp = Date.now();
+    const client = net.createConnection(socketPath);
+    let generator = null;
+    const abortController = new AbortController();
+    client.on("error", err => {
+      var _generator;
+      void ((_generator = generator) === null || _generator === void 0 ? void 0 : _generator.throw(err).catch(() => undefined));
+    });
+    process.on("SIGINT", () => {
+      var _generator2;
+      void ((_generator2 = generator) === null || _generator2 === void 0 ? void 0 : _generator2.throw(new Error("Interrupted")).catch(() => undefined));
+      client.end();
+      process.exit(1);
+    });
+    process.on("SIGTERM", () => {
+      var _generator3;
+      void ((_generator3 = generator) === null || _generator3 === void 0 ? void 0 : _generator3.throw(new Error("Interrupted")).catch(() => undefined));
+      client.end();
+      process.exit(1);
+    });
+    const jsonUnixSocket = new _unixSocket.JSONUnixSocket(client);
+    const messagesGenerator = jsonUnixSocket.receiveJSON();
+    async function receiveMessages() {
+      const data = await messagesGenerator.next();
+      if (data.done) {
+        return;
+      }
+      const inputParseResult = inputSchema.safeParse(data.value);
+      if (!inputParseResult.success) {
+        console.error("Validation error:", (0, _formatZodError.formatZodError)(inputParseResult.error));
+        return {
+          type: "error",
+          error: new _runApi.InternalInvalidInputError("Invalid input", (0, _formatZodError.formatZodError)(inputParseResult.error))
+        };
+      }
+      const input = inputParseResult.data;
+      return input;
+    }
+    let resultPromise = null;
+    async function handleMessage(input) {
+      if (input.type === "abort") {
+        abortController.abort();
+        return "aborted";
+      }
+      if (input.type === "tokenUpdate") {
+        _jwtTokenManager.backendFunctionsTokenManager.token = input.parameters.functionsToken;
+        return;
+      }
+      if (input.type === "start") {
+        generator = (0, _runApi.runApiGenerator)({
+          ...input.parameters,
+          abortSignal: abortController.signal,
+          importFunction
+        });
+        context = {
+          extendedPayloads: [],
+          runEnvironment: input.parameters.runOptions.environment === "standalone" ? _enums.RunEnvironment.DEPLOYED : _enums.RunEnvironment.IDE,
+          timeoutInfo: {
+            extendTimeoutCallback: async () => {
+              if (Date.now() - timeoutTimestamp < throttleTime) return;
+              timeoutTimestamp = Date.now();
+              jsonUnixSocket.sendJSON({
+                type: "extend"
+              });
+            }
+          },
+          ...(input.parameters.context ?? {}),
+          proxy: getProxyUrlFromRunOptions(input.parameters.runOptions)
+        };
+        _jwtTokenManager.backendFunctionsTokenManager.token = input.parameters.functionsToken;
+        resultPromise = (0, _asyncLocalStorage.runWithContext)(context, async () => {
+          return await generator.next();
+        });
+      }
+      if (input.type === "next") {
+        if (!generator) {
+          throw new Error("generator not started");
+        }
+        resultPromise = (0, _asyncLocalStorage.runWithContext)(context, async () => {
+          return await generator.next(input.parameters.value);
+        });
+      }
+    }
+    async function handleResult(generatorResult) {
+      if (!generatorResult.done) {
+        jsonUnixSocket.sendJSON({
+          type: "yield",
+          result: generatorResult.value
+        });
+        return;
+      }
+      const result = generatorResult.value;
+      const success = result.isOk();
+      const resultToSend = success ? result.value : result.error.json;
+      jsonUnixSocket.sendJSON({
+        type: "done",
+        result: resultToSend,
+        success
+      });
+    }
+    let receiveMessagesPromise = receiveMessages();
+    while (true) {
+      const messageOrResult = await Promise.race([receiveMessagesPromise.then(message => ({
+        type: "message",
+        message
+      })), ...(resultPromise ? [resultPromise.then(result => ({
+        type: "result",
+        result
+      }))] : [])]);
+      if (messageOrResult.type === "message") {
+        const {
+          message
+        } = messageOrResult;
+        if (message === undefined) {
+          break;
+        }
+        if (message.type === "error") {
+          jsonUnixSocket.sendJSON({
+            type: "done",
+            result: message.error.json,
+            success: false
+          });
+          break;
+        }
+        await handleMessage(message);
+        receiveMessagesPromise = receiveMessages();
+        continue;
+      }
+      const {
+        result
+      } = messageOrResult;
+      await handleResult(result);
+    }
+    if (!client.closed) {
+      client.end();
+      await Promise.race([new Promise(resolve => client.once("close", resolve)), new Promise(resolve => client.once("error", resolve)), (0, _promises.setTimeout)(3000)]);
+    }
+    process.exit(0);
+  });
+  _commander.program.parse(process.argv);
+}
+function getProxyUrlFromRunOptions(runOptions) {
+  if ((runOptions === null || runOptions === void 0 ? void 0 : runOptions.environment) !== "standalone") return undefined;
+  const proxy = runOptions.proxy;
+  if (!proxy) return undefined;
+  const url = new URL(proxy.server);
+  url.username = proxy.username;
+  url.password = proxy.password;
+  return url.toString();
+}
+if (require.main === module) {
+  runAutomationCLI();
+}

package/dist/common/runApi/index.js

@@ -68,7 +68,6 @@ async function* runApiGenerator({
   const abortPromise = new Promise(resolve => {
     if (!abortSignal) return;
     abortSignal.addEventListener("abort", () => {
-      console.log("Aborted");
       resolve(abortSymbol);
     });
   });
@@ -82,11 +81,9 @@ async function* runApiGenerator({
     }
     try {
       var _context;
-      console.log("Saving trace");
       await ((_context = context) === null || _context === void 0 ? void 0 : _context.tracing.stop({
         path: tracing.filePath
       }));
-      console.log("Trace saved");
     } catch (error) {
       console.log(errorMessage, error === null || error === void 0 ? void 0 : error.message);
       await (0, _fsExtra.remove)(tracing.filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.0.2-abort.2",
+  "version": "1.0.4-refactor.0",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",