@steedos/service-package-loader 2.5.20-beta.8 → 2.5.20

package/index.js

@@ -10,7 +10,7 @@ const _ = require('lodash');
 const fs = require("fs");
 const metaDataCore = require('@steedos/metadata-core');
 const { registerMetadataConfigs, loadStandardMetadata, loadRouters } = require('@steedos/metadata-registrar');
-
+const moment = require('moment');
 const objectMixin = require('@steedos/service-object-mixin')
 
 const loadFlowFile = new metaDataCore.LoadFlowFile();
@@ -18,7 +18,7 @@ const loadFlowFile = new metaDataCore.LoadFlowFile();
 const getPackageYmlData = (packagePath)=>{
     let packageYmlData = {};
     if(fs.existsSync(path.join(packagePath, 'package.service.yml'))){
-        packageYmlData = metaDataCore.loadFile(path.join(packagePath, 'package.service.yml'));
+        packageYmlData = metaDataCore.loadFile(path.join(packagePath, 'package.service.yml')) || {};
     }
     if(fs.existsSync(path.join(packagePath, 'README.md'))){
         packageYmlData.readme = metaDataCore.loadFile(path.join(packagePath, 'README.md'));
@@ -77,9 +77,10 @@ module.exports = {
         "space.initialized": {
             async handler(ctx) {
                 const spaceDoc = ctx.params
+                const spaceId = spaceDoc._id
                 // 扫描main/default/data文件夹
-                await this.importData(path.join(this.settings.packageInfo.path, 'main', 'default', 'data'), false, spaceDoc._id);
-                await this.loadDataOnServiceStarted();
+                await this.importData(path.join(this.settings.packageInfo.path, 'main', 'default', 'data'), false, spaceId);
+                await this.loadDataOnServiceStarted(spaceId);
             }
         }
     },
@@ -121,24 +122,28 @@ module.exports = {
                 this.broker.logger.warn(`The router.js file has been deprecated. ${filePath}`); 
             }
         },
-        sendPackageFlowToDb: async function(packagePath, name) {
+        sendPackageFlowToDb: async function(packagePath, name, spaceId) {
             const flows = loadFlowFile.load(path.join(packagePath, '**'));
             for (const apiName in flows) {
                 const flow = flows[apiName];
                 const flowFilePath = flow.__filename;
                 delete flow.__filename;
                 try {
-                    await this.importFlow(flow, name);
+                    await this.importFlow(flow, name, spaceId);
                 } catch (error) {
                     console.error(`importFlow error`, flowFilePath, error)
                 }
             }
         },
 
-        importFlow: async function(flow, name) {
-            return await this.broker.call('steedos-server.importFlow', {flow, name});
+        importFlow: async function(flow, name, spaceId) {
+            return await this.broker.call('steedos-server.importFlow', {flow, name, spaceId});
         }, 
-        loadDataOnServiceStarted: async function(){
+        /**
+         * @param {string} spaceId 非必传
+         * @returns 
+         */
+        loadDataOnServiceStarted: async function(spaceId){
             let packageInfo = this.settings.packageInfo;
             if (!packageInfo) {
                 return;
@@ -147,7 +152,7 @@ module.exports = {
 
             this.loadPackagePublicFiles(_path);
             if(_path){
-                this.sendPackageFlowToDb(_path)
+                this.sendPackageFlowToDb(_path, null, spaceId)
                 processLoader.sendPackageProcessToDb(_path);
             }
         },
@@ -253,7 +258,7 @@ module.exports = {
                 }
             }
     
-            console.time(`service ${this.name} started`)
+            const startTime = moment();
             let packageInfo = this.settings.packageInfo;
             if (!packageInfo) {
                 return;
@@ -288,7 +293,8 @@ module.exports = {
     
             // await this.loadPackagePublicFiles(_path);
             this.started = true;
-            console.timeEnd(`service ${this.name} started`)
+            const endTime = moment();
+            console.log(`service ${this.name} started:`, `${endTime.diff(startTime, 'seconds', true)}s`);
             if(this.afterStart){
                 try {
                     await this.afterStart();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.5.20-beta.8",
+  "version": "2.5.20",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,13 +10,14 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "2.5.20-beta.8",
-    "@steedos/metadata-registrar": "2.5.20-beta.8",
-    "@steedos/router": "2.5.20-beta.8",
-    "@steedos/service-object-mixin": "2.5.20-beta.8",
+    "@steedos/metadata-core": "2.5.20",
+    "@steedos/metadata-registrar": "2.5.20",
+    "@steedos/router": "2.5.20",
+    "@steedos/service-object-mixin": "2.5.20",
     "clone": "^2.1.2",
     "csvtojson": "~2.0.10",
     "moleculer": "^0.14.25",
+    "moment": "^2.24.0",
     "node-xlsx": "^0.16.1",
     "underscore": "^1.12.0"
   },
@@ -27,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9501bbf23858aa74a7bb9dcf53f3c7ce4dc765b1"
+  "gitHead": "1e2c9a88c8eeddc492481195d2d8c5e3519680e8"
 }