@steedos/service-package-registry 2.2.52-beta.1 → 2.2.52-beta.14

package/main/default/manager/loader.js

@@ -59,7 +59,8 @@ const loadPackages = async ()=>{
                         paths: [path.join(userDir, 'node_modules')]
                     }))
                     if(packagePath){
-                        await loadPackage(packageName);
+                        const packageInfo = await loadPackage(packageName);
+                        appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: false});
                     }
                 } catch (error) {
                     try {
@@ -76,12 +77,10 @@ const loadPackages = async ()=>{
                     packagePath = path.resolve(process.cwd(), packagePath)
                 }
                 if(packagePath){
-                    await loadPackage(packageName, packagePath);
+                    const packageInfo = await loadPackage(packageName, packagePath);
+                    appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
                 }
             }
-
-            
-
         }
     }
 }

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

@@ -120,7 +120,7 @@ router.post('/api/nodes/enable', core.requireAuthentication, async function (req
 router.get('/api/nodes/versions', core.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     const isSpaceAdmin = userSession.is_space_admin;
-    console.log(`req.query`, req.query)
+    // console.log(`req.query`, req.query)
     const body = req.query;
     const { module } = body || {};
     if(!module){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.2.52-beta.1",
+  "version": "2.2.52-beta.14",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,8 +9,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/service-package-license": "2.2.52-beta.1",
-    "@steedos/service-package-loader": "2.2.52-beta.1",
+    "@steedos/service-package-license": "2.2.52-beta.14",
+    "@steedos/service-package-loader": "2.2.52-beta.14",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -18,14 +18,15 @@
     "lodash": "~4.17.21",
     "lodash.clonedeep": "^4.5.0",
     "moment-timezone": "0.5.33",
-    "npm-package-arg": "~8.1.5",
+    "npm-package-arg": "~9.1.0",
     "npm-registry-client": "8.6.0",
     "package-json": "^7.0.0",
-    "radwag-mass": "~1.0.5"
+    "radwag-mass": "~1.0.5",
+    "validator": "^13.5.2"
   },
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "deba56dae254d9d14d80e46a564a49059e5c7a16"
+  "gitHead": "893000f7cdde94c4050995e3f17b84a4af921f74"
 }

package/package.service.js

@@ -10,13 +10,13 @@ const packageLicense = require('@steedos/service-package-license');
 const axios = require('axios');
 const _ = require(`lodash`);
 const path = require(`path`);
-const objectql = require('@steedos/objectql');
 const metadataApi = require('@steedos/metadata-api');
 const util = require('./main/default/manager/util');
 const fetch = require('node-fetch');
 const fs = require('fs');
 const { MoleculerError } = require("moleculer").Errors;
-
+const validator = require('validator');
+const npa = require("npm-package-arg");
 const login = require('./main/default/manager/login');
 
 const HEADER_AUTH = 'Authorization';
@@ -75,6 +75,8 @@ module.exports = {
 		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
 	},
 
 	/**
@@ -92,13 +94,6 @@ module.exports = {
                 path: "/getProjectNodes"
             },
             async handler(ctx) {
-                // let schema = objectql.getSteedosSchema();
-				// let broker = schema.broker;
-				// const serviceList = broker.registry.getServiceList({ withActions: false });
-				// const services = _.filter(serviceList, (_service)=>{
-				// 	return _service.name == this.name;
-				// })
-				// return services;
 				const data = await ctx.broker.call('metadata.filter', {key: `#package_install_node.*`}, {meta: ctx.meta})
 				const nodes = [];
 				_.each(data,(item)=>{
@@ -236,21 +231,29 @@ module.exports = {
 					} catch (error) {
 						console.error(`login steedos registry fail: `, error.message);
 					}
-					const result = await this.getCloudSaasPurchasedPackages();
+					const settings = this.settings;
+					const syncCloudPackages = settings.STEEDOS_CLOUD_SYNC_PACKAGES;
+					let result = null;
+					if(syncCloudPackages){
+						result = await this.getCloudSaasPurchasedPackages();
+					}
 					//同步软件包许可证
 					await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
-					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, version, label, description, enable, ctx.broker);
-							installPackages.push(packageInfo)
-						} catch (error) {
-							if(error.stderr){
-								installErrors[_package.name] = error.stderr
-							}else{
-								installErrors[_package.name] = error.message
+					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
+								}
 							}
 						}
 					}
@@ -318,6 +321,11 @@ module.exports = {
 					throw new MoleculerError(errorInfo, 500, "ERR_SOMETHING");
 				}
 			}
+		},
+		initialPackages: {
+			async handler(ctx) {
+				return await this.initialPackages();
+			}
 		}
 	},
 
@@ -563,6 +571,55 @@ module.exports = {
 				await login.loginToRegistry(adminPhone, apiKey, `${adminPhone}@steedos.com`, registryUrl, undefined);
 				login.setYarnrcScopes(scopes, registryUrl);
 			}
+		},
+		initialPackages: {
+			async handler(){
+				const settings = this.settings;
+				const packages = settings.STEEDOS_INITIAL_PACKAGES;
+				if(_.isString(packages)){
+					for (const packageName of packages.split(',')) {
+						try {
+							const parsed = npa(packageName);
+							const installProps = {
+								url: null,
+								name: null,
+								version: null
+							};
+							switch (parsed.type) {
+								case "tag":
+									installProps.name = parsed.name;
+									installProps.version = parsed.rawSpec;
+									break;
+								case "version":
+									installProps.name = parsed.name;
+									installProps.version = parsed.rawSpec;
+									break;
+								case "range":
+									installProps.name = parsed.name;
+									installProps.version = parsed.rawSpec;
+									break;
+								case "directory":
+								case "remote":
+								case "file":
+								case "git":
+									installProps.url = parsed.rawSpec;
+									break;
+								case "alias":
+									throw new Error(`not support ${parsed.type}`);
+							}
+							if(installProps.url){
+								//module, version, url, auth, enable, registry_url, broker
+								await this.installPackageFromUrl(installProps.url, installProps.version, installProps.url, null, true, null, this.broker);
+							}else{
+								//module, version, label, description, enable, broker
+								await this.installPackage(installProps.name, installProps.version, null, null, true, this.broker);
+							}
+						} catch (error) {
+							this.broker.logger.error(`initialPackages: ${packageName}. ${error.message}`);
+						}
+					}
+				}
+			}
 		}
 	},
 
@@ -581,7 +638,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);
 		}
 
 		await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);