@steedos/service-package-registry 2.2.55-beta.2 → 2.2.55-beta.5

package/main/default/manager/loader.js

@@ -7,7 +7,8 @@ const objectql = require('@steedos/objectql');
 const registry = require('./registry');
 const userDir = path.join(process.cwd(), '.steedos');
 const packagesFilePath = path.join(userDir, 'steedos-packages.yml'); 
-
+const metadataApi = require('@steedos/metadata-api');
+const util = require('./util');
 const loadPackagesConfig = ()=>{
     return yaml.load(fs.readFileSync(packagesFilePath, 'utf8')) || {};
 }
@@ -111,6 +112,51 @@ 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;
+    let packageInfo = null;
+    const packageConfig = getPackageConfig(dependencyName);
+    if(packageConfig){
+        if(packageConfig.enable){
+            return ;
+        }else{
+            await enablePackage(dependencyName)
+        }
+    }else{
+        try {
+            const packagePath = path.dirname(require.resolve(`${dependencyName}/package.json`, {
+                paths: [path.join(userDir, 'node_modules')]
+            }))
+            packageInfo = require(path.join(packagePath, 'package.json'));
+        } catch (error) {
+            // console.log(`loadDependency`, error.message)
+        }
+        if(packageInfo && isPackage(dependencyName)){
+            await enablePackage(dependencyName)
+        }else{
+            try {
+                await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+            } catch (error) {
+                
+            }
+        }
+        // 如果steedos package yml 中没有该依赖，则直接安装
+        // await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+    }
+}
+
 const loadPackage = async (packageName, packagePath)=>{
     try {
         if(!packagePath){
@@ -120,7 +166,14 @@ const loadPackage = async (packageName, packagePath)=>{
         }
         const packageInfo = require(path.join(packagePath, 'package.json'));
         await destroyExistThePackageService(packageInfo);
-        await steedos.loadPackage(packagePath)
+        await steedos.loadPackage(packagePath);
+
+        if(packageInfo.dependencies){
+            for (const dependencyName in packageInfo.dependencies) {
+                const dependencyVersion = packageInfo.dependencies[dependencyName];
+                await loadDependency(dependencyName, dependencyVersion);
+            }
+        }   
         return Object.assign({packagePath: packagePath}, packageInfo);
     } catch (error) {
         console.error(error)
@@ -162,13 +215,17 @@ const removePackage = async (packageName)=>{
     fs.writeFileSync(packagesFilePath, data);
 }
 
-const enablePackage = async (packageName)=>{
+const getPackageConfig = (packageName)=>{
     const packages = loadPackagesConfig();
-    let packagePath = null;
-    const package = _.find(packages, (info, name)=>{
+    return _.find(packages, (info, name)=>{
         return packageName == name
-    })
-    if(package.local){
+    });
+}
+
+const enablePackage = async (packageName)=>{
+    let packagePath = null;
+    let package = getPackageConfig(packageName);
+    if(package && package.local){
         if(path.isAbsolute(package.path)){
             packagePath = package.path
         }else{
@@ -179,19 +236,86 @@ const enablePackage = async (packageName)=>{
             paths: [path.join(userDir, 'node_modules')]
         }))
     }
-    await steedos.loadPackage(packagePath)
-    let packageInfo = {};
-    _.map(packages, (package, name)=>{
-        if(packageName == name){
-            package.enable = true;
-            packageInfo = Object.assign({}, package, {name: packageName});
+    await loadPackage(packageName, packagePath)
+    
+    if(package){
+        package.enable = true;
+    }else{
+        const packageJSON = require(path.join(packagePath, 'package.json'));
+        package = {
+            label: '', 
+            version: packageJSON.version, 
+            description: packageJSON.description || '', 
+            local: false, 
+            enable: true,
+            path: util.getPackageRelativePath(process.cwd(), packagePath)
         }
-    })
-    let data = yaml.dump(packages);
-    fs.writeFileSync(packagesFilePath, data);
+    }
+    appendToPackagesConfig(packageName, package);
+    let packageInfo = Object.assign({}, package, {name: packageName});
     return packageInfo;
 }
+const installPackage = async (broker, options)=>{
+    let {module, version, label, description, enable} = options;
+    const packagePath = await registry.installModule(module, version);
+    if(enable){
+        await loadPackage(module, packagePath);
+    }else{
+        enable = false;
+    }
+    const packageConfig = {
+        label: label || '', 
+        version: version, 
+        description: description || '', 
+        local: false, 
+        enable: enable,
+        path: util.getPackageRelativePath(process.cwd(), packagePath)
+    }
+    appendToPackagesConfig(module, packageConfig);
+    const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+    await broker.call(`@steedos/service-packages.install`, {
+        serviceInfo: Object.assign({}, packageConfig, {
+            name: module,
+            enable: enable, 
+            nodeID: broker.nodeID, 
+            instanceID: broker.instanceID,
+            metadata: metadata
+        })
+    })
+    return packageConfig;
+}
+
+const getPackageMetadata = async (packagePath)=>{
+	const packageMetadata = [];
+	const result = await metadataApi.loadFileToJson(packagePath, {
+		CustomApplication: '*',
+		CustomPermissionset: '*',
+		CustomProfile: '*',
+		CustomObject: '*',
+		Layout: '*',
+		CustomReport: '*',
+		Workflow: '*',
+		Flow: '*',
+		ApprovalProcess: '*',
+		Role: '*',
+		FlowRole: '*',
+		Query: '*',
+		Chart: '*',
+		Page: '*',
+		Tab: '*',
+	});
 
+	_.each(result, (metadataItems, metadataType)=>{
+		_.each(metadataItems, (metadata, apiName)=>{
+			packageMetadata.push({
+				label: metadata.label || metadata.name,
+				type: metadataType,
+				api_name: apiName
+			})
+		})
+	})
+	return packageMetadata;
+}
 
 module.exports = {
     loadPackages,
@@ -201,5 +325,7 @@ module.exports = {
     disablePackage,
     enablePackage,
     removePackage,
-    getPackageInfo
+    getPackageInfo,
+    getPackageMetadata,
+    installPackage
 }

package/main/default/manager/packages.js

@@ -6,7 +6,7 @@ const objectql = require('@steedos/objectql');
 const packageJson = require('./package-json');
 const _ = require('lodash');
 const login = require('./login');
-
+const metadataApi = require('@steedos/metadata-api');
 function registryUrl(scope) {
     try {
         const result = login.getYarnrcScopes();

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.2",
+  "version": "2.2.55-beta.5",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,12 +9,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.2.55-beta.2",
-    "@steedos/core": "2.2.55-beta.2",
-    "@steedos/metadata-core": "2.2.55-beta.2",
-    "@steedos/objectql": "2.2.55-beta.2",
-    "@steedos/service-package-license": "2.2.55-beta.2",
-    "@steedos/service-package-loader": "2.2.55-beta.2",
+    "@steedos/auth": "2.2.55-beta.5",
+    "@steedos/core": "2.2.55-beta.5",
+    "@steedos/metadata-core": "2.2.55-beta.5",
+    "@steedos/objectql": "2.2.55-beta.5",
+    "@steedos/service-package-license": "2.2.55-beta.5",
+    "@steedos/service-package-loader": "2.2.55-beta.5",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6e4d3d24ef1164cdb9134efd03c1304c471eb615"
+  "gitHead": "ab16a9162d1c2ef61b47056e139ddd4d69a5919b"
 }

package/project.package.service.js

@@ -9,7 +9,7 @@ const packageLicense = require('@steedos/service-package-license');
 const axios = require('axios');
 const _ = require(`lodash`);
 const path = require(`path`);
-const metadataApi = require('@steedos/metadata-api');
+
 const util = require('./main/default/manager/util');
 const fetch = require('node-fetch');
 const fs = require('fs');
@@ -21,38 +21,6 @@ const login = require('./main/default/manager/login');
 const HEADER_AUTH = 'Authorization';
 const AUTH_TYPE = 'Bearer';
 
-const getPackageMetadata = async (packagePath)=>{
-	const packageMetadata = [];
-	const result = await metadataApi.loadFileToJson(packagePath, {
-		CustomApplication: '*',
-		CustomPermissionset: '*',
-		CustomProfile: '*',
-		CustomObject: '*',
-		Layout: '*',
-		CustomReport: '*',
-		Workflow: '*',
-		Flow: '*',
-		ApprovalProcess: '*',
-		Role: '*',
-		FlowRole: '*',
-		Query: '*',
-		Chart: '*',
-		Page: '*',
-		Tab: '*',
-	});
-
-	_.each(result, (metadataItems, metadataType)=>{
-		_.each(metadataItems, (metadata, apiName)=>{
-			packageMetadata.push({
-				label: metadata.label || metadata.name,
-				type: metadataType,
-				api_name: apiName
-			})
-		})
-	})
-	return packageMetadata;
-}
-
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  * 软件包服务启动后也需要抛出事件。
@@ -141,7 +109,7 @@ module.exports = {
 								packagePath = path.resolve(process.cwd(), packagePath)
 							}
 							await loader.loadPackage(module, packagePath);
-							const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
+							const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
 							await ctx.broker.call(`@steedos/service-packages.install`, {
 								serviceInfo: Object.assign({}, Object.assign({}, packageConfig, { name: module }), {
 									nodeID: ctx.broker.nodeID,
@@ -167,7 +135,7 @@ module.exports = {
 				const { module } = ctx.params
                 const packageConfig = await loader.disablePackage(module);
 				if(packageConfig.path){
-					const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), 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, {
 							nodeID: ctx.broker.nodeID, 
@@ -183,7 +151,7 @@ module.exports = {
 			async handler(ctx) {
 				const { module } = ctx.params
                 const packageConfig = await loader.enablePackage(module);
-				const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), 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, {
 						nodeID: ctx.broker.nodeID, 
@@ -229,7 +197,7 @@ module.exports = {
 						await this.loginSteedosRegistry();
 						console.info(`login steedos registry success`);
 					} catch (error) {
-						console.error(`login steedos registry fail: `, error.message);
+						// console.error(`login steedos registry fail: `, error.message);
 					}
 					const settings = this.settings;
 					const syncCloudPackages = settings.STEEDOS_CLOUD_SYNC_PACKAGES;
@@ -295,7 +263,7 @@ module.exports = {
 						await this.loginSteedosRegistry();
 						console.info(`login steedos registry success`);
 					} catch (error) {
-						console.error(`login steedos registry fail: `, error.message);
+						// console.error(`login steedos registry fail: `, error.message);
 					}
 					let { module, version, url, auth, registry_url } = ctx.params
 					const enable = true;
@@ -342,32 +310,7 @@ module.exports = {
 	methods: {
 		installPackage: {
 			async handler(module, version, label, description, enable, broker) {
-                const packagePath = await registry.installModule(module, version)
-				if(enable){
-					const packageInfo = await loader.loadPackage(module, packagePath);
-				}else{
-					enable = false;
-				}
-				const packageConfig = {
-					label: label, 
-					version: version, 
-					description: description || '', 
-					local: false, 
-					enable: enable,
-					path: util.getPackageRelativePath(process.cwd(), packagePath)
-				}
-				loader.appendToPackagesConfig(module, packageConfig);
-				const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
-				await broker.call(`@steedos/service-packages.install`, {
-					serviceInfo: Object.assign({}, packageConfig, {
-						name: module,
-						enable: enable, 
-						nodeID: broker.nodeID, 
-						instanceID: broker.instanceID,
-						metadata: metadata
-					})
-				})
-				return packageConfig;
+				return await loader.installPackage(broker, {module, version, label, description, enable})
             }
 		},
 		getCloudSaasPurchasedPackages:{
@@ -432,7 +375,7 @@ module.exports = {
 					path: util.getPackageRelativePath(process.cwd(), packagePath)
 				}
 				const newConfig = loader.appendToPackagesConfig(module, packageConfig);
-				const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
 				await this.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, newConfig, {
 						name: module,
@@ -508,7 +451,7 @@ module.exports = {
 					path: util.getPackageRelativePath(process.cwd(), packagePath)
 				}
 				loader.appendToPackagesConfig(packageName, packageConfig);
-				const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
 				await broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfig, {
 						name: packageName,
@@ -642,22 +585,36 @@ module.exports = {
 		}
 
 		await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
-
+ 
 		const PACKAGE_INSTALL_NODE = process.env.PACKAGE_INSTALL_NODE
 		if(PACKAGE_INSTALL_NODE){
 			await this.broker.call('metadata.add', {key: `#package_install_node.${this.broker.nodeID}`, data: {nodeID: PACKAGE_INSTALL_NODE}}, {meta: {}}) 
 		}
 		packages.maintainSystemFiles()
+		// 单包路径steedos-app
 		try {
 			const packagePath = path.join(process.cwd(), 'steedos-app');
 			if(fs.existsSync(packagePath)){
 				const packageInfo = require(path.join(packagePath, 'package.json'));
-				loader.appendToPackagesConfig(`${packageInfo.name}`, {version: packageInfo.version, description: packageInfo.description, local: true, path: util.getPackageRelativePath(process.cwd(), packagePath)});
+				loader.appendToPackagesConfig(`${packageInfo.name}`, {version: packageInfo.version, description: packageInfo.description || '', local: true, path: util.getPackageRelativePath(process.cwd(), packagePath)});
 			}
 		} catch (error) {
 			console.log(`started error`, error)
 		}
 
+		// 新版单包项目加载
+		// try {
+		// 	if(fs.existsSync(path.join(process.cwd(), 'package.service.js'))){
+		// 		const packagePath = process.cwd(); 
+		// 		if(fs.existsSync(packagePath)){
+		// 			const packageInfo = require(path.join(packagePath, 'package.json'));
+		// 			loader.appendToPackagesConfig(`${packageInfo.name}`, {version: packageInfo.version, description: packageInfo.description, local: true, path: util.getPackageRelativePath(process.cwd(), packagePath)});
+		// 		}
+		// 	}
+		// } catch (error) {
+		// 	console.log(`started error`, error)
+		// }
+
 		await metadata.uncompressPackages(process.cwd());
 		const mPackages = metadata.getAllPackages(process.cwd());
 		_.each(mPackages, (packagePath)=>{
@@ -675,7 +632,7 @@ module.exports = {
 		for (const name in installPackages) {
 			if (Object.hasOwnProperty.call(installPackages, name)) {
 				const _packageInfo = installPackages[name];
-				const metadata = await getPackageMetadata(_packageInfo.path);
+				const metadata = await loader.getPackageMetadata(_packageInfo.path);
 				await this.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: {
 						name: name,