@things-factory/integration-base 7.0.0-alpha.1 → 7.0.0-alpha.21

package/dist-server/engine/connector/oracle-connector.js

@@ -4,7 +4,7 @@ exports.OracleConnector = void 0;
 const env_1 = require("@things-factory/env");
 const connection_manager_1 = require("../connection-manager");
 try {
-    var Client = require('oracledb');
+    var oracledb = require('oracledb');
 }
 catch (err) {
     env_1.logger.error('oracledb module loading failed');
@@ -14,33 +14,108 @@ class OracleConnector {
         await Promise.all(connectionConfigs.map(this.connect));
         connection_manager_1.ConnectionManager.logger.info('oracle-connector connections are ready');
     }
+    async recreatePool(connection) {
+        const { name, endpoint, params: { user, password, database, poolMin, poolMax, poolIncrement }, domain } = connection;
+        if (!oracledb) {
+            throw new Error('oracledb module loading failed');
+        }
+        const poolAlias = `${domain.name}-${name}`;
+        await oracledb.getPool(poolAlias).close(10);
+        await oracledb.createPool({
+            user,
+            password,
+            // when oracle not using default port must add connection string with port like localhost:port
+            connectString: `${endpoint.trim()}/${database}`,
+            poolMin,
+            poolMax,
+            poolIncrement,
+            poolAlias
+        });
+        connection_manager_1.ConnectionManager.logger.info(`Oracle Database(${connection.name}:${database}) at ${endpoint} recreated.`);
+    }
     async connect(connection) {
-        const { endpoint, params: { user, password, database } } = connection;
-        if (!Client) {
+        const { name, endpoint, params: { user, password, database, poolMin, poolMax, poolIncrement }, domain } = connection;
+        if (!oracledb) {
             throw new Error('oracledb module loading failed');
         }
-        //when oracle not using default port must add connection string with port like localhsot:port
-        const client = await Client.getConnection({
+        const poolAlias = `${domain.name}-${name}`;
+        var enableStatistics = true;
+        const pool = await oracledb.createPool({
             user,
             password,
-            connectString: `${endpoint.trim()}/${database}`
+            // when oracle not using default port must add connection string with port like localhost:port
+            connectString: `${endpoint.trim()}/${database}`,
+            poolMin,
+            poolMax,
+            poolIncrement,
+            poolAlias,
+            enableStatistics
         });
         connection_manager_1.ConnectionManager.addConnectionInstance(connection, {
             query: async (query, params) => {
-                return (await client.execute(query, params, {
-                    outFormat: Client.OBJECT
-                })).rows;
+                let dbConnection = {};
+                let taskResult = {};
+                try {
+                    dbConnection = await oracledb.getConnection(poolAlias);
+                    taskResult = (await dbConnection.execute(query, params, {
+                        outFormat: oracledb.OBJECT
+                    })).rows;
+                }
+                catch (e) {
+                    if (e.name === 'Error' && e.message.includes('NJS-040')) {
+                        await this.recreatePool(connection);
+                    }
+                    throw e;
+                }
+                finally {
+                    await dbConnection.close();
+                }
+                return taskResult;
             },
             execute: async (procedure, params) => {
-                // TODO: need to check if this is available when procedure string is a common query.
-                procedure = `BEGIN
-          ${procedure}
-        END;`;
-                return await client.execute(procedure, params, {
-                    outFormat: Client.OBJECT
-                });
+                let dbConnection = {};
+                let taskResult = {};
+                try {
+                    // TODO: need to check if this is available when procedure string is a common query.
+                    procedure = `BEGIN
+            ${procedure}
+          END;`;
+                    dbConnection = await oracledb.getConnection(poolAlias);
+                    // console.log('\n************* stat after get ****************')
+                    // await oracledb.getPool(poolAlias).logStatistics()
+                    const result = await dbConnection.execute(procedure, params, {
+                        outFormat: oracledb.OBJECT
+                    });
+                    let paramKeys = Object.keys(params);
+                    for (const paramKey of paramKeys) {
+                        if (params[paramKey].dir === (oracledb === null || oracledb === void 0 ? void 0 : oracledb.BIND_OUT)) {
+                            if (params[paramKey].type === (oracledb === null || oracledb === void 0 ? void 0 : oracledb.CURSOR)) {
+                                const resultSetTemp = result.outBinds[paramKey];
+                                taskResult[paramKey] = await resultSetTemp.getRows();
+                                await resultSetTemp.close();
+                            }
+                            else {
+                                taskResult[paramKey] = result.outBinds[paramKey];
+                            }
+                        }
+                    }
+                }
+                catch (e) {
+                    if (e.name === 'Error' && e.message.includes('NJS-040')) {
+                        await this.recreatePool(connection);
+                    }
+                    throw e;
+                }
+                finally {
+                    await dbConnection.close();
+                    // console.log('\n************* stat after close ****************')
+                    // await oracledb.getPool(poolAlias).logStatistics()
+                }
+                return taskResult;
             },
-            close: client.close.bind(client)
+            close: async () => {
+                await oracledb.getPool(poolAlias).close(10);
+            }
         });
         connection_manager_1.ConnectionManager.logger.info(`Oracle Database(${connection.name}:${database}) at ${endpoint} connected.`);
     }
@@ -72,6 +147,27 @@ class OracleConnector {
                 name: 'database',
                 placeholder: 'SID',
                 label: 'database'
+            },
+            {
+                type: 'number',
+                name: 'poolMin',
+                placeholder: 'minimum connection-pool size',
+                label: 'pool-min',
+                value: 0
+            },
+            {
+                type: 'number',
+                name: 'poolMax',
+                placeholder: 'maximum connection-pool size',
+                label: 'pool-max',
+                value: 4
+            },
+            {
+                type: 'number',
+                name: 'poolIncrement',
+                placeholder: 'connection incremental size',
+                label: 'pool-increment',
+                value: 1
             }
         ];
     }

package/dist-server/engine/connector/oracle-connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"oracle-connector.js","sourceRoot":"","sources":["../../../server/engine/connector/oracle-connector.ts"],"names":[],"mappings":"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","sourcesContent":["import { logger } from '@things-factory/env'\n\nimport { ConnectionManager } from '../connection-manager'\nimport { Connector } from '../types'\nimport { InputConnection } from '../../service/connection/connection-type'\n\n\ntry {\n  var Client = require('oracledb')\n} catch (err) {\n  logger.error('oracledb module loading failed')\n}\n\nexport class OracleConnector implements Connector {\n  async ready(connectionConfigs: InputConnection[]) {\n    await Promise.all(connectionConfigs.map(this.connect))\n\n    ConnectionManager.logger.info('oracle-connector connections are ready')\n  }\n\n  async connect(connection: InputConnection) {\n    const {\n      endpoint,\n      params: { user, password, database }\n    } = connection\n\n    if (!Client) {\n      throw new Error('oracledb module loading failed')\n    }\n\n    //when oracle not using default port must add connection string with port like localhsot:port\n    const client = await Client.getConnection({\n      user,\n      password,\n      connectString: `${endpoint.trim()}/${database}`\n    })\n\n    ConnectionManager.addConnectionInstance(connection, {\n      query: async (query, params) => {\n        return (\n          await client.execute(query, params, {\n            outFormat: Client.OBJECT\n          })\n        ).rows\n      },\n      execute: async (procedure, params) => {\n        // TODO: need to check if this is available when procedure string is a common query.\n        procedure = `BEGIN\n          ${procedure}\n        END;`\n\n        return await client.execute(procedure, params, {\n          outFormat: Client.OBJECT\n        })\n      },\n      close: client.close.bind(client)\n    })\n\n    ConnectionManager.logger.info(`Oracle Database(${connection.name}:${database}) at ${endpoint} connected.`)\n  }\n\n  async disconnect(connection: InputConnection) {\n    var client = ConnectionManager.getConnectionInstance(connection)\n\n    try {\n      await client.close()\n      ConnectionManager.logger.info(`Oracle Database(${connection.name}) closed.`)\n    } catch (e) {\n      ConnectionManager.logger.error(e)\n    }\n\n    ConnectionManager.removeConnectionInstance(connection)\n  }\n\n  get parameterSpec() {\n    return [\n      {\n        type: 'string',\n        name: 'user',\n        label: 'user'\n      },\n      {\n        type: 'password',\n        name: 'password',\n        label: 'password'\n      },\n      {\n        type: 'string',\n        name: 'database',\n        placeholder: 'SID',\n        label: 'database'\n      }\n    ]\n  }\n\n  get taskPrefixes() {\n    return ['database', 'oracle']\n  }\n\n  get help() {\n    return 'integration/connector/oracle-connector'\n  }\n}\n\nConnectionManager.registerConnector('oracle-connector', new OracleConnector())\n\n// need reference:\n// https://download.oracle.com/otn_software/mac/instantclient/193000/instantclient-basiclite-macos.x64-19.3.0.0.0dbru.zip\n// https://node-oracledb.readthedocs.io/en/latest/index.html\n\n// docker pull store/oracle/database-instantclient:12.2.0.1\n"]}
+{"version":3,"file":"oracle-connector.js","sourceRoot":"","sources":["../../../server/engine/connector/oracle-connector.ts"],"names":[],"mappings":"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","sourcesContent":["import { logger } from '@things-factory/env'\n\nimport { ConnectionManager } from '../connection-manager'\nimport { Connector } from '../types'\nimport { InputConnection } from '../../service/connection/connection-type'\n\ntry {\n  var oracledb = require('oracledb')\n} catch (err) {\n  logger.error('oracledb module loading failed')\n}\n\nexport class OracleConnector implements Connector {\n  async ready(connectionConfigs: InputConnection[]) {\n    await Promise.all(connectionConfigs.map(this.connect))\n\n    ConnectionManager.logger.info('oracle-connector connections are ready')\n  }\n\n  async recreatePool(connection: InputConnection) {\n    const {\n      name,\n      endpoint,\n      params: { user, password, database, poolMin, poolMax, poolIncrement },\n      domain\n    } = connection\n\n    if (!oracledb) {\n      throw new Error('oracledb module loading failed')\n    }\n\n    const poolAlias = `${domain.name}-${name}`\n    await oracledb.getPool(poolAlias).close(10)\n    await oracledb.createPool({\n      user,\n      password,\n      // when oracle not using default port must add connection string with port like localhost:port\n      connectString: `${endpoint.trim()}/${database}`,\n      poolMin,\n      poolMax,\n      poolIncrement,\n      poolAlias\n    })\n\n    ConnectionManager.logger.info(`Oracle Database(${connection.name}:${database}) at ${endpoint} recreated.`)\n  }\n\n  async connect(connection: InputConnection) {\n    const {\n      name,\n      endpoint,\n      params: { user, password, database, poolMin, poolMax, poolIncrement },\n      domain\n    } = connection\n\n    if (!oracledb) {\n      throw new Error('oracledb module loading failed')\n    }\n\n    const poolAlias = `${domain.name}-${name}`\n\n    var enableStatistics = true\n    const pool = await oracledb.createPool({\n      user,\n      password,\n      // when oracle not using default port must add connection string with port like localhost:port\n      connectString: `${endpoint.trim()}/${database}`,\n      poolMin,\n      poolMax,\n      poolIncrement,\n      poolAlias,\n      enableStatistics\n    })\n    \n    ConnectionManager.addConnectionInstance(connection, {\n      query: async (query, params) => {\n        let dbConnection: any = {}\n        let taskResult: any = {}\n        try {\n          dbConnection = await oracledb.getConnection(poolAlias)\n\n          taskResult = (\n            await dbConnection.execute(query, params, {\n              outFormat: oracledb.OBJECT\n            })\n          ).rows\n        } catch (e) {\n          if (e.name === 'Error' && e.message.includes('NJS-040')) {\n            await this.recreatePool(connection)\n          }\n          throw e\n        }\n        finally {\n          await dbConnection.close()\n        }\n        return taskResult\n        \n      },\n      execute: async (procedure, params) => {\n        let dbConnection: any = {}\n        let taskResult: any = {}\n        try {\n          // TODO: need to check if this is available when procedure string is a common query.\n          procedure = `BEGIN\n            ${procedure}\n          END;`\n          dbConnection = await oracledb.getConnection(poolAlias)\n          \n          // console.log('\\n************* stat after get ****************')\n          // await oracledb.getPool(poolAlias).logStatistics()\n\n          const result = await dbConnection.execute(procedure, params, {\n            outFormat: oracledb.OBJECT\n          })\n\n          let paramKeys = Object.keys(params)\n\n          for (const paramKey of paramKeys) {\n            if (params[paramKey].dir === oracledb?.BIND_OUT) {\n              if (params[paramKey].type === oracledb?.CURSOR) {\n                const resultSetTemp = result.outBinds[paramKey]\n                taskResult[paramKey] = await resultSetTemp.getRows()\n                await resultSetTemp.close()\n              } else {\n                taskResult[paramKey] = result.outBinds[paramKey]\n              }\n            }\n          }\n        } catch (e) {\n          if (e.name === 'Error' && e.message.includes('NJS-040')) {\n            await this.recreatePool(connection)\n          }\n          throw e\n        }\n        finally {\n          await dbConnection.close()\n\n          // console.log('\\n************* stat after close ****************')\n          // await oracledb.getPool(poolAlias).logStatistics()\n        }\n        return taskResult\n      },\n      close: async () => {\n        await oracledb.getPool(poolAlias).close(10)\n      }\n    })\n\n    ConnectionManager.logger.info(`Oracle Database(${connection.name}:${database}) at ${endpoint} connected.`)\n  }\n\n  async disconnect(connection: InputConnection) {\n    var client = ConnectionManager.getConnectionInstance(connection)\n\n    try {\n      await client.close()\n      ConnectionManager.logger.info(`Oracle Database(${connection.name}) closed.`)\n    } catch (e) {\n      ConnectionManager.logger.error(e)\n    }\n\n    ConnectionManager.removeConnectionInstance(connection)\n  }\n\n  get parameterSpec() {\n    return [\n      {\n        type: 'string',\n        name: 'user',\n        label: 'user'\n      },\n      {\n        type: 'password',\n        name: 'password',\n        label: 'password'\n      },\n      {\n        type: 'string',\n        name: 'database',\n        placeholder: 'SID',\n        label: 'database'\n      },\n      {\n        type: 'number',\n        name: 'poolMin',\n        placeholder: 'minimum connection-pool size',\n        label: 'pool-min',\n        value: 0\n      },\n      {\n        type: 'number',\n        name: 'poolMax',\n        placeholder: 'maximum connection-pool size',\n        label: 'pool-max',\n        value: 4\n      },\n      {\n        type: 'number',\n        name: 'poolIncrement',\n        placeholder: 'connection incremental size',\n        label: 'pool-increment',\n        value: 1\n      }\n    ]\n  }\n\n  get taskPrefixes() {\n    return ['database', 'oracle']\n  }\n\n  get help() {\n    return 'integration/connector/oracle-connector'\n  }\n}\n\nConnectionManager.registerConnector('oracle-connector', new OracleConnector())\n\n// need reference:\n// https://download.oracle.com/otn_software/mac/instantclient/193000/instantclient-basiclite-macos.x64-19.3.0.0.0dbru.zip\n// https://node-oracledb.readthedocs.io/en/latest/index.html\n\n// docker pull store/oracle/database-instantclient:12.2.0.1\n"]}

package/dist-server/engine/connector/proxy-connector.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProxyConnector = void 0;
+const connection_manager_1 = require("../connection-manager");
+const edge_client_1 = require("../edge-client");
+/**
+ * This connector is a proxy connector installed on the edge server to manage connections from the host.
+ * It interacts with connections established on the edge server and provides synchronization functionality.
+ */
+class ProxyConnector {
+    async ready(connectionConfigs) {
+        await Promise.all(connectionConfigs.map(this.connect.bind(this)));
+        connection_manager_1.ConnectionManager.logger.info('proxy-connector connections are ready');
+    }
+    async connect(connection) {
+        // TODO 원래 커넥션과 에지설정을 참고하여, 에지 서버로 CONNECT/DISCONNECT 명령을 보낸다.
+        const proxy = {
+            disconnect: async () => {
+                connection_manager_1.ConnectionManager.logger.info('[proxy-connector] trying disconnect');
+                await (0, edge_client_1.disconnectConnections)([connection]);
+            }
+        };
+        await (0, edge_client_1.connectConnections)([connection]);
+        connection_manager_1.ConnectionManager.addConnectionInstance(connection, proxy);
+        connection_manager_1.ConnectionManager.logger.info(`proxy-connector connection(${connection.name}:${connection.endpoint}) is connected`);
+    }
+    async disconnect(connection) {
+        const proxy = connection_manager_1.ConnectionManager.removeConnectionInstance(connection);
+        await proxy.disconnect();
+        connection_manager_1.ConnectionManager.logger.info(`proxy-connector connection(${connection.name}) is disconnected`);
+    }
+    get parameterSpec() {
+        return [];
+    }
+    get taskPrefixes() {
+        return [];
+    }
+    get description() {
+        return 'Operato Proxy Connector';
+    }
+}
+exports.ProxyConnector = ProxyConnector;
+ProxyConnector.instance = new ProxyConnector();
+//# sourceMappingURL=proxy-connector.js.map

package/dist-server/engine/connector/proxy-connector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-connector.js","sourceRoot":"","sources":["../../../server/engine/connector/proxy-connector.ts"],"names":[],"mappings":";;;AAAA,8DAAyD;AAGzD,gDAA0E;AAE1E;;;GAGG;AACH,MAAa,cAAc;IAGzB,KAAK,CAAC,KAAK,CAAC,iBAAoC;QAC9C,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAEjE,sCAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,UAA2B;QACvC,8DAA8D;QAC9D,MAAM,KAAK,GAAG;YACZ,UAAU,EAAE,KAAK,IAAI,EAAE;gBACrB,sCAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;gBACpE,MAAM,IAAA,mCAAqB,EAAC,CAAC,UAAU,CAAC,CAAC,CAAA;YAC3C,CAAC;SACF,CAAA;QAED,MAAM,IAAA,gCAAkB,EAAC,CAAC,UAAU,CAAC,CAAC,CAAA;QAEtC,sCAAiB,CAAC,qBAAqB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;QAE1D,sCAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,QAAQ,gBAAgB,CAAC,CAAA;IACrH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,UAA2B;QAC1C,MAAM,KAAK,GAAG,sCAAiB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAA;QACpE,MAAM,KAAK,CAAC,UAAU,EAAE,CAAA;QAExB,sCAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,UAAU,CAAC,IAAI,mBAAmB,CAAC,CAAA;IACjG,CAAC;IAED,IAAI,aAAa;QACf,OAAO,EAAE,CAAA;IACX,CAAC;IAED,IAAI,YAAY;QACd,OAAO,EAAE,CAAA;IACX,CAAC;IAED,IAAI,WAAW;QACb,OAAO,yBAAyB,CAAA;IAClC,CAAC;;AA1CH,wCA2CC;AA1Ce,uBAAQ,GAAG,IAAI,cAAc,EAAE,CAAA","sourcesContent":["import { ConnectionManager } from '../connection-manager'\nimport { Connector } from '../types'\nimport { InputConnection } from '../../service/connection/connection-type'\nimport { connectConnections, disconnectConnections } from '../edge-client'\n\n/**\n * This connector is a proxy connector installed on the edge server to manage connections from the host.\n * It interacts with connections established on the edge server and provides synchronization functionality.\n */\nexport class ProxyConnector implements Connector {\n  public static instance = new ProxyConnector()\n\n  async ready(connectionConfigs: InputConnection[]) {\n    await Promise.all(connectionConfigs.map(this.connect.bind(this)))\n\n    ConnectionManager.logger.info('proxy-connector connections are ready')\n  }\n\n  async connect(connection: InputConnection) {\n    // TODO 원래 커넥션과 에지설정을 참고하여, 에지 서버로 CONNECT/DISCONNECT 명령을 보낸다.\n    const proxy = {\n      disconnect: async () => {\n        ConnectionManager.logger.info('[proxy-connector] trying disconnect')\n        await disconnectConnections([connection])\n      }\n    }\n\n    await connectConnections([connection])\n\n    ConnectionManager.addConnectionInstance(connection, proxy)\n\n    ConnectionManager.logger.info(`proxy-connector connection(${connection.name}:${connection.endpoint}) is connected`)\n  }\n\n  async disconnect(connection: InputConnection) {\n    const proxy = ConnectionManager.removeConnectionInstance(connection)\n    await proxy.disconnect()\n\n    ConnectionManager.logger.info(`proxy-connector connection(${connection.name}) is disconnected`)\n  }\n\n  get parameterSpec() {\n    return []\n  }\n\n  get taskPrefixes() {\n    return []\n  }\n\n  get description() {\n    return 'Operato Proxy Connector'\n  }\n}\n"]}

package/dist-server/engine/edge-client.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setEdgeClient = exports.disconnectConnections = exports.connectConnections = exports.syncConnections = exports.handler = void 0;
+var edgeClient = {
+    async handler(step, scenarioContext) {
+        throw 'edgeClient not supported';
+    },
+    async syncConnections(connections, context) {
+        throw 'edgeClient not supported';
+    },
+    async connectConnections(connections, context) {
+        throw 'edgeClient not supported';
+    },
+    async disconnectConnections(connections, context) {
+        throw 'edgeClient not supported';
+    }
+};
+async function handler(step, scenarioContext) {
+    return await edgeClient.handler(step, scenarioContext);
+}
+exports.handler = handler;
+async function syncConnections(connections, context) {
+    return await edgeClient.syncConnections(connections, context);
+}
+exports.syncConnections = syncConnections;
+async function connectConnections(connections, context) {
+    return await edgeClient.connectConnections(connections, context);
+}
+exports.connectConnections = connectConnections;
+async function disconnectConnections(connections, context) {
+    return await edgeClient.disconnectConnections(connections, context);
+}
+exports.disconnectConnections = disconnectConnections;
+function setEdgeClient(edge) {
+    edgeClient = edge;
+}
+exports.setEdgeClient = setEdgeClient;
+//# sourceMappingURL=edge-client.js.map

package/dist-server/engine/edge-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edge-client.js","sourceRoot":"","sources":["../../server/engine/edge-client.ts"],"names":[],"mappings":";;;AAWA,IAAI,UAAU,GAAe;IAC3B,KAAK,CAAC,OAAO,CAAC,IAAU,EAAE,eAAwB;QAChD,MAAM,0BAA0B,CAAA;IAClC,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,WAAyB,EAAE,OAAwB;QACvE,MAAM,0BAA0B,CAAA;IAClC,CAAC;IACD,KAAK,CAAC,kBAAkB,CAAC,WAAyB,EAAE,OAAwB;QAC1E,MAAM,0BAA0B,CAAA;IAClC,CAAC;IACD,KAAK,CAAC,qBAAqB,CAAC,WAAyB,EAAE,OAAwB;QAC7E,MAAM,0BAA0B,CAAA;IAClC,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAAC,IAAU,EAAE,eAAwB;IAChE,OAAO,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;AACxD,CAAC;AAFD,0BAEC;AAEM,KAAK,UAAU,eAAe,CAAC,WAAyB,EAAE,OAAyB;IACxF,OAAO,MAAM,UAAU,CAAC,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC/D,CAAC;AAFD,0CAEC;AAEM,KAAK,UAAU,kBAAkB,CAAC,WAAyB,EAAE,OAAyB;IAC3F,OAAO,MAAM,UAAU,CAAC,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAClE,CAAC;AAFD,gDAEC;AAEM,KAAK,UAAU,qBAAqB,CAAC,WAAyB,EAAE,OAAyB;IAC9F,OAAO,MAAM,UAAU,CAAC,qBAAqB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AACrE,CAAC;AAFD,sDAEC;AAED,SAAgB,aAAa,CAAC,IAAgB;IAC5C,UAAU,GAAG,IAAI,CAAA;AACnB,CAAC;AAFD,sCAEC","sourcesContent":["import { Connection } from '../service/connection/connection-type'\nimport { Step } from '../service/step/step-type'\nimport { Context, TaskHandler } from './types'\n\nexport type EdgeClient = {\n  handler: TaskHandler\n  syncConnections(connections: Connection[], context?: ResolverContext): Promise<any>\n  connectConnections(connections: Connection[], context?: ResolverContext): Promise<any>\n  disconnectConnections(connections: Connection[], context?: ResolverContext): Promise<any>\n}\n\nvar edgeClient: EdgeClient = {\n  async handler(step: Step, scenarioContext: Context) {\n    throw 'edgeClient not supported'\n  },\n  async syncConnections(connections: Connection[], context: ResolverContext): Promise<any> {\n    throw 'edgeClient not supported'\n  },\n  async connectConnections(connections: Connection[], context: ResolverContext): Promise<any> {\n    throw 'edgeClient not supported'\n  },\n  async disconnectConnections(connections: Connection[], context: ResolverContext): Promise<any> {\n    throw 'edgeClient not supported'\n  }\n}\n\nexport async function handler(step: Step, scenarioContext: Context) {\n  return await edgeClient.handler(step, scenarioContext)\n}\n\nexport async function syncConnections(connections: Connection[], context?: ResolverContext): Promise<any> {\n  return await edgeClient.syncConnections(connections, context)\n}\n\nexport async function connectConnections(connections: Connection[], context?: ResolverContext): Promise<any> {\n  return await edgeClient.connectConnections(connections, context)\n}\n\nexport async function disconnectConnections(connections: Connection[], context?: ResolverContext): Promise<any> {\n  return await edgeClient.disconnectConnections(connections, context)\n}\n\nexport function setEdgeClient(edge: EdgeClient) {\n  edgeClient = edge\n}\n"]}

package/dist-server/engine/index.js

@@ -7,4 +7,5 @@ tslib_1.__exportStar(require("./connection-manager"), exports);
 tslib_1.__exportStar(require("./scenario-engine"), exports);
 tslib_1.__exportStar(require("./task-registry"), exports);
 tslib_1.__exportStar(require("./analyzer/analyze-integration"), exports);
+tslib_1.__exportStar(require("./edge-client"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/engine/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/engine/index.ts"],"names":[],"mappings":";;;AAAA,uBAAoB;AACpB,kBAAe;AAEf,+DAAoC;AACpC,4DAAiC;AACjC,0DAA+B;AAC/B,yEAA8C","sourcesContent":["import './connector'\nimport './task'\n\nexport * from './connection-manager'\nexport * from './scenario-engine'\nexport * from './task-registry'\nexport * from './analyzer/analyze-integration'\n\nexport { Connector } from './types'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/engine/index.ts"],"names":[],"mappings":";;;AAAA,uBAAoB;AACpB,kBAAe;AAEf,+DAAoC;AACpC,4DAAiC;AACjC,0DAA+B;AAC/B,yEAA8C;AAC9C,wDAA6B","sourcesContent":["import './connector'\nimport './task'\n\nexport * from './connection-manager'\nexport * from './scenario-engine'\nexport * from './task-registry'\nexport * from './analyzer/analyze-integration'\nexport * from './edge-client'\n\nexport { Connector } from './types'\n"]}

package/dist-server/engine/task/oracle-procedure.js

@@ -66,22 +66,8 @@ async function OracleProcedure(step, context) {
             return sum;
         }, {});
     const result = await dbconnection.execute(code, procedureParameters);
-    var taskResult = {};
-    let paramKeys = Object.keys(procedureParameters);
-    for (const paramKey of paramKeys) {
-        if (procedureParameters[paramKey].dir === (oracledb === null || oracledb === void 0 ? void 0 : oracledb.BIND_OUT)) {
-            if (procedureParameters[paramKey].type === (oracledb === null || oracledb === void 0 ? void 0 : oracledb.CURSOR)) {
-                const resultSetTemp = result.outBinds[paramKey];
-                taskResult[paramKey] = await resultSetTemp.getRows();
-                await resultSetTemp.close();
-            }
-            else {
-                taskResult[paramKey] = result.outBinds[paramKey];
-            }
-        }
-    }
     return {
-        data: taskResult
+        data: result
     };
 }
 OracleProcedure.parameterSpec = [

package/dist-server/engine/task/oracle-procedure.js.map

@@ -1 +1 @@
-{"version":3,"file":"oracle-procedure.js","sourceRoot":"","sources":["../../../server/engine/task/oracle-procedure.ts"],"names":[],"mappings":"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","sourcesContent":["import { VM } from 'vm2'\nimport { logger } from '@things-factory/env'\nimport { access } from '@things-factory/utils'\nimport { ConnectionManager } from '../connection-manager'\nimport { TaskRegistry } from '../task-registry'\nimport { InputStep } from '../../service/step/step-type'\nimport { Context } from '../types'\n\ntry {\n  var oracledb = require('oracledb')\n} catch (err) {\n  logger.error('oracledb module loading failed')\n}\n\ntype ProcedureParameterType = {\n  name: string\n  dir: string\n  type: string\n  val?: any\n  accessor?: string\n  maxSize?: number\n}\n\ntype ValueType = {\n  code?: string\n  procedure?: string\n  parameters?: ProcedureParameterType[]\n}\n\nconst TYPES = {\n  Number: oracledb?.NUMBER,\n  String: oracledb?.STRING,\n  Date: oracledb?.DATE,\n  Buffer: oracledb?.BUFFER,\n  Blob: oracledb?.BLOB,\n  Clob: oracledb?.CLOB,\n  Cursor: oracledb?.CURSOR\n}\n\nconst DIR = {\n  In: oracledb?.BIND_IN,\n  Inout: oracledb?.BIND_INOUT,\n  Out: oracledb?.BIND_OUT\n}\n\nasync function OracleProcedure(step: InputStep, context: Context) {\n  var { domain, user, data, variables, lng } = context\n  var { connection: connectionName, params } = step\n\n  var { code = '', parameters = [] } = params.parameters as ValueType\n\n  var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n\n  const vm = new VM({\n    sandbox: {\n      domain,\n      user,\n      lng,\n      data,\n      variables\n    }\n  })\n\n  if (!code) {\n    throw 'procedure code not defined'\n  }\n\n  code = vm.run('`' + code + '`')\n\n  const procedureParameters =\n    parameters &&\n    parameters.reduce((sum, { name, val, dir, type, accessor, maxSize }) => {\n      sum[name] = {\n        dir: DIR[dir],\n        type: TYPES[type]\n      }\n\n      const calculated = accessor ? access(accessor, data) || val : val\n\n      if (calculated !== undefined) {\n        sum[name].val =\n          type == 'Date'\n            ? new Date(calculated)\n            : type == 'Number'\n            ? Number(calculated)\n            : type == 'String'\n            ? String(calculated)\n            : calculated\n      }\n\n      if (maxSize) {\n        sum[name].maxSize = maxSize\n      }\n\n      return sum\n    }, {})\n\n  const result = await dbconnection.execute(code, procedureParameters)\n\n  var taskResult = {}\n  let paramKeys = Object.keys(procedureParameters)\n\n  for (const paramKey of paramKeys) {\n    if (procedureParameters[paramKey].dir === oracledb?.BIND_OUT) {\n      if (procedureParameters[paramKey].type === oracledb?.CURSOR) {\n        const resultSetTemp = result.outBinds[paramKey]\n        taskResult[paramKey] = await resultSetTemp.getRows()\n        await resultSetTemp.close()\n      } else {\n        taskResult[paramKey] = result.outBinds[paramKey]\n      }\n    }\n  }\n\n  return {\n    data: taskResult\n  }\n}\n\nOracleProcedure.parameterSpec = [\n  {\n    type: 'procedure-parameters',\n    name: 'parameters',\n    label: ''\n  }\n]\n\nOracleProcedure.help = 'integration/task/oracle-procedure'\n\nTaskRegistry.registerTaskHandler('oracle-procedure', OracleProcedure)\n"]}
+{"version":3,"file":"oracle-procedure.js","sourceRoot":"","sources":["../../../server/engine/task/oracle-procedure.ts"],"names":[],"mappings":"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","sourcesContent":["import { VM } from 'vm2'\nimport { logger } from '@things-factory/env'\nimport { access } from '@things-factory/utils'\nimport { ConnectionManager } from '../connection-manager'\nimport { TaskRegistry } from '../task-registry'\nimport { InputStep } from '../../service/step/step-type'\nimport { Context } from '../types'\n\ntry {\n  var oracledb = require('oracledb')\n} catch (err) {\n  logger.error('oracledb module loading failed')\n}\n\ntype ProcedureParameterType = {\n  name: string\n  dir: string\n  type: string\n  val?: any\n  accessor?: string\n  maxSize?: number\n}\n\ntype ValueType = {\n  code?: string\n  procedure?: string\n  parameters?: ProcedureParameterType[]\n}\n\nconst TYPES = {\n  Number: oracledb?.NUMBER,\n  String: oracledb?.STRING,\n  Date: oracledb?.DATE,\n  Buffer: oracledb?.BUFFER,\n  Blob: oracledb?.BLOB,\n  Clob: oracledb?.CLOB,\n  Cursor: oracledb?.CURSOR\n}\n\nconst DIR = {\n  In: oracledb?.BIND_IN,\n  Inout: oracledb?.BIND_INOUT,\n  Out: oracledb?.BIND_OUT\n}\n\nasync function OracleProcedure(step: InputStep, context: Context) {\n  var { domain, user, data, variables, lng } = context\n  var { connection: connectionName, params } = step\n\n  var { code = '', parameters = [] } = params.parameters as ValueType\n\n  var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n\n  const vm = new VM({\n    sandbox: {\n      domain,\n      user,\n      lng,\n      data,\n      variables\n    }\n  })\n\n  if (!code) {\n    throw 'procedure code not defined'\n  }\n\n  code = vm.run('`' + code + '`')\n\n  const procedureParameters =\n    parameters &&\n    parameters.reduce((sum, { name, val, dir, type, accessor, maxSize }) => {\n      sum[name] = {\n        dir: DIR[dir],\n        type: TYPES[type]\n      }\n\n      const calculated = accessor ? access(accessor, data) || val : val\n\n      if (calculated !== undefined) {\n        sum[name].val =\n          type == 'Date'\n            ? new Date(calculated)\n            : type == 'Number'\n            ? Number(calculated)\n            : type == 'String'\n            ? String(calculated)\n            : calculated\n      }\n\n      if (maxSize) {\n        sum[name].maxSize = maxSize\n      }\n\n      return sum\n    }, {})\n\n  const result = await dbconnection.execute(code, procedureParameters)\n\n  return {\n    data: result\n  }\n}\n\nOracleProcedure.parameterSpec = [\n  {\n    type: 'procedure-parameters',\n    name: 'parameters',\n    label: ''\n  }\n]\n\nOracleProcedure.help = 'integration/task/oracle-procedure'\n\nTaskRegistry.registerTaskHandler('oracle-procedure', OracleProcedure)\n"]}

package/dist-server/engine/task/script.js

@@ -13,6 +13,7 @@ async function Script(step, context) {
             domain,
             user,
             lng,
+            logger,
             data,
             variables
         }

package/dist-server/engine/task/script.js.map

@@ -1 +1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../server/engine/task/script.ts"],"names":[],"mappings":";;AAAA,oDAA+C;AAC/C,6BAA4B;AAK5B,KAAK,UAAU,MAAM,CAAC,IAAe,EAAE,OAAgB;IACrD,IAAI,EACF,MAAM,EAAE,EAAE,MAAM,EAAE,EACnB,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAE9D,MAAM,EAAE,GAAG,IAAI,YAAM,CAAC;QACpB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE;YACP,MAAM;YACN,IAAI;YACJ,GAAG;YACH,IAAI;YACJ,SAAS;SACV;KACF,CAAC,CAAA;IAEF,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,0BAA0B,MAAM,QAAQ,CAAC,CAAA;IAEnE,OAAO;QACL,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,MAAM,CAAC,aAAa,GAAG;IACrB;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE;YACR,QAAQ,EAAE,YAAY;SACvB;KACF;CACF,CAAA;AAED,MAAM,CAAC,aAAa,GAAG,IAAI,CAAA;AAC3B,MAAM,CAAC,IAAI,GAAG,yBAAyB,CAAA;AAEvC,4BAAY,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA","sourcesContent":["import { TaskRegistry } from '../task-registry'\nimport { NodeVM } from 'vm2'\n\nimport { InputStep } from '../../service/step/step-type'\nimport { Context } from '../types'\n\nasync function Script(step: InputStep, context: Context) {\n  var {\n    params: { script }\n  } = step\n\n  const { domain, user, data, variables, lng, logger } = context\n\n  const vm = new NodeVM({\n    timeout: 5000,\n    wrapper: 'none',\n    console: 'inherit',\n    sandbox: {\n      domain,\n      user,\n      lng,\n      data,\n      variables\n    }\n  })\n\n  var result = await vm.run(`return (async () => {\\n${script}\\n})()`)\n\n  return {\n    data: result\n  }\n}\n\nScript.parameterSpec = [\n  {\n    type: 'textarea',\n    name: 'script',\n    label: 'script',\n    property: {\n      language: 'javascript'\n    }\n  }\n]\n\nScript.connectorFree = true\nScript.help = 'integration/task/script'\n\nTaskRegistry.registerTaskHandler('script', Script)\n"]}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../server/engine/task/script.ts"],"names":[],"mappings":";;AAAA,oDAA+C;AAC/C,6BAA4B;AAK5B,KAAK,UAAU,MAAM,CAAC,IAAe,EAAE,OAAgB;IACrD,IAAI,EACF,MAAM,EAAE,EAAE,MAAM,EAAE,EACnB,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAE9D,MAAM,EAAE,GAAG,IAAI,YAAM,CAAC;QACpB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE;YACP,MAAM;YACN,IAAI;YACJ,GAAG;YACH,MAAM;YACN,IAAI;YACJ,SAAS;SACV;KACF,CAAC,CAAA;IAEF,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,0BAA0B,MAAM,QAAQ,CAAC,CAAA;IAEnE,OAAO;QACL,IAAI,EAAE,MAAM;KACb,CAAA;AACH,CAAC;AAED,MAAM,CAAC,aAAa,GAAG;IACrB;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE;YACR,QAAQ,EAAE,YAAY;SACvB;KACF;CACF,CAAA;AAED,MAAM,CAAC,aAAa,GAAG,IAAI,CAAA;AAC3B,MAAM,CAAC,IAAI,GAAG,yBAAyB,CAAA;AAEvC,4BAAY,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA","sourcesContent":["import { TaskRegistry } from '../task-registry'\nimport { NodeVM } from 'vm2'\n\nimport { InputStep } from '../../service/step/step-type'\nimport { Context } from '../types'\n\nasync function Script(step: InputStep, context: Context) {\n  var {\n    params: { script }\n  } = step\n\n  const { domain, user, data, variables, lng, logger } = context\n\n  const vm = new NodeVM({\n    timeout: 5000,\n    wrapper: 'none',\n    console: 'inherit',\n    sandbox: {\n      domain,\n      user,\n      lng,\n      logger,\n      data,\n      variables\n    }\n  })\n\n  var result = await vm.run(`return (async () => {\\n${script}\\n})()`)\n\n  return {\n    data: result\n  }\n}\n\nScript.parameterSpec = [\n  {\n    type: 'textarea',\n    name: 'script',\n    label: 'script',\n    property: {\n      language: 'javascript'\n    }\n  }\n]\n\nScript.connectorFree = true\nScript.help = 'integration/task/script'\n\nTaskRegistry.registerTaskHandler('script', Script)\n"]}

package/dist-server/engine/task/utils/headless-pool-for-scenario.js

@@ -50,7 +50,7 @@ async function initializeChromium() {
         }
         var launchSetting = {
             args: ['--mute-audio', '--no-sandbox'],
-            headless: 'new'
+            headless: 'shell'
         };
         if (CHROMIUM_PATH) {
             launchSetting['executablePath'] = CHROMIUM_PATH;

package/dist-server/engine/task/utils/headless-pool-for-scenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"headless-pool-for-scenario.js","sourceRoot":"","sources":["../../../../server/engine/task/utils/headless-pool-for-scenario.ts"],"names":[],"mappings":";;;;AAAA,kEAA2C;AAE3C,6CAAoD;AAEpD,IAAI;IACF,IAAI,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CACrC;AAAC,OAAO,GAAG,EAAE;IACZ,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;CAClB;AAED,IAAI,YAAY,CAAA;AAEhB,SAAgB,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE;QACjB,YAAY,GAAG,WAAW,CAAC,UAAU,CACnC;YACE,MAAM;gBACJ,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;gBACzD,OAAO,kBAAkB,EAAE,CAAA;YAC7B,CAAC;YACD,QAAQ,CAAC,OAAO;gBACd,OAAO,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;oBACtD,OAAO;wBACL,YAAY;yBACX,OAAO,EAAE;yBACT,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;yBACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;iBACrB,CAAC,CAAA;YACJ,CAAC;YACD,OAAO,CAAC,OAAO;gBACb,YAAY;gBACZ,OAAO,OAAO,CAAC,KAAK,EAAE,CAAA;YACxB,CAAC;SACF,EACD;YACE,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,EAAE;YACP,YAAY,EAAE,IAAI;YAClB,oBAAoB,EAAE,KAAK;SAC5B,CACF,CAAA;KACF;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAjCD,0CAiCC;AAED,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAEjD,KAAK,UAAU,kBAAkB;IAC/B,IAAI;QACF,IAAI,CAAC,SAAS,EAAE;YACd,OAAM;SACP;QAED,IAAI,aAAa,GAAG;YAClB,IAAI,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;YACtC,QAAQ,EAAE,KAAK;SAChB,CAAA;QAED,IAAI,aAAa,EAAE;YACjB,aAAa,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAA;SAChD;QAED,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAErD,OAAO,OAAO,CAAA;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAClB;AACH,CAAC","sourcesContent":["import * as genericPool from 'generic-pool'\n\nimport { config, logger } from '@things-factory/env'\n\ntry {\n  var puppeteer = require('puppeteer')\n} catch (err) {\n  logger.error(err)\n}\n\nvar headlessPool\n\nexport function getHeadlessPool() {\n  if (!headlessPool) {\n    headlessPool = genericPool.createPool(\n      {\n        create() {\n          console.log('headless-pool-for-scensrio about to create')\n          return initializeChromium()\n        },\n        validate(browser) {\n          return Promise.race([\n            new Promise(res => setTimeout(() => res(false), 1500)),\n            browser\n              //@ts-ignore\n              .version()\n              .then(_ => true)\n              .catch(_ => false)\n          ])\n        },\n        destroy(browser) {\n          //@ts-ignore\n          return browser.close()\n        }\n      },\n      {\n        min: 2,\n        max: 10,\n        testOnBorrow: true,\n        acquireTimeoutMillis: 15000\n      }\n    )\n  }\n\n  return headlessPool\n}\n\nconst CHROMIUM_PATH = config.get('CHROMIUM_PATH')\n\nasync function initializeChromium() {\n  try {\n    if (!puppeteer) {\n      return\n    }\n\n    var launchSetting = {\n      args: ['--mute-audio', '--no-sandbox'],\n      headless: 'new'\n    }\n\n    if (CHROMIUM_PATH) {\n      launchSetting['executablePath'] = CHROMIUM_PATH\n    }\n\n    const browser = await puppeteer.launch(launchSetting)\n\n    return browser\n  } catch (err) {\n    logger.error(err)\n  }\n}\n"]}
+{"version":3,"file":"headless-pool-for-scenario.js","sourceRoot":"","sources":["../../../../server/engine/task/utils/headless-pool-for-scenario.ts"],"names":[],"mappings":";;;;AAAA,kEAA2C;AAE3C,6CAAoD;AAEpD,IAAI;IACF,IAAI,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CACrC;AAAC,OAAO,GAAG,EAAE;IACZ,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;CAClB;AAED,IAAI,YAAY,CAAA;AAEhB,SAAgB,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE;QACjB,YAAY,GAAG,WAAW,CAAC,UAAU,CACnC;YACE,MAAM;gBACJ,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;gBACzD,OAAO,kBAAkB,EAAE,CAAA;YAC7B,CAAC;YACD,QAAQ,CAAC,OAAO;gBACd,OAAO,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;oBACtD,OAAO;wBACL,YAAY;yBACX,OAAO,EAAE;yBACT,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;yBACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;iBACrB,CAAC,CAAA;YACJ,CAAC;YACD,OAAO,CAAC,OAAO;gBACb,YAAY;gBACZ,OAAO,OAAO,CAAC,KAAK,EAAE,CAAA;YACxB,CAAC;SACF,EACD;YACE,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,EAAE;YACP,YAAY,EAAE,IAAI;YAClB,oBAAoB,EAAE,KAAK;SAC5B,CACF,CAAA;KACF;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAjCD,0CAiCC;AAED,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAEjD,KAAK,UAAU,kBAAkB;IAC/B,IAAI;QACF,IAAI,CAAC,SAAS,EAAE;YACd,OAAM;SACP;QAED,IAAI,aAAa,GAAG;YAClB,IAAI,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;YACtC,QAAQ,EAAE,OAAO;SAClB,CAAA;QAED,IAAI,aAAa,EAAE;YACjB,aAAa,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAA;SAChD;QAED,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAErD,OAAO,OAAO,CAAA;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAClB;AACH,CAAC","sourcesContent":["import * as genericPool from 'generic-pool'\n\nimport { config, logger } from '@things-factory/env'\n\ntry {\n  var puppeteer = require('puppeteer')\n} catch (err) {\n  logger.error(err)\n}\n\nvar headlessPool\n\nexport function getHeadlessPool() {\n  if (!headlessPool) {\n    headlessPool = genericPool.createPool(\n      {\n        create() {\n          console.log('headless-pool-for-scensrio about to create')\n          return initializeChromium()\n        },\n        validate(browser) {\n          return Promise.race([\n            new Promise(res => setTimeout(() => res(false), 1500)),\n            browser\n              //@ts-ignore\n              .version()\n              .then(_ => true)\n              .catch(_ => false)\n          ])\n        },\n        destroy(browser) {\n          //@ts-ignore\n          return browser.close()\n        }\n      },\n      {\n        min: 2,\n        max: 10,\n        testOnBorrow: true,\n        acquireTimeoutMillis: 15000\n      }\n    )\n  }\n\n  return headlessPool\n}\n\nconst CHROMIUM_PATH = config.get('CHROMIUM_PATH')\n\nasync function initializeChromium() {\n  try {\n    if (!puppeteer) {\n      return\n    }\n\n    var launchSetting = {\n      args: ['--mute-audio', '--no-sandbox'],\n      headless: 'shell'\n    }\n\n    if (CHROMIUM_PATH) {\n      launchSetting['executablePath'] = CHROMIUM_PATH\n    }\n\n    const browser = await puppeteer.launch(launchSetting)\n\n    return browser\n  } catch (err) {\n    logger.error(err)\n  }\n}\n"]}

package/dist-server/engine/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../server/engine/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Connection, PropertySpec, ScenarioInstanceStatus, Step } from '../service'\nimport { Domain } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\n\nexport interface Connector {\n  ready(connections: Connection[]): Promise<any>\n  connect(connection: Connection): Promise<any>\n  disconnect(connection: Connection): Promise<any>\n  parameterSpec: PropertySpec[]\n  taskPrefixes?: string[]\n  description?: string\n  help?: string\n}\n\nexport type Context = {\n  /** \n    * Represents the domain context.\n    */\n  domain: Domain\n\n  /** \n    * User information.\n    */\n  user: User\n\n  /** \n    * Language code, for example 'en', 'ko'.\n    */\n  lng: string\n\n  /** \n    * Flag to indicate if the IP is unsafe, can be undefined.\n    */\n  unsafeIP: boolean | undefined\n\n  /** \n    * List of prohibited privileges, can be undefined.\n    */\n  prohibitedPrivileges: { category: string; privilege: string }[] | undefined\n\n  /** \n    * Logger for logging purposes.\n    */\n  logger: any\n\n  /** \n    * Function to publish events or messages.\n    */\n  publish: Function\n\n  /** \n    * Function to load resources or data.\n    */\n  load: Function\n\n  /** \n    * Current status of the scenario instance.\n    */\n  state: ScenarioInstanceStatus\n\n  /** \n    * General data storage object.\n    */\n  data: any\n\n  /** \n    * Variables related to the context.\n    */\n  variables: Object\n\n  /** \n    * Local GraphQL client object.\n    */\n  client: any /* graphql local client */\n\n  /** \n    * Root object, can be used for various purposes.\n    */\n  root: Object\n\n  /** \n    * Array of function closures.\n    */\n  closures: Function[]\n\n  /** \n    * Function to check the state.\n    */\n  checkState: Function\n\n  /**\n   * MQTT subscriber context object.\n   */\n  __mqtt_subscriber?: any\n\n  /**\n   * socket listener context object.\n   */\n  __socket_listener?: any\n\n  /**\n   * csv readline context object.\n   */\n  __csv_resources?: any\n}\n\n\nexport type TaskHandler = (\n  step: Step,\n  context: Context\n) => Promise<{\n  next?: string\n  state?: ScenarioInstanceStatus\n  data?: any\n}>\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../server/engine/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Connection, PropertySpec, ScenarioInstanceStatus, Step } from '../service'\nimport { Domain } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\n\nexport interface Connector {\n  ready(connections: Connection[]): Promise<any>\n  connect(connection: Connection): Promise<any>\n  disconnect(connection: Connection): Promise<any>\n  parameterSpec: PropertySpec[]\n  taskPrefixes?: string[]\n  description?: string\n  help?: string\n}\n\nexport type Context = {\n  /**\n   * Represents the domain context.\n   */\n  domain: Domain\n\n  /**\n   * User information.\n   */\n  user: User\n\n  /**\n   * Language code, for example 'en', 'ko'.\n   */\n  lng: string\n\n  /**\n   * Flag to indicate if the IP is unsafe, can be undefined.\n   */\n  unsafeIP: boolean | undefined\n\n  /**\n   * List of prohibited privileges, can be undefined.\n   */\n  prohibitedPrivileges: { category: string; privilege: string }[] | undefined\n\n  /**\n   * Logger for logging purposes.\n   */\n  logger: any\n\n  /**\n   * Function to publish events or messages.\n   */\n  publish: Function\n\n  /**\n   * Function to load resources or data.\n   */\n  load: Function\n\n  /**\n   * Current status of the scenario instance.\n   */\n  state: ScenarioInstanceStatus\n\n  /**\n   * General data storage object.\n   */\n  data: any\n\n  /**\n   * Variables related to the context.\n   */\n  variables: Object\n\n  /**\n   * Local GraphQL client object.\n   */\n  client: any /* graphql local client */\n\n  /**\n   * Root object, can be used for various purposes.\n   */\n  root: Object\n\n  /**\n   * Array of function closures.\n   */\n  closures: Function[]\n\n  /**\n   * Function to check the state.\n   */\n  checkState: Function\n\n  /**\n   * MQTT subscriber context object.\n   */\n  __mqtt_subscriber?: any\n\n  /**\n   * socket listener context object.\n   */\n  __socket_listener?: any\n\n  /**\n   * csv readline context object.\n   */\n  __csv_resources?: any\n}\n\nexport type TaskHandler = (\n  step: Step,\n  context: Context\n) => Promise<{\n  next?: string\n  state?: ScenarioInstanceStatus\n  data?: any\n}>\n"]}

package/dist-server/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./migrations"), exports);
 tslib_1.__exportStar(require("./engine"), exports);
+tslib_1.__exportStar(require("./controllers"), exports);
 tslib_1.__exportStar(require("./service"), exports);
 require("./routes");
 require("./restful"); /* APIs */

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;AAAA,uDAA4B;AAC5B,mDAAwB;AACxB,oDAAyB;AAEzB,oBAAiB;AACjB,qBAAkB,CAAC,UAAU;AAE7B,qCAA4D;AAE5D,OAAO,CAAC,EAAE,CAAC,wBAA+B,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAO,EAAE,EAAE;IACjF,IAAI;QACF,MAAM,0BAAiB,CAAC,KAAK,EAAE,CAAA;QAC/B,MAAM,uBAAc,CAAC,OAAO,EAAE,CAAA;QAE9B,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;KACjD;IAAC,OAAO,EAAE,EAAE;QACX,0BAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAClC,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;KACzD;AACH,CAAC,CAAC,CAAA","sourcesContent":["export * from './migrations'\nexport * from './engine'\nexport * from './service'\n\nimport './routes'\nimport './restful' /* APIs */\n\nimport { ConnectionManager, ScenarioEngine } from './engine'\n\nprocess.on('bootstrap-module-start' as any, async ({ app, config, client }: any) => {\n  try {\n    await ConnectionManager.ready()\n    await ScenarioEngine.loadAll()\n\n    console.log('Scenario Engine has just started.')\n  } catch (ex) {\n    ConnectionManager.logger.error(ex)\n    console.log('Just has failed to start Scenario Engine.')\n  }\n})\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;AAAA,uDAA4B;AAC5B,mDAAwB;AACxB,wDAA6B;AAC7B,oDAAyB;AAEzB,oBAAiB;AACjB,qBAAkB,CAAC,UAAU;AAE7B,qCAA4D;AAE5D,OAAO,CAAC,EAAE,CAAC,wBAA+B,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAO,EAAE,EAAE;IACjF,IAAI;QACF,MAAM,0BAAiB,CAAC,KAAK,EAAE,CAAA;QAC/B,MAAM,uBAAc,CAAC,OAAO,EAAE,CAAA;QAE9B,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;KACjD;IAAC,OAAO,EAAE,EAAE;QACX,0BAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAClC,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;KACzD;AACH,CAAC,CAAC,CAAA","sourcesContent":["export * from './migrations'\nexport * from './engine'\nexport * from './controllers'\nexport * from './service'\n\nimport './routes'\nimport './restful' /* APIs */\n\nimport { ConnectionManager, ScenarioEngine } from './engine'\n\nprocess.on('bootstrap-module-start' as any, async ({ app, config, client }: any) => {\n  try {\n    await ConnectionManager.ready()\n    await ScenarioEngine.loadAll()\n\n    console.log('Scenario Engine has just started.')\n  } catch (ex) {\n    ConnectionManager.logger.error(ex)\n    console.log('Just has failed to start Scenario Engine.')\n  }\n})\n"]}

package/dist-server/restful/unstable/run-scenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-scenario.js","sourceRoot":"","sources":["../../../server/restful/unstable/run-scenario.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAE7B,6CAAgE;AAGhE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,+DAA+D,CAAC,CAAA;AAE/F,sBAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACvC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;IACvC,IAAI,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,IAAI,CAAA;IAEhD,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACvC,SAAS,GAAG,IAAI,CAAA;KACjB;IAED,KAAK,CAAC,2CAA2C,EAAE,YAAY,CAAC,CAAA;IAChE,IAAI,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;;KAYZ;QACD,SAAS,EAAE;YACT,YAAY;YACZ,YAAY;YACZ,SAAS;SACV;QACD,OAAO;KACR,CAAC,CAAA;IAEF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAA;IAEjC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;QACpB,OAAO,CAAC,IAAI,GAAG,MAAM,CAAA;QAErB,OAAM;KACP;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAA;IAEnC,OAAO,CAAC,IAAI,GAAG,MAAM,CAAA;AACvB,CAAC,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\n\nimport { restfulApiRouter as router } from '@things-factory/api'\nimport { ScenarioInstanceStatus } from '../../service/scenario-instance/scenario-instance-type'\n\nconst debug = require('debug')('things-factory:integration-base:restful:unstable:run-scenario')\n\nrouter.post('/unstable/run-scenario/:scenarioName', async (context, next) => {\n  const { client } = context.state\n  const { scenarioName } = context.params\n  const body = context.request.body || {}\n  let { instanceName = '', variables = {} } = body\n\n  if (Object.keys(variables).length === 0) {\n    variables = body\n  }\n\n  debug('post:/unstable/run-scenario/:scenarioName', scenarioName)\n  let response = await client.mutate({\n    mutation: gql`\n      mutation ($instanceName: String, $scenarioName: String!, $variables: Object) {\n        runScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {\n          instanceName\n          scenarioName\n          state\n          data\n          result\n          message\n          timestamp\n        }\n      }\n    `,\n    variables: {\n      instanceName,\n      scenarioName,\n      variables\n    },\n    context\n  })\n\n  const { errors, data } = response\n\n  if (!data) {\n    context.status = 500\n    context.body = errors\n\n    return\n  }\n\n  const { result } = data.runScenario\n\n  context.body = result\n})\n"]}
+{"version":3,"file":"run-scenario.js","sourceRoot":"","sources":["../../../server/restful/unstable/run-scenario.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAE7B,6CAAgE;AAEhE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,+DAA+D,CAAC,CAAA;AAE/F,sBAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACvC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;IACvC,IAAI,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,IAAI,CAAA;IAEhD,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACvC,SAAS,GAAG,IAAI,CAAA;KACjB;IAED,KAAK,CAAC,2CAA2C,EAAE,YAAY,CAAC,CAAA;IAChE,IAAI,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;;KAYZ;QACD,SAAS,EAAE;YACT,YAAY;YACZ,YAAY;YACZ,SAAS;SACV;QACD,OAAO;KACR,CAAC,CAAA;IAEF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAA;IAEjC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;QACpB,OAAO,CAAC,IAAI,GAAG,MAAM,CAAA;QAErB,OAAM;KACP;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAA;IAEnC,OAAO,CAAC,IAAI,GAAG,MAAM,CAAA;AACvB,CAAC,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\n\nimport { restfulApiRouter as router } from '@things-factory/api'\n\nconst debug = require('debug')('things-factory:integration-base:restful:unstable:run-scenario')\n\nrouter.post('/unstable/run-scenario/:scenarioName', async (context, next) => {\n  const { client } = context.state\n  const { scenarioName } = context.params\n  const body = context.request.body || {}\n  let { instanceName = '', variables = {} } = body\n\n  if (Object.keys(variables).length === 0) {\n    variables = body\n  }\n\n  debug('post:/unstable/run-scenario/:scenarioName', scenarioName)\n  let response = await client.mutate({\n    mutation: gql`\n      mutation ($instanceName: String, $scenarioName: String!, $variables: Object) {\n        runScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {\n          instanceName\n          scenarioName\n          state\n          data\n          result\n          message\n          timestamp\n        }\n      }\n    `,\n    variables: {\n      instanceName,\n      scenarioName,\n      variables\n    },\n    context\n  })\n\n  const { errors, data } = response\n\n  if (!data) {\n    context.status = 500\n    context.body = errors\n\n    return\n  }\n\n  const { result } = data.runScenario\n\n  context.body = result\n})\n"]}

package/dist-server/restful/unstable/start-scenario.js

@@ -11,7 +11,7 @@ api_1.restfulApiRouter.post('/unstable/start-scenario/:scenarioName', async (con
     debug('post:/unstable/start-scenario/:scenarioName', scenarioName);
     context.body = await client.mutate({
         mutation: (0, graphql_tag_1.default) `
-      mutation($instanceName: String, $scenarioName: String!, $variables: Object) {
+      mutation ($instanceName: String, $scenarioName: String!, $variables: Object) {
         startScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {
           instanceName
           scenarioName

package/dist-server/restful/unstable/start-scenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"start-scenario.js","sourceRoot":"","sources":["../../../server/restful/unstable/start-scenario.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAC7B,6CAAgE;AAEhE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,iEAAiE,CAAC,CAAA;AAEjG,sBAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC5E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACvC,MAAM,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;IAExE,KAAK,CAAC,6CAA6C,EAAE,YAAY,CAAC,CAAA;IAElE,OAAO,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;KAWZ;QACD,SAAS,EAAE;YACT,YAAY;YACZ,YAAY;YACZ,SAAS;SACV;QACD,OAAO;KACR,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { restfulApiRouter as router } from '@things-factory/api'\n\nconst debug = require('debug')('things-factory:integration-base:restful:unstable:start-scenario')\n\nrouter.post('/unstable/start-scenario/:scenarioName', async (context, next) => {\n  const { client } = context.state\n  const { scenarioName } = context.params\n  const { instanceName = '', variables = {} } = context.request.body || {}\n\n  debug('post:/unstable/start-scenario/:scenarioName', scenarioName)\n\n  context.body = await client.mutate({\n    mutation: gql`\n      mutation($instanceName: String, $scenarioName: String!, $variables: Object) {\n        startScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {\n          instanceName\n          scenarioName\n          state\n          data\n          message\n          timestamp\n        }\n      }\n    `,\n    variables: {\n      instanceName,\n      scenarioName,\n      variables\n    },\n    context\n  })\n})\n"]}
+{"version":3,"file":"start-scenario.js","sourceRoot":"","sources":["../../../server/restful/unstable/start-scenario.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAC7B,6CAAgE;AAEhE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,iEAAiE,CAAC,CAAA;AAEjG,sBAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC5E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IACvC,MAAM,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;IAExE,KAAK,CAAC,6CAA6C,EAAE,YAAY,CAAC,CAAA;IAElE,OAAO,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;KAWZ;QACD,SAAS,EAAE;YACT,YAAY;YACZ,YAAY;YACZ,SAAS;SACV;QACD,OAAO;KACR,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { restfulApiRouter as router } from '@things-factory/api'\n\nconst debug = require('debug')('things-factory:integration-base:restful:unstable:start-scenario')\n\nrouter.post('/unstable/start-scenario/:scenarioName', async (context, next) => {\n  const { client } = context.state\n  const { scenarioName } = context.params\n  const { instanceName = '', variables = {} } = context.request.body || {}\n\n  debug('post:/unstable/start-scenario/:scenarioName', scenarioName)\n\n  context.body = await client.mutate({\n    mutation: gql`\n      mutation ($instanceName: String, $scenarioName: String!, $variables: Object) {\n        startScenario(instanceName: $instanceName, scenarioName: $scenarioName, variables: $variables) {\n          instanceName\n          scenarioName\n          state\n          data\n          message\n          timestamp\n        }\n      }\n    `,\n    variables: {\n      instanceName,\n      scenarioName,\n      variables\n    },\n    context\n  })\n})\n"]}

package/dist-server/restful/unstable/stop-scenario.js

@@ -10,7 +10,7 @@ api_1.restfulApiRouter.post('/unstable/stop-scenario/:instanceName', async (cont
     debug('post:/unstable/stop-scenario/:scenarioName', instanceName);
     context.body = await client.mutate({
         mutation: (0, graphql_tag_1.default) `
-      mutation($instanceName: String!) {
+      mutation ($instanceName: String!) {
         stopScenario(instanceName: $instanceName) {
           instanceName
           scenarioName

package/dist-server/restful/unstable/stop-scenario.js.map

@@ -1 +1 @@
-{"version":3,"file":"stop-scenario.js","sourceRoot":"","sources":["../../../server/restful/unstable/stop-scenario.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAC7B,6CAAgE;AAEhE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,gEAAgE,CAAC,CAAA;AAEhG,sBAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC3E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IAEvC,KAAK,CAAC,4CAA4C,EAAE,YAAY,CAAC,CAAA;IAEjE,OAAO,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;KAWZ;QACD,SAAS,EAAE;YACT,YAAY;SACb;QACD,OAAO;KACR,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { restfulApiRouter as router } from '@things-factory/api'\n\nconst debug = require('debug')('things-factory:integration-base:restful:unstable:stop-scenario')\n\nrouter.post('/unstable/stop-scenario/:instanceName', async (context, next) => {\n  const { client } = context.state\n  const { instanceName } = context.params\n\n  debug('post:/unstable/stop-scenario/:scenarioName', instanceName)\n\n  context.body = await client.mutate({\n    mutation: gql`\n      mutation($instanceName: String!) {\n        stopScenario(instanceName: $instanceName) {\n          instanceName\n          scenarioName\n          state\n          data\n          message\n          timestamp\n        }\n      }\n    `,\n    variables: {\n      instanceName\n    },\n    context\n  })\n})\n"]}
+{"version":3,"file":"stop-scenario.js","sourceRoot":"","sources":["../../../server/restful/unstable/stop-scenario.ts"],"names":[],"mappings":";;;AAAA,sEAA6B;AAC7B,6CAAgE;AAEhE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,gEAAgE,CAAC,CAAA;AAEhG,sBAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC3E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAChC,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;IAEvC,KAAK,CAAC,4CAA4C,EAAE,YAAY,CAAC,CAAA;IAEjE,OAAO,CAAC,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACjC,QAAQ,EAAE,IAAA,qBAAG,EAAA;;;;;;;;;;;KAWZ;QACD,SAAS,EAAE;YACT,YAAY;SACb;QACD,OAAO;KACR,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import gql from 'graphql-tag'\nimport { restfulApiRouter as router } from '@things-factory/api'\n\nconst debug = require('debug')('things-factory:integration-base:restful:unstable:stop-scenario')\n\nrouter.post('/unstable/stop-scenario/:instanceName', async (context, next) => {\n  const { client } = context.state\n  const { instanceName } = context.params\n\n  debug('post:/unstable/stop-scenario/:scenarioName', instanceName)\n\n  context.body = await client.mutate({\n    mutation: gql`\n      mutation ($instanceName: String!) {\n        stopScenario(instanceName: $instanceName) {\n          instanceName\n          scenarioName\n          state\n          data\n          message\n          timestamp\n        }\n      }\n    `,\n    variables: {\n      instanceName\n    },\n    context\n  })\n})\n"]}

package/dist-server/service/connection/connection-mutation.js

@@ -61,26 +61,22 @@ let ConnectionMutation = class ConnectionMutation {
         var repository = (0, shell_1.getRepository)(connection_type_1.Connection);
         var connection = await repository.findOne({
             where: { domain: { id: domain.id }, name },
-            relations: ['domain']
+            relations: ['domain', 'edge']
         });
         await connection.connect();
         await repository.save(connection);
-        return Object.assign(Object.assign({}, connection), { state: connection_manager_1.ConnectionManager.getConnectionInstance(connection)
-                ? connection_type_1.ConnectionStatus.CONNECTED
-                : connection_type_1.ConnectionStatus.DISCONNECTED });
+        return Object.assign(Object.assign({}, connection), { state: connection_manager_1.ConnectionManager.getConnectionInstance(connection) ? connection_type_1.ConnectionStatus.CONNECTED : connection_type_1.ConnectionStatus.DISCONNECTED });
     }
     async disconnectConnection(name, context) {
         const { domain } = context.state;
         var repository = (0, shell_1.getRepository)(connection_type_1.Connection);
         var connection = await repository.findOne({
             where: { domain: { id: domain.id }, name },
-            relations: ['domain']
+            relations: ['domain', 'edge']
         });
         await connection.disconnect();
         await repository.save(connection);
-        return Object.assign(Object.assign({}, connection), { state: connection_manager_1.ConnectionManager.getConnectionInstance(connection)
-                ? connection_type_1.ConnectionStatus.CONNECTED
-                : connection_type_1.ConnectionStatus.DISCONNECTED });
+        return Object.assign(Object.assign({}, connection), { state: connection_manager_1.ConnectionManager.getConnectionInstance(connection) ? connection_type_1.ConnectionStatus.CONNECTED : connection_type_1.ConnectionStatus.DISCONNECTED });
     }
     async importConnections(connections, context) {
         const { tx, domain, user } = context.state;