@steedos/service-package-registry 2.5.0-beta.1 → 2.5.0-beta.11

package/main/default/manager/loader.js

@@ -79,7 +79,9 @@ const loadPackages = async ()=>{
                 }
                 if(packagePath){
                     const packageInfo = await loadPackage(packageName, packagePath);
-                    appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
+                    if(packageInfo){
+                        appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
+                    }
                 }
             }
         }
@@ -106,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);
@@ -164,6 +171,13 @@ const loadPackage = async (packageName, packagePath)=>{
                 paths: [path.join(userDir, 'node_modules')]
             }))
         }
+        let schema = objectql.getSteedosSchema();
+        let broker = schema.broker;
+        if(!fs.existsSync(packagePath) || !fs.existsSync(path.join(packagePath, 'package.json'))){
+            broker.logger.warn(`已经从 steedos-packages.yml 文件中删除无效的软件包配置 ${packageName} : ${packagePath}`)
+            removePackageConfig(packageName);
+            return ;
+        }
         const packageInfo = require(path.join(packagePath, 'package.json'));
         await destroyExistThePackageService(packageInfo);
         await steedos.loadPackage(packagePath);
@@ -184,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);
     }
@@ -205,10 +219,14 @@ 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);
     }
+    removePackageConfig(packageName);
+}
+
+const removePackageConfig = (packageName)=>{
     const packages = loadPackagesConfig();
     delete packages[packageName];
     let data = yaml.dump(packages);

package/package.json

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