@steedos/service-package-registry 2.2.54-beta.8 → 2.2.55-beta.10

package/main/default/manager/loader.js

@@ -7,7 +7,8 @@ const objectql = require('@steedos/objectql');
 const registry = require('./registry');
 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 loadPackagesConfig = ()=>{
     return yaml.load(fs.readFileSync(packagesFilePath, 'utf8')) || {};
 }
@@ -111,6 +112,51 @@ const destroyExistThePackageService = async (packageInfo)=>{
     }
 }
 
+const isPackage = (name)=>{
+    try {
+        const packagePath = path.dirname(require.resolve(`${name}/package.json`, {
+            paths: [path.join(userDir, 'node_modules')]
+        }))
+        return fs.existsSync(path.join(packagePath, 'package.service.js'));
+    } catch (error) {
+        return false;
+    }
+}
+
+const loadDependency = async (dependencyName, dependencyVersion)=>{
+    let schema = objectql.getSteedosSchema();
+    let broker = schema.broker;
+    let packageInfo = null;
+    const packageConfig = getPackageConfig(dependencyName);
+    if(packageConfig){
+        if(packageConfig.enable){
+            return ;
+        }else{
+            await enablePackage(dependencyName)
+        }
+    }else{
+        try {
+            const packagePath = path.dirname(require.resolve(`${dependencyName}/package.json`, {
+                paths: [path.join(userDir, 'node_modules')]
+            }))
+            packageInfo = require(path.join(packagePath, 'package.json'));
+        } catch (error) {
+            // console.log(`loadDependency`, error.message)
+        }
+        if(packageInfo && isPackage(dependencyName)){
+            await enablePackage(dependencyName)
+        }else{
+            try {
+                await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+            } catch (error) {
+                
+            }
+        }
+        // 如果steedos package yml 中没有该依赖，则直接安装
+        // await installPackage(broker, {module: dependencyName, version: dependencyVersion, enable: true})
+    }
+}
+
 const loadPackage = async (packageName, packagePath)=>{
     try {
         if(!packagePath){
@@ -120,7 +166,14 @@ const loadPackage = async (packageName, packagePath)=>{
         }
         const packageInfo = require(path.join(packagePath, 'package.json'));
         await destroyExistThePackageService(packageInfo);
-        await steedos.loadPackage(packagePath)
+        await steedos.loadPackage(packagePath);
+
+        if(packageInfo.dependencies){
+            for (const dependencyName in packageInfo.dependencies) {
+                const dependencyVersion = packageInfo.dependencies[dependencyName];
+                await loadDependency(dependencyName, dependencyVersion);
+            }
+        }   
         return Object.assign({packagePath: packagePath}, packageInfo);
     } catch (error) {
         console.error(error)
@@ -162,13 +215,17 @@ const removePackage = async (packageName)=>{
     fs.writeFileSync(packagesFilePath, data);
 }
 
-const enablePackage = async (packageName)=>{
+const getPackageConfig = (packageName)=>{
     const packages = loadPackagesConfig();
-    let packagePath = null;
-    const package = _.find(packages, (info, name)=>{
+    return _.find(packages, (info, name)=>{
         return packageName == name
-    })
-    if(package.local){
+    });
+}
+
+const enablePackage = async (packageName)=>{
+    let packagePath = null;
+    let package = getPackageConfig(packageName);
+    if(package && package.local){
         if(path.isAbsolute(package.path)){
             packagePath = package.path
         }else{
@@ -179,19 +236,86 @@ const enablePackage = async (packageName)=>{
             paths: [path.join(userDir, 'node_modules')]
         }))
     }
-    await steedos.loadPackage(packagePath)
-    let packageInfo = {};
-    _.map(packages, (package, name)=>{
-        if(packageName == name){
-            package.enable = true;
-            packageInfo = Object.assign({}, package, {name: packageName});
+    await loadPackage(packageName, packagePath)
+    
+    if(package){
+        package.enable = true;
+    }else{
+        const packageJSON = require(path.join(packagePath, 'package.json'));
+        package = {
+            label: '', 
+            version: packageJSON.version, 
+            description: packageJSON.description || '', 
+            local: false, 
+            enable: true,
+            path: util.getPackageRelativePath(process.cwd(), packagePath)
         }
-    })
-    let data = yaml.dump(packages);
-    fs.writeFileSync(packagesFilePath, data);
+    }
+    appendToPackagesConfig(packageName, package);
+    let packageInfo = Object.assign({}, package, {name: packageName});
     return packageInfo;
 }
+const installPackage = async (broker, options)=>{
+    let {module, version, label, description, enable} = options;
+    const packagePath = await registry.installModule(module, version);
+    if(enable){
+        await loadPackage(module, packagePath);
+    }else{
+        enable = false;
+    }
+    const packageConfig = {
+        label: label || '', 
+        version: version, 
+        description: description || '', 
+        local: false, 
+        enable: enable,
+        path: util.getPackageRelativePath(process.cwd(), packagePath)
+    }
+    appendToPackagesConfig(module, packageConfig);
+    const metadata = await getPackageMetadata(util.getPackageRelativePath(process.cwd(), packagePath));
+    await broker.call(`@steedos/service-packages.install`, {
+        serviceInfo: Object.assign({}, packageConfig, {
+            name: module,
+            enable: enable, 
+            nodeID: broker.nodeID, 
+            instanceID: broker.instanceID,
+            metadata: metadata
+        })
+    })
+    return packageConfig;
+}
+
+const getPackageMetadata = async (packagePath)=>{
+	const packageMetadata = [];
+	const result = await metadataApi.loadFileToJson(packagePath, {
+		CustomApplication: '*',
+		CustomPermissionset: '*',
+		CustomProfile: '*',
+		CustomObject: '*',
+		Layout: '*',
+		CustomReport: '*',
+		Workflow: '*',
+		Flow: '*',
+		ApprovalProcess: '*',
+		Role: '*',
+		FlowRole: '*',
+		Query: '*',
+		Chart: '*',
+		Page: '*',
+		Tab: '*',
+	});
 
+	_.each(result, (metadataItems, metadataType)=>{
+		_.each(metadataItems, (metadata, apiName)=>{
+			packageMetadata.push({
+				label: metadata.label || metadata.name,
+				type: metadataType,
+				api_name: apiName
+			})
+		})
+	})
+	return packageMetadata;
+}
 
 module.exports = {
     loadPackages,
@@ -201,5 +325,7 @@ module.exports = {
     disablePackage,
     enablePackage,
     removePackage,
-    getPackageInfo
+    getPackageInfo,
+    getPackageMetadata,
+    installPackage
 }

package/main/default/manager/packages.js

@@ -6,7 +6,7 @@ const objectql = require('@steedos/objectql');
 const packageJson = require('./package-json');
 const _ = require('lodash');
 const login = require('./login');
-
+const metadataApi = require('@steedos/metadata-api');
 function registryUrl(scope) {
     try {
         const result = login.getYarnrcScopes();

package/main/default/manager/registry.js

@@ -213,7 +213,6 @@ async function installModule(module, version, url, registry_url) {
                 activePromise = Promise.resolve(packagePath);
                 return activePromise;
             } catch (error) {
-                console.log(`error`, error)
                 throw new Error(`${module} is not steedos package`)
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "2.2.54-beta.8",
+  "version": "2.2.55-beta.10",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,12 +9,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.2.54-beta.8",
-    "@steedos/core": "2.2.54-beta.8",
-    "@steedos/metadata-core": "2.2.54-beta.8",
-    "@steedos/objectql": "2.2.54-beta.8",
-    "@steedos/service-package-license": "2.2.54-beta.8",
-    "@steedos/service-package-loader": "2.2.54-beta.8",
+    "@steedos/auth": "2.2.55-beta.10",
+    "@steedos/core": "2.2.55-beta.10",
+    "@steedos/metadata-core": "2.2.55-beta.10",
+    "@steedos/objectql": "2.2.55-beta.10",
+    "@steedos/service-package-license": "2.2.55-beta.10",
+    "@steedos/service-package-loader": "2.2.55-beta.10",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f91a35447a4a07a7d6868748ce911cd660c5fadc"
+  "gitHead": "8332c1b7386041d49e191183011c96210ffa97d8"
 }