@steedos/service-package-registry 2.5.14-beta.7 → 2.5.14

package/main/default/manager/loader.js

@@ -159,7 +159,7 @@ const isPackage = (name)=>{
     }
 }
 
-const loadDependency = async (mainPackageInfo, dependencyName, dependencyVersion)=>{
+const loadDependency = async (mainPackageInfo = {}, dependencyName, dependencyVersion)=>{
     // console.log(`loadDependency`, mainPackageInfo, dependencyName, dependencyVersion)
     if(mainPackageInfo.static == true){
         return ;
@@ -187,7 +187,7 @@ const loadDependency = async (mainPackageInfo, dependencyName, dependencyVersion
             await enablePackage(dependencyName)
         }else{
             try {
-                if(mainPackageInfo?.static != true){
+                if(mainPackageInfo && mainPackageInfo.static != true){
                     await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
                 }
             } catch (error) {

package/main/default/manager/packages.js

@@ -184,9 +184,22 @@ const scanPackageMetadatas = async (packagePath) => {
     return packageMetadatas;
 }
 
+const checkDependencies = async (packagePath)=>{
+    const packageServiceConfig = require(path.join(packagePath, 'package.service.js'));
+    const dependencies = (packageServiceConfig && packageServiceConfig.dependencies) || [];
+    for(const item of dependencies){
+        const hasService = await objectql.getSteedosSchema().broker.registry.hasService(item);
+        if(!hasService){
+            throw new Error(`依赖项${item}未启动, 请先启动依赖项`)
+        }
+    }
+    return true;
+}
+
 module.exports = {
     maintainSystemFiles,
     getAllPackages,
     getPackageVersions,
-    scanPackageMetadatas
+    scanPackageMetadatas,
+    checkDependencies
 }

package/main/default/objects/steedos_packages/listviews/all.listview.yml

@@ -7,6 +7,7 @@ columns:
   - field: version
     wrap: false
   - field: status
+  - field: static
 filter_scope: space
 label: 已安装
 scrolling_mode: standard

package/package.json

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

package/project.package.service.js

@@ -148,6 +148,7 @@ module.exports = {
 				if(packageConfig.static){
 					packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
 				}
+				await packages.checkDependencies(path.resolve(packageConfig.path))
 				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
 				await ctx.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfig, {
@@ -178,9 +179,9 @@ module.exports = {
 					if(!user.is_space_admin){
 						throw new Error('not permission!');
 					}
-					let { module, version, url, auth, registry_url } = ctx.params
+					let { module, version, url, auth, registry_url, fromClient = false } = ctx.params
 					const enable = true;
-					return await this.installPackageFromUrl(module, version, url, auth, enable, registry_url, ctx.broker)
+					return await this.installPackageFromUrl(module, version, url, auth, enable, registry_url, ctx.broker, {fromClient})
 				} catch (error) {
 					let errorInfo = error.message || '';
 					if (error.stderr) {
@@ -265,7 +266,7 @@ module.exports = {
             }
 		},
 		installPackageFromUrl: {
-			async handler(module, version, url, auth, enable, registry_url, broker) {
+			async handler(module, version, url, auth, enable, registry_url, broker, {fromClient}) {
 				if(!module || !_.isString(module) || !module.trim()){
 					throw new Error(`无效的软件包名称`);
 				} else {
@@ -290,6 +291,9 @@ module.exports = {
 				const packageInfo = loader.getPackageInfo(null, packagePath);
 				const packageName = packageInfo.name;
 				if(enable){
+					if(fromClient){
+						await packages.checkDependencies(packagePath)
+					}
 					await loader.loadPackage(packageName, packagePath);
 				}else{
 					enable = false;