@steedos/service-package-loader 2.2.52-beta.7 → 2.2.53-beta.3

package/LICENSE.txt

@@ -6,14 +6,11 @@ To determine under which license you may use a file from the Steedos source code
 please resort to the header of that file.
 
 If the file has no header, the following rules apply
-1. project templates are licensed under MIT, see License.MIT.txt
-2. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
-3. source code that is neither (1) nor (2) is licensed under AGPL, see License.AGPL.txt
+1. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
+2. source code that is neither (1) is licensed under MIT, see https://opensource.org/licenses/MIT
 
 On request, licenses under different terms are available.
 
-Project templates can be found in the folders steedos-projects/
-
 Source code of enterprise features are files that
 * are in folders named "ee" or start with "ee_", or in subfolders of such folders.
 * contain the strings "ee_" in its filename name.

package/index.js

@@ -70,6 +70,7 @@ module.exports = {
      */
     methods: {
         loadPackageMetadataFiles: async function (packagePath, name, datasourceName) {
+            this.broker.logger.debug(`Loading package from ${packagePath}`)
             await Future.task(async () => {
                 if (!datasourceName) {
                     datasourceName = 'default';
@@ -198,7 +199,7 @@ module.exports = {
         await this.loadPackageMetadataServices(_path);
 
         await this.loadPackagePublicFiles(_path);
-
+        this.started = true;
         console.timeEnd(`service ${this.name} started`)
         // console.log(`service ${this.name} started`);
     },
@@ -207,6 +208,9 @@ module.exports = {
      * Service stopped lifecycle event handler
      */
     async stopped() {
+        if(!this.started){
+            return ;
+        }
         for await (const packageService of this.packageServices) {
             try {
                 await this.broker.destroyService(packageService);

package/lib/loadPackageFlow.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const metadata_core_1 = require("@steedos/metadata-core");
 const loadFlowFile = new metadata_core_1.LoadFlowFile();
 const path = require('path');
-const sendPackageFlowToDb = (broker, packagePath, name) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+const sendPackageFlowToDb = (broker, packagePath, name) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const flows = loadFlowFile.load(path.join(packagePath, '**'));
     for (const apiName in flows) {
         const flow = flows[apiName];

package/lib/processLoader/index.js

@@ -15,7 +15,7 @@ const objectql_1 = require("@steedos/objectql");
 const metadata_core_1 = require("@steedos/metadata-core");
 const loadProcessFile = new metadata_core_1.LoadProcessFile();
 function load(broker, packagePath, packageServiceName) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let filePath = path.join(packagePath, "**");
         let processes = loadProcessFile.load(filePath);
         if (_.isEmpty(processes)) {
@@ -41,7 +41,7 @@ function load(broker, packagePath, packageServiceName) {
 exports.load = load;
 // 软件包中的process元数据直接加载到库中
 function sendPackageProcessToDb(packagePath) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let filePath = path.join(packagePath, "**");
         let processes = loadProcessFile.load(filePath);
         if (_.isEmpty(processes)) {

package/lib/processLoader/types/index.js

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

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

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

package/lib/processTriggerLoader/index.js

@@ -9,7 +9,7 @@ const ENUM_WHEN = ['beforeDraftInsert', 'afterDraftInsert', 'beforeDraftSubmit',
     '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* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let filePath = path.join(packagePath, "**");
         let wTriggers = (0, objectql_1.loadProcessTriggers)(filePath);
         if (_.isEmpty(wTriggers)) {

package/lib/processTriggerLoader/types/index.js

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

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

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

package/lib/triggerLoader/index.js

@@ -8,7 +8,7 @@ const objectql = require("@steedos/objectql");
 const objectql_1 = require("@steedos/objectql");
 const ENUM_WHEN = ['before.find', 'before.insert', 'before.update', 'before.delete', 'after.find', 'after.count', 'after.findOne', 'after.insert', 'after.delete', 'after.update', 'before.aggregate', 'after.aggregate'];
 function load(broker, packagePath, packageServiceName) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let actions = {};
         let serviceName = `~triggers-${packageServiceName}`;
         let filePath = path.join(packagePath, "**");
@@ -64,7 +64,7 @@ function generateAction(trigger) {
     };
     if (_.has(trigger, 'handler')) {
         action.handler = function (ctx) {
-            return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            return tslib_1.__awaiter(this, void 0, void 0, function* () {
                 return yield trigger.handler.call(ctx.params, ctx);
             });
         };
@@ -72,7 +72,7 @@ function generateAction(trigger) {
     return action;
 }
 function register(broker, actions, serviceName, packageServiceName) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         for (const key in actions) {
             if (Object.hasOwnProperty.call(actions, key)) {
                 let action = actions[key];

package/lib/triggerLoader/types/index.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/triggerLoader/types/index.ts"],"names":[],"mappings":";;;AAAA,sDAAuB;AACvB,6DAA8B;AAC9B,wDAAyB;AACzB,yDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/triggerLoader/types/index.ts"],"names":[],"mappings":";;;AAAA,iDAAuB;AACvB,wDAA8B;AAC9B,mDAAyB;AACzB,oDAA0B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.2.52-beta.7",
+  "version": "2.2.53-beta.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,27 +10,20 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.2.52-beta.7",
-    "@steedos/metadata-core": "2.2.52-beta.7",
-    "@steedos/objectql": "2.2.52-beta.7",
+    "@steedos/core": "2.2.53-beta.3",
+    "@steedos/metadata-core": "2.2.53-beta.3",
+    "@steedos/objectql": "2.2.53-beta.3",
     "clone": "^2.1.2",
-    "globby": "^9.1.0",
-    "moleculer": "^0.14.12",
+    "globby": "^11.1.0",
+    "moleculer": "^0.14.21",
     "underscore": "^1.12.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.1.7",
-    "@types/chai-as-promised": "7.1.0",
-    "@types/mocha": "^5.2.6",
-    "jslint": "^0.12.1",
-    "moleculer-repl": "^0.6.4",
-    "nodemon": "^1.18.10",
-    "ts-node": "^8.0.3",
-    "typescript": "^4.2.2"
+    "typescript": "4.6.3"
   },
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ecf8b1cc86813d63697cca572cde7a4d996643d6"
+  "gitHead": "5782f1171133c05cce158adef71e527d970ef50e"
 }