Merge pull request #81 from georgejecook/fix/node-task-return-fix

Fix/node task return fix

src/lib/framework/MaestroPluginUtils.brs

@@ -0,0 +1,46 @@
+function mc_private_taskExec(instance as dynamic)
+    instance.delete("top")
+    instance.delete("global")
+    top = m.top
+    m.append(instance)
+    m.__isVMCreated = true
+    m.new()
+    m.top = top
+    args = m.top.args
+    maxTaskRetries = 1
+    if args <> invalid and args.maxTaskRetries <> invalid
+        maxTaskRetries = args.maxTaskRetries
+    end if
+    lastResult = { isOk: false }
+    attempt = 0
+    while attempt < maxTaskRetries
+        try
+            if m._execute <> invalid
+                result = m._execute(args)
+            else
+                result = m.execute(args)
+            end if
+            if type(result) = "<uninitialized>"
+                result = { isOk: false, message: "no result returned" }
+            else if result = invalid or getInterface(result, "ifAssociativeArray") = invalid or result.isOk = invalid
+                result = { isOk: true, data: result }
+            end if
+            if result.isOk = true
+                return result
+            else
+                lastResult = result
+            end if
+        catch error
+            m.log.error("error occurred executing task", m.top.subType(), m.top.id, error)
+            if error <> invalid
+                errorMessage = errorMessage.message
+            else
+                errorMessage = ""
+            end if
+            lastResult = { isOk: false, data: error, message: errorMessage }
+        end try
+        attempt++
+    end while
+
+    return lastResult
+end function

src/lib/node-classes/NodeClass.ts

@@ -183,41 +183,7 @@ export class NodeClass {
 
   function exec()
     instance = __${nodeFile.classStatement.getName(ParseMode.BrightScript)}_builder()
-    instance.delete("top")
-    instance.delete("global")
-    top = m.top
-    m.append(instance)
-    m.__isVMCreated = true
-    m.new()
-    m.top = top
-    args = m.top.args
-    maxTaskRetries = 1
-    if args <> invalid  and args.maxTaskRetries <> invalid
-        maxTaskRetries = args.maxTaskRetries
-    end if
-    lastError = invalid
-    attempt = 0
-    while attempt < maxTaskRetries
-        try
-            if m._execute <> invalid
-                result = m._execute(args)
-            else
-                result = m.execute(args)
-            end if
-            if type(result) <> "<uninitialized>" and result <> invalid and GetInterface(result, "ifAssociativeArray") <> invalid and result.isOk <> invalid
-                m.top.output = result
-            else
-                m.top.output = {isOk: true, data: result}
-            end if
-        catch error
-            m.log.error("error occurred executing task", mc_dv(m.top), error)
-            lastError = error
-            lastErrorMessage = mc_getString(error, "message")
-        end try
-        attempt++
-    end while
-
-    m.top.output = {isOk:false, data: error, message: lastErrorMessage}
+    m.top.output = mc_private_taskExec(instance)
   end function
     `;
         return text;
@@ -312,6 +278,7 @@ export class NodeClass {
     <field id="output" type="assocarray"/>
     <function name="exec"/>
     </interface>
+    <script type="text/brightscript" uri="pkg:/source/roku_modules/maestro/private/MaestroPluginUtils.brs" />
     <children>
     </children>
     </component>

src/lib/utils/FileFactory.ts

@@ -10,7 +10,8 @@ export class FileFactory {
     }
     public ignoredFilePaths = [];
     private frameworkFiles = {
-        'Reflection.brs': 'source/roku_modules/maestro/reflection/Reflection.brs'
+        'Reflection.brs': 'source/roku_modules/maestro/reflection/Reflection.brs',
+        'MaestroPluginUtils.brs': 'source/roku_modules/maestro/private/MaestroPluginUtils.brs'
     };
 
     public sourcePath = path.join(__dirname, '../framework');