@steedos/service-package-registry 2.5.15-beta.9 → 2.5.16-beta.1

package/main/default/manager/loader.js

@@ -9,11 +9,21 @@ const userDir = path.join(process.cwd(), '.steedos');
 const packagesFilePath = path.join(userDir, 'steedos-packages.yml'); 
 const metadataApi = require('@steedos/metadata-api');
 const util = require('./util');
+const metaDataCore = require('@steedos/metadata-core');
+
+const getPackageYmlData = (packagePath)=>{
+    let packageYmlData = {};
+    if(fs.existsSync(path.join(packagePath, 'steedos.package.yml'))){
+        packageYmlData = metaDataCore.loadFile(path.join(packagePath, 'steedos.package.yml'));
+    }
+    return packageYmlData;
+}
+
 const loadPackagesConfig = ()=>{
     return yaml.load(fs.readFileSync(packagesFilePath, 'utf8')) || {};
 }
 
-const appendToPackagesConfig = (packageName, options)=>{
+const appendToPackagesConfig = (packageName, options, actionName)=>{
     let packages = loadPackagesConfig();
     let changeNamePackage = null;
     if(options.local && !packages[packageName]){
@@ -36,7 +46,9 @@ const appendToPackagesConfig = (packageName, options)=>{
             }
         }else{
             // 对于已经存在的软件包, 不支持使用传入的enable控制软件包状态.
-            delete options.enable
+            if(actionName === 'addPackage'){
+                delete options.enable
+            }
             packages[packageName] = Object.assign(packages[packageName], options)
         }
     }else{
@@ -331,8 +343,10 @@ const installPackage = async (broker, options)=>{
     }
     appendToPackagesConfig(module, packageConfig);
     const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+    const packageYmlData = getPackageYmlData(packagePath);
     await broker.call(`@steedos/service-packages.install`, {
         serviceInfo: Object.assign({}, packageConfig, {
+            packageYmlData: packageYmlData,
             name: module,
             enable: enable, 
             nodeID: broker.nodeID, 
@@ -385,5 +399,6 @@ module.exports = {
     removePackage,
     getPackageInfo,
     getPackageMetadata,
-    installPackage
+    installPackage,
+    getPackageYmlData
 }

package/main/default/manager/packages.js

@@ -47,16 +47,17 @@ const getAllPackages = async ()=>{
             _package.version = package.version
         }else{
             packages.push({
+                label: package.label || packageName,
+                homepage: package.homepage,
+                description: package.description,
+                ...(package.packageYmlData || {}),
                 _id : packageName.replace("/", '_'),
                 name: packageName,
                 status : package.enable ? 'starting' : 'disable',
                 version : package.version,
                 local: package.local,
-                label: package.label || packageName,
-                description: package.description,
                 metadata: package.metadata,
-                static: package.static,
-                homepage: package.homepage
+                static: package.static
             })
         }
     })
@@ -72,6 +73,10 @@ const getAllPackages = async ()=>{
             _package.homepage = packageInfo.homepage
         }else{
             packages.push({
+                label: packageInfo.label || packageName,
+                description: packageInfo.description,
+                homepage: packageInfo.homepage,
+                ...(packageInfo.packageYmlData || {}),
                 _id : packageName.replace("/", '_'),
                 name: packageName,
                 service_name: packageInfo.name,
@@ -79,10 +84,7 @@ const getAllPackages = async ()=>{
                 instance_id: packageInfo.instanceID,
                 status : 'enable',
                 version : packageInfo.version,
-                label: packageInfo.label || packageName,
-                description: packageInfo.description,
-                local: false,
-                homepage: packageInfo.homepage
+                local: false
             })
         }
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.5.15-beta.9",
+  "version": "2.5.16-beta.1",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.5.15-beta.9",
-    "@steedos/core": "2.5.15-beta.9",
-    "@steedos/metadata-core": "2.5.15-beta.9",
-    "@steedos/objectql": "2.5.15-beta.9",
-    "@steedos/service-package-loader": "2.5.15-beta.9",
+    "@steedos/auth": "2.5.16-beta.1",
+    "@steedos/core": "2.5.16-beta.1",
+    "@steedos/metadata-core": "2.5.16-beta.1",
+    "@steedos/objectql": "2.5.16-beta.1",
+    "@steedos/service-package-loader": "2.5.16-beta.1",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9ddb0d963c52d496ac2bad2745b74c55ad31150d"
+  "gitHead": "a49fccb59a464a337093f027f5d5279d738f5570"
 }

package/project.package.service.js

@@ -92,11 +92,15 @@ module.exports = {
 			async handler(ctx) {
 				const { module } = ctx.params
                 const packages = loader.loadPackagesConfig();
-				const packageConfig = _.find(packages, (_p, pname) => {
+				let packageConfig = _.find(packages, (_p, pname) => {
+					_p.name = pname;
 					return pname === module;
 				})
 				if (packageConfig) {
 					if (packageConfig.enable) {
+						if(packageConfig.static){
+							packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
+						}
 						if (packageConfig.local) {
 							let packagePath = packageConfig.path;
 							if(!path.isAbsolute(packagePath)){
@@ -104,8 +108,10 @@ module.exports = {
 							}
 							await loader.loadPackage(module, packagePath);
 							const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
+							const packageYmlData = loader.getPackageYmlData(packagePath);
 							await ctx.broker.call(`@steedos/service-packages.install`, {
 								serviceInfo: Object.assign({}, Object.assign({}, packageConfig, { name: module }), {
+									packageYmlData: packageYmlData,
 									nodeID: ctx.broker.nodeID,
 									instanceID: ctx.broker.instanceID,
 									metadata: metadata
@@ -127,11 +133,16 @@ module.exports = {
 		disablePackage:{
 			async handler(ctx) {
 				const { module } = ctx.params
-                const packageConfig = await loader.disablePackage(module);
+                let packageConfig = await loader.disablePackage(module);
+				if(packageConfig.static){
+					packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
+				}
 				if(packageConfig.path){
 					const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
+					const packageYmlData = loader.getPackageYmlData(packageConfig.path);
 					await ctx.broker.call(`@steedos/service-packages.install`, {
 						serviceInfo: Object.assign({}, packageConfig, {
+							packageYmlData,
 							nodeID: ctx.broker.nodeID, 
 							instanceID: ctx.broker.instanceID,
 							metadata: metadata 
@@ -150,8 +161,10 @@ module.exports = {
 				}
 				await packages.checkDependencies(path.resolve(packageConfig.path))
 				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
+				const packageYmlData = loader.getPackageYmlData(packageConfig.path);
 				await ctx.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfig, {
+						packageYmlData,
 						nodeID: ctx.broker.nodeID, 
 						instanceID: ctx.broker.instanceID,
 						metadata: metadata
@@ -183,6 +196,7 @@ module.exports = {
 					const enable = true;
 					return await this.installPackageFromUrl(module, version, url, auth, enable, registry_url, ctx.broker, {fromClient})
 				} catch (error) {
+					this.broker.logger.error(`installPackageFromUrl: `, error);
 					let errorInfo = error.message || '';
 					if (error.stderr) {
 						const errors = error.stderr.split('\n');
@@ -253,8 +267,10 @@ module.exports = {
 				}
 				const newConfig = loader.appendToPackagesConfig(module, packageConfig);
 				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+				const packageYmlData = loader.getPackageYmlData(packagePath);
 				await this.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, newConfig, {
+						packageYmlData,
 						name: module,
 						enable: enable, 
 						nodeID: this.broker.nodeID, 
@@ -316,8 +332,10 @@ module.exports = {
 				} catch (error) {
 					console.error(error)
 				}
+				const packageYmlData = loader.getPackageYmlData(packagePath);
 				await broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfig, {
+						packageYmlData,
 						name: packageName,
 						enable: enable, 
 						nodeID: broker.nodeID, 
@@ -411,7 +429,7 @@ module.exports = {
 					if(!_.has(options, 'static')){
 						options.static = true
 					}
-					loader.appendToPackagesConfig(name, options)
+					loader.appendToPackagesConfig(name, options, 'addPackage')
 					await this.installPackagesSyncToMetaData(name);
 				}
 			}
@@ -451,8 +469,10 @@ module.exports = {
 							_packageInfo = Object.assign({}, _packageInfo, this.getPackageInfo(_packageInfo, name))
 						}
 						const metadata = await loader.getPackageMetadata(_packageInfo.path);
+						const packageYmlData = loader.getPackageYmlData(_packageInfo.path);
 						await this.broker.call(`@steedos/service-packages.install`, {
 							serviceInfo: {
+								packageYmlData,
 								name: name, 
 								nodeID: this.broker.nodeID, 
 								instanceID: this.broker.instanceID,