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

package/main/default/client/project_nodes.client.js

@@ -1,10 +1,10 @@
 Steedos.PackageRegistry = {
     getNodes: function(){
-        const projectNodes = Steedos.authRequest('/service/api/~packages-project-server/getProjectNodes', {async: false});
+        const projectNodes = Steedos.authRequest('/service/api/@steedos/service-project/getProjectNodes', {async: false});
         return projectNodes;
     },
     getNodesSelect: function(){
-        const projectNodes = Steedos.authRequest('/service/api/~packages-project-server/getProjectNodes', {async: false});
+        const projectNodes = Steedos.authRequest('/service/api/@steedos/service-project/getProjectNodes', {async: false});
         let selectOptions = '';
         _.each(projectNodes, function(nodeID){
             selectOptions = selectOptions + `<option value ="${nodeID}">${nodeID}</option>`

package/main/default/manager/loader.js

@@ -9,11 +9,41 @@ const userDir = path.join(process.cwd(), '.steedos');
 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 = {};
+    if(fs.existsSync(path.join(packagePath, 'package.service.yml'))){
+        packageYmlData = metaDataCore.loadFile(path.join(packagePath, 'package.service.yml')) || {};
+    }
+    if(fs.existsSync(path.join(packagePath, 'README.md'))){
+        packageYmlData.readme = metaDataCore.loadFile(path.join(packagePath, 'README.md'));
+    }else if(fs.existsSync(path.join(packagePath, 'readme.md'))){
+        packageYmlData.readme = metaDataCore.loadFile(path.join(packagePath, 'readme.md'));
+    }
+    return packageYmlData;
+}
+
 const loadPackagesConfig = ()=>{
     return yaml.load(fs.readFileSync(packagesFilePath, 'utf8')) || {};
 }
 
-const appendToPackagesConfig = (packageName, options)=>{
+const appendToPackagesConfig = (packageName, options, actionName)=>{
     let packages = loadPackagesConfig();
     let changeNamePackage = null;
     if(options.local && !packages[packageName]){
@@ -24,37 +54,72 @@ const appendToPackagesConfig = (packageName, options)=>{
             }
         })
     }
-    if(changeNamePackage){
-        //如果是修改package name, 在steedos-package.yml位置保持不变
-        const newPackages = {};
-        _.each(packages, (info, key)=>{
-            if(key === changeNamePackage.module){
-                delete changeNamePackage.module
-                newPackages[packageName] = Object.assign(changeNamePackage, options)
-            }else{
-                newPackages[key] = info
-            }
-        })
-        packages = newPackages
-    }else{
+    if(options.static){
         if(!packages[packageName]){
             packages[packageName] = Object.assign({
-                enable: true
+                enable: false,
+                local: true
             }, options)
+            if(options.enable){
+                const packagePath = options.path || path.dirname(require.resolve(`${packageName}/package.json`))
+                loadPackage(packageName, packagePath);
+            }
         }else{
+            // 对于已经存在的软件包, 不支持使用传入的enable控制软件包状态.
+            if(actionName === 'addPackage'){
+                delete options.enable
+            }
             packages[packageName] = Object.assign(packages[packageName], options)
         }
+    }else{
+        if(changeNamePackage){
+                //如果是修改package name, 在steedos-package.yml位置保持不变
+                const newPackages = {};
+                _.each(packages, (info, key)=>{
+                    if(key === changeNamePackage.module){
+                        delete changeNamePackage.module
+                        newPackages[packageName] = Object.assign(changeNamePackage, options)
+                    }else{
+                        newPackages[key] = info
+                    }
+                })
+                packages = newPackages
+            }else{
+                if(!packages[packageName]){
+                    packages[packageName] = Object.assign({
+                        enable: true
+                    }, options)
+                }else{
+                    packages[packageName] = Object.assign(packages[packageName], options)
+                }
+            }
     }
+    
     let data = yaml.dump(packages);
     fs.writeFileSync(packagesFilePath, data);
 }
 
 const loadPackages = async ()=>{
+    let schema = objectql.getSteedosSchema();
+    let broker = schema.broker;
     const packages = loadPackagesConfig();
     for (const packageName in packages) {
         const package = packages[packageName]
         if(package.enable){
-            if(package.local !== true){
+            if(package.static === true){
+                try {
+                    const packagePath = package.path || path.dirname(require.resolve(`${packageName}/package.json`))
+                    if(packagePath){
+                        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}`)
+                }
+
+            }else if(package.local !== true){
                 try {
                     const packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
                         paths: [path.join(userDir, 'node_modules')]
@@ -69,18 +134,22 @@ 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){
+            }else if(package.local === true && package.static != true){
                 let packagePath = package.path;
                 if(!path.isAbsolute(packagePath)){
                     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}`)
                     }
                 }
             }
@@ -130,7 +199,11 @@ const isPackage = (name)=>{
     }
 }
 
-const loadDependency = async (dependencyName, dependencyVersion)=>{
+const loadDependency = async (mainPackageInfo = {}, dependencyName, dependencyVersion)=>{
+    // console.log(`loadDependency`, mainPackageInfo, dependencyName, dependencyVersion)
+    if(mainPackageInfo.static == true){
+        return ;
+    }
     let schema = objectql.getSteedosSchema();
     let broker = schema.broker;
     let packageInfo = null;
@@ -154,9 +227,11 @@ const loadDependency = async (dependencyName, dependencyVersion)=>{
             await enablePackage(dependencyName)
         }else{
             try {
-                await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+                if(mainPackageInfo && mainPackageInfo.static != true){
+                    await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+                }
             } catch (error) {
-                
+                // console.log(error)
             }
         }
         // 如果steedos package yml 中没有该依赖，则直接安装
@@ -165,7 +240,7 @@ const loadDependency = async (dependencyName, dependencyVersion)=>{
 }
 
 const loadPackage = async (packageName, packagePath)=>{
-    try {
+    // try {
         if(!packagePath){
             packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
                 paths: [path.join(userDir, 'node_modules')]
@@ -179,19 +254,28 @@ const loadPackage = async (packageName, packagePath)=>{
             return ;
         }
         const packageInfo = require(path.join(packagePath, 'package.json'));
-        await destroyExistThePackageService(packageInfo);
-        await steedos.loadPackage(packagePath);
+        const packageYml = getPackageYmlData(packagePath);
 
-        if(packageInfo.dependencies){
-            for (const dependencyName in packageInfo.dependencies) {
-                const dependencyVersion = packageInfo.dependencies[dependencyName];
-                await loadDependency(dependencyName, dependencyVersion);
+        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);
+        //     }
+        // }   
         return Object.assign({packagePath: packagePath}, packageInfo);
-    } catch (error) {
-        console.error(error)
-    }
+    // } catch (error) {
+        // console.error(packageName, packagePath, error)
+    // }
 }
 
 const disablePackage = async (packageName)=>{
@@ -236,6 +320,7 @@ const removePackageConfig = (packageName)=>{
 const getPackageConfig = (packageName)=>{
     const packages = loadPackagesConfig();
     return _.find(packages, (info, name)=>{
+        info.name = name;
         return packageName == name
     });
 }
@@ -243,16 +328,20 @@ const getPackageConfig = (packageName)=>{
 const enablePackage = async (packageName)=>{
     let packagePath = null;
     let package = getPackageConfig(packageName);
-    if(package && package.local){
+    if(package && package.local && package.static !=true){
         if(path.isAbsolute(package.path)){
             packagePath = package.path
         }else{
             packagePath = path.resolve(process.cwd(), package.path)
         }
     }else{
-        packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
-            paths: [path.join(userDir, 'node_modules')]
-        }))
+        if(package && package.static){
+            packagePath = path.dirname(require.resolve(`${packageName}/package.json`))
+        }else{
+            packagePath = path.dirname(require.resolve(`${packageName}/package.json`, {
+                paths: [path.join(userDir, 'node_modules')]
+            }))
+        }
     }
     await loadPackage(packageName, packagePath)
     
@@ -271,6 +360,7 @@ const enablePackage = async (packageName)=>{
     }
     appendToPackagesConfig(packageName, package);
     let packageInfo = Object.assign({}, package, {name: packageName});
+    // console.log(`enable packageInfo`, packageInfo)
     return packageInfo;
 }
 const installPackage = async (broker, options)=>{
@@ -291,8 +381,10 @@ const installPackage = async (broker, options)=>{
     }
     appendToPackagesConfig(module, packageConfig);
     const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+    const packageYmlData = getPackageYmlData(packagePath);
     await broker.call(`@steedos/service-packages.install`, {
         serviceInfo: Object.assign({}, packageConfig, {
+            packageYmlData: packageYmlData,
             name: module,
             enable: enable, 
             nodeID: broker.nodeID, 
@@ -345,5 +437,9 @@ module.exports = {
     removePackage,
     getPackageInfo,
     getPackageMetadata,
-    installPackage
+    installPackage,
+    getPackageYmlData,
+    getNpmrc,
+    setNpmrc,
+    getPackageConfig
 }

package/main/default/manager/packages.js

@@ -32,6 +32,8 @@ const getAllPackages = async ()=>{
         package.status = '';
         package.new_version = package.version
         package.local = package.local
+        package.static = package.static
+        package.homepage = package.homepage
         delete package.version
         if(installPackages[package.name]){
             package.status = installPackages[package.name].enable ? 'enable' : 'disable'
@@ -45,14 +47,17 @@ const getAllPackages = async ()=>{
             _package.version = package.version
         }else{
             packages.push({
+                label: package.label || packageName,
+                homepage: package.homepage,
+                description: package.description,
+                ...(package.packageYmlData || {}),
                 _id : packageName.replace("/", '_'),
                 name: packageName,
                 status : package.enable ? 'starting' : 'disable',
                 version : package.version,
                 local: package.local,
-                label: package.label || packageName,
-                description: package.description,
-                metadata: package.metadata
+                metadata: package.metadata,
+                static: package.static
             })
         }
     })
@@ -65,8 +70,13 @@ const getAllPackages = async ()=>{
             _package.node_id = packageInfo.nodeID
             _package.instance_id = packageInfo.instanceID
             _package.version = packageInfo.version
+            _package.homepage = packageInfo.homepage
         }else{
             packages.push({
+                label: packageInfo.label || packageName,
+                description: packageInfo.description,
+                homepage: packageInfo.homepage,
+                ...(packageInfo.packageYmlData || {}),
                 _id : packageName.replace("/", '_'),
                 name: packageName,
                 service_name: packageInfo.name,
@@ -74,8 +84,6 @@ const getAllPackages = async ()=>{
                 instance_id: packageInfo.instanceID,
                 status : 'enable',
                 version : packageInfo.version,
-                label: packageInfo.label || packageName,
-                description: packageInfo.description,
                 local: false
             })
         }
@@ -178,9 +186,24 @@ const scanPackageMetadatas = async (packagePath) => {
     return packageMetadatas;
 }
 
+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){
+            throw new Error(`依赖项${item}未启动, 请先启动依赖项`)
+        }
+    }
+    return true;
+}
+
 module.exports = {
     maintainSystemFiles,
     getAllPackages,
     getPackageVersions,
-    scanPackageMetadatas
+    scanPackageMetadatas,
+    checkDependencies
 }

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)) {
@@ -320,11 +343,12 @@ async function uninstallModule(module){
 // }
 
 const isPackageUrl = (url)=>{
-    return pkgurlRe.test(url)
+    return pkgurlRe.test(url) || localtgzRe.test(url)
 }
 
 module.exports = {
     installModule,
     uninstallModule,
-    isPackageUrl
+    isPackageUrl,
+    yarnAddPackage
 }

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

@@ -104,6 +104,10 @@ fields:
 listviews:
   all:
     label: All Packages
+  custom:
+    label: Custom Packages
+  system:
+    label: System Packages
 actions:
   disable:
     label: Disable

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

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

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

@@ -10,6 +10,6 @@ readonly: false
 required: false
 rows: 2
 searchable: false
-sort_no: 130
+sort_no: 450
 sortable: false
 type: textarea

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

@@ -0,0 +1,4 @@
+name: homepage
+type: url
+label: homepage
+sort_no: 130

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

@@ -0,0 +1,3 @@
+name: icon
+type: text
+visible_on: "{{false}}"

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

@@ -12,3 +12,4 @@ searchable: true
 sort_no: 110
 sortable: true
 type: text
+visible_on: "{{false}}"

package/main/default/objects/steedos_packages/fields/metadata.$.type.field.yml

@@ -33,7 +33,7 @@ options:
     value: ApprovalProcess
   - label: 角色
     value: Role
-  - label: 岗位
+  - label: 审批岗位
     value: FlowRole
   - label: 查询
     value: Query

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

@@ -1,4 +1,5 @@
 name: metadata
 label: 软件包组件
 type: grid
-is_wide: true
+is_wide: true
+sort_no: 500

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

@@ -12,3 +12,4 @@ searchable: true
 sort_no: 110
 sortable: true
 type: text
+visible_on: "{{false}}"

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

@@ -0,0 +1,4 @@
+name: readme
+type: markdown
+is_wide: true
+visible_on: "{{false}}"

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

@@ -12,3 +12,4 @@ searchable: true
 sort_no: 100
 sortable: true
 type: text
+visible_on: "{{false}}"

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

@@ -0,0 +1,4 @@
+name: static
+type: boolean
+label: 静态(不支持卸载、升级)
+visible_on: "{{false}}"

package/main/default/objects/steedos_packages/listviews/all.listview.yml

@@ -2,15 +2,16 @@ name: all
 columns:
   - field: label
     wrap: false
-  - field: version
-    wrap: false
   - field: description
-    width: '150'
+    wrap: false
+  - field: version
     wrap: false
   - field: status
+  - field: static
+  - field: icon
 filter_scope: space
-label: 已安装
+label: 所有软件包
 scrolling_mode: standard
 shared: true
 show_count: false
-type: grid
+type: grid

package/main/default/objects/steedos_packages/listviews/custom.listview.yml

@@ -0,0 +1,8 @@
+name: custom
+filter_scope: space
+label: 自定义软件包
+scrolling_mode: standard
+shared: true
+show_count: false
+type: grid
+filters: [["static","!=", true]]

package/main/default/objects/steedos_packages/listviews/system.listview.yml

@@ -0,0 +1,8 @@
+name: system
+filter_scope: space
+label: 系统软件包
+scrolling_mode: standard
+shared: true
+show_count: false
+type: grid
+filters: [["static","=", true]]