@steedos/service-package-loader 2.5.3-beta.1 → 2.5.3-beta.2

package/index.js

@@ -1,14 +1,17 @@
 "use strict";
 
+const objectql = require('@steedos/objectql');
+const Future = require('fibers/future');
+const core = require('@steedos/core');
 const triggerLoader = require('./lib').triggerLoader;
 const processLoader = require('./lib').processLoader;
 const processTriggerLoader = require('./lib').processTriggerLoader;
 const triggerYmlLoader = require('./lib').triggerYmlLoader;
 const path = require('path');
 const _ = require('lodash');
+const express = require('express');
 const fs = require("fs");
 const metaDataCore = require('@steedos/metadata-core');
-const { registerMetadataConfigs, loadStandardMetadata, loadRouters } = require('@steedos/metadata-registrar');
 const loadFlowFile = new metaDataCore.LoadFlowFile();
 
 /**
@@ -64,47 +67,7 @@ module.exports = {
      * Methods
      */
     methods: {
-        checkPackageMetadataFiles: async function (packagePath) {
 
-            if(this.core){
-                return ;
-            }
-
-            let publicPath = path.join(packagePath, 'public');
-            if (this.settings.packageInfo.loadPublicFolder && fs.existsSync(publicPath)) {
-                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"),
-                "!" + path.join(packagePath, "node_modules"),
-            ]
-            const matchedPaths2 = metaDataCore.syncMatchFiles(filePatten2);
-            for await (const filePath of matchedPaths2) {
-                this.broker.logger.warn(`The object.js file has been deprecated. ${filePath}`); 
-            }
-
-            // 扫描软件包中的元数据, 如果有 .router.js 文件, 则输出警告信息
-            const filePatten3 = [
-                path.join(packagePath, "**", "*.router.js"),
-                "!" + path.join(packagePath, "node_modules"),
-            ]
-            const matchedPaths3 = metaDataCore.syncMatchFiles(filePatten3);
-            for await (const filePath of matchedPaths3) {
-                this.broker.logger.warn(`The router.js file has been deprecated. ${filePath}`); 
-            }
-        },
         sendPackageFlowToDb: async function(packagePath, name) {
             const flows = loadFlowFile.load(path.join(packagePath, '**'));
             for (const apiName in flows) {
@@ -120,7 +83,63 @@ module.exports = {
         },
 
         importFlow: async function(flow, name) {
-            return await this.broker.call('steedos-server.importFlow', {flow, name});
+            await Future.task(() => {
+                try {
+                    try {
+                        if(!db){
+                            return
+                        }
+                        if(!steedosImport){
+                            return
+                        }
+                    } catch (error) {
+                        return ;
+                    }
+                    
+                    if(db && db.flows && steedosImport){
+                        const steedosConfig = objectql.getSteedosConfig();
+                        let space;
+                        if(steedosConfig && steedosConfig.tenant && steedosConfig.tenant._id){
+                            space = db.spaces.findOne(steedosConfig.tenant._id)
+                        }
+                        if(!space){
+                            space = db.spaces.findOne()
+                        }
+                        if(!space){
+                            this.logger.debug(`import flow ${flow.name} fail. not find space in db`);
+                            return ;
+                        }
+                        if(!flow.api_name){
+                            this.logger.warn(`not find api_name in file`);
+                            return ;
+                        }
+                        const dbFlow = db.flows.findOne({api_name: flow.api_name});
+                        if(!dbFlow){
+                            if(flow && flow.current){
+                                if(!_.has(flow.current,'fields')){
+                                    flow.current.fields = [];
+                                }
+                            }
+                            this.logger.info(`insert flow ${flow.api_name} from ${name}`);
+
+                            let company_id = null;
+                            if(flow.company_id){
+                                let count = Creator.getCollection("company").find({ _id: flow.company_id, space: space._id }).count();
+                                if(count > 0){
+                                    company_id = flow.company_id
+                                }
+                            }
+
+                            return steedosImport.workflow(space.owner, space._id, flow, flow.state == 'enabled' ? true : false, company_id);
+                        }
+                        this.logger.debug(`not import flow. find flow `, dbFlow._id)
+                    }
+
+                } catch (error) {
+                    this.logger.error(error)
+                }
+            }).promise();
+            
         }, 
         loadDataOnServiceStarted: async function(){
             let packageInfo = this.settings.packageInfo;
@@ -137,23 +156,43 @@ module.exports = {
         },
         loadPackageMetadataFiles: async function (packagePath, name, datasourceName) {
             this.broker.logger.debug(`Loading package from ${packagePath}`)
-            packagePath = path.join(packagePath, '**');
             if (!datasourceName) {
                 datasourceName = 'default';
             }
-            if(this.objectql){
-                await this.initDataSource(packagePath, datasourceName);
-                await loadStandardMetadata(name, datasourceName);
+            objectql.getSteedosSchema(this.broker);
+            packagePath = path.join(packagePath, '**');
+            const datasource = objectql.getDataSource(datasourceName);
+            if(datasource){
+                await datasource.init();
             }
-            await registerMetadataConfigs(packagePath, datasourceName, name);
+            await objectql.loadStandardMetadata(name, datasourceName);
+            await objectql.addAllConfigFiles(packagePath, datasourceName, name);
             await triggerLoader.load(this.broker, packagePath, name);
             await processTriggerLoader.load(this.broker, packagePath, name);
             await triggerYmlLoader.load(this.broker, packagePath, name);
-            if(this.core){
-                this.core.loadClientScripts();
-                const routersInfo = await this.loadPackageRouters(packagePath, name);
-                await this.broker.call(`@steedos/service-packages.setPackageRoutersInfo`, {packageName: name, data: routersInfo});
+            core.loadClientScripts();
+            let routersData = objectql.loadRouters(packagePath);
+            let oldRoutersInfo = await this.broker.call(`@steedos/service-packages.getPackageRoutersInfo`, {packageName: name})
+            let routersInfo = _.flattenDeep(_.map(routersData, 'infoList'));
+            if(oldRoutersInfo){
+                _.each(oldRoutersInfo.metadata, (info)=>{
+                    const _info = _.find(routersInfo, (item)=>{
+                        return item.path == info.path && JSON.stringify(item.methods) == JSON.stringify(info.methods) && item.md5 == info.md5
+                    })
+                    if(!_info){
+                        core.removeRouter(info.path, info.methods)
+                    }
+                })
             }
+            const _routers = [];
+            routersData.forEach(element => {
+                // if(element.router.default === require('@steedos/router').staticRouter()){
+                //     objectql.broker.broker.logger.warn(`router error, packagePath: ${packagePath} `);
+                // }
+                _routers.push(element)
+            });
+            core.loadRouters(_routers);
+            await this.broker.call(`@steedos/service-packages.setPackageRoutersInfo`, {packageName: name, data: routersInfo});
             await this.broker.emit(`translations.object.change`, {});
             return;
         },
@@ -165,8 +204,7 @@ module.exports = {
             const matchedPaths = metaDataCore.syncMatchFiles(filePatten);
             for await (const serviceFilePath of matchedPaths) {
                 try {
-                    metaDataCore.clearRequireCache(serviceFilePath);
-                    const service = this.broker.loadService(serviceFilePath);
+                    const service = objectql.loadService(this.broker, serviceFilePath);
                     this.packageServices.push(service);
                     if (!this.broker.started) {
                         this.broker._restartService(service)
@@ -190,24 +228,19 @@ module.exports = {
                     return
                 }
 
+                this.settings.loadedPackagePublicFiles = true;
                 try {
-                    const express = require('express');
-                    this.settings.loadedPackagePublicFiles = true;
-                    try {
-                        const router = require('@steedos/router').staticRouter();
-                        let routerPath = "";
-                        if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
-                            routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
-                        }
-                        const cacheTime = 86400000 * 1; // one day
-                        router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
-                        // WebApp.connectHandlers.use(router);
-                    } catch (error) {
-                        console.error(error)
-                        this.settings.loadedPackagePublicFiles = false;
+                    const router = require('@steedos/router').staticRouter();
+                    let routerPath = "";
+                    if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
+                        routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
                     }
+                    const cacheTime = 86400000 * 1; // one day
+                    router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
+                    // WebApp.connectHandlers.use(router);
                 } catch (error) {
-                        
+                    console.error(error)
+                    this.settings.loadedPackagePublicFiles = false;
                 }
             }
         },
@@ -219,9 +252,6 @@ module.exports = {
             return await this.broker.destroyService(this);
         },
         async onStarted(){
-
-            this.checkPackageMetadataFiles(this.settings.packageInfo.path)
-
             if(this.beforeStart){
                 try {
                     await this.beforeStart()
@@ -248,7 +278,7 @@ module.exports = {
             await this.loadPackageMetadataFiles(_path, this.name, datasource);
             if(isPackage !== false){
                 try {
-                    const _packageInfo = metaDataCore.loadJSONFile(path.join(_path, 'package.json'));
+                    const _packageInfo = objectql.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}})
                 } catch (error) {
                     
@@ -267,35 +297,6 @@ module.exports = {
                     this.broker.logger.error(`[${this.name}]: ${error.message}`);
                 }
             }
-        },
-        async loadPackageRouters(packagePath, name){
-            let routersData = loadRouters(packagePath);
-            let oldRoutersInfo = await this.broker.call(`@steedos/service-packages.getPackageRoutersInfo`, {packageName: name})
-            let routersInfo = _.flattenDeep(_.map(routersData, 'infoList'));
-            if(oldRoutersInfo){
-                _.each(oldRoutersInfo.metadata, (info)=>{
-                    const _info = _.find(routersInfo, (item)=>{
-                        return item.path == info.path && JSON.stringify(item.methods) == JSON.stringify(info.methods) && item.md5 == info.md5
-                    })
-                    if(!_info){
-                        this.core.removeRouter(info.path, info.methods)
-                    }
-                })
-            }
-            const _routers = [];
-            routersData.forEach(element => {
-                _routers.push(element)
-            });
-            this.core.loadRouters(_routers);
-            return routersInfo
-        },
-        async initDataSource(packagePath, datasourceName){
-            this.objectql.getSteedosSchema(this.broker);
-            packagePath = path.join(packagePath, '**');
-            const datasource = this.objectql.getDataSource(datasourceName);
-            if(datasource){
-                await datasource.init();
-            }
         }
     },
 
@@ -303,23 +304,8 @@ module.exports = {
      * Service created lifecycle event handler
      */
     created() {
-        if(!global.broker){
-            global.broker = this.broker;
-        }
         this.packageServices = [];  //此属性不能放到settings下，否则会导致mo clone settings 时 内存溢出。
         this.logger.debug('service package loader created!!!');
-        
-        try {
-            this.core = require('@steedos/core');
-        } catch (e) {
-            
-        }
-
-        try {
-            this.objectql = require('@steedos/objectql');
-        } catch (e) {
-            
-        }
     },
 
     merged(schema) {
@@ -358,16 +344,15 @@ module.exports = {
             }
         };
 
-        if(this.core){
-            let oldRoutersInfo = await this.broker.call(`@steedos/service-packages.getPackageRoutersInfo`, {packageName: this.name})
-            if(oldRoutersInfo){
-                _.each(oldRoutersInfo.metadata, (info)=>{
-                    this.core.removeRouter(info.path, info.methods)
-                })
-            }
-            await this.core.deletePackageClientScripts(this.name);
-            await this.core.loadClientScripts();
+        let oldRoutersInfo = await this.broker.call(`@steedos/service-packages.getPackageRoutersInfo`, {packageName: this.name})
+        if(oldRoutersInfo){
+            _.each(oldRoutersInfo.metadata, (info)=>{
+                core.removeRouter(info.path, info.methods)
+            })
         }
+
+        objectql.deletePackageClientScripts(this.name);
+        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: [{
             name: this.name,

package/lib/processLoader/index.js

@@ -4,18 +4,9 @@ exports.sendPackageProcessToDb = exports.load = void 0;
 const tslib_1 = require("tslib");
 const _ = require("underscore");
 const path = require("path");
+const objectql_1 = require("@steedos/objectql");
 const metadata_core_1 = require("@steedos/metadata-core");
-const metadata_registrar_1 = require("@steedos/metadata-registrar");
 const loadProcessFile = new metadata_core_1.LoadProcessFile();
-function getObject(objectName) {
-    try {
-        const objectql = require('@steedos/objectql');
-        return objectql.getObject(objectName);
-    }
-    catch (error) {
-        return null;
-    }
-}
 function load(broker, packagePath, packageServiceName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let filePath = path.join(packagePath, "**");
@@ -36,7 +27,7 @@ function load(broker, packagePath, packageServiceName) {
             }));
         }
         if (data.length > 0) {
-            yield metadata_registrar_1.registerProcess.mregister(broker, packageServiceName, data);
+            yield objectql_1.registerProcess.mregister(broker, packageServiceName, data);
         }
     });
 }
@@ -48,12 +39,9 @@ function sendPackageProcessToDb(packagePath) {
         if (_.isEmpty(processes)) {
             return;
         }
-        const processObj = getObject('process');
-        const processVersionsObj = getObject('process_versions');
-        const spaceObj = getObject('spaces');
-        if (!processObj || !processVersionsObj || !spaceObj) {
-            return;
-        }
+        const processObj = (0, objectql_1.getObject)('process');
+        const processVersionsObj = (0, objectql_1.getObject)('process_versions');
+        const spaceObj = (0, objectql_1.getObject)('spaces');
         const spaceDoc = (yield spaceObj.find({}))[0];
         if (!spaceDoc) {
             return;

package/lib/processLoader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/processLoader/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/processLoader/index.ts"],"names":[],"mappings":"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"}

package/lib/processTriggerLoader/index.js

@@ -4,15 +4,14 @@ exports.load = void 0;
 const tslib_1 = require("tslib");
 const _ = require("underscore");
 const path = require("path");
-const metadata_core_1 = require("@steedos/metadata-core");
-const metadata_registrar_1 = require("@steedos/metadata-registrar");
+const objectql_1 = require("@steedos/objectql");
 const ENUM_WHEN = ['beforeDraftInsert', 'afterDraftInsert', 'beforeDraftSubmit', 'afterDraftSubmit', 'beforeStepSubmit', 'afterStepSubmit', 'cacluateNextStepUsers',
     'beforeCancel', 'afterCancel', 'beforeTerminate', 'afterTerminate', 'beforeEnd', 'afterEnd'];
 const LISTENTO_ALL_FLOWS = 'LISTENTO_ALL_FLOWS';
 function load(broker, packagePath, packageServiceName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let filePath = path.join(packagePath, "**");
-        let wTriggers = (0, metadata_registrar_1.loadProcessTriggers)(filePath);
+        let wTriggers = (0, objectql_1.loadProcessTriggers)(filePath);
         if (_.isEmpty(wTriggers)) {
             return;
         }
@@ -23,14 +22,14 @@ function load(broker, packagePath, packageServiceName) {
                     if (!handler) {
                         continue;
                     }
-                    let name = wt.name || (0, metadata_core_1.getMD5)((0, metadata_core_1.JSONStringify)(wt));
+                    let name = wt.name || (0, objectql_1.getMD5)((0, objectql_1.JSONStringify)(wt));
                     let config = {
                         name: name,
                         "listenTo": wt.listenTo == '*' ? LISTENTO_ALL_FLOWS : wt.listenTo,
                         "when": when,
                         "handler": handler.toString()
                     };
-                    yield metadata_registrar_1.registerProcessTrigger.register(broker, packageServiceName, config);
+                    yield objectql_1.registerProcessTrigger.register(broker, packageServiceName, config);
                 }
             }
         }

package/lib/processTriggerLoader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/processTriggerLoader/index.ts"],"names":[],"mappings":";;;;AAOA,gCAAgC;AAChC,6BAA6B;AAC7B,0DAA+D;AAE/D,oEAA0F;AAE1F,MAAM,SAAS,GAAG,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,uBAAuB;IAC/J,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;AACjG,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QACnF,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,SAAS,GAAG,IAAA,wCAAmB,EAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACtB,OAAO;SACV;QACD,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE;YAExB,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;gBACzB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;oBAC1B,IAAI,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;oBACvB,IAAI,CAAC,OAAO,EAAE;wBACV,SAAS;qBACZ;oBACD,IAAI,IAAI,GAAG,EAAE,CAAC,IAAI,IAAI,IAAA,sBAAM,EAAC,IAAA,6BAAa,EAAC,EAAE,CAAC,CAAC,CAAC;oBAChD,IAAI,MAAM,GAAY;wBAClB,IAAI,EAAE,IAAI;wBACV,UAAU,EAAE,EAAE,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ;wBACjE,MAAM,EAAE,IAAI;wBACZ,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE;qBAChC,CAAA;oBACD,MAAM,2CAAsB,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;iBAC7E;aAEJ;SACJ;IAEL,CAAC;CAAA;AA3BD,oBA2BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/processTriggerLoader/index.ts"],"names":[],"mappings":";;;;AAAA,gCAAgC;AAChC,6BAA6B;AAC7B,gDAAuG;AAGvG,MAAM,SAAS,GAAG,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,uBAAuB;IAC/J,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;AACjG,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD,SAAsB,IAAI,CAAC,MAAW,EAAE,WAAmB,EAAE,kBAA0B;;QACnF,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC5C,IAAI,SAAS,GAAG,IAAA,8BAAmB,EAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YACtB,OAAO;SACV;QACD,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE;YAExB,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE;gBACzB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;oBAC1B,IAAI,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;oBACvB,IAAI,CAAC,OAAO,EAAE;wBACV,SAAS;qBACZ;oBACD,IAAI,IAAI,GAAG,EAAE,CAAC,IAAI,IAAI,IAAA,iBAAM,EAAC,IAAA,wBAAa,EAAC,EAAE,CAAC,CAAC,CAAC;oBAChD,IAAI,MAAM,GAAY;wBAClB,IAAI,EAAE,IAAI;wBACV,UAAU,EAAE,EAAE,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ;wBACjE,MAAM,EAAE,IAAI;wBACZ,SAAS,EAAE,OAAO,CAAC,QAAQ,EAAE;qBAChC,CAAA;oBACD,MAAM,iCAAsB,CAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;iBAC7E;aAEJ;SACJ;IAEL,CAAC;CAAA;AA3BD,oBA2BC"}

package/lib/triggerLoader/index.js

@@ -4,29 +4,19 @@ exports.load = void 0;
 const tslib_1 = require("tslib");
 const _ = require("underscore");
 const path = require("path");
-const metadata_core_1 = require("@steedos/metadata-core");
-const metadata_registrar_1 = require("@steedos/metadata-registrar");
+const objectql_1 = require("@steedos/objectql");
 const TRIGGERKEYS = ['beforeFind', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterFind', 'afterInsert', 'afterUpdate', 'afterDelete', 'afterFindOne', 'afterCount'];
-function getObject(objectName) {
-    try {
-        const objectql = require('@steedos/objectql');
-        return objectql.getObject(objectName);
-    }
-    catch (error) {
-        return null;
-    }
-}
 function load(broker, packagePath, packageServiceName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let actions = {};
         let serviceName = `~triggers-${packageServiceName}`;
         let filePath = path.join(packagePath, "**");
-        let objTriggers = (0, metadata_registrar_1.loadObjectTriggers)(filePath, packageServiceName);
+        let objTriggers = (0, objectql_1.loadObjectTriggers)(filePath, packageServiceName);
         if (_.isEmpty(objTriggers)) {
             return;
         }
         for (const trigger of objTriggers) {
-            const actionTriggerName = (0, metadata_core_1.getMD5)((0, metadata_core_1.JSONStringify)(trigger));
+            const actionTriggerName = (0, objectql_1.getMD5)((0, objectql_1.JSONStringify)(trigger));
             actions[actionTriggerName] = generateActionTrigger(trigger);
             broker.emit('trigger.loaded', {
                 objectName: trigger['listenTo']
@@ -106,10 +96,7 @@ function generateActionTrigger(trigger) {
                     }
                 }
                 if (when) {
-                    const object = getObject(objectName);
-                    if (!object) {
-                        return;
-                    }
+                    const object = (0, objectql_1.getObject)(objectName);
                     yield object.runTriggers(when, context);
                     return context;
                 }

package/lib/triggerLoader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/triggerLoader/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.5.3-beta.1",
+  "version": "2.5.3-beta.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,9 +10,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/metadata-core": "2.5.3-beta.1",
-    "@steedos/metadata-registrar": "2.5.3-beta.1",
-    "@steedos/router": "2.5.3-beta.1",
+    "@steedos/core": "2.5.3-beta.2",
+    "@steedos/metadata-core": "2.5.3-beta.2",
+    "@steedos/objectql": "2.5.3-beta.2",
+    "@steedos/router": "2.5.3-beta.2",
     "clone": "^2.1.2",
     "moleculer": "^0.14.25",
     "underscore": "^1.12.0"
@@ -24,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a2e723ed4256279e8e6fa9f67d7f607c83f8638f"
+  "gitHead": "321fe88aba6ddc3380a0d71eaa2e9a18186d49f8"
 }

package/src/processLoader/index.ts

@@ -1,26 +1,17 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-03-30 11:49:53
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-30 09:33:01
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2022-04-19 15:36:41
  * @Description: 
  */
 import * as _ from "underscore";
 import * as path from "path";
+import { registerProcess, getObject } from "@steedos/objectql";
 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);
@@ -59,9 +50,6 @@ export async function sendPackageProcessToDb(packagePath: string) {
     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) {

package/src/processTriggerLoader/index.ts

@@ -1,15 +1,7 @@
-/*
- * @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 { getMD5, JSONStringify, loadProcessTriggers, registerProcessTrigger } from "@steedos/objectql";
 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'];

package/src/triggerLoader/index.ts

@@ -1,28 +1,16 @@
 /*
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-06-12 19:08:48
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-30 09:52:23
+ * @LastEditors: sunhaolin@hotoa.com
+ * @LastEditTime: 2023-04-24 13:09:55
  * @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";
-
-
+import { getMD5, JSONStringify, TriggerActionParams, SteedosTriggerContextConfig, loadObjectTriggers, getObject } from "@steedos/objectql";
 
 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}`;
@@ -98,9 +86,9 @@ function generateActionTrigger(trigger) {
                 isInsert, isUpdate, isDelete, isFind, isBefore, isAfter, isFindOne, isCount,
                 id, doc, previousDoc,
                 // size, 
-                userId, spaceId, objectName, query, data }: any = ctx.params;
+                userId, spaceId, objectName, query, data }: TriggerActionParams = ctx.params;
 
-            const context: any = {
+            const context: SteedosTriggerContextConfig = {
                 id,
                 userId,
                 spaceId,
@@ -141,9 +129,6 @@ function generateActionTrigger(trigger) {
 
             if (when) {
                 const object = getObject(objectName);
-                if(!object){
-                    return ;
-                }
                 await object.runTriggers(when, context);
                 return context;
             }