@nxtedition/shared 2.0.8 → 2.0.11

package/index.js

@@ -33,18 +33,21 @@ async function* _reader({ sharedState, sharedBuffer }, cb) {
         continue
       }
 
-      assert.equal(tag, -2)
+      assert(tag === -2, `tag: ${tag} === -2`)
 
       const len = buffer.readInt32LE(readPos)
       readPos += 4
 
-      assert(len >= 0)
+      assert(len > 0, `len: ${len} > 0`)
 
       const raw = buffer.subarray(readPos, readPos + len)
       readPos += len
 
       if (cb) {
-        await cb(raw)
+        const thenable = cb(raw)
+        if (thenable) {
+          await thenable
+        }
       } else {
         yield raw
       }
@@ -72,8 +75,6 @@ export function writer({ sharedState, sharedBuffer }) {
   let writePos = 0
 
   function _tryWrite(maxLen, fn, opaque) {
-    maxLen += 4
-
     assert(maxLen <= size)
 
     readPos = Atomics.load(state, READ_INDEX)
@@ -96,18 +97,15 @@ export function writer({ sharedState, sharedBuffer }) {
     buffer.writeInt32LE(-2, writePos)
     writePos += 4
 
-    const lenPos = writePos
-    writePos += 4
-
-    const len = fn(buffer.subarray(writePos, writePos + maxLen), opaque)
-    assert(len <= size)
-
-    writePos += len
     buffer.writeInt32LE(-3, writePos)
+    const len = fn(buffer.subarray(writePos + 4, writePos + 4 + maxLen), opaque)
+    assert(len > 0, `len: ${len} > 0`)
+    assert(len <= maxLen, `len: ${len} <= maxLen: ${maxLen}`)
+    assert(len <= size, `len: ${len} <= size: ${size}`)
 
-    assert(len <= maxLen)
-
-    buffer.writeInt32LE(len, lenPos)
+    buffer.writeInt32LE(len, writePos)
+    writePos += 4 + len
+    buffer.writeInt32LE(-4, writePos)
 
     Atomics.store(state, WRITE_INDEX, writePos)
     Atomics.notify(state, WRITE_INDEX)
@@ -115,18 +113,16 @@ export function writer({ sharedState, sharedBuffer }) {
     return true
   }
 
-  async function _write(maxLen, fn, opaque) {
-    assert(maxLen <= size)
-
-    const buf = Buffer.allocUnsafe(maxLen)
-    const len = fn(buf, opaque)
-
-    while (!_tryWrite(len, (dst, buf) => buf.copy(dst, 0, 0, len))) {
-      const { async, value } = Atomics.waitAsync(state, READ_INDEX, readPos)
-      if (async) {
-        await value
+  function defaultWrite(dst, data) {
+    let pos = 0
+    for (const buf of data) {
+      if (typeof buf === 'string') {
+        pos += dst.write(buf, pos)
+      } else {
+        pos += buf.copy(dst, pos)
       }
     }
+    return pos
   }
 
   function write(...args) {
@@ -143,31 +139,26 @@ export function writer({ sharedState, sharedBuffer }) {
       fn = args[1]
       opaque = args[2]
 
-      assert(maxLen >= 0)
-      assert(typeof fn === 'function')
+      assert(maxLen >= 0, `maxLen: ${maxLen} >= 0`)
+      assert(typeof fn === 'function', `fn: ${typeof fn} === 'function`)
     } else {
       if (Array.isArray(args[0])) {
         args = args[0]
       }
 
-      maxLen = args.reduce((len, buf) => len + Buffer.byteLength(buf), 0)
-      fn = (dst, data) => {
-        let pos = 0
-        for (const buf of data) {
-          if (typeof buf === 'string') {
-            pos += dst.write(buf, pos)
-          } else {
-            pos += buf.copy(dst, pos)
-          }
-        }
-        assert(pos < maxLen)
-        return pos
+      maxLen = 0
+      for (const buf of args) {
+        maxLen += Buffer.byteLength(buf)
       }
+
+      fn = defaultWrite
+
       opaque = args
     }
 
-    if (!_tryWrite(maxLen, fn, opaque)) {
-      return _write(maxLen, fn, opaque)
+    while (!_tryWrite(maxLen, fn, opaque)) {
+      // TODO (fix): Async? Warn? Timeout?
+      Atomics.wait(state, READ_INDEX, readPos)
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/shared",
-  "version": "2.0.8",
+  "version": "2.0.11",
   "description": "Ring Buffer for NodeJS cross Worker communication",
   "main": "index.js",
   "repository": {