@steedos/service-package-registry 2.5.13-beta.8 → 2.5.13

package/main/default/manager/loader.js

@@ -70,7 +70,18 @@ const loadPackages = async ()=>{
     for (const packageName in packages) {
         const package = packages[packageName]
         if(package.enable){
-            if(package.local !== true){
+            if(package.static === true){
+                try {
+                    const packagePath = package.path || path.dirname(require.resolve(`${packageName}/package.json`))
+                    if(packagePath){
+                        const packageInfo = await loadPackage(packageName, packagePath);
+                        appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
+                    }
+                } catch (error) {
+                    console.error(error)
+                }
+
+            }else if(package.local !== true){
                 try {
                     const packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
                         paths: [path.join(userDir, 'node_modules')]
@@ -148,6 +159,9 @@ const isPackage = (name)=>{
 
 const loadDependency = async (mainPackageInfo, dependencyName, dependencyVersion)=>{
     // console.log(`loadDependency`, mainPackageInfo, dependencyName, dependencyVersion)
+    if(mainPackageInfo.static == true){
+        return ;
+    }
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     let packageInfo = null;
@@ -171,11 +185,11 @@ const loadDependency = async (mainPackageInfo, dependencyName, dependencyVersion
             await enablePackage(dependencyName)
         }else{
             try {
-                if(mainPackageInfo.static != true){
+                if(mainPackageInfo?.static != true){
                     await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
                 }
             } catch (error) {
-                console.log(error)
+                // console.log(error)
             }
         }
         // 如果steedos package yml 中没有该依赖，则直接安装

package/main/default/manager/packages.js

@@ -33,6 +33,7 @@ const getAllPackages = async ()=>{
         package.new_version = package.version
         package.local = package.local
         package.static = package.static
+        package.homepage = package.homepage
         delete package.version
         if(installPackages[package.name]){
             package.status = installPackages[package.name].enable ? 'enable' : 'disable'
@@ -54,7 +55,8 @@ const getAllPackages = async ()=>{
                 label: package.label || packageName,
                 description: package.description,
                 metadata: package.metadata,
-                static: package.static
+                static: package.static,
+                homepage: package.homepage
             })
         }
     })
@@ -67,6 +69,7 @@ const getAllPackages = async ()=>{
             _package.node_id = packageInfo.nodeID
             _package.instance_id = packageInfo.instanceID
             _package.version = packageInfo.version
+            _package.homepage = packageInfo.homepage
         }else{
             packages.push({
                 _id : packageName.replace("/", '_'),
@@ -78,7 +81,8 @@ const getAllPackages = async ()=>{
                 version : packageInfo.version,
                 label: packageInfo.label || packageName,
                 description: packageInfo.description,
-                local: false
+                local: false,
+                homepage: packageInfo.homepage
             })
         }
     })

package/main/default/manager/registry.js

@@ -320,7 +320,7 @@ async function uninstallModule(module){
 // }
 
 const isPackageUrl = (url)=>{
-    return pkgurlRe.test(url)
+    return pkgurlRe.test(url) || localtgzRe.test(url)
 }
 
 module.exports = {

package/main/default/objects/steedos_packages/fields/description.field.yml

@@ -10,6 +10,6 @@ readonly: false
 required: false
 rows: 2
 searchable: false
-sort_no: 999
+sort_no: 450
 sortable: false
 type: textarea

package/main/default/objects/steedos_packages/fields/homepage.field.yml

@@ -0,0 +1,4 @@
+name: homepage
+type: url
+label: homepage
+sort_no: 130

package/main/default/objects/steedos_packages/fields/metadata.field.yml

@@ -1,4 +1,5 @@
 name: metadata
 label: 软件包组件
 type: grid
-is_wide: true
+is_wide: true
+sort_no: 500

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

@@ -2,11 +2,11 @@ name: all
 columns:
   - field: label
     wrap: false
-  - field: version
-    wrap: false
   - field: description
     width: '150'
     wrap: false
+  - field: version
+    wrap: false
   - field: status
 filter_scope: space
 label: 已安装

package/package.json

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

package/project.package.service.js

@@ -441,7 +441,13 @@ module.exports = {
 					path: util.getPackageRelativePath(process.cwd(), packagePath)
 				}
 				loader.appendToPackagesConfig(packageName, packageConfig);
-				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+				let metadata = {}
+				try {
+					// 软件包元数据扫描失败,并不影响软件包的启动. 在控制台输出异常信息即可.
+					metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+				} catch (error) {
+					console.error(error)
+				}
 				await broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfig, {
 						name: packageName,
@@ -583,7 +589,18 @@ module.exports = {
 				return {
 					path: _path,
 					version: packageJson.version,
-					description: packageJson.description
+					description: packageJson.description,
+					homepage: packageJson.homepage
+				}
+			}
+		},
+		getPackageInfo: {
+			handler(packageInfo, packageName){
+				const packageJson = require(`${_path}/package.json`);
+				return {
+					version: packageJson.version,
+					description: packageJson.description,
+					homepage: packageJson.homepage
 				}
 			}
 		},
@@ -596,6 +613,8 @@ module.exports = {
 						let _packageInfo = installPackages[name];
 						if(_packageInfo.static){
 							_packageInfo = Object.assign({}, _packageInfo, this.getStaticPackageInfo(_packageInfo, name))
+						}else{
+							_packageInfo = Object.assign({}, _packageInfo, this.getPackageInfo(_packageInfo, name))
 						}
 						const metadata = await loader.getPackageMetadata(_packageInfo.path);
 						await this.broker.call(`@steedos/service-packages.install`, {
@@ -609,7 +628,8 @@ module.exports = {
 								version: _packageInfo.version, 
 								description: _packageInfo.description,
 								metadata: metadata,
-								static: _packageInfo.static
+								static: _packageInfo.static,
+								homepage: _packageInfo.homepage
 							}
 						})
 					}