@steedos/service-package-loader 2.2.54-beta.6 → 2.2.54

package/index.js

@@ -12,6 +12,7 @@ const _ = require('lodash');
 const globby = require("globby");
 const express = require('express');
 const fs = require("fs");
+const metaDataCore = require('@steedos/metadata-core');
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
@@ -31,7 +32,7 @@ module.exports = {
     /**
      * Dependencies
      */
-    dependencies: ['metadata-server'],
+    dependencies: ['metadata-server', '~packages-project-server'],
 
     /**
      * Actions
@@ -45,22 +46,13 @@ module.exports = {
      */
     events: {
         "steedos-server.started": {
-            handler() {
-                let packageInfo = this.settings.packageInfo;
-                if (!packageInfo) {
-                    return;
-                }
-                const { path : _path } = packageInfo;
-
-                this.loadPackagePublicFiles(_path);
-
-                if(_path){
-                    //此处延迟10秒加载流程文件，防止工作区初始化未完成
-                    setTimeout(() => {
-                        sendPackageFlowToDb(this.broker, _path)
-                        processLoader.sendPackageProcessToDb(_path);
-                    }, 10 * 1000)
-                }
+            async handler() {
+                await this.loadDataOnServiceStarted();
+            }
+        },
+        "space.initialized": {
+            async handler() {
+                await this.loadDataOnServiceStarted();
             }
         }
     },
@@ -69,6 +61,19 @@ module.exports = {
      * Methods
      */
     methods: {
+        loadDataOnServiceStarted: async function(){
+            let packageInfo = this.settings.packageInfo;
+            if (!packageInfo) {
+                return;
+            }
+            const { path : _path } = packageInfo;
+
+            this.loadPackagePublicFiles(_path);
+            if(_path){
+                sendPackageFlowToDb(this.broker, _path)
+                processLoader.sendPackageProcessToDb(_path);
+            }
+        },
         loadPackageMetadataFiles: async function (packagePath, name, datasourceName) {
             this.broker.logger.debug(`Loading package from ${packagePath}`)
             await Future.task(async () => {
@@ -112,7 +117,7 @@ module.exports = {
                 path.join(packagePath, 'main', 'default', 'services', "**", `*.service.js`),
                 "!" + path.join(packagePath, "**", "node_modules"),
             ];
-            const matchedPaths = globby.sync(filePatten);
+            const matchedPaths = metaDataCore.syncMatchFiles(filePatten);
             for await (const serviceFilePath of matchedPaths) {
                 try {
                     const service = objectql.loadService(this.broker, serviceFilePath);
@@ -151,6 +156,13 @@ module.exports = {
                     this.settings.loadedPackagePublicFiles = false;
                 }
             }
+        },
+        async errorHandler(error) {
+            this.broker.logger.error(`[${this.name}] 启动失败: ${error.message}`);
+            await await this.broker.call(`~packages-project-server.disablePackage`, {
+                module: this.schema.packageName
+            })
+            return await this.broker.destroyService(this);
         }
     },
 
@@ -163,6 +175,7 @@ module.exports = {
     },
 
     merged(schema) {
+        schema.packageName = schema.name;
         schema.name = `~packages-${schema.name}`;
     },
 
@@ -170,6 +183,14 @@ module.exports = {
      * Service started lifecycle event handler
      */
     async started() {
+        if(this.beforeStart){
+            try {
+                await this.beforeStart()
+            } catch (error) {
+                return await this.errorHandler(error);
+            }
+        }
+
         console.time(`service ${this.name} started`)
         let packageInfo = this.settings.packageInfo;
         if (!packageInfo) {
@@ -182,8 +203,7 @@ module.exports = {
             return;
         }
         this.broker.waitForServices("steedos-server").then(async () => {
-            sendPackageFlowToDb(this.broker, _path, this.name)
-            processLoader.sendPackageProcessToDb(_path);
+            await this.loadDataOnServiceStarted()
         });
         
         await this.loadPackageMetadataFiles(_path, this.name, datasource);
@@ -198,10 +218,16 @@ module.exports = {
 
         await this.loadPackageMetadataServices(_path);
 
-        await this.loadPackagePublicFiles(_path);
+        // await this.loadPackagePublicFiles(_path);
         this.started = true;
         console.timeEnd(`service ${this.name} started`)
-        // console.log(`service ${this.name} started`);
+        if(this.afterStart){
+            try {
+                await this.afterStart();
+            } catch (error) {
+                this.broker.logger.error(`[${this.name}]: ${error.message}`);
+            }
+        }
     },
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.2.54-beta.6",
+  "version": "2.2.54",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,11 +10,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.2.54-beta.6",
-    "@steedos/metadata-core": "2.2.54-beta.6",
-    "@steedos/objectql": "2.2.54-beta.6",
+    "@steedos/core": "2.2.54",
+    "@steedos/metadata-core": "2.2.54",
+    "@steedos/objectql": "2.2.54",
     "clone": "^2.1.2",
-    "globby": "^11.1.0",
     "moleculer": "^0.14.21",
     "underscore": "^1.12.0"
   },
@@ -25,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "42049eee94baa827da1bf943f3736328a42ed308"
+  "gitHead": "c3c4c95a7010fd3a1af0cd41d999bff14718da1b"
 }