@steedos/service-packages 2.4.6 → 2.4.8-beta.1

package/index.js

@@ -1,4 +1,5 @@
 "use strict";
+const  { Register } = require('@steedos/metadata-registrar');
 const project = require('./package.json');
 const packageName = project.name;
 /**
@@ -9,6 +10,15 @@ const packageName = project.name;
 const getCacherKey = (serviceInfo)=>{
     return `#packages.${serviceInfo.name}.${serviceInfo.instanceID}`
 }
+
+const getStartingCacherKey = ()=>{
+    return `#packages_starting`
+}
+
+const getStartedCacherKey = ()=>{
+    return `#packages_started`
+}
+
 const getInstallCacherKey = (serviceInfo)=>{
     return `#packages_install.${serviceInfo.name}.${serviceInfo.nodeID}`
 }
@@ -18,6 +28,7 @@ const getRoutersInfoCacherKey = (packageName)=>{
 }
 
 module.exports = {
+	countTimeoutId: null,
 	name: packageName,
 	namespace: "steedos",
 	mixins: [],
@@ -40,12 +51,25 @@ module.exports = {
 	 * Actions
 	 */
 	actions: {
+		starting: {	
+			async handler(ctx) {
+				const { serviceInfo } = ctx.params;
+				return await Register.rpush(ctx.broker, { key: getStartingCacherKey(), data: [serviceInfo] })
+			}
+		},
+		started: {	
+			async handler(ctx) {
+				const { serviceInfo } = ctx.params;
+				return await Register.rpush(ctx.broker, { key: getStartedCacherKey(), data: [serviceInfo] })
+			}
+		},
         offline: {
 			params: {
                 serviceInfo: { type: "object"},
             },
 			async handler(ctx) {
                 await ctx.broker.call('metadata.delete', {key: getCacherKey(ctx.params.serviceInfo)}, {meta: ctx.meta})
+				await this.statisticsActivatedPackages();
 			}
 		},
         online: {
@@ -54,6 +78,7 @@ module.exports = {
             },
 			async handler(ctx) {
                 await ctx.broker.call('metadata.add', {key: getCacherKey(ctx.params.serviceInfo), data: ctx.params.serviceInfo}, {meta: ctx.meta})
+				await this.statisticsActivatedPackages();
 			}
 		},
 		install: {
@@ -116,14 +141,35 @@ module.exports = {
 	 * Events
 	 */
 	events: {
-
+		"$packages.statisticsActivatedPackages": {
+			handler(){
+				return this.statisticsActivatedPackages()
+			}
+		}
 	},
 
 	/**
 	 * Methods
 	 */
 	methods: {
-
+		//统计已启动的软件包
+		statisticsActivatedPackages: {
+			async handler(){
+				if(this.countTimeoutId){
+					clearTimeout(this.countTimeoutId);
+				}
+				// console.log(`statisticsActivatedPackages`);
+				this.countTimeoutId = setTimeout(async()=>{
+					const startingPackages = await Register.filterList(this.broker, {key: getStartingCacherKey()});
+					const startedPackages = await Register.filterList(this.broker, {key: getStartedCacherKey()});
+					// console.log(`startingPackages`, startingPackages.length, startedPackages.length);
+					if(startingPackages.length <= startedPackages.length){
+						// console.log(`broadcast $packages.changed========`)
+						this.broker.broadcast("$packages.changed", {});
+					}
+				}, 1000 * 3)
+			}
+		}
 	},
 
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-packages",
-  "version": "2.4.6",
+  "version": "2.4.8-beta.1",
   "main": "index.js",
   "scripts": {},
   "license": "MIT",
@@ -8,5 +8,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "baf2b26509111eb49b56ea563ce9b86fde8753f7"
+  "gitHead": "f35130770cfb86468309f8f9a8ce21a3bbb5b2f6"
 }