Fixed a bug in the processing of Property's type and Action's input/o…

…utput type when null was specified
eclipse-thingweb · Jul 20, 2024 · ae300d4 · ae300d4
1 parent 021da87
commit ae300d4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/node-red-node-wot/plugin-resources-src/node-wot-plugin-lib.ts b/node-red-node-wot/plugin-resources-src/node-wot-plugin-lib.ts
@@ -109,12 +109,13 @@ export const createClientFlowUsingDashboard = (tdString: string, existedNodes: a
                 actionGenIds.push(generateId())
             }
             const tdAction = td.actions[actionName]
+            let actionInputType = tdAction.input?.type || "actionInputTypeNull"
             const actionParams = {
                 ...commonParams,
                 actionName,
                 actionDescription: tdAction.description,
-                inputMode: DATATYPES[tdAction.input?.type || "actionInputTypeNull"].inputMode,
-                convert: DATATYPES[tdAction.input?.type || "actionInputTypeNull"].typeConvert,
+                inputMode: DATATYPES[actionInputType].inputMode,
+                convert: DATATYPES[actionInputType].typeConvert,
             }
             flowAndOffsetY = makeActionFlow(commonGenIds, actionGenIds, actionParams, tdAction, flowAndOffsetY.offsetY)
             flow = flow.concat(flowAndOffsetY.flow)
@@ -264,7 +265,7 @@ const makeActionFlow = (commonGenIds, actionGenIds, params, tdAction, offsetY) =
         offsetY
     )
     flow = flow.concat(flowAndOffsetY.flow)
-    if (tdAction.input?.type) {
+    if (params.inputMode) {
         flowAndOffsetY = replaceParamsAndIds(
             ACTION_ARGS_TEMP,
             params,

diff --git a/node-red-node-wot/src/wot-action.js b/node-red-node-wot/src/wot-action.js
@@ -63,6 +63,7 @@ module.exports = function (RED) {
                         shape: "ring",
                         text: err.message,
                     })
+                    console.error(err)
                     done(err)
                 })
         })

diff --git a/node-red-node-wot/src/wot-property.js b/node-red-node-wot/src/wot-property.js
@@ -120,6 +120,7 @@ module.exports = function (RED) {
                         shape: "ring",
                         text: "Response error",
                     })
+                    console.error(err)
                     done(err)
                 })
         })
@@ -189,6 +190,7 @@ module.exports = function (RED) {
                         shape: "ring",
                         text: err.message,
                     })
+                    console.error(err)
                     done(err)
                 })
         })

diff --git a/node-red-node-wot/src/wot-server-action.ts b/node-red-node-wot/src/wot-server-action.ts
@@ -6,18 +6,21 @@ module.exports = function (RED) {
 
         // for wot-server-config
         node.getProps = () => {
+            const input = config.actionInputDataType === "null" ? undefined : { type: config.actionInputDataType }
+            const output =
+                config.actionOutputDataType === "null"
+                    ? undefined
+                    : {
+                          type: config.actionOutputDataType,
+                      }
             return {
                 attrType: "actions",
                 name: config.actionName,
                 outputArgs: config.outParams1_actionArgsConstValue,
                 content: {
                     description: config.actionDescription,
-                    input: {
-                        type: config.actionInputDataType,
-                    },
-                    output: {
-                        type: config.actionOutputDataType,
-                    },
+                    input,
+                    output,
                 },
             }
         }

diff --git a/node-red-node-wot/src/wot-server-property.ts b/node-red-node-wot/src/wot-server-property.ts
@@ -8,13 +8,14 @@ module.exports = function (RED) {
 
         // for wot-server-config
         node.getProps = () => {
+            const type = config.propertyDataType === "null" ? undefined : config.propertyDataType
             return {
                 attrType: "properties",
                 name: config.propertyName,
                 outputAttr: config.outParams2_writingValueConstValue,
                 content: {
                     description: config.propertyDescription,
-                    type: config.propertyDataType,
+                    type,
                     readOnly: config.propertyReadOnlyFlag,
                     observable: config.propertyObservableFlag,
                 },