@steedos/service-package-registry 2.5.15-beta.11 → 2.5.15-beta.13

package/main/default/manager/loader.js

@@ -9,6 +9,7 @@ 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 = {};
@@ -22,7 +23,7 @@ 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]){
@@ -45,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{

package/package.json

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

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)){
@@ -129,7 +133,10 @@ 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);
@@ -189,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');
@@ -421,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);
 				}
 			}