@hahnpro/flow-sdk 4.27.1 → 4.27.2

package/dist/FlowApplication.js

@@ -37,9 +37,12 @@ class FlowApplication {
                 const event = new cloudevents_1.CloudEvent({
                     source: `flows/${flowId}/deployments/${deploymentId}/elements/${elementId}`,
                     type: eventType,
-                    data: Object.assign({ flowEventId,
+                    data: {
+                        flowEventId,
                         functionFqn,
-                        inputStreamId }, data),
+                        inputStreamId,
+                        ...data,
+                    },
                     time: new Date().toISOString(),
                 });
                 const message = event.toJSON();
@@ -100,7 +103,6 @@ class FlowApplication {
             }
         };
         this.onMessage = async (msg) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             let event;
             try {
                 event = JSON.parse(msg.content.toString());
@@ -118,23 +120,23 @@ class FlowApplication {
                     }
                     let context = {};
                     if (flow.context) {
-                        this.context = Object.assign(Object.assign({}, this.context), flow.context);
+                        this.context = { ...this.context, ...flow.context };
                         context = this.context;
                     }
                     if (flow.properties) {
                         this.properties = flow.properties;
                         for (const element of Object.values(this.elements)) {
-                            (_a = element.onFlowPropertiesChanged) === null || _a === void 0 ? void 0 : _a.call(element, flow.properties);
+                            element.onFlowPropertiesChanged?.(flow.properties);
                         }
                     }
                     if (Object.keys(context).length > 0) {
                         for (const element of flow.elements || []) {
-                            context = Object.assign(Object.assign({}, context), { name: element.name });
-                            (_c = (_b = this.elements) === null || _b === void 0 ? void 0 : _b[element.id]) === null || _c === void 0 ? void 0 : _c.onContextChanged(context);
+                            context = { ...context, name: element.name };
+                            this.elements?.[element.id]?.onContextChanged(context);
                         }
                     }
                     for (const element of flow.elements || []) {
-                        (_e = (_d = this.elements) === null || _d === void 0 ? void 0 : _d[element.id]) === null || _e === void 0 ? void 0 : _e.onPropertiesChanged(element.properties);
+                        this.elements?.[element.id]?.onPropertiesChanged(element.properties);
                     }
                     const statusEvent = {
                         eventId: (0, crypto_1.randomUUID)(),
@@ -144,7 +146,7 @@ class FlowApplication {
                         data: { deploymentId: this.context.deploymentId, status: 'updated' },
                     };
                     try {
-                        (_f = this.amqpChannel) === null || _f === void 0 ? void 0 : _f.publish('deployment', 'health', statusEvent);
+                        this.amqpChannel?.publish('deployment', 'health', statusEvent);
                     }
                     catch (err) {
                         this.logger.error(err);
@@ -160,7 +162,7 @@ class FlowApplication {
                         data: { deploymentId: this.context.deploymentId, status: 'updating failed' },
                     };
                     try {
-                        (_g = this.amqpChannel) === null || _g === void 0 ? void 0 : _g.publish('deployment', 'health', statusEvent);
+                        this.amqpChannel?.publish('deployment', 'health', statusEvent);
                     }
                     catch (e) {
                         this.logger.error(e);
@@ -169,13 +171,13 @@ class FlowApplication {
             }
             else if (event.type === 'com.flowstudio.deployment.message') {
                 const data = event.data;
-                const elementId = data === null || data === void 0 ? void 0 : data.elementId;
+                const elementId = data?.elementId;
                 if (elementId) {
-                    (_k = (_j = (_h = this.elements) === null || _h === void 0 ? void 0 : _h[elementId]) === null || _j === void 0 ? void 0 : _j.onMessage) === null || _k === void 0 ? void 0 : _k.call(_j, data);
+                    this.elements?.[elementId]?.onMessage?.(data);
                 }
                 else {
                     for (const element of Object.values(this.elements)) {
-                        (_l = element === null || element === void 0 ? void 0 : element.onMessage) === null || _l === void 0 ? void 0 : _l.call(element, data);
+                        element?.onMessage?.(data);
                     }
                 }
             }
@@ -212,12 +214,12 @@ class FlowApplication {
         }
         else {
             this.baseLogger = baseLoggerOrConfig;
-            this.amqpConnection = amqpConnection === null || amqpConnection === void 0 ? void 0 : amqpConnection.managedConnection;
+            this.amqpConnection = amqpConnection?.managedConnection;
             this.skipApi = skipApi || false;
             explicitInit = explicitInit || false;
             this._api = mockApi || null;
         }
-        this.logger = new FlowLogger_1.FlowLogger(Object.assign({ id: 'none', functionFqn: 'FlowApplication' }, flow === null || flow === void 0 ? void 0 : flow.context), this.baseLogger || undefined, this.publishEvent);
+        this.logger = new FlowLogger_1.FlowLogger({ id: 'none', functionFqn: 'FlowApplication', ...flow?.context }, this.baseLogger || undefined, this.publishEvent);
         process.once('uncaughtException', (err) => {
             this.logger.error('Uncaught exception!');
             this.logger.error(err);
@@ -245,10 +247,9 @@ class FlowApplication {
         return this._api;
     }
     async init() {
-        var _a;
         if (this.initialized)
             return;
-        this.context = Object.assign({}, this.flow.context);
+        this.context = { ...this.flow.context };
         this.properties = this.flow.properties || {};
         try {
             if (!this.skipApi && !(this._api instanceof hpc_api_1.MockAPI)) {
@@ -256,13 +257,13 @@ class FlowApplication {
             }
         }
         catch (err) {
-            this.logger.error((err === null || err === void 0 ? void 0 : err.message) || err);
+            this.logger.error(err?.message || err);
         }
         const logErrorAndExit = async (err) => {
             this.logger.error(new Error(err));
             await this.destroy(1);
         };
-        this.amqpChannel = (_a = this.amqpConnection) === null || _a === void 0 ? void 0 : _a.createChannel({
+        this.amqpChannel = this.amqpConnection?.createChannel({
             json: true,
             setup: async (channel) => {
                 try {
@@ -303,7 +304,7 @@ class FlowApplication {
         for (const element of this.flow.elements) {
             const { id, name, properties, module, functionFqn } = element;
             try {
-                const context = Object.assign(Object.assign({}, this.context), { id, name, logger: this.baseLogger, app: this });
+                const context = { ...this.context, id, name, logger: this.baseLogger, app: this };
                 this.elements[id] = new this.declarations[`${module}.${functionFqn}`](context, properties);
             }
             catch (err) {
@@ -373,11 +374,10 @@ class FlowApplication {
         return this.properties;
     }
     async destroy(exitCode = 0) {
-        var _a;
         try {
             try {
                 for (const element of Object.values(this.elements)) {
-                    (_a = element === null || element === void 0 ? void 0 : element.onDestroy) === null || _a === void 0 ? void 0 : _a.call(element);
+                    element?.onDestroy?.();
                 }
                 this._rpcClient && (await this._rpcClient.close());
             }

package/dist/FlowElement.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowDashboard = exports.FlowTrigger = exports.FlowTask = exports.FlowResource = exports.FlowFunction = exports.InputStream = exports.FlowElement = void 0;
-const tslib_1 = require("tslib");
 const class_transformer_1 = require("class-transformer");
 const class_validator_1 = require("class-validator");
 const python_shell_1 = require("python-shell");
@@ -9,15 +8,12 @@ const FlowEvent_1 = require("./FlowEvent");
 const FlowLogger_1 = require("./FlowLogger");
 const utils_1 = require("./utils");
 class FlowElement {
-    constructor(_a, properties, propertiesClassType, whitelist) {
-        var _b, _c;
-        var { app, logger } = _a, metadata = tslib_1.__rest(_a, ["app", "logger"]);
-        if (whitelist === void 0) { whitelist = false; }
+    constructor({ app, logger, ...metadata }, properties, propertiesClassType, whitelist = false) {
         this.propertiesClassType = propertiesClassType;
         this.whitelist = whitelist;
         this.stopPropagateStream = new Map();
         this.onContextChanged = (context) => {
-            this.metadata = Object.assign(Object.assign({}, this.metadata), context);
+            this.metadata = { ...this.metadata, ...context };
         };
         this.onPropertiesChanged = (properties) => {
             this.setProperties(properties);
@@ -34,32 +30,30 @@ class FlowElement {
         this.handleApiError = (error) => (0, utils_1.handleApiError)(error, this.logger);
         this.interpolate = (value, ...templateVariables) => (0, utils_1.fillTemplate)(value, ...templateVariables);
         this.app = app;
-        this.api = (_b = this.app) === null || _b === void 0 ? void 0 : _b.api;
-        this.metadata = Object.assign(Object.assign({}, metadata), { functionFqn: this.functionFqn });
-        this.logger = new FlowLogger_1.FlowLogger(this.metadata, logger || undefined, (_c = this.app) === null || _c === void 0 ? void 0 : _c.publishEvent);
+        this.api = this.app?.api;
+        this.metadata = { ...metadata, functionFqn: this.functionFqn };
+        this.logger = new FlowLogger_1.FlowLogger(this.metadata, logger || undefined, this.app?.publishEvent);
         this.rpcRoutingKey = (this.metadata.flowId || '') + (this.metadata.deploymentId || '') + this.metadata.id;
         if (properties) {
             this.setProperties(properties);
         }
     }
     get flowProperties() {
-        var _a, _b;
-        return ((_b = (_a = this.app) === null || _a === void 0 ? void 0 : _a.getProperties) === null || _b === void 0 ? void 0 : _b.call(_a)) || {};
+        return this.app?.getProperties?.() || {};
     }
     emitOutput(data = {}, outputId = 'default', time = new Date()) {
         return this.emitEvent(data, null, outputId, time);
     }
     emitEvent(data, inputEvent, outputId = 'default', time = new Date()) {
-        var _a, _b, _c;
         const partialEvent = new FlowEvent_1.FlowEvent(this.metadata, data, outputId, time);
-        const completeEvent = new FlowEvent_1.FlowEvent(this.metadata, Object.assign(Object.assign({}, ((inputEvent === null || inputEvent === void 0 ? void 0 : inputEvent.getData()) || {})), data), outputId, time);
-        const streamID = ((_a = inputEvent === null || inputEvent === void 0 ? void 0 : inputEvent.getMetadata()) === null || _a === void 0 ? void 0 : _a.inputStreamId) || '';
+        const completeEvent = new FlowEvent_1.FlowEvent(this.metadata, { ...(inputEvent?.getData() || {}), ...data }, outputId, time);
+        const streamID = inputEvent?.getMetadata()?.inputStreamId || '';
         if ((this.stopPropagateStream.has(streamID) && this.stopPropagateStream.get(streamID)) || !this.stopPropagateStream.has(streamID)) {
-            (_b = this.app) === null || _b === void 0 ? void 0 : _b.emit(partialEvent);
+            this.app?.emit(partialEvent);
             return partialEvent;
         }
         else {
-            (_c = this.app) === null || _c === void 0 ? void 0 : _c.emitPartial(completeEvent, partialEvent);
+            this.app?.emitPartial(completeEvent, partialEvent);
             return completeEvent;
         }
     }
@@ -92,8 +86,7 @@ class FlowElement {
         return this.validateProperties(classType, event.getData(), whitelist);
     }
     async callRpcFunction(functionName, ...args) {
-        var _a;
-        return (_a = this.app) === null || _a === void 0 ? void 0 : _a.rpcClient.callFunction(this.rpcRoutingKey, functionName, ...args);
+        return this.app?.rpcClient.callFunction(this.rpcRoutingKey, functionName, ...args);
     }
     runPyRpcScript(scriptPath, ...args) {
         const options = {
@@ -118,11 +111,10 @@ function InputStream(id = 'default', options) {
         }
         const method = propertyDescriptor.value;
         propertyDescriptor.value = function (event) {
-            var _a;
             if (!this.stopPropagateStream.has(id)) {
-                this.stopPropagateStream.set(id, (_a = options === null || options === void 0 ? void 0 : options.stopPropagation) !== null && _a !== void 0 ? _a : false);
+                this.stopPropagateStream.set(id, options?.stopPropagation ?? false);
             }
-            return method.call(this, new FlowEvent_1.FlowEvent(Object.assign(Object.assign({ id: event.getMetadata().elementId }, event.getMetadata()), { inputStreamId: id }), event.getData(), event.getType(), new Date(event.getTime())));
+            return method.call(this, new FlowEvent_1.FlowEvent({ id: event.getMetadata().elementId, ...event.getMetadata(), inputStreamId: id }, event.getData(), event.getType(), new Date(event.getTime())));
         };
     };
 }

package/dist/FlowLogger.js

@@ -41,15 +41,15 @@ class FlowLogger {
         }
         switch (level) {
             case 'debug':
-                return this.logger.debug(message, Object.assign(Object.assign({}, this.metadata), options));
+                return this.logger.debug(message, { ...this.metadata, ...options });
             case 'error':
-                return this.logger.error(message, Object.assign(Object.assign({}, this.metadata), options));
+                return this.logger.error(message, { ...this.metadata, ...options });
             case 'warn':
-                return this.logger.warn(message, Object.assign(Object.assign({}, this.metadata), options));
+                return this.logger.warn(message, { ...this.metadata, ...options });
             case 'verbose':
-                return this.logger.verbose(message, Object.assign(Object.assign({}, this.metadata), options));
+                return this.logger.verbose(message, { ...this.metadata, ...options });
             default:
-                this.logger.log(message, Object.assign(Object.assign({}, this.metadata), options));
+                this.logger.log(message, { ...this.metadata, ...options });
         }
     }
 }

package/dist/RpcClient.js

@@ -43,14 +43,13 @@ class RpcClient {
         this.callFunction = (routingKey, functionName, ...args) => {
             const stack = new Error('test').stack;
             return new Promise((resolve, reject) => {
-                var _a;
                 if (MAX_MSG_SIZE || WARN_MSG_SIZE) {
                     const messageSize = (0, object_sizeof_1.default)(args);
                     if (messageSize > MAX_MSG_SIZE) {
                         throw new Error(`Max RPC message size exceeded: ${messageSize} bytes / ${MAX_MSG_SIZE} bytes`);
                     }
                     if (messageSize > WARN_MSG_SIZE) {
-                        (_a = this.logger) === null || _a === void 0 ? void 0 : _a.warn(`Large RPC message size detected: ${messageSize} bytes`);
+                        this.logger?.warn(`Large RPC message size detected: ${messageSize} bytes`);
                     }
                 }
                 const call = { functionName, arguments: args };

package/dist/TestModule.js

@@ -19,9 +19,8 @@ tslib_1.__decorate([
 TestTrigger = tslib_1.__decorate([
     (0, FlowElement_1.FlowFunction)('test.task.Trigger')
 ], TestTrigger);
-let TestModule = class TestModule {
+let TestModule = exports.TestModule = class TestModule {
 };
-TestModule = tslib_1.__decorate([
+exports.TestModule = TestModule = tslib_1.__decorate([
     (0, FlowModule_1.FlowModule)({ name: 'test', declarations: [TestTrigger] })
 ], TestModule);
-exports.TestModule = TestModule;

package/dist/flow.interface.js

@@ -6,4 +6,4 @@ var LifecycleEvent;
     LifecycleEvent["ACTIVATED"] = "com.hahnpro.flow_function.activated";
     LifecycleEvent["COMPLETED"] = "com.hahnpro.flow_function.completed";
     LifecycleEvent["TERMINATED"] = "com.hahnpro.flow_function.terminated";
-})(LifecycleEvent = exports.LifecycleEvent || (exports.LifecycleEvent = {}));
+})(LifecycleEvent || (exports.LifecycleEvent = LifecycleEvent = {}));

package/dist/unit-utils.js

@@ -95,7 +95,7 @@ function verifyIndices(indices, unit) {
         let index = 0;
         let convfactor = 1;
         while (index != unit.length) {
-            const find = filteredElement.find((obj) => (obj === null || obj === void 0 ? void 0 : obj.index) === index);
+            const find = filteredElement.find((obj) => obj?.index === index);
             if (!find)
                 continue outer;
             index += find.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/flow-sdk",
-  "version": "4.27.1",
+  "version": "4.27.2",
   "description": "SDK for building Flow Modules",
   "license": "MIT",
   "author": {
@@ -28,23 +28,23 @@
     "amqplib": "^0.10.3",
     "class-transformer": "0.5.1",
     "class-validator": "~0.14.0",
-    "cloudevents": "^7.0.0",
+    "cloudevents": "^7.0.1",
     "lodash": "^4.17.21",
     "object-sizeof": "~2.4.2",
     "python-shell": "^3.0.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "string-interp": "^0.3.6",
-    "@hahnpro/hpc-api": "4.0.1"
+    "@hahnpro/hpc-api": "4.0.2"
   },
   "devDependencies": {
     "@types/amqplib": "^0.10.1",
-    "@types/jest": "^29.5.1",
+    "@types/jest": "^29.5.2",
     "@types/lodash": "^4.14.195",
-    "@types/node": "^18.16.16",
+    "@types/node": "^18.16.19",
     "class-validator-jsonschema": "^5.0.0",
-    "jest": "^29.5.0",
-    "typescript": "^5.0.4"
+    "jest": "^29.6.0",
+    "typescript": "^5.1.6"
   },
   "peerDependencies": {
     "axios": "1.x",