engine/ script execution getService

src/engine/native/node/native-script-execution/src/childProcess.js

@@ -70,8 +70,6 @@ context.global.setSync('_stdout_log', function (...args) {
 // TODO: pass these in as a process argument
 
 // TODO: setProgress(<number between 0 - 100>)
-// TODO: getService('capabilities')
-// TODO: getService('network')
 
 const structure = {
   log: ['get'],
@@ -104,6 +102,38 @@ for (const objName of Object.keys(structure)) {
   }
 }
 
+function _callToService(serviceName, method, args) {
+  /**@type {import('isolated-vm').Reference} */
+  const call = $0;
+  return call.apply(null, [serviceName, method, JSON.stringify(args)], {
+    result: { promise: true, copy: true },
+  });
+}
+function _getService(serviceName) {
+  return new Proxy(
+    {},
+    {
+      get: function (_, method) {
+        return (...args) => callToService(serviceName, method, args);
+      },
+    },
+  );
+}
+context.evalClosureSync(
+  `
+  ${_callToService.toString()}; globalThis["callToService"] = _callToService;
+  ${_getService.toString()}; globalThis["getService"] = _getService;
+  `,
+  [
+    new ivm.Reference(function (serviceName, method, args) {
+      return callToExecutor('call', {
+        functionName: `getService.${serviceName}.${method}`,
+        args: [processId, processInstanceId, tokenId, ...JSON.parse(args)],
+      });
+    }),
+  ],
+);
+
 const errorClasses = ['BpmnError', 'BpmnEscalation'];
 
 for (const errorName of errorClasses)

src/engine/universal/core/src/engine/neoEngineSetup.js

@@ -2,30 +2,54 @@ const NeoEngine = require('neo-bpmn-engine');
 const system = require('@proceed/system');
 const capabilities = require('@proceed/capabilities');
 
+const allowedResponseKeys = [
+  'httpVersionMajor',
+  'httpVersionMinor',
+  'httpVersion',
+  'complete',
+  'rawHeaders',
+  'rawTrailers',
+  'joinDuplicateHeaders',
+  'aborted',
+  'upgrade',
+  'url',
+  'method',
+  'statusCode',
+  'statusMessage',
+];
+/** @param {{response: import('http').IncomingMessage, body: any}} response */
+function networkResponseToSerializable(response) {
+  if (!response || !response.response) return response;
+  const filteredResponse = {};
+  for (const key of allowedResponseKeys) filteredResponse[key] = response.response[key];
+  return { response: filteredResponse, body: response.body };
+}
+
 module.exports = {
   setupNeoEngine() {
     // Register the modules which we wish to make use of in the script environment
     NeoEngine.provideService('capabilities', {
-      startCapability: (processId, processInstanceId, capabilityName, args, callback) =>
+      startCapability: (_processId, _processInstanceId, _tokenId, capabilityName, args, callback) =>
         capabilities.startCapability.call(capabilities, capabilityName, args, callback),
     });
     NeoEngine.provideService('network', {
-      get: (processId, processInstanceId, tokenId, url, options) => {
-        return system.http.request.call(system.http, url, {
+      get: async (_processId, _processInstanceId, _tokenId, url, options) => {
+        const response = await system.http.request.call(system.http, url, {
           ...options,
           method: 'GET',
         });
+        return networkResponseToSerializable(response);
       },
-      post: (
-        processId,
-        processInstanceId,
-        tokenId,
+      post: async (
+        _processId,
+        _processInstanceId,
+        _tokenId,
         url,
         body,
         contentType = 'text/plain',
         options = {},
       ) => {
-        return system.http.request.call(system.http, url, {
+        const response = await system.http.request.call(system.http, url, {
           ...options,
           body,
           method: 'POST',
@@ -34,17 +58,18 @@ module.exports = {
             'Content-Type': contentType,
           },
         });
+        return networkResponseToSerializable(response);
       },
-      put: (
-        processId,
-        processInstanceId,
-        tokenId,
+      put: async (
+        _processId,
+        _processInstanceId,
+        _tokenId,
         url,
         body,
         contentType = 'text/plain',
         options = {},
       ) => {
-        return system.http.request.call(system.http, url, {
+        const response = await system.http.request.call(system.http, url, {
           ...options,
           body,
           method: 'PUT',
@@ -53,18 +78,21 @@ module.exports = {
             'Content-Type': contentType,
           },
         });
+        return networkResponseToSerializable(response);
       },
-      delete: (processId, processInstanceId, tokenId, url, options) => {
-        return system.http.request.call(system.http, url, {
+      delete: async (_processId, _processInstanceId, _tokenId, url, options) => {
+        const response = await system.http.request.call(system.http, url, {
           ...options,
           method: 'DELETE',
         });
+        return networkResponseToSerializable(response);
       },
-      head: (processId, processInstanceId, tokenId, url, options) => {
-        return system.http.request.call(system.http, url, {
+      head: async (_processId, _processInstanceId, _tokenId, url, options) => {
+        const response = await system.http.request.call(system.http, url, {
           ...options,
           method: 'HEAD',
         });
+        return networkResponseToSerializable(response);
       },
     });
   },

src/engine/universal/system/src/script-execution.js

@@ -97,16 +97,21 @@ class ScriptExecutor extends System {
 
         try {
           let target = req.process.dependencies;
-          for (const segment of functionName.split('.')) {
-            target = target[segment];
+          const segments = functionName.split('.');
+          for (let i = 0; i < segments.length; i++) {
+            const segment = segments[i];
+
+            if (segments[i - 1] === 'getService') target = target(segment);
+            else target = target[segment];
 
             if (typeof target === 'undefined')
               return { response: { error: 'Function not found' }, statusCode: 404 };
           }
 
+          let result = target;
           if (typeof target === 'function' || typeof target === 'object')
-            return { response: { result: await target(...args) } };
-          else return { response: { result: target } };
+            result = await target(...args);
+          return { response: { result } };
         } catch (e) {
           return { response: { error: `Error: ${e.message}` }, statusCode: 500 };
         }

yarn.lock

@@ -20298,6 +20298,20 @@ simple-get@^4.0.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
+simple-concat@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
+  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
+
+simple-get@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
+  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
+  dependencies:
+    decompress-response "^6.0.0"
+    once "^1.3.1"
+    simple-concat "^1.0.0"
+
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"