@nxtedition/shared 1.4.2 → 2.0.2

package/index.js

@@ -27,6 +27,7 @@ async function* _reader({ sharedState, sharedBuffer }, cb) {
 
     while (readPos !== writePos) {
       const len = buffer.readInt32LE(readPos)
+      assert(len > 0)
 
       if (len === END_OF_PACKET) {
         readPos = 0
@@ -34,10 +35,7 @@ async function* _reader({ sharedState, sharedBuffer }, cb) {
         const raw = buffer.subarray(readPos + 4, readPos + len)
         readPos += len
         if (cb) {
-          const thenable = cb(raw)
-          if (thenable && typeof thenable.then === 'function') {
-            await thenable
-          }
+          await cb(raw)
         } else {
           yield raw
         }
@@ -62,11 +60,9 @@ export function writer({ sharedState, sharedBuffer }) {
   const state = new Int32Array(sharedState)
   const buffer = Buffer.from(sharedBuffer)
   const size = buffer.byteLength
-  const queue = []
 
   let readPos = 0
   let writePos = 0
-  let flushing = null
 
   function tryWrite(maxLen, fn, opaque) {
     readPos = Atomics.load(state, READ_INDEX)
@@ -105,35 +101,16 @@ export function writer({ sharedState, sharedBuffer }) {
     return true
   }
 
-  function flush() {
-    if (queue.length && !flushing) {
-      flushing = _flush()
-    }
-    return flushing
-  }
+  async function _write(len, fn, opaque) {
+    const buf = Buffer.allocUnsafe(len)
+    buf.subarray(0, fn(buf, opaque))
 
-  async function _flush() {
-    while (queue.length) {
-      const buf = queue[0]
-      while (
-        !tryWrite(
-          buf.byteLength,
-          (dst, buf) => {
-            dst.set(buf)
-            return buf.byteLength
-          },
-          buf
-        )
-      ) {
-        const { async, value } = Atomics.waitAsync(state, READ_INDEX, readPos)
-        if (async) {
-          await value
-        }
+    while (!tryWrite(len, (dst, buf) => buf.copy(dst), buf)) {
+      const { async, value } = Atomics.waitAsync(state, READ_INDEX, readPos)
+      if (async) {
+        await value
       }
-      queue.shift()
     }
-
-    flushing = null
   }
 
   function write(...args) {
@@ -149,6 +126,9 @@ export function writer({ sharedState, sharedBuffer }) {
       len = args[0]
       fn = args[1]
       opaque = args[2]
+
+      assert(len > 0)
+      assert(typeof fn === 'function')
     } else {
       if (Array.isArray(args[0])) {
         args = args[0]
@@ -175,18 +155,13 @@ export function writer({ sharedState, sharedBuffer }) {
       opaque = args
     }
 
-    if (!queue.length && tryWrite(len, fn, opaque)) {
-      return
+    if (!tryWrite(len, fn, opaque)) {
+      return _write(len, fn, opaque)
     }
-
-    const buf = Buffer.allocUnsafe(len)
-    queue.push(buf.subarray(0, fn(buf, opaque)))
-
-    return flush()
   }
 
   write.write = write
-  write.flush = flush
+  write.flush = () => {}
 
   return write
 }

package/package.json

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