@steedos/service-package-registry 2.5.0-beta.3 → 2.5.0-beta.33

package/main/default/manager/loader.js

@@ -108,6 +108,11 @@ const destroyExistThePackageService = async (packageInfo)=>{
     let svc = broker.getLocalService({
         name: `~packages-${packageInfo.name}`
     });
+    if(!svc){
+        svc = broker.getLocalService({
+            name: packageInfo.name
+        });
+    }
     if (svc) {
         broker.logger.info(`Destroy previous '${schema.name}' service...`);
         await broker.destroyService(svc);
@@ -193,7 +198,7 @@ const disablePackage = async (packageName)=>{
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     const serviceList = broker.registry.getServiceList({ withActions: true });
-    const service = _.find(serviceList, (_service)=>{return _service.name == `~packages-${packageName}`;})
+    const service = _.find(serviceList, (_service)=>{return _service.name == `~packages-${packageName}` || _service.name == packageName;})
     if(service){
         await broker.destroyService(service);
     }
@@ -214,7 +219,7 @@ const removePackage = async (packageName)=>{
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     const serviceList = broker.registry.getServiceList({ withActions: true });
-    const service = _.find(serviceList, (_service)=>{return _service.name == `~packages-${packageName}`;})
+    const service = _.find(serviceList, (_service)=>{return _service.name == `~packages-${packageName}` || _service.name == packageName;})
     if(service){
         await broker.destroyService(service);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.5.0-beta.3",
+  "version": "2.5.0-beta.33",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,12 +9,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.5.0-beta.3",
-    "@steedos/core": "2.5.0-beta.3",
-    "@steedos/metadata-core": "2.5.0-beta.3",
-    "@steedos/objectql": "2.5.0-beta.3",
-    "@steedos/service-package-license": "2.5.0-beta.3",
-    "@steedos/service-package-loader": "2.5.0-beta.3",
+    "@steedos/auth": "2.5.0-beta.33",
+    "@steedos/core": "2.5.0-beta.33",
+    "@steedos/metadata-core": "2.5.0-beta.33",
+    "@steedos/objectql": "2.5.0-beta.33",
+    "@steedos/service-package-license": "2.5.0-beta.30",
+    "@steedos/service-package-loader": "2.5.0-beta.33",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "48546b91b2a44dd6f6673af7f5ab707faff6e07c"
+  "gitHead": "370c9eaa707a6932f3eb12fb3d711e679bcd2484"
 }

package/project.package.service.js

@@ -198,7 +198,7 @@ module.exports = {
 						result = await this.getCloudSaasPurchasedPackages();
 					}
 					//同步软件包许可证
-					await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
+					// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
 					if(result){
 						for (const _package of result.packages) {
 							try {
@@ -236,7 +236,7 @@ module.exports = {
 			async handler(ctx) {
 				const { module, version } = ctx.params
 				//同步软件包许可证
-				await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
+				// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
 				return await this.upgradePackage(module, version);
             }
 		},
@@ -256,7 +256,7 @@ module.exports = {
 					let { module, version, url, auth, registry_url } = ctx.params
 					const enable = true;
 					//同步软件包许可证
-					await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
+					// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
 					return await this.installPackageFromUrl(module, version, url, auth, enable, registry_url, ctx.broker)
 				} catch (error) {
 					let errorInfo = error.message || '';
@@ -572,7 +572,7 @@ module.exports = {
 			// console.error(`login steedos registry fail: `, error.message);
 		}
 
-		await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
+		// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
  
 		const PACKAGE_INSTALL_NODE = process.env.PACKAGE_INSTALL_NODE
 		if(PACKAGE_INSTALL_NODE){