@steedos/service-package-loader 2.7.9 → 2.7.10-beta.10

package/index.js

@@ -14,6 +14,9 @@ const metaDataCore = require('@steedos/metadata-core');
 const { registerMetadataConfigs, loadStandardMetadata, loadRouters } = require('@steedos/metadata-registrar');
 const moment = require('moment');
 const objectMixin = require('@steedos/service-object-mixin')
+const {
+    compressFiles, deleteFolderRecursive, mkTempFolder
+} = require('@steedos/metadata-core');
 
 const loadFlowFile = new metaDataCore.LoadFlowFile();
 
@@ -83,6 +86,16 @@ module.exports = {
                 // 扫描main/default/data文件夹
                 await this.importData(path.join(this.settings.packageInfo.path, 'main', 'default', 'data'), false, spaceId);
                 await this.loadDataOnServiceStarted(spaceId);
+
+                let packageInfo = this.settings.packageInfo;
+                if (!packageInfo) {
+                    return;
+                }
+                const { path: packagePath, isUnmanaged } = packageInfo;
+                if (isUnmanaged && packagePath) {
+                    const userSession = { spaceId: spaceId, userId: spaceDoc.owner };
+                    await this.deployPackage(packagePath, userSession);
+                }
             }
         }
     },
@@ -267,7 +280,7 @@ module.exports = {
             if (!packageInfo) {
                 return;
             }
-            const { path : _path, datasource, isPackage } = packageInfo;
+            const { path : _path, datasource, isPackage, isUnmanaged } = packageInfo;
             if (!_path) {
                 this.logger.error(`Please config packageInfo in your settings.`);
                 console.log(`service ${this.name} started`);
@@ -277,7 +290,10 @@ module.exports = {
                 await this.loadDataOnServiceStarted()
             });
             
-            await this.loadPackageMetadataFiles(_path, this.name, datasource);
+            if (true != isUnmanaged) {
+                // 受管软件包加载元数据文件，非受管软件包不加载
+                await this.loadPackageMetadataFiles(_path, this.name, datasource);
+            }
             if(isPackage !== false){
                 try {
                     let _packageInfo = {};
@@ -335,7 +351,32 @@ module.exports = {
             if(datasource){
                 await datasource.init();
             }
+        },
+        async deployPackage(sourcePath, userSession){
+            try {
+                var tempDir = mkTempFolder('deploy-');
+                var option = { includeJs: false, tableTitle: 'Steedos Deploy', showLog: true, inDeploy: true };
+    
+                compressFiles(sourcePath, sourcePath, tempDir, option, async (base64, zipDir) => {
+                    const result = await this.broker.call('~packages-@steedos/metadata-api.deploy', {
+                        fileBase64: base64,
+                    }, {
+                        timeout: 0,
+                        meta: {
+                            user: userSession
+                        }
+                    })
+                    console.log(sourcePath, JSON.stringify(result))
+                    deleteFolderRecursive(tempDir);
+                });
+    
+            } catch (err) {
+                console.log(err);
+                throw err;
+            }
+            
         }
+
     },
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.7.9",
+  "version": "2.7.10-beta.10",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,10 +10,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "2.7.9",
-    "@steedos/metadata-registrar": "2.7.9",
-    "@steedos/router": "2.7.9",
-    "@steedos/service-object-mixin": "2.7.9",
+    "@steedos/metadata-core": "2.7.10-beta.10",
+    "@steedos/metadata-registrar": "2.7.10-beta.10",
+    "@steedos/router": "2.7.10-beta.10",
+    "@steedos/service-object-mixin": "2.7.10-beta.10",
     "clone": "^2.1.2",
     "csvtojson": "~2.0.10",
     "moleculer": "^0.14.25",
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1ffda098098a1364492288ee0fd94265a7b9225d"
+  "gitHead": "cffd1ba851c6e18adcdd8b92f2c20d4d9d76247e"
 }