@steedos/service-package-registry 2.5.3-beta.2 → 2.5.3-beta.21

package/main/default/objectTranslations/steedos_packages.en/steedos_packages.en.objectTranslation.yml

@@ -1,5 +1,5 @@
 name: steedos_packages
-label: Software package
+label: Packages
 description: 
 fields:
   metadata:
@@ -52,7 +52,7 @@ fields:
     description: 
 listviews:
   all:
-    label: All
+    label: All Packages
 actions:
   disable:
     label: Disable

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

@@ -5,6 +5,8 @@ const registry = require('../manager/registry');
 const loader = require('../manager/loader');
 const objectql = require('@steedos/objectql');
 let schema = objectql.getSteedosSchema();
+
+const packageInstallationNodeID = process.env.STEEDOS_PACKAGE_INSTALLATION_NODEID || null;
 router.get('/api/nodes/install', core.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     const isSpaceAdmin = userSession.is_space_admin;
@@ -13,12 +15,12 @@ router.get('/api/nodes/install', core.requireAuthentication, async function (req
         return res.status(401).send({ message: 'No permission' });
     }
     try {
-        const { module, version, label, description, nodeID} = body || {};
+        const { module, version, label, description} = body || {};
         let broker = schema.broker;
         const result = await broker.call(`~packages-project-server.installPackage`, {
             module, version, label, description
         },{
-            nodeID: nodeID
+            nodeID: packageInstallationNodeID
         })
         res.redirect(302, `/app/admin/steedos_packages/grid/all`);
         // res.status(200).send(result); //TODO 完善返回信息
@@ -43,7 +45,7 @@ router.post('/api/nodes/uninstall', core.requireAuthentication, async function (
         const result = await broker.call(`~packages-project-server.uninstallPackage`, {
             module
         },{
-            nodeID: nodeID
+            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result); //TODO 完善返回信息
     } catch (error) {
@@ -65,7 +67,7 @@ router.post('/api/nodes/reload', core.requireAuthentication, async function (req
         const result = await broker.call(`~packages-project-server.reloadPackage`, {
             module
         },{
-            nodeID: nodeID
+            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -84,10 +86,11 @@ router.post('/api/nodes/disable', core.requireAuthentication, async function (re
     try {
         const { module, nodeID} = body || {};
         let broker = schema.broker;
+        console.log(`disablePackage ${module}, node id is`, packageInstallationNodeID)
         const result = await broker.call(`~packages-project-server.disablePackage`, {
             module
         },{
-            nodeID: nodeID
+            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -109,7 +112,7 @@ router.post('/api/nodes/enable', core.requireAuthentication, async function (req
         const result = await broker.call(`~packages-project-server.enablePackage`, {
             module
         },{
-            nodeID: nodeID
+            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -134,6 +137,8 @@ router.get('/api/nodes/versions', core.requireAuthentication, async function (re
         let broker = schema.broker;
         const result = await broker.call(`~packages-project-server.getPackageVersions`, {
             module
+        },{
+            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result); //TODO 完善返回信息
     } catch (error) {
@@ -154,6 +159,8 @@ router.post('/api/nodes/upgrade', core.requireAuthentication, async function (re
         let broker = schema.broker;
         const result = await broker.call(`~packages-project-server.upgradePackage`, {
             module, version
+        },{
+            nodeID: packageInstallationNodeID
         })
         res.status(200).send(result);
     } catch (error) {
@@ -162,5 +169,58 @@ router.post('/api/nodes/upgrade', core.requireAuthentication, async function (re
     }
 });
 
+router.get('/api/nodes/cloud/saas/packages/purchased', core.requireAuthentication, async function (req, res) {
+    const userSession = req.user;
+    try {
+        let broker = schema.broker;
+        const result = await broker.call(`~packages-project-server.getCloudSaasPurchasedPackages`, {
+        }, {
+            nodeID: packageInstallationNodeID,
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/cloud/saas/packages/purchased', core.requireAuthentication, async function(req, res){
+    const userSession = req.user;
+    try {
+        let broker = schema.broker;
+        const result = await broker.call(`~packages-project-server.installPurchasedPackages`, {}, {
+            nodeID: packageInstallationNodeID,
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+});
+
+router.post('/api/nodes/cloud/saas/packages/url', core.requireAuthentication, async function(req, res){
+    const userSession = req.user;
+    try {
+        let broker = schema.broker;
+        const { module, version, url, auth, registry_url } = req.body;
+        const result = await broker.call(`~packages-project-server.installPackageFromUrl`, {module, version, url, auth, registry_url}, {
+            nodeID: packageInstallationNodeID,
+            meta: {
+                user: userSession
+            }
+        })
+        res.status(200).send(result);
+    } catch (error) {
+        console.error(error);
+        res.status(500).send(error.message);
+    }
+})
+
 
 exports.default = router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.5.3-beta.2",
+  "version": "2.5.3-beta.21",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,12 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.5.3-beta.2",
-    "@steedos/core": "2.5.3-beta.2",
-    "@steedos/metadata-core": "2.5.3-beta.2",
-    "@steedos/objectql": "2.5.3-beta.2",
-    "@steedos/service-package-license": "2.5.0-beta.30",
-    "@steedos/service-package-loader": "2.5.3-beta.2",
+    "@steedos/auth": "2.5.3-beta.21",
+    "@steedos/core": "2.5.3-beta.21",
+    "@steedos/metadata-core": "2.5.3-beta.21",
+    "@steedos/objectql": "2.5.3-beta.21",
+    "@steedos/service-package-loader": "2.5.3-beta.21",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -32,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "321fe88aba6ddc3380a0d71eaa2e9a18186d49f8"
+  "gitHead": "b4313a2ef5d18ef1cf9271bd3c89b2d6fe52d65b"
 }

package/project.package.service.js

@@ -5,7 +5,6 @@ const loader = require('./main/default/manager/loader');
 const packages = require('./main/default/manager/packages');
 const registry = require('./main/default/manager/registry');
 const metadata = require('@steedos/metadata-core')
-const packageLicense = require('@steedos/service-package-license');
 const axios = require('axios');
 const _ = require(`lodash`);
 const path = require(`path`);
@@ -17,6 +16,7 @@ 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';
@@ -48,7 +48,7 @@ module.exports = {
 	/**
 	 * Dependencies
 	 */
-	dependencies: ['~packages-standard-objects', '@steedos/service-package-license'],
+	dependencies: ['~packages-standard-objects'],
 
 	/**
 	 * Actions
@@ -197,8 +197,6 @@ module.exports = {
 					if(syncCloudPackages){
 						result = await this.getCloudSaasPurchasedPackages();
 					}
-					//同步软件包许可证
-					// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
 					if(result){
 						for (const _package of result.packages) {
 							try {
@@ -235,8 +233,6 @@ module.exports = {
 		upgradePackage: {
 			async handler(ctx) {
 				const { module, version } = ctx.params
-				//同步软件包许可证
-				// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
 				return await this.upgradePackage(module, version);
             }
 		},
@@ -255,8 +251,6 @@ module.exports = {
 					}
 					let { module, version, url, auth, registry_url } = ctx.params
 					const enable = true;
-					//同步软件包许可证
-					// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
 					return await this.installPackageFromUrl(module, version, url, auth, enable, registry_url, ctx.broker)
 				} catch (error) {
 					let errorInfo = error.message || '';
@@ -558,21 +552,20 @@ module.exports = {
 	 * Service created lifecycle event handler
 	 */
 	async created() {
-		this.broker.createService(packageLicense);
+
 	},
 
 	/**
 	 * 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);
 		}
-
-		// await this.broker.call(`@steedos/service-package-license.syncPackagesLicense`);
  
 		const PACKAGE_INSTALL_NODE = process.env.PACKAGE_INSTALL_NODE
 		if(PACKAGE_INSTALL_NODE){