@steedos/service-package-registry 2.2.55-beta.3 → 2.2.55-beta.6

package/main/default/manager/loader.js

@@ -112,6 +112,17 @@ const destroyExistThePackageService = async (packageInfo)=>{
     }
 }
 
+const isPackage = (name)=>{
+    try {
+        const packagePath = path.dirname(require.resolve(`${name}/package.json`, {
+            paths: [path.join(userDir, 'node_modules')]
+        }))
+        return fs.existsSync(path.join(packagePath, 'package.service.js'));
+    } catch (error) {
+        return false;
+    }
+}
+
 const loadDependency = async (dependencyName, dependencyVersion)=>{
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
@@ -132,10 +143,14 @@ const loadDependency = async (dependencyName, dependencyVersion)=>{
         } catch (error) {
             // console.log(`loadDependency`, error.message)
         }
-        if(packageInfo){
+        if(packageInfo && isPackage(dependencyName)){
             await enablePackage(dependencyName)
         }else{
-            await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+            try {
+                await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+            } catch (error) {
+                
+            }
         }
         // 如果steedos package yml 中没有该依赖，则直接安装
         // await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
@@ -221,7 +236,7 @@ const enablePackage = async (packageName)=>{
             paths: [path.join(userDir, 'node_modules')]
         }))
     }
-    await steedos.loadPackage(packagePath)
+    await loadPackage(packageName, packagePath)
     
     if(package){
         package.enable = true;
@@ -242,7 +257,7 @@ const enablePackage = async (packageName)=>{
 }
 const installPackage = async (broker, options)=>{
     let {module, version, label, description, enable} = options;
-    const packagePath = await registry.installModule(module, version)
+    const packagePath = await registry.installModule(module, version);
     if(enable){
         await loadPackage(module, packagePath);
     }else{

package/main/default/manager/registry.js

@@ -213,7 +213,6 @@ async function installModule(module, version, url, registry_url) {
                 activePromise = Promise.resolve(packagePath);
                 return activePromise;
             } catch (error) {
-                console.log(`error`, error)
                 throw new Error(`${module} is not steedos package`)
             }
 

package/package.json

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