@steedos/service-package-registry 2.5.18-beta.2 → 2.5.18-beta.4

package/main/default/manager/loader.js

@@ -10,6 +10,21 @@ const packagesFilePath = path.join(userDir, 'steedos-packages.yml');
 const metadataApi = require('@steedos/metadata-api');
 const util = require('./util');
 const metaDataCore = require('@steedos/metadata-core');
+const npmRCFilePath = path.join(userDir, '.npmrc')
+
+// 读取.steedos下的.npmrc文件内容
+const getNpmrc = ()=>{
+    let npmrc = "";
+    if(fs.existsSync(npmRCFilePath)){
+        npmrc = fs.readFileSync(npmRCFilePath, 'utf8')
+    }
+    return npmrc;
+}
+
+// 写入.steedos下的.npmrc文件内容
+const setNpmrc = (data)=>{
+    fs.writeFileSync(npmRCFilePath, data);
+}
 
 const getPackageYmlData = (packagePath)=>{
     let packageYmlData = {};
@@ -85,6 +100,8 @@ const appendToPackagesConfig = (packageName, options, actionName)=>{
 }
 
 const loadPackages = async ()=>{
+    let schema = objectql.getSteedosSchema();
+    let broker = schema.broker;
     const packages = loadPackagesConfig();
     for (const packageName in packages) {
         const package = packages[packageName]
@@ -94,10 +111,12 @@ const loadPackages = async ()=>{
                     const packagePath = package.path || path.dirname(require.resolve(`${packageName}/package.json`))
                     if(packagePath){
                         const packageInfo = await loadPackage(packageName, packagePath);
-                        appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
+                        if(packageInfo){
+                            appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
+                        }
                     }
                 } catch (error) {
-                    console.error(error)
+                    broker.logger.error(`start package ${packageName} error: ${error.message}`)
                 }
 
             }else if(package.local !== true){
@@ -115,7 +134,7 @@ const loadPackages = async ()=>{
                         const packageInfo = await loadPackage(packageName);
                         appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: false});
                     } catch (error) {
-                        console.error(error)
+                        broker.logger.error(`start package ${packageName} error: ${error.message}`)
                     }
                 }
             }else if(package.local === true && package.static != true){
@@ -124,9 +143,13 @@ const loadPackages = async ()=>{
                     packagePath = path.resolve(process.cwd(), packagePath)
                 }
                 if(packagePath){
-                    const packageInfo = await loadPackage(packageName, packagePath);
-                    if(packageInfo){
-                        appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
+                    try {
+                        const packageInfo = await loadPackage(packageName, packagePath);
+                        if(packageInfo){
+                            appendToPackagesConfig(packageInfo.name, {version: packageInfo.version, description: packageInfo.description, local: true});
+                        }
+                    } catch (error) {
+                        broker.logger.error(`start package ${packageName} error: ${error.message}`)
                     }
                 }
             }
@@ -217,7 +240,7 @@ const loadDependency = async (mainPackageInfo = {}, dependencyName, dependencyVe
 }
 
 const loadPackage = async (packageName, packagePath)=>{
-    try {
+    // try {
         if(!packagePath){
             packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
                 paths: [path.join(userDir, 'node_modules')]
@@ -231,19 +254,28 @@ const loadPackage = async (packageName, packagePath)=>{
             return ;
         }
         const packageInfo = require(path.join(packagePath, 'package.json'));
+        const packageYml = getPackageYmlData(packagePath);
+
+        if(packageYml && packageYml.license && _.isArray(packageYml.license) && packageYml.license.length > 0){
+            const has = await broker.call('@steedos/service-license.checkProducts', {keys: packageYml.license});
+            if(!has){
+                throw new Error(`Software package 「${packageName}」 requires 「${packageYml.license.join(',')}」 license.`)    
+            }
+        }
+        
         await destroyExistThePackageService(packageInfo);
         await steedos.loadPackage(packagePath);
-        const packageConfig = getPackageConfig(packageName);
-        if(packageInfo.dependencies){
-            for (const dependencyName in packageInfo.dependencies) {
-                const dependencyVersion = packageInfo.dependencies[dependencyName];
-                await loadDependency(packageConfig, dependencyName, dependencyVersion);
-            }
-        }   
+        // const packageConfig = getPackageConfig(packageName);
+        // if(packageInfo.dependencies){
+        //     for (const dependencyName in packageInfo.dependencies) {
+        //         const dependencyVersion = packageInfo.dependencies[dependencyName];
+        //         await loadDependency(packageConfig, dependencyName, dependencyVersion);
+        //     }
+        // }   
         return Object.assign({packagePath: packagePath}, packageInfo);
-    } catch (error) {
-        console.error(packageName, packagePath, error)
-    }
+    // } catch (error) {
+        // console.error(packageName, packagePath, error)
+    // }
 }
 
 const disablePackage = async (packageName)=>{
@@ -288,6 +320,7 @@ const removePackageConfig = (packageName)=>{
 const getPackageConfig = (packageName)=>{
     const packages = loadPackagesConfig();
     return _.find(packages, (info, name)=>{
+        info.name = name;
         return packageName == name
     });
 }
@@ -405,5 +438,8 @@ module.exports = {
     getPackageInfo,
     getPackageMetadata,
     installPackage,
-    getPackageYmlData
+    getPackageYmlData,
+    getNpmrc,
+    setNpmrc,
+    getPackageConfig
 }

package/main/default/manager/packages.js

@@ -186,9 +186,11 @@ const scanPackageMetadatas = async (packagePath) => {
     return packageMetadatas;
 }
 
-const checkDependencies = async (packagePath)=>{
-    const packageServiceConfig = require(path.join(packagePath, 'package.service.js'));
-    const dependencies = (packageServiceConfig && packageServiceConfig.dependencies) || [];
+const checkDependencies = async (packagePath, dependencies)=>{
+    if(!dependencies){
+        const packageServiceConfig = require(path.join(packagePath, 'package.service.js'));
+        dependencies = (packageServiceConfig && packageServiceConfig.dependencies) || [];
+    }
     for(const item of dependencies){
         const hasService = await objectql.getSteedosSchema().broker.registry.hasService(item);
         if(!hasService){

package/main/default/manager/registry.js

@@ -14,6 +14,8 @@ let installDenyList = [];
 let installAllAllowed = true;
 let installVersionRestricted = false;
 var activePromise = Promise.resolve();
+const _ = require('lodash');
+const npa = require("npm-package-arg");
 
 log.init({});
 
@@ -268,6 +270,27 @@ async function installModule(module, version, url, registry_url) {
     return activePromise;
 }
 
+async function yarnAddPackage(yarnPackage){
+    var installDir = settings.userDir || ".";
+    var yarnArgs = ['add', '-E', ...yarnPackage.split(' '), '--json'];
+    const data = await exec.run(yarnCommand, yarnArgs, {cwd: installDir}, true);
+    const formatData = JSON.parse(_.last(_.compact(data.stdout.split('\n'))))
+    // 解析 yarn add 返回的结果
+    const steedosPackages = [];
+    _.each(formatData.data.trees, (module)=>{
+        const parsed = npa(module.name);
+        const packagePath = path.dirname(require.resolve(`${parsed.name}/package.json`, {
+            paths: [path.join(installDir, 'node_modules')]
+        }))
+        steedosPackages.push({
+            name: parsed.name,
+            version: parsed.rawSpec,
+            path: packagePath
+        })
+    })
+    return steedosPackages;
+}
+
 
 async function uninstallModule(module){
     if (Buffer.isBuffer(module)) {
@@ -326,5 +349,6 @@ const isPackageUrl = (url)=>{
 module.exports = {
     installModule,
     uninstallModule,
-    isPackageUrl
+    isPackageUrl,
+    yarnAddPackage
 }

package/main/default/objects/steedos_packages/fields/dependencies.field.yml

@@ -0,0 +1,4 @@
+name: dependencies
+type: select
+multiple: true
+label: 依赖项

package/main/default/pages/steedos_package_detail.page.amis.json

@@ -68,12 +68,42 @@
                                     "mode": "read",
                                     "className": "mb-4",
                                     "excludedFields": [
-                                        "metadata"
+                                        "metadata",
+                                        "dependencies"
                                     ]
                                 }
                             ],
                             "className": "p-0",
                             "id": "u:5d4e7e3f6ecc"
+                        },
+                        {
+                            "title": "依赖服务",
+                            "body": [
+                                {
+                                    "type": "steedos-object-form",
+                                    "label": "对象表单",
+                                    "objectApiName": "${objectName}",
+                                    "recordId": "${recordId}",
+                                    "appId": "${appId}",
+                                    "id": "u:fec578db3278",
+                                    "mode": "read",
+                                    "className": "mb-4",
+                                    "fields": [
+                                        "dependencies"
+                                    ],
+                                    "fieldsExtend": {
+                                        "dependencies": {
+                                            "label": false,
+                                            "amis": {
+                                                "type": "tpl",
+                                                "tpl": "${dependencies | join: }"
+                                            }
+                                        }
+                                    }
+                                }
+                            ],
+                            "className": "p-0",
+                            "id": "u:5d4e7e3f6ecc"
                         }
                     ],
                     "id": "u:148cf8e840eb"

package/main/default/pages/steedos_packages_list.page.amis.json

@@ -26,13 +26,13 @@
           "body": [
             {
               "type": "tpl",
-              "tpl": "<div class='antd-Card-heading bg-white'><span class='antd-Card-avtar pull-left thumb-md m-r slds-icon slds-icon_container slds-icon-${iconCategory}-${iconName} ${display === \"split\" && 'hidden'}'><img class='antd-Card-img'src='${icon}' /></span><div class='antd-Card-meta'><div class='antd-Card-title'><span class='antd-TplField'><span>${label}</span></span></div><div class='antd-Card-subTitle'><span class='antd-TplField'><span>${description}</span></span></div><div class='antd-Card-desc'><span class='antd-TplField'><span><span class='bg-green-300 rounded-full px-2 py-0.5 mt-2 inline-block'>${_display.status}</span><span class='text-gray-600 px-2 py-0.5 mt-2 inline-block float-right'>${version}</span></span></span></div></div></div>"
+              "tpl": "<div class='antd-Card-heading bg-white'><span class='antd-Card-avtar pull-left thumb-md m-r slds-icon slds-icon_container slds-icon-${iconCategory}-${iconName} ${display === \"split\" && 'hidden'}'><img class='antd-Card-img'src='${icon}' /></span><div class='antd-Card-meta'><div class='antd-Card-title'><span class='antd-TplField' title='${label}'><span>${label}</span></span></div><div class='antd-Card-subTitle'><span class='antd-TplField' title='${description}'><span>${description}</span></span></div><div class='antd-Card-desc'><span class='antd-TplField'><span><span class='bg-${status === 'enable' ? 'green': 'gray'}-300 rounded-full px-2 py-0.5 mt-2 inline-block'>${_display.status}</span><span class='text-gray-600 px-2 py-0.5 mt-2 inline-block float-right'>${version}</span></span></span></div></div></div>"
             }
           ],
           "actions": [
             {
               "label": "${uiSchema.actions.enable.label}",
-              "disabledOn": "${status === 'enable'}",
+              "disabledOn": "${status === 'enable' || window:Meteor.settings.public.enable_saas}",
               "className": "mr-4",
               "onEvent": {
                 "click": {
@@ -48,7 +48,7 @@
             },
             {
               "label": "${uiSchema.actions.disable.label}",
-              "disabledOn": "${status !== 'enable'}",
+              "disabledOn": "${status !== 'enable' || window:Meteor.settings.public.enable_saas}",
               "onEvent": {
                 "click": {
                   "actions": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.5.18-beta.2",
+  "version": "2.5.18-beta.4",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.5.18-beta.2",
-    "@steedos/core": "2.5.18-beta.2",
-    "@steedos/metadata-core": "2.5.18-beta.2",
-    "@steedos/objectql": "2.5.18-beta.2",
-    "@steedos/service-package-loader": "2.5.18-beta.2",
+    "@steedos/auth": "2.5.18-beta.4",
+    "@steedos/core": "2.5.18-beta.4",
+    "@steedos/metadata-core": "2.5.18-beta.4",
+    "@steedos/objectql": "2.5.18-beta.4",
+    "@steedos/service-package-loader": "2.5.18-beta.4",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0f48957d39df17d699a5177f473401362a9916bf"
+  "gitHead": "dbed817b5b9689fd0ee6bbfb8e9911a18a3c8403"
 }

package/project.package.service.js

@@ -155,13 +155,24 @@ module.exports = {
 		enablePackage:{
 			async handler(ctx) {
 				const { module } = ctx.params
-                let packageConfig = await loader.enablePackage(module);
+				let packageConfig = await loader.getPackageConfig(module);
+
 				if(packageConfig.static){
 					packageConfig = Object.assign({}, packageConfig, this.getStaticPackageInfo(packageConfig, packageConfig.name))
 				}
-				await packages.checkDependencies(path.resolve(packageConfig.path))
-				const metadata = await loader.getPackageMetadata(util.getPackageRelativePath(process.cwd(), packageConfig.path));
+
 				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,
@@ -225,8 +236,24 @@ module.exports = {
 			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);
+            }
 		}
-
 	},
 
 	/**
@@ -478,7 +505,7 @@ module.exports = {
 								instanceID: this.broker.instanceID, 
 								path: _packageInfo.path,
 								local: _packageInfo.local, 
-								enable: _packageInfo.enable, 
+								enable: false, 
 								version: _packageInfo.version, 
 								description: _packageInfo.description,
 								metadata: metadata,
@@ -489,6 +516,34 @@ module.exports = {
 					}
 				}
 			}
+		},
+		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
+						})
+					})
+				}
+            }
 		}
 	},
 

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

@@ -1,166 +0,0 @@
-const express = require('express');
-const router = express.Router();
-const core = require('@steedos/core');
-const registry = require('../manager/registry');
-const loader = require('../manager/loader');
-const objectql = require('@steedos/objectql');
-let schema = objectql.getSteedosSchema();
-router.get('/api/nodes/install', core.requireAuthentication, async function (req, res) {
-    const userSession = req.user;
-    const isSpaceAdmin = userSession.is_space_admin;
-    const body = JSON.parse(decodeURIComponent(Buffer.from(req.query.data, "base64").toString('utf8')));
-    if(!isSpaceAdmin){
-        return res.status(401).send({ message: 'No permission' });
-    }
-    try {
-        const { module, version, label, description, nodeID} = body || {};
-        let broker = schema.broker;
-        const result = await broker.call(`@steedos/service-project.installPackage`, {
-            module, version, label, description
-        },{
-            nodeID: nodeID
-        })
-        res.redirect(302, `/app/admin/steedos_packages/grid/all`);
-        // res.status(200).send(result); //TODO 完善返回信息
-    } catch (error) {
-        console.error(error);
-        res.status(500).send({error: error.message});
-    }
-});
-
-router.post('/api/nodes/uninstall', core.requireAuthentication, async function (req, res) {
-    const userSession = req.user;
-    const isSpaceAdmin = userSession.is_space_admin;
-    const body = req.body;
-    if(!isSpaceAdmin){
-        return res.status(401).send({ message: 'No permission' });
-    }
-    try {
-        await loader.removePackage(body.module);
-        await registry.uninstallModule(body.module)
-        const { module, nodeID} = body || {};
-        let broker = schema.broker;
-        const result = await broker.call(`@steedos/service-project.uninstallPackage`, {
-            module
-        },{
-            nodeID: nodeID
-        })
-        res.status(200).send(result); //TODO 完善返回信息
-    } catch (error) {
-        console.error(error);
-        res.status(500).send({error: error.message});
-    }
-});
-
-router.post('/api/nodes/reload', core.requireAuthentication, async function (req, res) {
-    const userSession = req.user;
-    const isSpaceAdmin = userSession.is_space_admin;
-    const body = req.body;
-    if(!isSpaceAdmin){
-        return res.status(401).send({ message: 'No permission' });
-    }
-    try {
-        const { module, nodeID} = body || {};
-        let broker = schema.broker;
-        const result = await broker.call(`@steedos/service-project.reloadPackage`, {
-            module
-        },{
-            nodeID: nodeID
-        })
-        res.status(200).send(result);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send({error: error.message});
-    }
-});
-
-router.post('/api/nodes/disable', core.requireAuthentication, async function (req, res) {
-    const userSession = req.user;
-    const isSpaceAdmin = userSession.is_space_admin;
-    const body = req.body;
-    if(!isSpaceAdmin){
-        return res.status(401).send({ message: 'No permission' });
-    }
-    try {
-        const { module, nodeID} = body || {};
-        let broker = schema.broker;
-        const result = await broker.call(`@steedos/service-project.disablePackage`, {
-            module
-        },{
-            nodeID: nodeID
-        })
-        res.status(200).send(result);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send({error: error.message});
-    }
-});
-
-router.post('/api/nodes/enable', core.requireAuthentication, async function (req, res) {
-    const userSession = req.user;
-    const isSpaceAdmin = userSession.is_space_admin;
-    const body = req.body;
-    if(!isSpaceAdmin){
-        return res.status(401).send({ message: 'No permission' });
-    }
-    try {
-        const { module, nodeID} = body || {};
-        let broker = schema.broker;
-        const result = await broker.call(`@steedos/service-project.enablePackage`, {
-            module
-        },{
-            nodeID: nodeID
-        })
-        res.status(200).send(result);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send({error: error.message});
-    }
-});
-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)
-    const body = req.query;
-    const { module } = body || {};
-    if(!module){
-        return res.status(500).send({ message: 'Not find module' });
-    }
-    if(!isSpaceAdmin){
-        return res.status(401).send({ message: 'No permission' });
-    }
-    try {
-       
-        let broker = schema.broker;
-        const result = await broker.call(`@steedos/service-project.getPackageVersions`, {
-            module
-        })
-        res.status(200).send(result); //TODO 完善返回信息
-    } catch (error) {
-        console.error(error);
-        res.status(500).send({error: error.message});
-    }
-});
-
-router.post('/api/nodes/upgrade', core.requireAuthentication, async function (req, res) {
-    const userSession = req.user;
-    const isSpaceAdmin = userSession.is_space_admin;
-    const body = req.body;
-    if(!isSpaceAdmin){
-        return res.status(401).send({ message: 'No permission' });
-    }
-    try {
-        const { module, version} = body || {};
-        let broker = schema.broker;
-        const result = await broker.call(`@steedos/service-project.upgradePackage`, {
-            module, version
-        })
-        res.status(200).send(result);
-    } catch (error) {
-        console.error(error);
-        res.status(500).send({error: error.message});
-    }
-});
-
-
-exports.default = router;

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

@@ -1,21 +0,0 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-11-17 16:29:17
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-28 18:01:04
- * @Description: 
- */
-const express = require('express');
-const router = express.Router();
-const core = require("@steedos/core");
-
-let STEEDOS_REGISTRY_URL = process.env.STEEDOS_REGISTRY_URL ? process.env.STEEDOS_REGISTRY_URL : 'https://registry.steedos.cn/';
-
-router.get("/api/nodes/registry", core.requireAuthentication, async function (req, res) {
-    res.status(200).send([
-        { label: "https://registry.npmjs.org/", value: "https://registry.npmjs.org/" },
-        { label: "https://registry.npm.taobao.org/", value: "https://registry.npm.taobao.org/" },
-        { label: STEEDOS_REGISTRY_URL, value: STEEDOS_REGISTRY_URL },
-    ]);
-});
-exports.default = router;