@steedos/service-package-loader 2.1.89 → 2.1.92

package/index.js

@@ -3,10 +3,12 @@
 const objectql = require('@steedos/objectql');
 const core = require('@steedos/core');
 const triggerLoader = require('./lib').triggerLoader;
+const processTriggerLoader = require('./lib').processTriggerLoader;
 const sendPackageFlowToDb = require('./lib/loadPackageFlow').sendPackageFlowToDb;
 const path = require('path');
 const Future = require('fibers/future');
 const _ = require('lodash');
+const globby = require("globby");
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
@@ -71,6 +73,7 @@ module.exports = {
                 await objectql.loadStandardMetadata(name, datasourceName);
                 await objectql.addAllConfigFiles(packagePath, datasourceName, name);
                 await triggerLoader.load(this.broker, packagePath, name);
+                await processTriggerLoader.load(this.broker, packagePath, name);
                 core.loadClientScripts();
                 let routersData = objectql.loadRouters(packagePath);
                 let oldRoutersInfo = await this.broker.call(`@steedos/service-packages.getPackageRoutersInfo`, {packageName: name})
@@ -93,6 +96,24 @@ module.exports = {
                 await this.broker.call(`@steedos/service-packages.setPackageRoutersInfo`, {packageName: name, data: routersInfo})
                 return;
             }).promise();
+        },
+        loadPackageMetadataServices: async function (packagePath) {
+            const filePatten = [
+                path.join(packagePath, 'main', 'default', 'services', `*.service.js`),
+                "!" + path.join(packagePath, "**", "node_modules"),
+            ];
+            const matchedPaths = globby.sync(filePatten);
+            for await (const serviceFilePath of matchedPaths) {
+                try {
+                    const service = this.broker.loadService(serviceFilePath);
+                    this.packageServices.push(service);
+                    if (!this.broker.started) {
+                        this.broker._restartService(service)
+                    }
+                } catch (error) {
+                    this.logger.error(error)
+                }
+            }
         }
     },
 
@@ -100,6 +121,7 @@ module.exports = {
      * Service created lifecycle event handler
      */
     created() {
+        this.packageServices = [];  //此属性不能放到settings下，否则会导致mo clone settings 时 内存溢出。
         this.logger.debug('service package loader created!!!');
     },
 
@@ -135,6 +157,9 @@ module.exports = {
                 
             }    
         }
+
+        await this.loadPackageMetadataServices(_path);
+
         console.timeEnd(`service ${this.name} started`)
         // console.log(`service ${this.name} started`);
     },
@@ -143,6 +168,13 @@ module.exports = {
      * Service stopped lifecycle event handler
      */
     async stopped() {
+        for await (const packageService of this.packageServices) {
+            try {
+                await this.broker.destroyService(packageService);
+            } catch (error) {
+                this.logger.errorr(error);
+            }
+        }
         this.broker.call(`@steedos/service-packages.offline`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
         await this.broker.call(`metadata.refreshServiceMetadatas`, { offlinePackageServices: [`${this.broker.nodeID}.${this.name}`] });
         console.log(`service ${this.name} stopped`);

package/lib/index.d.ts

@@ -1 +1,2 @@
 export * as triggerLoader from "./triggerLoader";
+export * as processTriggerLoader from "./processTriggerLoader";

package/lib/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.triggerLoader = void 0;
+exports.processTriggerLoader = exports.triggerLoader = void 0;
 exports.triggerLoader = require("./triggerLoader");
+exports.processTriggerLoader = require("./processTriggerLoader");
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,iEAA8D"}

package/lib/processTriggerLoader/index.d.ts

@@ -0,0 +1 @@
+export declare function load(broker: any, packagePath: string, packageServiceName: string): Promise<void>;

package/lib/processTriggerLoader/index.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.load = void 0;
+const tslib_1 = require("tslib");
+const _ = require("underscore");
+const path = require("path");
+const objectql_1 = require("@steedos/objectql");
+const ENUM_WHEN = ['beforeDraftInsert', 'afterDraftInsert', 'beforeDraftSubmit', 'afterDraftSubmit', 'beforeStepSubmit', 'afterStepSubmit', 'cacluateNextStepUsers',
+    'beforeCancel', 'afterCancel', 'beforeTerminate', 'afterTerminate', 'beforeEnd', 'afterEnd'];
+const LISTENTO_ALL_FLOWS = 'LISTENTO_ALL_FLOWS';
+function load(broker, packagePath, packageServiceName) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        let filePath = path.join(packagePath, "**");
+        let wTriggers = (0, objectql_1.loadProcessTriggers)(filePath);
+        if (_.isEmpty(wTriggers)) {
+            return;
+        }
+        for (const wt of wTriggers) {
+            if (_.isString(wt.listenTo)) {
+                for (const when of ENUM_WHEN) {
+                    let handler = wt[when];
+                    if (!handler) {
+                        continue;
+                    }
+                    let name = wt.name || (0, objectql_1.getMD5)((0, objectql_1.JSONStringify)(wt));
+                    let config = {
+                        name: name,
+                        "listenTo": wt.listenTo == '*' ? LISTENTO_ALL_FLOWS : wt.listenTo,
+                        "when": when,
+                        "handler": handler.toString()
+                    };
+                    yield objectql_1.registerProcessTrigger.register(broker, packageServiceName, config);
+                }
+            }
+        }
+    });
+}
+exports.load = load;
+//# sourceMappingURL=index.js.map

package/lib/processTriggerLoader/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/processTriggerLoader/index.ts"],"names":[],"mappings":";;;;AAAA,gCAAgC;AAChC,6BAA6B;AAC7B,gDAAuG;AAGvG,MAAM,SAAS,GAAG,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,uBAAuB;IAC/J,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;AACjG,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QACnF,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,SAAS,GAAG,IAAA,8BAAmB,EAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACtB,OAAO;SACV;QACD,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE;YAExB,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;gBACzB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;oBAC1B,IAAI,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;oBACvB,IAAI,CAAC,OAAO,EAAE;wBACV,SAAS;qBACZ;oBACD,IAAI,IAAI,GAAG,EAAE,CAAC,IAAI,IAAI,IAAA,iBAAM,EAAC,IAAA,wBAAa,EAAC,EAAE,CAAC,CAAC,CAAC;oBAChD,IAAI,MAAM,GAAY;wBAClB,IAAI,EAAE,IAAI;wBACV,UAAU,EAAE,EAAE,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ;wBACjE,MAAM,EAAE,IAAI;wBACZ,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE;qBAChC,CAAA;oBACD,MAAM,iCAAsB,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;iBAC7E;aAEJ;SACJ;IAEL,CAAC;CAAA;AA3BD,oBA2BC"}

package/lib/processTriggerLoader/types/index.d.ts

@@ -0,0 +1 @@
+export * from './trigger';

package/lib/processTriggerLoader/types/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+(0, tslib_1.__exportStar)(require("./trigger"), exports);
+//# sourceMappingURL=index.js.map

package/lib/processTriggerLoader/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/processTriggerLoader/types/index.ts"],"names":[],"mappings":";;;AAAA,yDAA0B"}

package/lib/processTriggerLoader/types/trigger.d.ts

@@ -0,0 +1,6 @@
+export declare type Trigger = {
+    name: string;
+    listenTo: string;
+    when: string | string[];
+    handler: Function;
+};

package/lib/processTriggerLoader/types/trigger.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=trigger.js.map

package/lib/processTriggerLoader/types/trigger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../../src/processTriggerLoader/types/trigger.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.1.89",
+  "version": "2.1.92",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,8 +11,8 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.1.89",
-    "@steedos/objectql": "2.1.89",
+    "@steedos/core": "2.1.92",
+    "@steedos/objectql": "2.1.92",
     "clone": "^2.1.2",
     "globby": "^11.0.2",
     "moleculer": "^0.14.12",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4b2cd15644d673357382176b925003df5d03ba31"
+  "gitHead": "b4f200efd338673eabbcccc0cc23f0f9c662eee2"
 }

package/src/index.ts

@@ -1 +1,2 @@
-export * as triggerLoader from "./triggerLoader"
+export * as triggerLoader from "./triggerLoader"
+export * as processTriggerLoader from "./processTriggerLoader"

package/src/processTriggerLoader/index.ts

@@ -0,0 +1,37 @@
+import * as _ from "underscore";
+import * as path from "path";
+import { getMD5, JSONStringify, loadProcessTriggers, registerProcessTrigger } from "@steedos/objectql";
+import { Trigger } from "./types";
+
+const ENUM_WHEN = ['beforeDraftInsert', 'afterDraftInsert', 'beforeDraftSubmit', 'afterDraftSubmit', 'beforeStepSubmit', 'afterStepSubmit', 'cacluateNextStepUsers',
+    'beforeCancel', 'afterCancel', 'beforeTerminate', 'afterTerminate', 'beforeEnd', 'afterEnd'];
+const LISTENTO_ALL_FLOWS = 'LISTENTO_ALL_FLOWS';
+
+export async function load(broker: any, packagePath: string, packageServiceName: string) {
+    let filePath = path.join(packagePath, "**");
+    let wTriggers = loadProcessTriggers(filePath);
+    if (_.isEmpty(wTriggers)) {
+        return;
+    }
+    for (const wt of wTriggers) {
+
+        if (_.isString(wt.listenTo)) {
+            for (const when of ENUM_WHEN) {
+                let handler = wt[when];
+                if (!handler) {
+                    continue;
+                }
+                let name = wt.name || getMD5(JSONStringify(wt));
+                let config: Trigger = {
+                    name: name,
+                    "listenTo": wt.listenTo == '*' ? LISTENTO_ALL_FLOWS : wt.listenTo,
+                    "when": when,
+                    "handler": handler.toString()
+                }
+                await registerProcessTrigger.register(broker, packageServiceName, config);
+            }
+
+        }
+    }
+
+}

package/src/processTriggerLoader/types/index.ts

@@ -0,0 +1 @@
+export * from './trigger';

package/src/processTriggerLoader/types/trigger.ts

@@ -0,0 +1,6 @@
+export type Trigger = {
+    name: string,
+    listenTo: string,
+    when: string | string[],
+    handler: Function
+}