@steedos/service-package-registry 2.1.10 → 2.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.1.10",
+  "version": "2.1.14",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,10 +9,14 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@node-red/util": "2.0.5",
-    "@steedos/service-package-loader": "2.1.10",
+    "@steedos/service-package-loader": "2.1.14",
     "fs-extra": "8.1.0",
+    "i18next": "20.3.2",
+    "json-stringify-safe": "5.0.1",
+    "jsonata": "1.8.5",
     "lodash": "~4.17.21",
+    "lodash.clonedeep": "^4.5.0",
+    "moment-timezone": "0.5.33",
     "npm-package-arg": "~8.1.5",
     "radwag-mass": "~1.0.5"
   },
@@ -20,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6c8f1ea04dcf16fddea88eb5298cd7c18742a0fb"
+  "gitHead": "342ba8540ab4bf230529947ac1efa1180e144d23"
 }

package/package.service.js

@@ -34,6 +34,7 @@ const getPackageMetadata = async (packagePath)=>{
 		Query: '*',
 		Chart: '*',
 		Page: '*',
+		Tab: '*',
 	});
 
 	_.each(result, (metadataItems, metadataType)=>{
@@ -64,7 +65,10 @@ module.exports = {
 			path: __dirname,
 			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
 	},
 
 	/**
@@ -155,10 +159,12 @@ module.exports = {
 			async handler(ctx) {
 				const { module } = ctx.params
                 const packageConfog = await loader.disablePackage(module);
+				const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfog.path));
 				await ctx.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfog, {
 						nodeID: ctx.broker.nodeID, 
-						instanceID: ctx.broker.instanceID, 
+						instanceID: ctx.broker.instanceID,
+						metadata: metadata 
 					})
 				})
 				return {}
@@ -168,10 +174,12 @@ module.exports = {
 			async handler(ctx) {
 				const { module } = ctx.params
                 const packageConfog = await loader.enablePackage(module);
+				const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfog.path));
 				await ctx.broker.call(`@steedos/service-packages.install`, {
 					serviceInfo: Object.assign({}, packageConfog, {
 						nodeID: ctx.broker.nodeID, 
-						instanceID: ctx.broker.instanceID, 
+						instanceID: ctx.broker.instanceID,
+						metadata: metadata
 					})
 				})
 				return {}
@@ -202,27 +210,30 @@ module.exports = {
             },
 			async handler(ctx){
 				const installErrors = {};
+				const installPackages = [];
 				try {
 					const user = ctx.meta.user;
 					if(!user.is_space_admin){
 						throw new Error('not permission!');
 					}
 					const result = await this.getCloudSaasPurchasedPackages();
-					for (const item of result.packages) {
+					for (const _package of result.packages) {
 						try {
-							const { name, version, label, description} = item.package
-							const { enable } = item
-							await this.installPackage(name, version, label, description, enable, ctx.broker);
+							const { name, version, label, description } = _package
+							let enable = true; //安装已购买的软件包时先默认启用
+							const packageInfo = await this.installPackage(name, version, label, description, enable, ctx.broker);
+							installPackages.push(packageInfo)
 						} catch (error) {
 							if(error.stderr){
-								installErrors[item.package.name] = error.stderr
+								installErrors[_package.name] = error.stderr
 							}else{
-								installErrors[item.package.name] = error.message
+								installErrors[_package.name] = error.message
 							}
 						}
 					}
-					if(!_.isEmpty(installErrors)){
-						throw new Error(JSON.stringify(installErrors))
+					return {
+						installPackages: installPackages,
+						installErrors: installErrors
 					}
 				} catch (error) {
 					throw new MoleculerError(error.message, 500, "ERR_SOMETHING");
@@ -274,18 +285,41 @@ module.exports = {
 		},
 		getCloudSaasPurchasedPackages:{
 			async handler() {
-				const apiKey = process.env.STEEDOS_CLOUD_API_KEY
-				const spaceId = process.env.STEEDOS_CLOUD_SPACE_ID
-				const url = process.env.STEEDOS_CLOUD_URL
+				const settings = this.settings;
+				const apiKey = settings.STEEDOS_CLOUD_API_KEY
+				const spaceId = settings.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/saas/packages/purchased/detail`, {
+				const response = await fetch(`${url}/api/shop/product_subscriptions/steedos-packages`, {
 					method: 'GET', headers: headers
 				});
-				return await response.json()
+
+				const result = await response.json();
+
+				if(result.status === 'error'){
+					throw new Error(`${url}: ${result.message}`)
+				}
+
+				const packages = [];
+
+				_.each(result.data, (item)=>{
+					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}
             }
 		},
 	},