*make message encoding/decoding async for use with the kernel

index.js

@@ -50,11 +50,7 @@ class Channel {
     for (const m of messages) this.addMessage(m);
   }
 
-  async open(handshake) {
+  open(handshake) {
-    await this._mux.pullLocal();
-    await this._mux.pullFree();
-
-    const freeLen = this._mux._free.length;
     const id =
       this._mux._free.length > 0
         ? this._mux._free.pop()
@@ -64,15 +60,8 @@ class Channel {
     this._localId = id + 1;
     this._mux._local[id] = this;
 
-    if (freeLen > 0) {
-      await this._mux.popFree(id);
-    } else {
-      await this._mux.pushLocal(id);
-    }
-
     if (this._remoteId === 0) {
       this._info.outgoing.push(this._localId);
-      await this._mux.pushInfos();
     }
 
     const state = { buffer: null, start: 2, end: 2 };
@@ -103,7 +92,7 @@ class Channel {
     this._mux._safeDestroy(err);
   }
 
-  async _fullyOpenSoon() {
+  _fullyOpenSoon() {
     this._mux._remote[this._remoteId - 1].session = this;
     queueTick(this._fullyOpen.bind(this));
   }
@@ -142,31 +131,24 @@ class Channel {
     }
   }
 
-  async _close(isRemote) {
+  _close(isRemote) {
     if (this.closed === true) return;
     this.closed = true;
 
-    await this._mux.pullInfos();
-
     this._info.opened--;
 
-    await this._mux.pushInfos();
-
     if (this._remoteId > 0) {
       this._mux._remote[this._remoteId - 1] = null;
       this._remoteId = 0;
-      await this._mux.pullFree();
       // If remote has acked, we can reuse the local id now
       // otherwise, we need to wait for the "ack" to arrive
       this._mux._free.push(this._localId - 1);
-
-      await this._mux.pushFree(this._localId - 1);
     }
 
     this._mux._local[this._localId - 1] = null;
     this._localId = 0;
 
-    await this._mux._gc(this._info);
+    this._mux._gc(this._info);
     this._track(this.onclose(isRemote, this));
 
     if (this._active === 0) this._destroy();
@@ -192,7 +174,7 @@ class Channel {
     this._mux.uncork();
   }
 
-  async close() {
+  close() {
     if (this.closed === true) return;
 
     const state = { buffer: null, start: 2, end: 2 };
@@ -205,7 +187,7 @@ class Channel {
     state.buffer[1] = 3;
     c.uint.encode(state, this._localId);
 
-    await this._mux._close(false);
+    this._close(false);
     this._mux._write0(state.buffer);
   }
 
@@ -277,12 +259,8 @@ class Channel {
 }
 
 module.exports = class Protomux {
-  constructor(stream, { alloc, slave = false } = {}) {
+  constructor(stream, { alloc } = {}) {
-    if (stream.userData) {
+    if (stream.userData === null) stream.userData = this;
-      throw new Error("Mux already set for this stream");
-    }
-
-    stream.userData = this;
 
     this.isProtomux = true;
     this.stream = stream;
@@ -357,7 +335,8 @@ module.exports = class Protomux {
     const info = this._infos.get(key);
     return info ? info.opened > 0 : false;
   }
-  async createChannel({
+
+  createChannel({
     userData = null,
     protocol,
     aliases = [],
@@ -371,7 +350,7 @@ module.exports = class Protomux {
   }) {
     if (this.stream.destroyed) return null;
 
-    const info = await this._get(protocol, id, aliases);
+    const info = this._get(protocol, id, aliases);
     if (unique && info.opened > 0) return null;
 
     if (info.incoming.length === 0) {
@@ -392,12 +371,7 @@ module.exports = class Protomux {
 
     this._remoteBacklog--;
 
-    await this.pullInfos();
-
     const remoteId = info.incoming.shift();
-
-    await this.pushInfos();
-
     const r = this._remote[remoteId - 1];
     if (r === null) return null;
 
@@ -462,11 +436,9 @@ module.exports = class Protomux {
     this.stream.write(state.buffer);
   }
 
-  async _get(protocol, id, aliases = []) {
+  _get(protocol, id, aliases = []) {
     const key = toKey(protocol, id);
 
-    await this.pullInfos();
-
     let info = this._infos.get(key);
     if (info) return info;
 
@@ -489,22 +461,18 @@ module.exports = class Protomux {
       this._infos.set(key, info);
     }
 
-    await this.pushInfos();
-
     return info;
   }
 
-  async _gc(info) {
+  _gc(info) {
     if (
       info.opened === 0 &&
       info.outgoing.length === 0 &&
       info.incoming.length === 0
     ) {
-      await this.pullInfos();
       this._infos.delete(info.key);
 
       for (const alias of info.aliases) this._infos.delete(alias);
-      await this.pullInfos();
     }
   }
 
@@ -522,7 +490,7 @@ module.exports = class Protomux {
     this.stream.end();
   }
 
-  async _decode(remoteId, state) {
+  _decode(remoteId, state) {
     const type = c.uint.decode(state);
 
     if (remoteId === 0) {
@@ -600,7 +568,7 @@ module.exports = class Protomux {
     }
   }
 
-  async _onopensession(state) {
+  _onopensession(state) {
     const remoteId = c.uint.decode(state);
     const protocol = c.string.decode(state);
     const id = c.buffer.decode(state);
@@ -613,15 +581,11 @@ module.exports = class Protomux {
     }
 
     const rid = remoteId - 1;
-    const info = await this._get(protocol, id);
+    const info = this._get(protocol, id);
-
-    await this.pullRemote();
 
     // allow the remote to grow the ids by one
     if (this._remote.length === rid) {
       this._remote.push(null);
-
-      await this.pushRemote(this._remote.length - 1);
     }
 
     if (rid >= this._remote.length || this._remote[rid] !== null) {
@@ -629,26 +593,17 @@ module.exports = class Protomux {
     }
 
     if (info.outgoing.length > 0) {
-      await this.pullInfos();
       const localId = info.outgoing.shift();
       const session = this._local[localId - 1];
 
-      await this.pushInfos();
-
       if (session === null) {
-        await this.pullFree();
         // we already closed the channel - ignore
         this._free.push(localId - 1);
-
-        await this.pushFree(localId - 1);
-
         return;
       }
 
       this._remote[rid] = { state, pending: null, session: null };
 
-      await this.pushRemote(remoteId);
-
       session._remoteId = remoteId;
       session._fullyOpen();
       return;
@@ -665,18 +620,13 @@ module.exports = class Protomux {
       throw new Error("Remote exceeded backlog");
     }
 
-    await this.pullInfos();
-
     info.pairing++;
     info.incoming.push(remoteId);
 
-    await this.pushInfos();
-    await this.pushRemote(remoteId);
-
     this._requestSession(protocol, id, info).catch(this._safeDestroyBound);
   }
 
-  async _onrejectsession(state) {
+  _onrejectsession(state) {
     const localId = c.uint.decode(state);
 
     // TODO: can be done smarter...
@@ -684,23 +634,14 @@ module.exports = class Protomux {
       const i = info.outgoing.indexOf(localId);
       if (i === -1) continue;
 
-      await this.pullInfos();
-
       info.outgoing.splice(i, 1);
 
-      await this.pushInfos();
-
       const session = this._local[localId - 1];
 
-      await this.pullFree(localId - 1);
-
       this._free.push(localId - 1);
-
-      await this.pushFree(localId - 1);
-
       if (session !== null) session._close(true);
 
-      await this._gc(info);
+      this._gc(info);
       return;
     }
 
@@ -727,25 +668,13 @@ module.exports = class Protomux {
 
     if (notify) await notify(id);
 
-    await this.pullInfos();
+    if (--info.pairing > 0) return;
-
-    let p = --info.pairing;
-
-    await this.pushInfos();
-
-    if (p > 0) return;
 
     while (info.incoming.length > 0) {
-      await this.pullInfos();
+      this._rejectSession(info, info.incoming.shift());
-
-      const id = info.incoming.shift();
-
-      await this.pushInfos();
-
-      this._rejectSession(info, id);
     }
 
-    await this._gc(info);
+    this._gc(info);
   }
 
   _rejectSession(info, remoteId) {
@@ -798,60 +727,6 @@ module.exports = class Protomux {
       if (s !== null) s._close(true);
     }
   }
-
-  async popFree(id) {
-    await this.stream.syncProtomux("popFree", id);
-  }
-  async pushFree(id) {
-    await this.stream.syncProtomux("pushFree", id);
-  }
-  async pushLocal(id) {
-    await this.stream.syncProtomux("pushLocal", id);
-  }
-  async pushRemote(id) {
-    await this.stream.syncProtomux("pushRemote", id);
-  }
-  async pushInfos() {
-    await this.stream.syncProtomux(
-      "pushInfos",
-      Array.from(this._infos.entries())
-    );
-  }
-
-  async pullLocal() {
-    const ids = await this.stream.syncProtomux("pullLocal");
-
-    ids.forEach((item) => {
-      item = parseInt(item);
-      if (typeof this._local[item] === "undefined") {
-        this._local[item] = null;
-      }
-    });
-  }
-  async pullFree() {
-    const ids = await this.stream.syncProtomux("pullFree");
-
-    this._free = Array.from(new Set([...this._free, ...ids]));
-    this._free = this._free.filter((item) => item !== null);
-  }
-  async pullRemote() {
-    const ids = await this.stream.syncProtomux("pullRemote");
-
-    ids.forEach((item) => {
-      item = parseInt(item);
-      if (typeof this._remote[item] === "undefined") {
-        this._remote[item] = null;
-      }
-    });
-  }
-  async pullInfos() {
-    const info = await this.stream.syncProtomux(
-      "pullInfos",
-      Array.from(this._infos.entries())
-    );
-
-    this._infos = new Map(info);
-  }
 };
 
 function noop() {}