@steedos/service-package-registry 2.5.13-beta.5 → 2.5.13-beta.7

package/main/default/manager/loader.js

@@ -26,13 +26,14 @@ const appendToPackagesConfig = (packageName, options)=>{
     }
     if(options.static){
         if(!packages[packageName]){
+            packages[packageName] = Object.assign({
+                enable: false,
+                local: true
+            }, options)
             if(options.enable){
-                const packagePath = path.dirname(require.resolve(`${packageName}/package.json`))
+                const packagePath = options.path || path.dirname(require.resolve(`${packageName}/package.json`))
                 loadPackage(packageName, packagePath);
             }
-            packages[packageName] = Object.assign({
-                enable: false
-            }, options)
         }else{
             packages[packageName] = Object.assign(packages[packageName], options)
         }
@@ -87,7 +88,7 @@ const loadPackages = async ()=>{
                         console.error(error)
                     }
                 }
-            }else if(package.local === true){
+            }else if(package.local === true && package.static != true){
                 let packagePath = package.path;
                 if(!path.isAbsolute(packagePath)){
                     packagePath = path.resolve(process.cwd(), packagePath)
@@ -145,7 +146,8 @@ const isPackage = (name)=>{
     }
 }
 
-const loadDependency = async (dependencyName, dependencyVersion)=>{
+const loadDependency = async (mainPackageInfo, dependencyName, dependencyVersion)=>{
+    // console.log(`loadDependency`, mainPackageInfo, dependencyName, dependencyVersion)
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     let packageInfo = null;
@@ -169,9 +171,11 @@ const loadDependency = async (dependencyName, dependencyVersion)=>{
             await enablePackage(dependencyName)
         }else{
             try {
-                await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+                if(mainPackageInfo.static != true){
+                    await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+                }
             } catch (error) {
-                
+                console.log(error)
             }
         }
         // 如果steedos package yml 中没有该依赖，则直接安装
@@ -196,16 +200,16 @@ const loadPackage = async (packageName, packagePath)=>{
         const packageInfo = require(path.join(packagePath, 'package.json'));
         await destroyExistThePackageService(packageInfo);
         await steedos.loadPackage(packagePath);
-
+        const packageConfig = getPackageConfig(packageName);
         if(packageInfo.dependencies){
             for (const dependencyName in packageInfo.dependencies) {
                 const dependencyVersion = packageInfo.dependencies[dependencyName];
-                await loadDependency(dependencyName, dependencyVersion);
+                await loadDependency(packageConfig, dependencyName, dependencyVersion);
             }
         }   
         return Object.assign({packagePath: packagePath}, packageInfo);
     } catch (error) {
-        console.error(error)
+        console.error(packageName, packagePath, error)
     }
 }
 
@@ -258,7 +262,7 @@ const getPackageConfig = (packageName)=>{
 const enablePackage = async (packageName)=>{
     let packagePath = null;
     let package = getPackageConfig(packageName);
-    if(package && package.local){
+    if(package && package.local && package.static !=true){
         if(path.isAbsolute(package.path)){
             packagePath = package.path
         }else{

package/package.json

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

package/project.package.service.js

@@ -151,7 +151,7 @@ module.exports = {
 				const { module } = ctx.params
                 let packageConfig = await loader.enablePackage(module);
 				if(packageConfig.static){
-					packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig.name))
+					packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
 				}
 				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
 				await ctx.broker.call(`@steedos/service-packages.install`, {
@@ -577,8 +577,8 @@ module.exports = {
 			}
 		},
 		getStaticPackageInfo: {
-			handler(packageName){
-				const _path = path.dirname(require.resolve(`${packageName}/package.json`));
+			handler(packageInfo, packageName){
+				const _path = packageInfo.path || path.dirname(require.resolve(`${packageName}/package.json`));
 				const packageJson = require(`${_path}/package.json`);
 				return {
 					path: _path,
@@ -595,7 +595,7 @@ module.exports = {
 					if (Object.hasOwnProperty.call(installPackages, name) && (packageName && packageName === name)) {
 						let _packageInfo = installPackages[name];
 						if(_packageInfo.static){
-							_packageInfo = Object.assign({}, _packageInfo, this.getStaticPackageInfo(name))
+							_packageInfo = Object.assign({}, _packageInfo, this.getStaticPackageInfo(_packageInfo, name))
 						}
 						const metadata = await loader.getPackageMetadata(_packageInfo.path);
 						await this.broker.call(`@steedos/service-packages.install`, {