@steedos/service-package-registry 2.5.13-beta.1 → 2.5.13-beta.10

package/main/default/client/project_nodes.client.js

@@ -1,10 +1,10 @@
 Steedos.PackageRegistry = {
     getNodes: function(){
-        const projectNodes = Steedos.authRequest('/service/api/~packages-project-server/getProjectNodes', {async: false});
+        const projectNodes = Steedos.authRequest('/service/api/@steedos/service-project/getProjectNodes', {async: false});
         return projectNodes;
     },
     getNodesSelect: function(){
-        const projectNodes = Steedos.authRequest('/service/api/~packages-project-server/getProjectNodes', {async: false});
+        const projectNodes = Steedos.authRequest('/service/api/@steedos/service-project/getProjectNodes', {async: false});
         let selectOptions = '';
         _.each(projectNodes, function(nodeID){
             selectOptions = selectOptions + `<option value ="${nodeID}">${nodeID}</option>`

package/main/default/manager/loader.js

@@ -24,27 +24,43 @@ const appendToPackagesConfig = (packageName, options)=>{
             }
         })
     }
-    if(changeNamePackage){
-        //如果是修改package name, 在steedos-package.yml位置保持不变
-        const newPackages = {};
-        _.each(packages, (info, key)=>{
-            if(key === changeNamePackage.module){
-                delete changeNamePackage.module
-                newPackages[packageName] = Object.assign(changeNamePackage, options)
-            }else{
-                newPackages[key] = info
-            }
-        })
-        packages = newPackages
-    }else{
+    if(options.static){
         if(!packages[packageName]){
             packages[packageName] = Object.assign({
-                enable: true
+                enable: false,
+                local: true
             }, options)
+            if(options.enable){
+                const packagePath = options.path || path.dirname(require.resolve(`${packageName}/package.json`))
+                loadPackage(packageName, packagePath);
+            }
         }else{
             packages[packageName] = Object.assign(packages[packageName], options)
         }
+    }else{
+        if(changeNamePackage){
+                //如果是修改package name, 在steedos-package.yml位置保持不变
+                const newPackages = {};
+                _.each(packages, (info, key)=>{
+                    if(key === changeNamePackage.module){
+                        delete changeNamePackage.module
+                        newPackages[packageName] = Object.assign(changeNamePackage, options)
+                    }else{
+                        newPackages[key] = info
+                    }
+                })
+                packages = newPackages
+            }else{
+                if(!packages[packageName]){
+                    packages[packageName] = Object.assign({
+                        enable: true
+                    }, options)
+                }else{
+                    packages[packageName] = Object.assign(packages[packageName], options)
+                }
+            }
     }
+    
     let data = yaml.dump(packages);
     fs.writeFileSync(packagesFilePath, data);
 }
@@ -72,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)
@@ -130,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;
@@ -154,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 中没有该依赖，则直接安装
@@ -181,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)
     }
 }
 
@@ -243,16 +262,20 @@ 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{
             packagePath = path.resolve(process.cwd(), package.path)
         }
     }else{
-        packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
-            paths: [path.join(userDir, 'node_modules')]
-        }))
+        if(package && package.static){
+            packagePath = path.dirname(require.resolve(`${packageName}/package.json`))
+        }else{
+            packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
+                paths: [path.join(userDir, 'node_modules')]
+            }))
+        }
     }
     await loadPackage(packageName, packagePath)
     
@@ -271,6 +294,7 @@ const enablePackage = async (packageName)=>{
     }
     appendToPackagesConfig(packageName, package);
     let packageInfo = Object.assign({}, package, {name: packageName});
+    // console.log(`enable packageInfo`, packageInfo)
     return packageInfo;
 }
 const installPackage = async (broker, options)=>{

package/main/default/manager/packages.js

@@ -32,6 +32,7 @@ const getAllPackages = async ()=>{
         package.status = '';
         package.new_version = package.version
         package.local = package.local
+        package.static = package.static
         delete package.version
         if(installPackages[package.name]){
             package.status = installPackages[package.name].enable ? 'enable' : 'disable'
@@ -52,7 +53,8 @@ const getAllPackages = async ()=>{
                 local: package.local,
                 label: package.label || packageName,
                 description: package.description,
-                metadata: package.metadata
+                metadata: package.metadata,
+                static: package.static
             })
         }
     })

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

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

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

@@ -12,3 +12,4 @@ searchable: true
 sort_no: 110
 sortable: true
 type: text
+visible_on: "{{false}}"

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

@@ -12,3 +12,4 @@ searchable: true
 sort_no: 110
 sortable: true
 type: text
+visible_on: "{{false}}"

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

@@ -12,3 +12,4 @@ searchable: true
 sort_no: 100
 sortable: true
 type: text
+visible_on: "{{false}}"

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

@@ -0,0 +1,4 @@
+name: static
+type: boolean
+label: 静态(不支持卸载、升级)
+visible_on: "{{false}}"

package/main/default/routes/nodes.router.js

@@ -15,7 +15,7 @@ router.get('/api/nodes/install', core.requireAuthentication, async function (req
     try {
         const { module, version, label, description, nodeID} = body || {};
         let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.installPackage`, {
+        const result = await broker.call(`@steedos/service-project.installPackage`, {
             module, version, label, description
         },{
             nodeID: nodeID
@@ -40,7 +40,7 @@ router.post('/api/nodes/uninstall', core.requireAuthentication, async function (
         await registry.uninstallModule(body.module)
         const { module, nodeID} = body || {};
         let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.uninstallPackage`, {
+        const result = await broker.call(`@steedos/service-project.uninstallPackage`, {
             module
         },{
             nodeID: nodeID
@@ -62,7 +62,7 @@ router.post('/api/nodes/reload', core.requireAuthentication, async function (req
     try {
         const { module, nodeID} = body || {};
         let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.reloadPackage`, {
+        const result = await broker.call(`@steedos/service-project.reloadPackage`, {
             module
         },{
             nodeID: nodeID
@@ -84,7 +84,7 @@ router.post('/api/nodes/disable', core.requireAuthentication, async function (re
     try {
         const { module, nodeID} = body || {};
         let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.disablePackage`, {
+        const result = await broker.call(`@steedos/service-project.disablePackage`, {
             module
         },{
             nodeID: nodeID
@@ -106,7 +106,7 @@ router.post('/api/nodes/enable', core.requireAuthentication, async function (req
     try {
         const { module, nodeID} = body || {};
         let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.enablePackage`, {
+        const result = await broker.call(`@steedos/service-project.enablePackage`, {
             module
         },{
             nodeID: nodeID
@@ -132,7 +132,7 @@ router.get('/api/nodes/versions', core.requireAuthentication, async function (re
     try {
        
         let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.getPackageVersions`, {
+        const result = await broker.call(`@steedos/service-project.getPackageVersions`, {
             module
         })
         res.status(200).send(result); //TODO 完善返回信息
@@ -152,7 +152,7 @@ router.post('/api/nodes/upgrade', core.requireAuthentication, async function (re
     try {
         const { module, version} = body || {};
         let broker = schema.broker;
-        const result = await broker.call(`~packages-project-server.upgradePackage`, {
+        const result = await broker.call(`@steedos/service-project.upgradePackage`, {
             module, version
         })
         res.status(200).send(result);

package/package.json

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

package/project.package.service.js

@@ -25,7 +25,7 @@ const AUTH_TYPE = 'Bearer';
  * 软件包服务启动后也需要抛出事件。
  */
 module.exports = {
-	name: '~packages-project-server',
+	name: '@steedos/service-project',
 	namespace: "steedos",
 	/**
 	 * Settings
@@ -149,7 +149,10 @@ module.exports = {
 		enablePackage:{
 			async handler(ctx) {
 				const { module } = ctx.params
-                const packageConfig = await loader.enablePackage(module);
+                let packageConfig = await loader.enablePackage(module);
+				if(packageConfig.static){
+					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`, {
 					serviceInfo: Object.assign({}, packageConfig, {
@@ -275,7 +278,13 @@ module.exports = {
 			async handler(ctx) {
 				return await this.initialPackages();
 			}
+		},
+		addPackages: {
+			async handler(ctx) {
+				return await this.addPackages(ctx);
+			}
 		}
+
 	},
 
 	/**
@@ -544,6 +553,68 @@ module.exports = {
 					}
 				}
 			}
+		},
+		addPackages: {
+			async handler(ctx){
+				const { packages } = ctx.params;
+				for(const _package of packages){
+					let name = null;
+					let options = null;
+					if(_.isString(_package)){
+						name = _package;
+						options = {}
+					}else{
+						const { name: _name, ..._options} = _package;
+						name = _name;
+						options = _options;
+					}
+					if(!_.has(options, 'static')){
+						options.static = true
+					}
+					loader.appendToPackagesConfig(name, options)
+					await this.installPackagesSyncToMetaData(name);
+				}
+			}
+		},
+		getStaticPackageInfo: {
+			handler(packageInfo, packageName){
+				const _path = packageInfo.path || path.dirname(require.resolve(`${packageName}/package.json`));
+				const packageJson = require(`${_path}/package.json`);
+				return {
+					path: _path,
+					version: packageJson.version,
+					description: packageJson.description
+				}
+			}
+		},
+		installPackagesSyncToMetaData:{
+			async handler(packageName){
+				//注册本地已安装的steedos packages
+				const installPackages = loader.loadPackagesConfig();
+				for (const name in installPackages) {
+					if (Object.hasOwnProperty.call(installPackages, name) && (packageName && packageName === name)) {
+						let _packageInfo = installPackages[name];
+						if(_packageInfo.static){
+							_packageInfo = Object.assign({}, _packageInfo, this.getStaticPackageInfo(_packageInfo, name))
+						}
+						const metadata = await loader.getPackageMetadata(_packageInfo.path);
+						await this.broker.call(`@steedos/service-packages.install`, {
+							serviceInfo: {
+								name: name, 
+								nodeID: this.broker.nodeID, 
+								instanceID: this.broker.instanceID, 
+								path: _packageInfo.path,
+								local: _packageInfo.local, 
+								enable: _packageInfo.enable, 
+								version: _packageInfo.version, 
+								description: _packageInfo.description,
+								metadata: metadata,
+								static: _packageInfo.static
+							}
+						})
+					}
+				}
+			}
 		}
 	},
 
@@ -606,27 +677,7 @@ module.exports = {
 		})
 		await loader.loadPackages();
 
-		//注册本地已安装的steedos packages
-		const installPackages = loader.loadPackagesConfig();
-		for (const name in installPackages) {
-			if (Object.hasOwnProperty.call(installPackages, name)) {
-				const _packageInfo = installPackages[name];
-				const metadata = await loader.getPackageMetadata(_packageInfo.path);
-				await this.broker.call(`@steedos/service-packages.install`, {
-					serviceInfo: {
-						name: name, 
-						nodeID: this.broker.nodeID, 
-						instanceID: this.broker.instanceID, 
-						path: _packageInfo.path,
-						local: _packageInfo.local, 
-						enable: _packageInfo.enable, 
-						version: _packageInfo.version, 
-						description: _packageInfo.description,
-						metadata: metadata
-					}
-				})
-			}
-		}
+		await this.installPackagesSyncToMetaData()
 		
 	},