@nxtedition/shared 2.0.2 → 2.0.5

package/index.js

@@ -2,7 +2,6 @@ import assert from 'node:assert'
 
 const WRITE_INDEX = 0
 const READ_INDEX = 1
-const END_OF_PACKET = -1
 
 export function alloc(size) {
   return {
@@ -26,19 +25,31 @@ async function* _reader({ sharedState, sharedBuffer }, cb) {
     writePos = Atomics.load(state, WRITE_INDEX)
 
     while (readPos !== writePos) {
-      const len = buffer.readInt32LE(readPos)
-      assert(len > 0)
+      const tag = buffer.readInt32LE(readPos)
+      readPos += 4
 
-      if (len === END_OF_PACKET) {
+      if (tag === -1) {
         readPos = 0
-      } else {
-        const raw = buffer.subarray(readPos + 4, readPos + len)
-        readPos += len
-        if (cb) {
-          await cb(raw)
-        } else {
-          yield raw
+        continue
+      }
+
+      assert.equal(tag, -2)
+
+      const len = buffer.readInt32LE(readPos)
+      readPos += 4
+
+      assert(len >= 0)
+
+      const raw = buffer.subarray(readPos, readPos + len)
+      readPos += len
+
+      if (cb) {
+        const thenable = cb(raw)
+        if (typeof thenable?.then === 'function') {
+          await thenable
         }
+      } else {
+        yield raw
       }
 
       Atomics.store(state, READ_INDEX, readPos)
@@ -65,12 +76,12 @@ export function writer({ sharedState, sharedBuffer }) {
   let writePos = 0
 
   function tryWrite(maxLen, fn, opaque) {
-    readPos = Atomics.load(state, READ_INDEX)
+    assert(maxLen < size - 12)
 
-    maxLen += 4 // len
+    readPos = Atomics.load(state, READ_INDEX)
 
-    if (size - writePos < maxLen + 4) {
-      if (readPos < maxLen + 4) {
+    if (size - writePos < maxLen + 12) {
+      if (readPos < maxLen + 12) {
         return false
       }
 
@@ -79,17 +90,19 @@ export function writer({ sharedState, sharedBuffer }) {
     } else {
       const available = writePos >= readPos ? size - writePos : readPos - writePos
 
-      if (available < maxLen + 4) {
+      if (available < maxLen + 12) {
         return false
       }
     }
 
-    const lenPos = writePos
+    buffer.writeInt32LE(-2, writePos)
     writePos += 4
 
-    writePos += fn(buffer.subarray(writePos, writePos + maxLen), opaque)
+    const lenPos = writePos
+    writePos += 4
 
-    const len = writePos - lenPos
+    const len = fn(buffer.subarray(writePos, writePos + maxLen), opaque)
+    writePos += len
 
     assert(len <= maxLen)
 
@@ -102,8 +115,8 @@ export function writer({ sharedState, sharedBuffer }) {
   }
 
   async function _write(len, fn, opaque) {
-    const buf = Buffer.allocUnsafe(len)
-    buf.subarray(0, fn(buf, opaque))
+    let buf = Buffer.allocUnsafe(len)
+    buf = buf.subarray(0, fn(buf, opaque))
 
     while (!tryWrite(len, (dst, buf) => buf.copy(dst), buf)) {
       const { async, value } = Atomics.waitAsync(state, READ_INDEX, readPos)
@@ -127,15 +140,17 @@ export function writer({ sharedState, sharedBuffer }) {
       fn = args[1]
       opaque = args[2]
 
-      assert(len > 0)
+      assert(len >= 0)
       assert(typeof fn === 'function')
     } else {
       if (Array.isArray(args[0])) {
         args = args[0]
       }
 
+      const data = args
+
       len = 0
-      for (const buf of args) {
+      for (const buf of data) {
         len += buf.byteLength ?? buf.length * 3
       }
 
@@ -145,14 +160,14 @@ export function writer({ sharedState, sharedBuffer }) {
           if (typeof buf === 'string') {
             pos += dst.write(buf, pos)
           } else {
-            dst.set(buf, pos)
-            pos += buf.byteLength
+            pos += buf.copy(dst, pos)
           }
         }
+        assert(pos <= len)
         return pos
       }
 
-      opaque = args
+      opaque = data
     }
 
     if (!tryWrite(len, fn, opaque)) {

package/package.json

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