Merge pull request #134 from kazuhitoyokoi/master-errorhandling4subflow

Add error handling for no module property in subflow
node-red · Jun 21, 2022 · c2ddb74 · c2ddb74
2 parents 5b719eb + f5bdc79
commit c2ddb74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/bin/node-red-nodegen.js b/bin/node-red-nodegen.js
@@ -110,8 +110,7 @@ function skipBom(body) {
 
 function isSubflowDefinition(data) {
     return data.find((item) => {
-        return ((item.type === "subflow") &&
-                (item.hasOwnProperty("meta")));
+        return item.type === "subflow";
     });
 }
 
@@ -156,7 +155,6 @@ if (argv.help || argv.h) {
             promise.then(function (result) {
                 console.log('Success: ' + result);
             }).catch(function (error) {
-                console.log('Error: ' + error);
                 console.log(error.stack);
             });
         }

diff --git a/lib/subflow/index.js b/lib/subflow/index.js
@@ -7,7 +7,6 @@ const crypt = require("crypto-js");
 
 const TEMPLATE_DIR = path.join(__dirname,'../../templates/subflow');
 
-
 // Extract Subflow definition from JSON data
 function getSubflowDef(flow) {
     const newFlow = [];
@@ -24,10 +23,12 @@ function getSubflowDef(flow) {
             newFlow.push(item);
         }
     });
+    if (sf == null) {
+        throw new Error("No module properties in subflow");
+    }
     return [sf, newFlow];
 }
 
-
 // get flow encoding method
 function getEncoder(encoding) {
     if (encoding === "AES") {
@@ -58,7 +59,6 @@ function createJSON(dstPath, flow, encoding, key) {
     fs.writeFileSync(dstPath, data);
 }
 
-
 module.exports = async function(data, options) {
     "use strict";