@things-factory/integration-base 6.1.118 → 6.1.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.1.118",
+  "version": "6.1.122",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,11 +26,11 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.1.118",
-    "@things-factory/auth-base": "^6.1.118",
+    "@things-factory/api": "^6.1.122",
+    "@things-factory/auth-base": "^6.1.122",
     "@things-factory/env": "^6.1.116",
-    "@things-factory/oauth2-client": "^6.1.118",
-    "@things-factory/scheduler-client": "^6.1.118",
+    "@things-factory/oauth2-client": "^6.1.122",
+    "@things-factory/scheduler-client": "^6.1.122",
     "@things-factory/shell": "^6.1.118",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "ea96bacb831bdc751bd1962a9d73a7d8abf0e304"
+  "gitHead": "01735af77d98fa26fbcc312e9b982eee1638114d"
 }

package/server/engine/task/data-accessor.ts

@@ -0,0 +1,33 @@
+import { access } from '@things-factory/utils'
+import { TaskRegistry } from '../task-registry'
+
+async function DataAccessor(step, { logger, data }) {
+  var {
+    params: { target, accessor }
+  } = step
+
+  const input = access(target, data)
+  const output = access(accessor, input)
+
+  return {
+    data: output
+  }
+}
+
+DataAccessor.parameterSpec = [
+  {
+    type: 'scenario-step-input',
+    name: 'target',
+    label: 'target'
+  },
+  {
+    type: 'data-accessor',
+    name: 'accessor',
+    label: 'accessor'
+  }
+]
+
+DataAccessor.connectorFree = true
+DataAccessor.help = 'integration/task/data-accessor'
+
+TaskRegistry.registerTaskHandler('data-accessor', DataAccessor)

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

@@ -19,27 +19,33 @@ type ProcedureParameterType = {
   maxSize?: number
 }
 
+type ValueType = {
+  code?: string
+  procedure?: string
+  parameters?: ProcedureParameterType[]
+}
+
 const TYPES = {
-  Number: oracledb.NUMBER,
-  String: oracledb.STRING,
-  Date: oracledb.DATE,
-  Buffer: oracledb.BUFFER,
-  Blob: oracledb.BLOB,
-  Clob: oracledb.CLOB,
-  Cursor: oracledb.CURSOR
+  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
+  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 { code = '', parameters = [] } = params.parameters as ValueType
 
   var dbconnection = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
 
@@ -51,7 +57,11 @@ async function OracleProcedure(step, context) {
     }
   })
 
-  procedure = vm.run('`' + procedure + '`')
+  if (!code) {
+    throw 'procedure code not defined'
+  }
+
+  code = vm.run('`' + code + '`')
 
   const procedureParameters =
     parameters &&
@@ -81,14 +91,14 @@ async function OracleProcedure(step, context) {
       return sum
     }, {})
 
-  const result = await dbconnection.execute(procedure, procedureParameters)
+  const result = await dbconnection.execute(code, 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) {
+    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()
@@ -106,15 +116,10 @@ async function OracleProcedure(step, context) {
 }
 
 OracleProcedure.parameterSpec = [
-  {
-    type: 'textarea',
-    name: 'procedure',
-    label: 'procedure'
-  },
   {
     type: 'procedure-parameters',
     name: 'parameters',
-    label: 'params'
+    label: ''
   }
 ]