@hahnpro/flow-sdk 4.20.11-0 → 4.20.11

package/dist/FlowApplication.d.ts

@@ -1,9 +1,9 @@
 import 'reflect-metadata';
-import { CloudEvent } from 'cloudevents';
+import type { CloudEvent } from 'cloudevents';
 import { PartialObserver } from 'rxjs';
 import { API } from '@hahnpro/hpc-api';
 import { AmqpConnection, Nack } from './amqp';
-import { ClassType, Flow, FlowElementContext } from './flow.interface';
+import type { ClassType, Flow, FlowElementContext } from './flow.interface';
 import type { FlowEvent } from './FlowEvent';
 import { Logger } from './FlowLogger';
 import { RpcClient } from './RpcClient';
@@ -21,7 +21,6 @@ export declare class FlowApplication {
     private _rpcClient;
     constructor(modules: ClassType<any>[], flow: Flow, logger?: Logger, amqpConnection?: AmqpConnection, skipApi?: boolean);
     private init;
-    private publishLifecycleEvent;
     private setQueueMetrics;
     private updateMetrics;
     subscribe: (streamId: string, observer: PartialObserver<FlowEvent>) => import("rxjs").Subscription;

package/dist/FlowApplication.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowApplication = void 0;
 const tslib_1 = require("tslib");
 require("reflect-metadata");
-const cloudevents_1 = require("cloudevents");
 const object_sizeof_1 = tslib_1.__importDefault(require("object-sizeof"));
 const perf_hooks_1 = require("perf_hooks");
 const rxjs_1 = require("rxjs");
@@ -12,7 +11,6 @@ const uuid_1 = require("uuid");
 const hpc_api_1 = require("@hahnpro/hpc-api");
 const amqp_1 = require("./amqp");
 const utils_1 = require("./utils");
-const flow_interface_1 = require("./flow.interface");
 const FlowLogger_1 = require("./FlowLogger");
 const RpcClient_1 = require("./RpcClient");
 const MAX_EVENT_SIZE_BYTES = +process.env.MAX_EVENT_SIZE_BYTES || 512 * 1024;
@@ -26,24 +24,6 @@ class FlowApplication {
         this.outputStreamMap = new Map();
         this.outputQueueMetrics = new Map();
         this.performanceMap = new Map();
-        this.publishLifecycleEvent = (flowEvent, eventType, date = new Date()) => {
-            if (!this.amqpConnection) {
-                return;
-            }
-            try {
-                const event = new cloudevents_1.CloudEvent({
-                    source: flowEvent.getSource(),
-                    type: eventType,
-                    data: Object.assign(Object.assign({}, flowEvent.getMetadata()), { flowEventId: flowEvent.getId() }),
-                    time: date.toISOString(),
-                });
-                const message = event.toJSON();
-                return this.amqpConnection.publish('flow', 'lifecycle', message);
-            }
-            catch (err) {
-                this.logger.error(err);
-            }
-        };
         this.setQueueMetrics = (id) => {
             const metrics = this.outputQueueMetrics.get(id) || { size: 0, lastAdd: 0, lastRemove: Date.now(), warnings: 0 };
             const secsProcessing = Math.round((metrics.lastAdd - metrics.lastRemove) / 1000);
@@ -213,7 +193,6 @@ class FlowApplication {
             try {
                 await this.amqpConnection.managedChannel.assertExchange('deployment', 'direct', { durable: true });
                 await this.amqpConnection.managedChannel.assertExchange('flowlogs', 'fanout', { durable: true });
-                await this.amqpConnection.managedChannel.assertExchange('flow', 'direct', { durable: true });
             }
             catch (e) {
                 logErrorAndExit(`Could not assert exchanges: ${e}`);
@@ -281,13 +260,10 @@ class FlowApplication {
             outputStream
                 .pipe((0, operators_1.tap)(() => this.setQueueMetrics(targetStreamId)), (0, operators_1.mergeMap)(async (event) => {
                 this.performanceMap.set(event.getId(), perf_hooks_1.performance.eventLoopUtilization());
-                this.publishLifecycleEvent(event, flow_interface_1.LifecycleEvent.ACTIVATED);
                 try {
                     await element[streamHandler](event);
-                    this.publishLifecycleEvent(event, flow_interface_1.LifecycleEvent.COMPLETED);
                 }
                 catch (err) {
-                    this.publishLifecycleEvent(event, flow_interface_1.LifecycleEvent.TERMINATED);
                     try {
                         element.handleApiError(err);
                     }
@@ -302,8 +278,8 @@ class FlowApplication {
                 if (elu) {
                     this.performanceMap.delete(event.getId());
                     elu = perf_hooks_1.performance.eventLoopUtilization(elu);
-                    if (elu.utilization > 0.75 && elu.active > 2000) {
-                        this.logger.warn(`High event loop utilization detected for ${targetStreamId} with event ${event.getId()}! Handler was active for ${Number(elu.active).toFixed(2)}ms with a utilization of ${Number(elu.utilization * 100).toFixed(2)}%. Consider refactoring or move tasks to a worker thread.`);
+                    if (elu.utilization > 0.7 && elu.active > 1000) {
+                        this.logger.warn(`High event loop utilization detected for ${targetStreamId} with event ${event.getId()}! Handler has been active for ${Number(elu.active).toFixed(2)}ms with a utilization of ${Number(elu.utilization * 100).toFixed(2)}%. Consider refactoring or move tasks to a worker thread.`);
                     }
                 }
             }))

package/dist/FlowElement.js

@@ -126,7 +126,7 @@ function InputStream(id = 'default', options) {
             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);
             }
-            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(Object.assign(Object.assign({}, event.getMetadata()), { inputStreamId: id }), event.getData(), event.getType(), new Date(event.getTime())));
         };
     };
 }

package/dist/FlowEvent.d.ts

@@ -8,13 +8,7 @@ export declare class FlowEvent {
     getDataContentType: () => string;
     getDataschema: () => string;
     getId: () => string;
-    getMetadata: () => {
-        deploymentId: string;
-        elementId: string;
-        flowId: string;
-        functionFqn: string;
-        inputStreamId: string;
-    };
+    getMetadata: () => any;
     getSource: () => string;
     getStreamId: () => string;
     getSubject: () => string;

package/dist/FlowModule.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlowModule = void 0;
 function FlowModule(metadata) {
-    const fqnRegExp = new RegExp('^([a-zA-Z][a-zA-Z0-9]*[.-])*[a-zA-Z][a-zA-Z0-9]*$');
-    if (!fqnRegExp.test(metadata.name)) {
-        throw new Error(`Flow Module name (${metadata.name}) is not valid`);
+    const validateNameRegExp = new RegExp(/^(@[a-z][a-z0-9-]*\/)?[a-z][a-z0-9-]*$/);
+    if (!validateNameRegExp.test(metadata.name)) {
+        throw new Error(`Flow Module name (${metadata.name}) is not valid. Name must be all lowercase and not contain any special characters except for hyphens. Can optionally start with a scope "@scopename/"`);
     }
     return (target) => {
         Reflect.defineMetadata('module:name', metadata.name, target);

package/dist/flow.interface.d.ts

@@ -38,9 +38,4 @@ export interface StreamOptions {
     concurrent?: number;
 }
 export declare type ClassType<T> = new (...args: any[]) => T;
-export declare enum LifecycleEvent {
-    ACTIVATED = "com.hahnpro.flow_function.activated",
-    COMPLETED = "com.hahnpro.flow_function.completed",
-    TERMINATED = "com.hahnpro.flow_function.terminated"
-}
 export {};

package/dist/flow.interface.js

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LifecycleEvent = void 0;
-var LifecycleEvent;
-(function (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 = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/flow-sdk",
-  "version": "4.20.11-0",
+  "version": "4.20.11",
   "description": "SDK for building Flow Modules",
   "license": "MIT",
   "author": {
@@ -26,7 +26,7 @@
   "dependencies": {
     "@hahnpro/hpc-api": "2.3.1",
     "amqp-connection-manager": "^3.9.0",
-    "amqplib": "^0.8.0",
+    "amqplib": "^0.9.0",
     "class-transformer": "0.5.1",
     "class-validator": "~0.13.2",
     "cloudevents": "^6.0.1",
@@ -45,7 +45,7 @@
     "@types/amqplib": "^0.8.2",
     "@types/jest": "^27.5.0",
     "@types/lodash": "^4.14.182",
-    "@types/node": "^16.11.33",
+    "@types/node": "^16.11.34",
     "class-validator-jsonschema": "^3.1.0",
     "jest": "^27.5.1",
     "typescript": "^4.6.4"