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

package/README.md

@@ -1,2 +1,11 @@
+<!--
+ * @Author: 孙浩林 sunhaolin@steedos.com
+ * @Date: 2021-10-21 14:19:05
+ * @LastEditors: 孙浩林 sunhaolin@steedos.com
+ * @LastEditTime: 2023-10-27 13:00:22
+ * @FilePath: /steedos-platform-2.3/services/service-package-loader/README.md
+ * @Description: 
+-->
 ## 功能说明
-- 用于加载自定义对象
+- 用于加载自定义对象
+- 工作区初始化完成后默认导入软件包main/default/data文件夹下的{objectname}.data.json、{objectname}.data.csv、{flowApiname}.flow.data.json数据

package/index.js

@@ -9,15 +9,35 @@ const path = require('path');
 const _ = require('lodash');
 const fs = require("fs");
 const metaDataCore = require('@steedos/metadata-core');
-const { registerMetadataConfigs, loadStandardMetadata, loadRouters, canLoadMetadata } = require('@steedos/metadata-registrar');
+const { registerMetadataConfigs, loadStandardMetadata, loadRouters } = require('@steedos/metadata-registrar');
+const moment = require('moment');
+const objectMixin = require('@steedos/service-object-mixin')
+
 const loadFlowFile = new metaDataCore.LoadFlowFile();
 
+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 methods = require('./lib/methods')
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
 
 module.exports = {
     name: "service-package-loader",
+
+	mixins: [objectMixin],
     
     triggerLoader,
 
@@ -36,7 +56,7 @@ module.exports = {
     /**
      * Dependencies
      */
-    dependencies: ['metadata-server', '~packages-project-server', '@steedos/service-packages'],
+    dependencies: ['metadata-server', '@steedos/service-project', '@steedos/service-packages', 'objectql', '@steedos/data-import'],
 
     /**
      * Actions
@@ -55,8 +75,12 @@ module.exports = {
             }
         },
         "space.initialized": {
-            async handler() {
-                await this.loadDataOnServiceStarted();
+            async handler(ctx) {
+                const spaceDoc = ctx.params
+                const spaceId = spaceDoc._id
+                // 扫描main/default/data文件夹
+                await this.importData(path.join(this.settings.packageInfo.path, 'main', 'default', 'data'), false, spaceId);
+                await this.loadDataOnServiceStarted(spaceId);
             }
         }
     },
@@ -65,6 +89,8 @@ module.exports = {
      * Methods
      */
     methods: {
+        ...methods,
+
         checkPackageMetadataFiles: async function (packagePath) {
 
             if(this.core){
@@ -76,16 +102,6 @@ module.exports = {
                 this.broker.logger.warn(`The public folder has been deprecated. ${publicPath}`); 
             }
 
-            // 扫描软件包中的元数据, 如果有 .client.js 文件, 则输出警告信息
-            const filePatten = [
-                path.join(packagePath, "**", "*.client.js"),
-                "!" + path.join(packagePath, "node_modules"),
-            ]
-            const matchedPaths = metaDataCore.syncMatchFiles(filePatten);
-            for await (const filePath of matchedPaths) {
-                this.broker.logger.warn(`The client.js file has been deprecated. ${filePath}`); 
-            }
-
             // 扫描软件包中的元数据, 如果有 .object.js 文件, 则输出警告信息
             const filePatten2 = [
                 path.join(packagePath, "**", "*.object.js"),
@@ -106,38 +122,38 @@ module.exports = {
                 this.broker.logger.warn(`The router.js file has been deprecated. ${filePath}`); 
             }
         },
-        sendPackageFlowToDb: async function(packagePath, name) {
-            if(!canLoadMetadata('Flow')){
-                return ;
-            }
+        sendPackageFlowToDb: async function(packagePath, name, spaceId) {
             const flows = loadFlowFile.load(path.join(packagePath, '**'));
             for (const apiName in flows) {
                 const flow = flows[apiName];
                 const flowFilePath = flow.__filename;
                 delete flow.__filename;
                 try {
-                    await this.importFlow(flow, name);
+                    await this.importFlow(flow, name, spaceId);
                 } catch (error) {
                     console.error(`importFlow error`, flowFilePath, error)
                 }
             }
         },
 
-        importFlow: async function(flow, name) {
-            return await this.broker.call('steedos-server.importFlow', {flow, name});
+        importFlow: async function(flow, name, spaceId) {
+            return await this.broker.call('steedos-server.importFlow', {flow, name, spaceId});
         }, 
-        loadDataOnServiceStarted: async function(){
+        /**
+         * @param {string} spaceId 非必传
+         * @returns 
+         */
+        loadDataOnServiceStarted: async function(spaceId){
             let packageInfo = this.settings.packageInfo;
             if (!packageInfo) {
                 return;
             }
             const { path : _path } = packageInfo;
+
             this.loadPackagePublicFiles(_path);
             if(_path){
-                this.sendPackageFlowToDb(_path)
-                if(canLoadMetadata('Process')){
-                    processLoader.sendPackageProcessToDb(_path);
-                }
+                this.sendPackageFlowToDb(_path, null, spaceId)
+                processLoader.sendPackageProcessToDb(_path);
             }
         },
         loadPackageMetadataFiles: async function (packagePath, name, datasourceName) {
@@ -147,28 +163,18 @@ module.exports = {
                 datasourceName = 'default';
             }
             if(this.objectql){
-                await loadStandardMetadata(name, datasourceName);
                 await this.initDataSource(packagePath, datasourceName);
+                await loadStandardMetadata(name, datasourceName);
             }
             await registerMetadataConfigs(packagePath, datasourceName, name);
-            if(canLoadMetadata('Trigger')){
-                await triggerLoader.load(this.broker, packagePath, name);
-            }
-            if(canLoadMetadata('ProcessTrigger')){
-                await processTriggerLoader.load(this.broker, packagePath, name);
-            }
-            if(canLoadMetadata('TriggerYml')){
-                await triggerYmlLoader.load(this.broker, packagePath, name);
-            }
+            await triggerLoader.load(this.broker, packagePath, name);
+            await processTriggerLoader.load(this.broker, packagePath, name);
+            await triggerYmlLoader.load(this.broker, packagePath, name);
             await importLoader.load(this.broker, packagePath, name);
             if(this.core){
-                if(canLoadMetadata('ClientJS')){
-                    this.core.loadClientScripts();
-                }
-                if(canLoadMetadata('Router')){
-                    const routersInfo = await this.loadPackageRouters(packagePath, name);
-                    await this.broker.call(`@steedos/service-packages.setPackageRoutersInfo`, {packageName: name, data: routersInfo});
-                }
+                // this.core.loadClientScripts();
+                const routersInfo = await this.loadPackageRouters(packagePath, name);
+                await this.broker.call(`@steedos/service-packages.setPackageRoutersInfo`, {packageName: name, data: routersInfo});
             }
             await this.broker.emit(`translations.object.change`, {});
             return;
@@ -194,9 +200,6 @@ module.exports = {
         },
         loadPackagePublicFiles: {
             handler(packagePath) {
-                if(!canLoadMetadata('PublicFolder')){
-                    return ;
-                }
                 if (!this.settings.packageInfo.loadPublicFolder) {
                     return;
                 }
@@ -208,6 +211,7 @@ module.exports = {
                 } catch (error) {
                     return
                 }
+
                 try {
                     const express = require('express');
                     this.settings.loadedPackagePublicFiles = true;
@@ -218,7 +222,6 @@ module.exports = {
                             routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
                         }
                         const cacheTime = 86400000 * 1; // one day
-                        // console.log(`static router`, routerPath, publicPath)
                         router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
                         // WebApp.connectHandlers.use(router);
                     } catch (error) {
@@ -232,13 +235,19 @@ module.exports = {
         },
         async errorHandler(error) {
             this.broker.logger.error(`[${this.name}] 启动失败: ${error.message}`);
-            await await this.broker.call(`~packages-project-server.disablePackage`, {
+            await await this.broker.call(`@steedos/service-project.disablePackage`, {
                 module: this.schema.packageName
             })
             return await this.broker.destroyService(this);
         },
         async onStarted(){
 
+            // 扫描main/default/data文件夹，在加载.flow.json前执行
+            const primarySpaceId = await this.broker.call("objectql.getPrimarySpaceId");
+            if (primarySpaceId) {
+                await this.importData(path.join(this.settings.packageInfo.path, 'main', 'default', 'data'), true, primarySpaceId);
+            }
+
             this.checkPackageMetadataFiles(this.settings.packageInfo.path)
 
             if(this.beforeStart){
@@ -249,7 +258,7 @@ module.exports = {
                 }
             }
     
-            console.time(`service ${this.name} started`)
+            const startTime = moment();
             let packageInfo = this.settings.packageInfo;
             if (!packageInfo) {
                 return;
@@ -267,18 +276,25 @@ module.exports = {
             await this.loadPackageMetadataFiles(_path, this.name, datasource);
             if(isPackage !== false){
                 try {
-                    const _packageInfo = metaDataCore.loadJSONFile(path.join(_path, 'package.json'));
-                    await this.broker.call(`@steedos/service-packages.online`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, path: _path, version: _packageInfo.version, description: _packageInfo.description}})
+                    let _packageInfo = {};
+                    if(fs.existsSync(path.join(_path, 'package.json'))){
+                        _packageInfo = metaDataCore.loadJSONFile(path.join(_path, 'package.json'));
+                    }else if(fs.existsSync(path.join(_path, '..','package.json'))){
+                        _packageInfo = metaDataCore.loadJSONFile(path.join(_path, '..', 'package.json'));
+                    }
+                    const packageYmlData = getPackageYmlData(_path);
+                    await this.broker.call(`@steedos/service-packages.online`, {serviceInfo: {packageYmlData: packageYmlData, name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID, path: _path, version: _packageInfo.version, description: _packageInfo.description}})
                 } catch (error) {
-                    
+                    console.log(`error`, error)
                 }    
             }
-            
+    
             await this.loadPackageMetadataServices(_path);
     
             // await this.loadPackagePublicFiles(_path);
             this.started = true;
-            console.timeEnd(`service ${this.name} started`)
+            const endTime = moment();
+            console.log(`service ${this.name} started:`, `${endTime.diff(startTime, 'seconds', true)}s`);
             if(this.afterStart){
                 try {
                     await this.afterStart();
@@ -349,7 +365,15 @@ module.exports = {
 
         schema.settings.packageInfo = {
             ...schema.settings.packageInfo,
-            ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {})
+            ...(schema.metadata && schema.metadata.$package ? schema.metadata.$package : {}),
+        }
+
+        const _path = schema.settings.packageInfo.path;
+        let packageYmlData = getPackageYmlData(_path);
+
+        schema.settings.packageInfo = {
+            ...schema.settings.packageInfo,
+            ...packageYmlData
         }
     },
 
@@ -385,7 +409,7 @@ module.exports = {
                 })
             }
             await this.objectql.deletePackageClientScripts(this.name);
-            await this.core.loadClientScripts();
+            // await this.core.loadClientScripts();
         }
         this.broker.call(`@steedos/service-packages.offline`, {serviceInfo: {name: this.name, nodeID: this.broker.nodeID, instanceID: this.broker.instanceID}})
         await this.broker.call(`metadata.refreshServiceMetadatas`, { offlinePackageServices: [{

package/lib/imports/Base.d.ts

@@ -0,0 +1,3 @@
+export interface Base {
+    readFile(filePath: string, options?: any): any;
+}

package/lib/imports/Base.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Base.js.map

package/lib/imports/Base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../src/imports/Base.ts"],"names":[],"mappings":""}

package/lib/imports/ImportCsv.d.ts

@@ -0,0 +1,7 @@
+import ImportJson from './ImportJson';
+export default class ImportCsv extends ImportJson {
+    readFile(filePath: string): Promise<Array<{
+        objectName: string;
+        records: Array<any>;
+    }>>;
+}

package/lib/imports/ImportCsv.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const ImportJson_1 = require("./ImportJson");
+const csv = require("csvtojson");
+const path = require("path");
+const metadata_core_1 = require("@steedos/metadata-core");
+class ImportCsv extends ImportJson_1.default {
+    readFile(filePath) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let results = [];
+            const filePatten = [
+                path.join(filePath, "**", "*.data.csv"),
+                "!" + path.join(filePath, "node_modules"),
+            ];
+            const matchedPaths = (0, metadata_core_1.syncMatchFiles)(filePatten);
+            for (const matchedPath of matchedPaths) {
+                let records = yield csv().fromFile(matchedPath);
+                let objectName = path.basename(matchedPath).split('.')[0];
+                results.push({ objectName: objectName, records: records });
+            }
+            return results;
+        });
+    }
+}
+exports.default = ImportCsv;
+//# sourceMappingURL=ImportCsv.js.map

package/lib/imports/ImportCsv.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportCsv.js","sourceRoot":"","sources":["../../src/imports/ImportCsv.ts"],"names":[],"mappings":";;;AAQA,6CAAsC;AACtC,iCAAkC;AAClC,6BAA8B;AAC9B,0DAAwD;AAExD,MAAqB,SAAU,SAAQ,oBAAU;IAEvC,QAAQ,CAAC,QAAgB;;YAC3B,IAAI,OAAO,GAAQ,EAAE,CAAA;YACrB,MAAM,UAAU,GAAG;gBACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC;gBACvC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC;aAC5C,CAAA;YACD,MAAM,YAAY,GAAa,IAAA,8BAAc,EAAC,UAAU,CAAC,CAAC;YAC1D,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;gBACpC,IAAI,OAAO,GAAG,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAChD,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1D,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;aAC9D;YACD,OAAO,OAAO,CAAA;QAClB,CAAC;KAAA;CACJ;AAhBD,4BAgBC"}

package/lib/imports/ImportExcel.d.ts

@@ -0,0 +1,7 @@
+import { Base } from './Base';
+export default class ImportExcel implements Base {
+    readFile(filePath: string, options?: any): {
+        datas: Array<any>;
+        headers: Array<string>;
+    };
+}

package/lib/imports/ImportExcel.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_xlsx_1 = require("node-xlsx");
+class ImportExcel {
+    readFile(filePath, options = {}) {
+        const { sheetIndex = 0, headerIndex = 0 } = options;
+        let workbook = node_xlsx_1.default.parse(filePath, {
+            cellDates: true,
+        });
+        const data = workbook[sheetIndex].data;
+        const headers = data[headerIndex];
+        const datas = data.slice(1);
+        return {
+            headers,
+            datas
+        };
+    }
+}
+exports.default = ImportExcel;
+//# sourceMappingURL=ImportExcel.js.map

package/lib/imports/ImportExcel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportExcel.js","sourceRoot":"","sources":["../../src/imports/ImportExcel.ts"],"names":[],"mappings":";;AAQA,yCAA6B;AAG7B,MAAqB,WAAW;IAE5B,QAAQ,CAAC,QAAgB,EAAE,UAAe,EAAE;QACxC,MAAM,EAAE,UAAU,GAAG,CAAC,EAAE,WAAW,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;QACpD,IAAI,QAAQ,GAAG,mBAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YAChC,SAAS,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5B,OAAO;YACH,OAAO;YACP,KAAK;SACR,CAAC;IACN,CAAC;CAEJ;AAhBD,8BAgBC"}

package/lib/imports/ImportJson.d.ts

@@ -0,0 +1,7 @@
+import { Base } from './Base';
+export default class ImportJson implements Base {
+    readFile(filePath: string): Promise<Array<{
+        objectName: string;
+        records: Array<any>;
+    }>>;
+}

package/lib/imports/ImportJson.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const lodash_1 = require("lodash");
+const metadata_core_1 = require("@steedos/metadata-core");
+const path = require("path");
+const fs = require("fs");
+class ImportJson {
+    readFile(filePath) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let results = [];
+            const filePatten = [
+                path.join(filePath, "**", "*.data.json"),
+                "!" + path.join(filePath, "**", "*.flow.data.json"),
+                "!" + path.join(filePath, "node_modules")
+            ];
+            const matchedPaths = (0, metadata_core_1.syncMatchFiles)(filePatten);
+            (0, lodash_1.each)(matchedPaths, (matchedPath) => {
+                let records = JSON.parse(fs.readFileSync(matchedPath, 'utf8').normalize('NFC'));
+                let objectName = path.basename(matchedPath).split('.')[0];
+                results.push({ objectName: objectName, records: records });
+            });
+            return results;
+        });
+    }
+}
+exports.default = ImportJson;
+//# sourceMappingURL=ImportJson.js.map

package/lib/imports/ImportJson.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportJson.js","sourceRoot":"","sources":["../../src/imports/ImportJson.ts"],"names":[],"mappings":";;;AAQA,mCAA8B;AAE9B,0DAAwD;AACxD,6BAA8B;AAC9B,yBAA0B;AAE1B,MAAqB,UAAU;IAErB,QAAQ,CAAC,QAAgB;;YAC3B,IAAI,OAAO,GAAQ,EAAE,CAAA;YACrB,MAAM,UAAU,GAAG;gBACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC;gBACxC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,kBAAkB,CAAC;gBACnD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC;aAAC,CAAC;YAE/C,MAAM,YAAY,GAAa,IAAA,8BAAc,EAAC,UAAU,CAAC,CAAC;YAC1D,IAAA,aAAI,EAAC,YAAY,EAAE,CAAC,WAAmB,EAAE,EAAE;gBACvC,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;gBAChF,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1D,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAClB,CAAC;KAAA;CAEJ;AAlBD,6BAkBC"}

package/lib/methods/importData.d.ts

@@ -0,0 +1 @@
+export declare function handler(filePath: string, onlyInsert: boolean, spaceId: string): Promise<void>;

package/lib/methods/importData.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handler = void 0;
+const tslib_1 = require("tslib");
+const ImportJson_1 = require("../imports/ImportJson");
+const ImportCsv_1 = require("../imports/ImportCsv");
+const fs = require("fs");
+function handler(filePath, onlyInsert, spaceId) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (!filePath) {
+            return;
+        }
+        if (!fs.existsSync(filePath)) {
+            return;
+        }
+        const importer = {
+            csv: new ImportCsv_1.default(),
+            json: new ImportJson_1.default(),
+        };
+        const csvData = yield importer.csv.readFile(filePath);
+        const jsonData = yield importer.json.readFile(filePath);
+        yield this.broker.call("@steedos/data-import.importData", {
+            data: {
+                "csv": csvData,
+                "json": jsonData,
+            },
+            spaceId,
+            onlyInsert,
+        });
+    });
+}
+exports.handler = handler;
+//# sourceMappingURL=importData.js.map

package/lib/methods/importData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"importData.js","sourceRoot":"","sources":["../../src/methods/importData.ts"],"names":[],"mappings":";;;;AAQA,sDAA+C;AAC/C,oDAA4C;AAE5C,yBAA0B;AAE1B,SAAsB,OAAO,CAAC,QAAgB,EAAE,UAAmB,EAAE,OAAe;;QAChF,IAAI,CAAC,QAAQ,EAAE;YACX,OAAM;SACT;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1B,OAAM;SACT;QAED,MAAM,QAAQ,GAAG;YACb,GAAG,EAAE,IAAI,mBAAS,EAAE;YACpB,IAAI,EAAE,IAAI,oBAAU,EAAE;SACzB,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAEtD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAGxD,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE;YACtD,IAAI,EAAE;gBACF,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,QAAQ;aACnB;YACD,OAAO;YACP,UAAU;SACb,CAAC,CAAA;IAEN,CAAC;CAAA;AA3BD,0BA2BC"}

package/lib/methods/index.d.ts

@@ -0,0 +1 @@
+export * as importData from './importData';

package/lib/methods/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importData = void 0;
+exports.importData = require("./importData");
+//# sourceMappingURL=index.js.map

package/lib/methods/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/methods/index.ts"],"names":[],"mappings":";;;AAQA,6CAA2C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.6.1-beta.7",
+  "version": "2.6.2-beta.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,11 +10,15 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "2.6.1-beta.7",
-    "@steedos/metadata-registrar": "2.6.1-beta.7",
-    "@steedos/router": "2.6.1-beta.7",
+    "@steedos/metadata-core": "2.6.2-beta.2",
+    "@steedos/metadata-registrar": "2.6.2-beta.2",
+    "@steedos/router": "2.6.2-beta.2",
+    "@steedos/service-object-mixin": "2.6.2-beta.2",
     "clone": "^2.1.2",
+    "csvtojson": "~2.0.10",
     "moleculer": "^0.14.25",
+    "moment": "^2.24.0",
+    "node-xlsx": "^0.16.1",
     "underscore": "^1.12.0"
   },
   "devDependencies": {
@@ -24,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b12f271460ef3686face095e875aa38e8ddc4c7f"
+  "gitHead": "ddef9fbc34afc7b57c59a31e9ed4f56818dc4c31"
 }

package/src/consts.ts

@@ -1,17 +0,0 @@
-/*
- * @Author: 孙浩林 sunhaolin@steedos.com
- * @Date: 2023-07-10 13:54:16
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-07-10 13:59:34
- * @Description: 
- */
-
-// 加载元数据文件时给的默认权限
-export const METADATA_SYSTEM_PERMISSION = {
-    is_system: true,
-    record_permissions: {
-        allowEdit: false,
-        allowDelete: false,
-        allowRead: true,
-    }
-}

package/src/importLoader/index.ts

@@ -1,36 +0,0 @@
-/*
- * @Author: 孙浩林 sunhaolin@steedos.com
- * @Date: 2023-07-10 13:49:21
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-07-10 14:05:05
- * @FilePath: /project-template/Users/sunhaolin/Documents/GitHub/steedos-platform-2.3/services/service-package-loader/src/importLoader/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
-import { LoadImportFile } from '@steedos/metadata-core'
-import { registerImport } from '@steedos/metadata-registrar'
-import path = require('path');
-import _ = require('lodash');
-import { Import } from './types';
-import { METADATA_SYSTEM_PERMISSION } from '../consts';
-
-const loadImportFile = new LoadImportFile();
-
-export async function load(broker: any, packagePath: string, packageServiceName: string) {
-    let filePath = path.join(packagePath, "**");
-    const metadatasJSON = loadImportFile.load(filePath);
-    if (_.isEmpty(metadatasJSON)) {
-        return;
-    }
-
-    // 注册到元数据中心
-    const data = [];
-    for (const apiName in metadatasJSON) {
-        const doc: Import = metadatasJSON[apiName];
-        data.push(Object.assign(doc, METADATA_SYSTEM_PERMISSION));
-    }
-    if (data.length > 0) {
-        await registerImport.mregister(broker, packageServiceName, data)
-    }
-
-}

package/src/importLoader/types/import.ts

@@ -1,26 +0,0 @@
-/*
- * @Author: 孙浩林 sunhaolin@steedos.com
- * @Date: 2023-07-10 13:50:03
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-07-10 15:06:59
- * @Description: 
- */
-
-type FieldMapping = {
-    header: string,               // 表头
-    api_name?: string,            // 导入对象的字段
-    matched_by?: string,          // 关联对象的key
-    save_key_while_fail?: boolean // 关联失败时保存key
-}
-
-export type Import = {
-    name: string,                              // API Name
-    description?: string,                      // 导入描述
-    object_name: string,                       // 导入对象
-    encoding?: string,                         // 字符代码 UTF8
-    value_separator?: string,                  // 值分隔符 ','
-    operation: 'insert' | 'update' | 'upsert', // 导入操作
-    field_mappings: [FieldMapping],            // 映射关系
-    external_id_name?: string,                 // 表示数据唯一性字段(重复执行导入时根据此字段更新记录)
-}
-

package/src/importLoader/types/index.ts

@@ -1 +0,0 @@
-export * from './import';

package/src/index.ts

@@ -1,12 +0,0 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2022-05-14 10:16:03
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-07-10 14:02:11
- * @Description: 
- */
-export * as triggerLoader from "./triggerLoader"
-export * as processLoader from "./processLoader"
-export * as processTriggerLoader from "./processTriggerLoader"
-export * as triggerYmlLoader from './loader/triggerYmlLoader';
-export * as importLoader from './importLoader'

package/src/loader/triggerYmlLoader.ts

@@ -1,57 +0,0 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2023-04-25 16:52:28
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-18 09:27:20
- * @Description: 
- */
-
-import { LoadTriggerFile } from '@steedos/metadata-core'
-import path = require('path');
-import _ = require('lodash');
-
-const loadTriggerFile = new LoadTriggerFile();
-function isPatternTrigger(data){
-    const {listenTo} = data;
-    if(listenTo === '*'){
-        return true;
-    }else if(_.isArray(listenTo)){
-        return true;
-    }else if(_.isRegExp(listenTo)){
-        return true;
-    }else if(_.isString(listenTo) && listenTo.startsWith("/")){
-        try {
-            if(_.isRegExp(eval(listenTo))){
-                return true;
-            }
-        } catch (error) {
-            return false
-        }
-        return false;
-    }
-    return false;
-}
-export async function load(broker: any, packagePath: string, packageServiceName: string) {
-    let filePath = path.join(packagePath, "**");
-    let triggers: any = loadTriggerFile.load(filePath);
-    if (_.isEmpty(triggers)) {
-        return;
-    }
-    for (const apiName in triggers) {
-        const trigger = triggers[apiName];
-        if(isPatternTrigger(trigger)){
-            trigger.isPattern = true
-        }
-        await broker.call(`object_triggers.add`, { apiName: `${trigger.listenTo}.${trigger.name}`, data: trigger }, {
-            meta: {
-            metadataServiceName: packageServiceName,
-            caller: {
-                nodeID: broker.nodeID,
-                service: {
-                    name: packageServiceName,
-                }
-            }
-        }});
-        broker.broadcast('metadata.object_triggers.change', {apiName: `${trigger.listenTo}.${trigger.name}`, listenTo: trigger.listenTo})
-    }
-}

package/src/processLoader/index.ts

@@ -1,115 +0,0 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2022-03-30 11:49:53
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-30 09:33:01
- * @Description: 
- */
-import * as _ from "underscore";
-import * as path from "path";
-import { Process } from "./types";
-import { LoadProcessFile } from '@steedos/metadata-core';
-import { registerProcess } from '@steedos/metadata-registrar';
-const loadProcessFile = new LoadProcessFile();
-
-function getObject(objectName: string) {
-    try {
-        const objectql = require('@steedos/objectql');
-        return objectql.getObject(objectName);
-    } catch (error) {
-        return null
-    }
-}
-
-export async function load(broker: any, packagePath: string, packageServiceName: string) {
-    let filePath = path.join(packagePath, "**");
-    let processes = loadProcessFile.load(filePath);
-    if (_.isEmpty(processes)) {
-        return;
-    }
-
-    const data = [];
-    for (const apiName in processes) {
-        const process: Process = processes[apiName];
-        data.push(Object.assign(process, {
-            is_system: true,
-            record_permissions: {
-                allowEdit: false,
-                allowDelete: false,
-                allowRead: true,
-            }
-        }));
-
-    }
-    if (data.length > 0) {
-        await registerProcess.mregister(broker, packageServiceName, data)
-    }
-
-}
-
-// 软件包中的process元数据直接加载到库中
-export async function sendPackageProcessToDb(packagePath: string) {
-    let filePath = path.join(packagePath, "**");
-    let processes = loadProcessFile.load(filePath);
-
-    if (_.isEmpty(processes)) {
-        return;
-    }
-
-    const processObj = getObject('process');
-    const processVersionsObj = getObject('process_versions');
-    const spaceObj = getObject('spaces');
-    if(!processObj || !processVersionsObj || !spaceObj){
-        return ;
-    }
-    const spaceDoc = (await spaceObj.find({}))[0];
-    // 如果没有工作区信息则说明为空库，不加载
-    if (!spaceDoc) {
-        return;
-    }
-    const now = new Date();
-    const ownerId = spaceDoc.owner;
-    const baseInfo = {
-        space: spaceDoc._id,
-        owner: ownerId,
-        created: now,
-        modified: now,
-        created_by: ownerId,
-        modified_by: ownerId,
-    }
-    for (const apiName in processes) {
-        const processCount = await processObj.count({ filters: [['name', '=', apiName]] });
-        if (processCount > 0) {
-            console.log(`process ${apiName} already exists`);
-            continue;
-        }
-        const process: Process = processes[apiName];
-        const processId = await processObj._makeNewID();
-        let processDoc = {
-            _id: processId,
-            name: process.name,
-            label: process.label,
-            object_name: process.object_name,
-            engine: process.engine,
-            is_active: false,
-            description: process.description || '',
-            entry_criteria: process.entry_criteria || '',
-            when: process.when || '',
-            ext: process.ext || '',
-            ...baseInfo
-        };
-        let processVersionDoc = {
-            process: processId,
-            is_active: false,
-            description: process.description || '',
-            entry_criteria: process.entry_criteria || '',
-            when: process.when || '',
-            schema: process.schema || '',
-            version: 1,
-            ...baseInfo
-        };
-        await processObj.directInsert(processDoc);
-        await processVersionsObj.directInsert(processVersionDoc);
-    }
-
-}

package/src/processLoader/types/index.ts

@@ -1 +0,0 @@
-export * from './process';

package/src/processLoader/types/process.ts

@@ -1,19 +0,0 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2022-03-30 11:49:53
- * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-03-30 21:24:32
- * @Description: Process 元数据格式
- */
-export type Process = {
-    name: string,
-    label: string,
-    object_name: string,
-    engine: string,
-    is_active?: boolean,
-    description?: string,
-    entry_criteria: string,
-    when: 'afterInsert' | 'afterUpdate',
-    schema?: string,
-    ext: string
-}

package/src/processTriggerLoader/index.ts

@@ -1,45 +0,0 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2022-05-16 11:55:06
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-30 09:47:15
- * @Description: 
- */
-import * as _ from "underscore";
-import * as path from "path";
-import { getMD5, JSONStringify } from '@steedos/metadata-core';
-import { Trigger } from "./types";
-import { registerProcessTrigger, loadProcessTriggers } from "@steedos/metadata-registrar";
-
-const ENUM_WHEN = ['beforeDraftInsert', 'afterDraftInsert', 'beforeDraftSubmit', 'afterDraftSubmit', 'beforeStepSubmit', 'afterStepSubmit', 'cacluateNextStepUsers',
-    'beforeCancel', 'afterCancel', 'beforeTerminate', 'afterTerminate', 'beforeEnd', 'afterEnd'];
-const LISTENTO_ALL_FLOWS = 'LISTENTO_ALL_FLOWS';
-
-export async function load(broker: any, packagePath: string, packageServiceName: string) {
-    let filePath = path.join(packagePath, "**");
-    let wTriggers = loadProcessTriggers(filePath);
-    if (_.isEmpty(wTriggers)) {
-        return;
-    }
-    for (const wt of wTriggers) {
-
-        if (_.isString(wt.listenTo)) {
-            for (const when of ENUM_WHEN) {
-                let handler = wt[when];
-                if (!handler) {
-                    continue;
-                }
-                let name = wt.name || getMD5(JSONStringify(wt));
-                let config: Trigger = {
-                    name: name,
-                    "listenTo": wt.listenTo == '*' ? LISTENTO_ALL_FLOWS : wt.listenTo,
-                    "when": when,
-                    "handler": handler.toString()
-                }
-                await registerProcessTrigger.register(broker, packageServiceName, config);
-            }
-
-        }
-    }
-
-}

package/src/processTriggerLoader/types/index.ts

@@ -1 +0,0 @@
-export * from './trigger';

package/src/processTriggerLoader/types/trigger.ts

@@ -1,6 +0,0 @@
-export type Trigger = {
-    name: string,
-    listenTo: string,
-    when: string | string[],
-    handler: Function
-}

package/src/triggerLoader/index.ts

@@ -1,153 +0,0 @@
-/*
- * @Author: sunhaolin@hotoa.com
- * @Date: 2022-06-12 19:08:48
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-30 09:52:23
- * @Description: 加载*.trigger.js文件注册为新版action trigger
- */
-import * as _ from "underscore";
-import * as path from "path";
-import { JSONStringify, getMD5 } from "@steedos/metadata-core";
-import { loadObjectTriggers } from "@steedos/metadata-registrar";
-
-
-
-const TRIGGERKEYS = ['beforeFind', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterFind', 'afterInsert', 'afterUpdate', 'afterDelete', 'afterFindOne', 'afterCount']
-
-function getObject(objectName: string) {
-    try {
-        const objectql = require('@steedos/objectql');
-        return objectql.getObject(objectName);
-    } catch (error) {
-        return null
-    }
-}
-
-export async function load(broker: any, packagePath: string, packageServiceName: string) {
-    let actions = {};
-    let serviceName = `~triggers-${packageServiceName}`;
-    let filePath = path.join(packagePath, "**");
-    let objTriggers = loadObjectTriggers(filePath, packageServiceName);
-    if (_.isEmpty(objTriggers)) {
-        return;
-    }
-    /** objTriggers格式
-    [
-        {
-            beforeInsert: [AsyncFunction: beforeInsert],
-            beforeUpdate: [AsyncFunction: beforeUpdate],
-            beforeDelete: [AsyncFunction: beforeDelete],
-            afterInsert: [AsyncFunction: afterInsert],
-            afterUpdate: [AsyncFunction: afterUpdate],
-            afterDelete: [AsyncFunction: afterDelete],
-            metadataServiceName: '~packages-my-steedos-package',
-            listenTo: 'company'
-        }
-    ]
-     */
-    for (const trigger of objTriggers) {
-        // 转换为action trigger
-        /** action trigger 格式
-        spaceUsersBeforeUpdate: {
-            trigger: { 
-                listenTo: 'space_users', 
-                when: ['beforeInsert', 'beforeUpdate']
-            },
-            async handler(ctx) {
-                this.broker.logger.debug('spaceUsersBeforeUpdate', ctx)
-            }   
-        }
-         */
-        const actionTriggerName = getMD5(JSONStringify(trigger));
-        actions[actionTriggerName] = generateActionTrigger(trigger)
-    
-        broker.emit('trigger.loaded', {
-            objectName: trigger['listenTo']
-        })
-    }
-
-    let serviceConfig = {
-        name: serviceName,
-        actions: actions
-    };
-    let service = broker.createService(serviceConfig);
-    if (!broker.started) {
-        await broker._restartService(service)
-    }
-
-}
-
-// 生成action trigger
-function generateActionTrigger(trigger) {
-    const when = [];
-    for (const key in trigger) {
-        if (Object.hasOwnProperty.call(trigger, key)) {
-            if (_.contains(TRIGGERKEYS, key)) {
-                when.push(key);
-            }
-        }
-    }
-    const actionTrigger = {
-        trigger: {
-            listenTo: trigger.listenTo,
-            when: when
-        },
-        async handler(ctx) {
-            // 调用trigger.js的处理函数
-            const {
-                isInsert, isUpdate, isDelete, isFind, isBefore, isAfter, isFindOne, isCount,
-                id, doc, previousDoc,
-                // size, 
-                userId, spaceId, objectName, query, data }: any = ctx.params;
-
-            const context: any = {
-                id,
-                userId,
-                spaceId,
-                doc,
-                previousDoc,
-                query,
-                data,
-                objectName
-            }
-
-            let when = ''
-            if (isBefore) {
-                if (isFind) {
-                    when = 'beforeFind'
-                } else if (isInsert) {
-                    when = 'beforeInsert'
-                } else if (isUpdate) {
-                    when = 'beforeUpdate'
-                } else if (isDelete) {
-                    when = 'beforeDelete'
-                }
-            }
-            else if (isAfter) {
-                if (isFind) {
-                    when = 'afterFind'
-                } else if (isInsert) {
-                    when = 'afterInsert'
-                } else if (isUpdate) {
-                    when = 'afterUpdate'
-                } else if (isDelete) {
-                    when = 'afterDelete'
-                } else if (isFindOne) {
-                    when = 'afterFindOne'
-                } else if (isCount) {
-                    when = 'afterCount'
-                }
-            }
-
-            if (when) {
-                const object = getObject(objectName);
-                if(!object){
-                    return ;
-                }
-                await object.runTriggers(when, context);
-                return context;
-            }
-        }
-    };
-    return actionTrigger;
-}

package/tsconfig.json

@@ -1,34 +0,0 @@
-{   
-    "compilerOptions": {
-        "outDir": "./lib",
-        "target": "es6",
-        "module": "commonjs",
-        "moduleResolution": "node",
-        "importHelpers": true,
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "sourceMap": true,
-        "noImplicitAny": false,
-        "declaration": true,
-        "noFallthroughCasesInSwitch": true,
-        //"noImplicitReturns": true,
-        "stripInternal": true,
-        "pretty": true,
-        "strictNullChecks": false,
-        "noUnusedLocals": true,
-        "downlevelIteration": true,
-        "skipLibCheck": true,
-        "lib": [
-          "es5",
-          "es6",
-          "es2015",
-          "es2016",
-          "es2017",
-          "esnext"
-        ],
-        "removeComments": true
-    },
-    "include": [
-      "./src/**/*"
-    ]
-  }