@steedos/service-package-registry 2.6.1-beta.7 → 2.6.2-beta.3

package/project.package.service.js

@@ -16,7 +16,6 @@ const { MoleculerError } = require("moleculer").Errors;
 const validator = require('validator');
 const npa = require("npm-package-arg");
 const login = require('./main/default/manager/login');
-// const objectql = require('@steedos/objectql');
 
 const HEADER_AUTH = 'Authorization';
 const AUTH_TYPE = 'Bearer';
@@ -26,7 +25,7 @@ const AUTH_TYPE = 'Bearer';
  * 软件包服务启动后也需要抛出事件。
  */
 module.exports = {
-	name: '~packages-project-server',
+	name: '@steedos/service-project',
 	namespace: "steedos",
 	/**
 	 * Settings
@@ -37,11 +36,6 @@ module.exports = {
 			name: this.name,
 			isPackage: false
 		},
-		STEEDOS_CLOUD_URL: process.env.STEEDOS_CLOUD_URL ? process.env.STEEDOS_CLOUD_URL : 'https://console.steedos.cn',
-		STEEDOS_CLOUD_SPACE_ID: process.env.STEEDOS_CLOUD_SPACE_ID,
-		STEEDOS_CLOUD_API_KEY: process.env.STEEDOS_CLOUD_API_KEY,
-		STEEDOS_REGISTRY_URL: process.env.STEEDOS_REGISTRY_URL ? process.env.STEEDOS_REGISTRY_URL : 'https://registry.steedos.cn/',
-		STEEDOS_CLOUD_SYNC_PACKAGES: validator.toBoolean(process.env.STEEDOS_CLOUD_SYNC_PACKAGES || 'false', true),
 		STEEDOS_INITIAL_PACKAGES: process.env.STEEDOS_INITIAL_PACKAGES
 	},
 
@@ -98,11 +92,15 @@ module.exports = {
 			async handler(ctx) {
 				const { module } = ctx.params
                 const packages = loader.loadPackagesConfig();
-				const packageConfig = _.find(packages, (_p, pname) => {
+				let packageConfig = _.find(packages, (_p, pname) => {
+					_p.name = pname;
 					return pname === module;
 				})
 				if (packageConfig) {
 					if (packageConfig.enable) {
+						if(packageConfig.static){
+							packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
+						}
 						if (packageConfig.local) {
 							let packagePath = packageConfig.path;
 							if(!path.isAbsolute(packagePath)){
@@ -110,8 +108,10 @@ module.exports = {
 							}
 							await loader.loadPackage(module, packagePath);
 							const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
+							const packageYmlData = loader.getPackageYmlData(packagePath);
 							await ctx.broker.call(`@steedos/service-packages.install`, {
 								serviceInfo: Object.assign({}, Object.assign({}, packageConfig, { name: module }), {
+									packageYmlData: packageYmlData,
 									nodeID: ctx.broker.nodeID,
 									instanceID: ctx.broker.instanceID,
 									metadata: metadata
@@ -133,11 +133,16 @@ module.exports = {
 		disablePackage:{
 			async handler(ctx) {
 				const { module } = ctx.params
-                const packageConfig = await loader.disablePackage(module);
+                let packageConfig = await loader.disablePackage(module);
+				if(packageConfig.static){
+					packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
+				}
 				if(packageConfig.path){
 					const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
+					const packageYmlData = loader.getPackageYmlData(packageConfig.path);
 					await ctx.broker.call(`@steedos/service-packages.install`, {
 						serviceInfo: Object.assign({}, packageConfig, {
+							packageYmlData,
 							nodeID: ctx.broker.nodeID, 
 							instanceID: ctx.broker.instanceID,
 							metadata: metadata 
@@ -150,10 +155,27 @@ module.exports = {
 		enablePackage:{
 			async handler(ctx) {
 				const { module } = ctx.params
-                const packageConfig = await loader.enablePackage(module);
+				let packageConfig = await loader.getPackageConfig(module);
+
+				if(packageConfig.static){
+					packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
+				}
+
+				const packageYmlData = loader.getPackageYmlData(packageConfig.path);
+
+				if(packageYmlData.dependencies){
+					await packages.checkDependencies(path.resolve(packageConfig.path), packageYmlData.dependencies || [])
+				}
+                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, {
+						packageYmlData,
 						nodeID: ctx.broker.nodeID, 
 						instanceID: ctx.broker.instanceID,
 						metadata: metadata
@@ -162,68 +184,6 @@ module.exports = {
 				return {}
             }
 		},
-		getCloudSaasPurchasedPackages:{
-			async handler(ctx) {
-				try {
-					
-					const user = ctx.meta.user;
-					if(!user.is_space_admin){
-						throw new Error('not permission!');
-					}
-					return await this.getCloudSaasPurchasedPackages();
-				} catch (error) {
-					throw new MoleculerError(error.message, 500, "ERR_SOMETHING");
-				}
-            }
-		},
-		installPurchasedPackages: {
-			async handler(ctx){
-				const installErrors = {};
-				const installPackages = [];
-				try {
-					const user = ctx.meta.user;
-					if(!user.is_space_admin){
-						throw new Error('not permission!');
-					}
-					try {
-						await this.loginSteedosRegistry();
-						console.info(`login steedos registry success`);
-					} catch (error) {
-						// console.error(`login steedos registry fail: `, error.message);
-					}
-					const settings = this.settings;
-					const syncCloudPackages = settings.STEEDOS_CLOUD_SYNC_PACKAGES;
-					let result = null;
-					if(syncCloudPackages){
-						result = await this.getCloudSaasPurchasedPackages();
-					}
-					if(result){
-						for (const _package of result.packages) {
-							try {
-								const { name, version, label, description } = _package
-								let enable = true; //安装已购买的软件包时先默认启用
-								//TODO 处理 registry_url
-								// 安装最新版
-								const packageInfo = await this.installPackage(name, null, label, description, enable, ctx.broker);
-								installPackages.push(packageInfo)
-							} catch (error) {
-								if(error.stderr){
-									installErrors[_package.name] = error.stderr
-								}else{
-									installErrors[_package.name] = error.message
-								}
-							}
-						}
-					}
-					return {
-						installPackages: installPackages,
-						installErrors: installErrors
-					}
-				} catch (error) {
-					throw new MoleculerError(error.message, 500, "ERR_SOMETHING");
-				}
-			}
-		},
 		getPackageVersions: {
 			async handler(ctx) {
 				const { module } = ctx.params
@@ -243,16 +203,11 @@ module.exports = {
 					if(!user.is_space_admin){
 						throw new Error('not permission!');
 					}
-					try {
-						await this.loginSteedosRegistry();
-						console.info(`login steedos registry success`);
-					} catch (error) {
-						// console.error(`login steedos registry fail: `, error.message);
-					}
-					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) {
+					this.broker.logger.error(`installPackageFromUrl: `, error);
 					let errorInfo = error.message || '';
 					if (error.stderr) {
 						const errors = error.stderr.split('\n');
@@ -276,6 +231,28 @@ module.exports = {
 			async handler(ctx) {
 				return await this.initialPackages();
 			}
+		},
+		addPackages: {
+			async handler(ctx) {
+				return await this.addPackages(ctx);
+			}
+		},
+		getNpmrc: {
+			async handler(ctx){
+				return await loader.getNpmrc()
+			}
+		},
+		setNpmrc: {
+			async handler(ctx){
+				const { npmrc } = ctx.params;
+				return await loader.setNpmrc(npmrc)
+			}
+		},
+		yarnAddPackage: {
+			async handler(ctx) {
+				const { yarnPackage } = ctx.params;
+				return await this.yarnAddPackage(yarnPackage);
+            }
 		}
 	},
 
@@ -293,47 +270,6 @@ module.exports = {
 		installPackage: {
 			async handler(module, version, label, description, enable, broker) {
 				return await loader.installPackage(broker, {module, version, label, description, enable})
-            }
-		},
-		getCloudSaasPurchasedPackages:{
-			async handler() {
-				const settings = this.settings;
-				const apiKey = settings.STEEDOS_CLOUD_API_KEY || process.env.STEEDOS_CLOUD_API_KEY
-				const spaceId = settings.STEEDOS_CLOUD_SPACE_ID || process.env.STEEDOS_CLOUD_SPACE_ID
-				const url = settings.STEEDOS_CLOUD_URL
-
-				if(!apiKey || !spaceId || !url){
-					throw new Error(`请配置STEEDOS_CLOUD参数`);
-				}
-				const headers = Object.assign({}, {'Content-Type': 'application/json'}, { [HEADER_AUTH]: `${AUTH_TYPE} apikey,${apiKey}`});
-				const response = await fetch(`${url}/api/shop/product_subscriptions/steedos-packages`, {
-					method: 'GET', headers: headers
-				});
-
-				const result = await response.json();
-
-				if(result.status === 'error'){
-					throw new Error(`${url}: ${result.message}`)
-				}
-
-				const packages = [];
-
-				_.each(result.data, (item)=>{
-					if(item.product){
-						let isExist = _.find(packages, (_package)=>{
-							return _package.name === item.product.sku
-						})
-						if(!isExist){
-							packages.push({
-								name: item.product.sku, 
-								version: null,  //始终安装latest最新版
-								label: item.product.name, 
-								description: item.product.description || ''
-							})
-						}
-					}
-				})
-				return { packages : packages}
             }
 		},
 		getPackageVersions: {
@@ -358,8 +294,10 @@ module.exports = {
 				}
 				const newConfig = loader.appendToPackagesConfig(module, packageConfig);
 				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+				const packageYmlData = loader.getPackageYmlData(packagePath);
 				await this.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, newConfig, {
+						packageYmlData,
 						name: module,
 						enable: enable, 
 						nodeID: this.broker.nodeID, 
@@ -371,7 +309,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 {
@@ -392,32 +330,13 @@ module.exports = {
 					}
 				}
 
-				const settings = this.settings;
-				if (url && url.startsWith(settings.STEEDOS_CLOUD_URL + '/api/pkg/download')) {
-					const apiKey = settings.STEEDOS_CLOUD_API_KEY || process.env.STEEDOS_CLOUD_API_KEY
-					const spaceId = settings.STEEDOS_CLOUD_SPACE_ID || process.env.STEEDOS_CLOUD_SPACE_ID
-					const cloudUrl = settings.STEEDOS_CLOUD_URL
-
-					if (!apiKey || !spaceId || !cloudUrl) {
-						throw new Error(`请配置STEEDOS_CLOUD参数`);
-					}
-					const headers = Object.assign({}, { 'Content-Type': 'application/json' }, { [HEADER_AUTH]: `${AUTH_TYPE} apikey,${apiKey}` });
-					const response = await fetch(url, {
-						method: 'POST', headers: headers, body: JSON.stringify({ _authToken: auth })
-					});
-
-					const result = await response.json();
-
-					if (result.error) {
-						throw new Error(`安装失败，软件包URL或认证信息错误`)
-					}
-					url = `${url}/${result.token}`
-					console.log(`url`, url);
-				}
 				const packagePath = await registry.installModule(module, version, url, registry_url);
 				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;
@@ -433,9 +352,17 @@ 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)
+				}
+				const packageYmlData = loader.getPackageYmlData(packagePath);
 				await broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfig, {
+						packageYmlData,
 						name: packageName,
 						enable: enable, 
 						nodeID: broker.nodeID, 
@@ -463,40 +390,6 @@ module.exports = {
 				return result.data;
 			}
 		},
-		loginSteedosRegistry: {
-			async handler() {
-				const settings = this.settings;
-				// 配置主控地址
-				const consoleUrl = settings.STEEDOS_CLOUD_URL;
-				if (!consoleUrl) {
-					throw new Error('请配置主控地址');
-				}
-
-				// 初始化工作区数据
-				// 获取环境变量中工作区信息
-				const spaceId = settings.STEEDOS_CLOUD_SPACE_ID || process.env.STEEDOS_CLOUD_SPACE_ID;
-				const apiKey = settings.STEEDOS_CLOUD_API_KEY || process.env.STEEDOS_CLOUD_API_KEY;
-
-				if (!spaceId || !apiKey) {
-					throw new Error('请配置环境变量STEEDOS_CLOUD_SPACE_ID和STEEDOS_CLOUD_API_KEY。');
-				}
-
-				const registryUrl = settings.STEEDOS_REGISTRY_URL
-
-				// 调用接口获取初始化信息
-				const { info, scopes } = await this.getSafeScopes(spaceId, apiKey, consoleUrl);
-				const { adminPhone } = info;
-				if (!adminPhone) {
-					throw new Error('缺少工作区信息 工作区名称、管理员姓名、管理员手机号，请检查');
-				}
-				// let scope = '';
-				// if (scopes && scopes.length > 0) {
-				// 	scope = scopes[0];
-				// }
-				await login.loginToRegistry(adminPhone, apiKey, `${adminPhone}@steedos.com`, registryUrl, undefined);
-				login.setYarnrcScopes(scopes, registryUrl);
-			}
-		},
 		initialPackages: {
 			async handler(){
 				const settings = this.settings;
@@ -545,6 +438,116 @@ 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, 'addPackage')
+					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,
+					homepage: packageJson.homepage
+				}
+			}
+		},
+		getPackageInfo: {
+			handler(packageInfo, packageName){
+				let packagePath = packageInfo.path || path.dirname(require.resolve(`${packageName}/package.json`));
+				if(!path.isAbsolute(packagePath)){
+					packagePath = path.resolve(process.cwd(), packagePath)
+				}
+				const packageJson = require(`${packagePath}/package.json`);
+				return {
+					version: packageJson.version,
+					description: packageJson.description,
+					homepage: packageJson.homepage
+				}
+			}
+		},
+		installPackagesSyncToMetaData:{
+			async handler(packageName){
+				//注册本地已安装的steedos packages
+				const installPackages = loader.loadPackagesConfig();
+				for (const name in installPackages) {
+					if (Object.hasOwnProperty.call(installPackages, name) && (packageName && packageName === name || !packageName)) {
+						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);
+						const packageYmlData = loader.getPackageYmlData(_packageInfo.path);
+						await this.broker.call(`@steedos/service-packages.install`, {
+							serviceInfo: {
+								packageYmlData,
+								name: name, 
+								nodeID: this.broker.nodeID, 
+								instanceID: this.broker.instanceID, 
+								path: _packageInfo.path,
+								local: _packageInfo.local, 
+								enable: false, 
+								version: _packageInfo.version, 
+								description: _packageInfo.description,
+								metadata: metadata,
+								static: _packageInfo.static,
+								homepage: _packageInfo.homepage
+							}
+						})
+					}
+				}
+			}
+		},
+		yarnAddPackage: {
+			async handler(yarnPackage) {
+                const packages = await registry.yarnAddPackage(yarnPackage);
+				for (const packageInfo of packages) {
+					const packagePath = packageInfo.path;
+					loader.appendToPackagesConfig(packageInfo.name, {
+						version: packageInfo.version,
+						path: util.getPackageRelativePath(process.cwd(), packagePath),
+						enable: false
+					});
+					const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+					const packageYmlData = loader.getPackageYmlData(packagePath);
+					await this.broker.call(`@steedos/service-packages.install`, {
+						serviceInfo: Object.assign({}, {
+							version: packageInfo.version,
+							path: packageInfo.path
+						}, {
+							packageYmlData: packageYmlData,
+							name: packageInfo.name,
+							enable: false, 
+							nodeID: broker.nodeID, 
+							instanceID: broker.instanceID,
+							metadata: metadata
+						})
+					})
+				}
+            }
 		}
 	},
 
@@ -559,13 +562,6 @@ module.exports = {
 	 * Service started lifecycle event handler
 	 */
 	async started() {
-		// objectql.getSteedosSchema(this.broker);
-		try {
-			await this.loginSteedosRegistry();
-			console.info(`login steedos registry success`);
-		} catch (error) {
-			// console.error(`login steedos registry fail: `, error.message);
-		}
  
 		const PACKAGE_INSTALL_NODE = process.env.PACKAGE_INSTALL_NODE
 		if(PACKAGE_INSTALL_NODE){
@@ -583,19 +579,6 @@ module.exports = {
 			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)=>{
@@ -608,27 +591,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()
 		
 	},