Async calls - still in progress

jazz-soft · Sep 11, 2019 · 9ffb355 · 9ffb355
1 parent c76ad17
commit 9ffb355
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 4 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,6 +15,9 @@ module.exports = {
   "overrides": [
     {
       "files": ["test/*"],
+      "parserOptions": {
+        "ecmaVersion": 2017
+      },
       "globals": {
         "describe": "readonly",
         "it": "readonly"

diff --git a/javascript/JZZ.js b/javascript/JZZ.js
@@ -39,8 +39,10 @@
           this._orig._hope = false;
           x[0].apply(this, x[1]);
         }
+        else if (this._orig._hope && x[0] == _then) {
+          x[0].apply(this, x[1]);
+        }
         else {
-          this._queue = [];
           this._orig._hope = false;
         }
       }

diff --git a/test/async.js b/test/async.js
@@ -2,15 +2,55 @@
 var JZZ = require('..');
 
 describe('async calls', function() {
+  var broke = 'We broke it!';
+  var notexisting = 'Not existing port';
+  var notfound = 'Port "Not existing port" not found';
+
   it('await JZZ()', async function() {
-    var jzz = await JZZ();
+    await JZZ();
+  });
+
+  it('await JZZ() / throw', async function() {
+    var msg;
+    try {
+      await JZZ().and(function() { this._break(broke); });
+    }
+    catch (err) {
+      msg = err.message;
+      JZZ()._repair();
+    }
+    assert.equal(msg, broke);
   });
+
   it('await JZZ().then(...)', async function() {
     await JZZ().then(function() {});
+    await JZZ().then(undefined, function() {});
   });
+
+  it('await JZZ().then(...) / throw', async function() {
+    var msg;
+    try {
+      await JZZ().and(function() { this._break(broke); }).then(function() {});
+    }
+    catch (err) {
+      msg = err.message;
+    }
+    assert.equal(msg, broke);
+    msg = undefined;
+    try {
+      await JZZ().then(undefined, function() {});
+    }
+    catch (err) {
+      msg = err.message;
+    }
+    assert.equal(msg, broke);
+    JZZ()._repair();
+  });
+
   it('await JZZ().wait(...)', async function() {
     await JZZ().wait(1);
   });
+
   it('await JZZ().openMidiIn(...)', async function() {
     var name = 'Widget MIDI-In';
     var widget = {
@@ -21,8 +61,21 @@ describe('async calls', function() {
       }
     };
     JZZ.lib.registerMidiIn(name, widget);
-    var port = await JZZ().openMidiIn(name);
+    await JZZ().openMidiIn(name);
+  });
+
+  it('await JZZ().openMidiIn(...) / throw', async function() {
+    var msg;
+    try {
+      var jzz = await JZZ();
+      await jzz.openMidiIn(notexisting);
+    }
+    catch (err) {
+      msg = err.message;
+    }
+    assert.equal(msg, notfound);
   });
+
   it('await JZZ().openMidiOut(...)', async function() {
     var name = 'Widget MIDI-Out';
     var widget = {
@@ -33,6 +86,19 @@ describe('async calls', function() {
       }
     };
     JZZ.lib.registerMidiOut(name, widget);
-    var port = await JZZ().openMidiOut(name);
+    await JZZ().openMidiOut(name);
   });
+
+  it('await JZZ().openMidiOut(...) / throw', async function() {
+    var msg;
+    try {
+      var jzz = await JZZ();
+      await jzz.openMidiOut(notexisting);
+    }
+    catch (err) {
+      msg = err.message;
+    }
+    assert.equal(msg, notfound);
+  });
+
 });