Improve Orchestrator response handling

qbrandon · qbrandon · commit 49bfe65be7ee · 2018-01-12T10:28:05.000+09:00
diff --git a/lib/restHelper.js b/lib/restHelper.js
@@ -56,23 +56,30 @@ function reqEndHandler(response, buffers, cb) {
         /** @type {number|null} */
         var statusCode = response.statusCode;
         /** @type {Error|{statusCode: number|null}} */
-        var err;
+        var err = null;
+        /** @type {*} */
+        var result = null;
 
         if (cb === undefined) {
             return;
         }
         dataString = Buffer.concat(buffers).toString('utf-8');
-        try {
-            if (statusCode >= 300) {
-                err = new Error("Unexpected status code: " + statusCode);
-                err.statusCode = statusCode;
-                cb(err, JSON.parse(dataString));
-            } else {
-                cb(undefined, JSON.parse(dataString));
+        if (dataString.length > 0) {
+            try {
+                result = JSON.parse(dataString);
+            } catch (e) {
+                err = e;
+                e.rawData = dataString;
             }
-        } catch (e) {
-            e.statusCode = statusCode;
-            cb(e, {rawData: dataString, statusCode: statusCode});
+        }
+        if (err === null && statusCode >= 300) {
+            err = new Error("Unexpected status code: " + statusCode);
+        }
+        if (err === null) {
+            cb(undefined, result);
+        } else {
+            err.statusCode = statusCode;
+            cb(err, result);
         }
     };
 }
