@things-factory/integration-base 6.1.111 → 6.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.1.111",
+  "version": "6.1.115",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.1.111",
-    "@things-factory/auth-base": "^6.1.111",
-    "@things-factory/env": "^6.1.99",
-    "@things-factory/oauth2-client": "^6.1.111",
-    "@things-factory/scheduler-client": "^6.1.111",
-    "@things-factory/shell": "^6.1.101",
+    "@things-factory/api": "^6.1.115",
+    "@things-factory/auth-base": "^6.1.115",
+    "@things-factory/env": "^6.1.112",
+    "@things-factory/oauth2-client": "^6.1.115",
+    "@things-factory/scheduler-client": "^6.1.115",
+    "@things-factory/shell": "^6.1.115",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "1ac99e94258ee70625bbc04de368b3f2558534d2"
+  "gitHead": "3677982365595b0f3a8ec26e47c234878ecbb910"
 }

package/server/engine/connector/oracle-connector.ts

@@ -41,6 +41,16 @@ export class OracleConnector implements Connector {
           })
         ).rows
       },
+      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
+        })
+      },
       close: client.close.bind(client)
     })
 
@@ -81,7 +91,7 @@ export class OracleConnector implements Connector {
   }
 
   get taskPrefixes() {
-    return ['database']
+    return ['database', 'oracle']
   }
 
   get help() {
@@ -93,5 +103,6 @@ ConnectionManager.registerConnector('oracle-connector', new OracleConnector())
 
 // need reference:
 // https://download.oracle.com/otn_software/mac/instantclient/193000/instantclient-basiclite-macos.x64-19.3.0.0.0dbru.zip
+// https://node-oracledb.readthedocs.io/en/latest/index.html
 
 // docker pull store/oracle/database-instantclient:12.2.0.1

package/server/engine/task/index.ts

@@ -37,3 +37,4 @@ import './data-mapper'
 import './headless-post'
 import './headless-scrap'
 import './set-domain'
+import './oracle-procedure'

package/server/engine/task/oracle-procedure.ts

@@ -0,0 +1,106 @@
+import { VM } from 'vm2'
+import { logger } from '@things-factory/env'
+import { access } from '@things-factory/utils'
+import { ConnectionManager } from '../connection-manager'
+import { TaskRegistry } from '../task-registry'
+
+try {
+  var oracledb = require('oracledb')
+} catch (err) {
+  logger.error('oracledb module loading failed')
+}
+
+type ProcedureParameterType = { name: string; dir: string; type: string; val: any; maxSize: number }
+
+const TYPES = {
+  Number: oracledb.NUMBER,
+  String: oracledb.STRING,
+  Date: oracledb.DATE,
+  Buffer: oracledb.BUFFER,
+  Blob: oracledb.BLOB,
+  Clob: oracledb.CLOB,
+  Cursor: oracledb.CURSOR
+}
+
+const DIR = {
+  In: oracledb.BIND_IN,
+  Inout: oracledb.BIND_INOUT,
+  Out: oracledb.BIND_OUT
+}
+
+async function OracleProcedure(step, context) {
+  var { domain, data, variables } = context
+  var { connection: connectionName, params } = step
+
+  var { procedure, parameters } = params as { procedure: string; parameters: ProcedureParameterType[] }
+
+  var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
+
+  const vm = new VM({
+    sandbox: {
+      domain,
+      data,
+      variables
+    }
+  })
+
+  procedure = vm.run('`' + procedure + '`')
+
+  const procedureParameters =
+    parameters &&
+    parameters.reduce((sum, { name, val, dir, type, maxSize }) => {
+      sum[name] = {
+        dir: DIR[dir],
+        type: TYPES[type],
+        val: access(val, data),
+        maxSize
+      }
+
+      // remove empty keys
+      Object.keys(sum[name]).forEach(key => {
+        if (!sum[name][key]) {
+          delete sum[name][key]
+        }
+      })
+
+      return sum
+    }, {})
+
+  const result = await dbconnection.execute(procedure, procedureParameters)
+
+  var taskResult = {}
+  let paramKeys = Object.keys(procedureParameters)
+
+  for (const paramKey of paramKeys) {
+    if (procedureParameters[paramKey].dir === oracledb.BIND_OUT) {
+      if (procedureParameters[paramKey].type === oracledb.CURSOR) {
+        const resultSetTemp = result.outBinds[paramKey]
+        taskResult[paramKey] = await resultSetTemp.getRows()
+        await resultSetTemp.close()
+      } else {
+        taskResult[paramKey] = result.outBinds[paramKey]
+      }
+    }
+  }
+
+  console.log('taskResult: ', taskResult)
+
+  return {
+    data: taskResult
+  }
+}
+
+OracleProcedure.parameterSpec = [
+  {
+    type: 'textarea',
+    name: 'procedure',
+    label: 'procedure'
+  },
+  {
+    type: 'procedure-parameters',
+    name: 'parameters',
+    label: 'params'
+  }
+]
+
+TaskRegistry.registerTaskHandler('oracle-procedure', OracleProcedure)