@steedos/service-package-loader 2.4.7 → 2.4.8-beta.1

package/index.js

@@ -35,7 +35,7 @@ module.exports = {
     /**
      * Dependencies
      */
-    dependencies: ['metadata-server', '~packages-project-server'],
+    dependencies: ['metadata-server', '~packages-project-server', '@steedos/service-packages'],
 
     /**
      * Actions
@@ -246,6 +246,53 @@ module.exports = {
                 module: this.schema.packageName
             })
             return await this.broker.destroyService(this);
+        },
+        async onStarted(){
+            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) {
+                return;
+            }
+            const { path : _path, datasource, isPackage } = packageInfo;
+            if (!_path) {
+                this.logger.error(`Please config packageInfo in your settings.`);
+                console.log(`service ${this.name} started`);
+                return;
+            }
+            this.broker.waitForServices("steedos-server").then(async () => {
+                await this.loadDataOnServiceStarted()
+            });
+            
+            await this.loadPackageMetadataFiles(_path, this.name, datasource);
+            if(isPackage !== false){
+                try {
+                    const _packageInfo = objectql.loadJSONFile(path.join(_path, 'package.json'));
+                    await this.broker.call(`@steedos/service-packages.online`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, path: _path, version: _packageInfo.version, description: _packageInfo.description}})
+                } catch (error) {
+                    
+                }    
+            }
+    
+            await this.loadPackageMetadataServices(_path);
+    
+            // await this.loadPackagePublicFiles(_path);
+            this.started = true;
+            console.timeEnd(`service ${this.name} started`)
+            if(this.afterStart){
+                try {
+                    await this.afterStart();
+                } catch (error) {
+                    this.broker.logger.error(`[${this.name}]: ${error.message}`);
+                }
+            }
         }
     },
 
@@ -266,51 +313,9 @@ 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) {
-            return;
-        }
-        const { path : _path, datasource, isPackage } = packageInfo;
-        if (!_path) {
-            this.logger.error(`Please config packageInfo in your settings.`);
-            console.log(`service ${this.name} started`);
-            return;
-        }
-        this.broker.waitForServices("steedos-server").then(async () => {
-            await this.loadDataOnServiceStarted()
-        });
-        
-        await this.loadPackageMetadataFiles(_path, this.name, datasource);
-        if(isPackage !== false){
-            try {
-                const _packageInfo = objectql.loadJSONFile(path.join(_path, 'package.json'));
-                await this.broker.call(`@steedos/service-packages.online`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, path: _path, version: _packageInfo.version, description: _packageInfo.description}})
-            } catch (error) {
-                
-            }    
-        }
-
-        await this.loadPackageMetadataServices(_path);
-
-        // await this.loadPackagePublicFiles(_path);
-        this.started = true;
-        console.timeEnd(`service ${this.name} started`)
-        if(this.afterStart){
-            try {
-                await this.afterStart();
-            } catch (error) {
-                this.broker.logger.error(`[${this.name}]: ${error.message}`);
-            }
-        }
+        await this.broker.call(`@steedos/service-packages.starting`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
+        await this.onStarted();
+        await this.broker.call(`@steedos/service-packages.started`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
     },
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.4.7",
+  "version": "2.4.8-beta.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,10 +10,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.4.7",
-    "@steedos/metadata-core": "2.4.7",
-    "@steedos/objectql": "2.4.7",
-    "@steedos/router": "2.4.7",
+    "@steedos/core": "2.4.8-beta.1",
+    "@steedos/metadata-core": "2.4.8-beta.1",
+    "@steedos/objectql": "2.4.8-beta.1",
+    "@steedos/router": "2.4.8-beta.1",
     "clone": "^2.1.2",
     "moleculer": "^0.14.25",
     "underscore": "^1.12.0"
@@ -25,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a58a5e537a2ff15dda57bf1c31d00f8a9ae19879"
+  "gitHead": "f35130770cfb86468309f8f9a8ce21a3bbb5b2f6"
 }