@steedos/service-package-loader 2.4.0-beta.8 → 2.4.1

package/index.js

@@ -1,16 +1,18 @@
 "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 sendPackageFlowToDb = require('./lib/loadPackageFlow').sendPackageFlowToDb;
 const path = require('path');
 const _ = require('lodash');
 const express = require('express');
 const fs = require("fs");
 const metaDataCore = require('@steedos/metadata-core');
+const loadFlowFile = new metaDataCore.LoadFlowFile();
+
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  */
@@ -62,6 +64,80 @@ module.exports = {
      * Methods
      */
     methods: {
+
+        sendPackageFlowToDb: async function(packagePath, name) {
+            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);
+                } catch (error) {
+                    console.error(`importFlow error`, flowFilePath, error)
+                }
+            }
+        },
+
+        importFlow: async function(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;
             if (!packageInfo) {
@@ -71,7 +147,7 @@ module.exports = {
 
             this.loadPackagePublicFiles(_path);
             if(_path){
-                sendPackageFlowToDb(this.broker, _path)
+                this.sendPackageFlowToDb(_path)
                 processLoader.sendPackageProcessToDb(_path);
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-loader",
-  "version": "2.4.0-beta.8",
+  "version": "2.4.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -10,10 +10,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@steedos/core": "2.4.0-beta.8",
-    "@steedos/metadata-core": "2.4.0-beta.8",
-    "@steedos/objectql": "2.4.0-beta.8",
-    "@steedos/router": "2.4.0-beta.8",
+    "@steedos/core": "2.4.1",
+    "@steedos/metadata-core": "2.4.1",
+    "@steedos/objectql": "2.4.1",
+    "@steedos/router": "2.4.1",
     "clone": "^2.1.2",
     "moleculer": "^0.14.25",
     "underscore": "^1.12.0"
@@ -25,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "61fe4ff720d68127dadcd728b9bc465b62c38855"
+  "gitHead": "ae77c1ed63399245141bf7237cd3966bfc4dc6b1"
 }

package/lib/loadPackageFlow.d.ts

@@ -1 +0,0 @@
-export declare const sendPackageFlowToDb: (broker: any, packagePath: string, name: string) => Promise<void>;

package/lib/loadPackageFlow.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendPackageFlowToDb = void 0;
-const tslib_1 = require("tslib");
-const metadata_core_1 = require("@steedos/metadata-core");
-const loadFlowFile = new metadata_core_1.LoadFlowFile();
-const path = require('path');
-const sendPackageFlowToDb = (broker, packagePath, name) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const flows = loadFlowFile.load(path.join(packagePath, '**'));
-    for (const apiName in flows) {
-        const flow = flows[apiName];
-        const flowFilePath = flow.__filename;
-        delete flow.__filename;
-        try {
-            yield broker.call('steedos-server.importFlow', { flow: flow }, { meta: { name: name } });
-        }
-        catch (error) {
-            console.error(`importFlow error`, flowFilePath, error);
-        }
-    }
-});
-exports.sendPackageFlowToDb = sendPackageFlowToDb;
-//# sourceMappingURL=loadPackageFlow.js.map

package/lib/loadPackageFlow.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"loadPackageFlow.js","sourceRoot":"","sources":["../src/loadPackageFlow.ts"],"names":[],"mappings":";;;;AAAA,0DAAsD;AACtD,MAAM,YAAY,GAAG,IAAI,4BAAY,EAAE,CAAC;AACxC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAEtB,MAAM,mBAAmB,GAAG,CAAO,MAAM,EAAE,WAAmB,EAAE,IAAY,EAAC,EAAE;IAClF,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;IAC9D,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE;QACzB,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC;QACrC,OAAO,IAAI,CAAC,UAAU,CAAC;QACvB,IAAI;YACA,MAAM,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,IAAI,EAAC,EAAC,CAAC,CAAA;SACrF;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;SACzD;KACJ;AACL,CAAC,CAAA,CAAA;AAZY,QAAA,mBAAmB,uBAY/B"}

package/src/loadPackageFlow.ts

@@ -1,17 +0,0 @@
-import { LoadFlowFile } from '@steedos/metadata-core';
-const loadFlowFile = new LoadFlowFile();
-const path = require('path');
-
-export const sendPackageFlowToDb = async (broker, packagePath: string, name: string)=>{
-    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 broker.call('steedos-server.importFlow', {flow: flow}, {meta: {name: name}})
-        } catch (error) {
-            console.error(`importFlow error`, flowFilePath, error)
-        }
-    }
-}