@nxtedition/shared 2.0.7 → 2.0.10

package/index.js

@@ -33,12 +33,12 @@ 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
@@ -66,18 +66,18 @@ export function reader(options, cb) {
 export function writer({ sharedState, sharedBuffer }) {
   const state = new Int32Array(sharedState)
   const buffer = Buffer.from(sharedBuffer)
-  const size = buffer.byteLength
+  const size = buffer.byteLength - 64
 
   let readPos = 0
   let writePos = 0
 
-  function tryWrite(maxLen, fn, opaque) {
-    assert(maxLen < size - 12)
+  function _tryWrite(maxLen, fn, opaque) {
+    assert(maxLen <= size)
 
     readPos = Atomics.load(state, READ_INDEX)
 
-    if (size - writePos < maxLen + 12) {
-      if (readPos < maxLen + 12) {
+    if (size - writePos < maxLen) {
+      if (readPos < maxLen) {
         return false
       }
 
@@ -86,7 +86,7 @@ export function writer({ sharedState, sharedBuffer }) {
     } else {
       const available = writePos >= readPos ? size - writePos : readPos - writePos
 
-      if (available < maxLen + 12) {
+      if (available < maxLen) {
         return false
       }
     }
@@ -94,15 +94,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)
-    writePos += len
-
-    assert(len <= maxLen)
+    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}`)
 
-    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)
@@ -110,46 +110,42 @@ export function writer({ sharedState, sharedBuffer }) {
     return true
   }
 
-  async function _write(len, fn, opaque) {
-    let buf = Buffer.allocUnsafe(len)
-    buf = buf.subarray(0, fn(buf, opaque))
+  // async function _write(maxLen, fn, opaque) {
+  //   assert(maxLen <= size)
 
-    while (!tryWrite(len, (dst, buf) => buf.copy(dst), buf)) {
-      const { async, value } = Atomics.waitAsync(state, READ_INDEX, readPos)
-      if (async) {
-        await value
-      }
-    }
-  }
+  //   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 write(...args) {
     if (!args.length) {
       return
     }
 
-    let len
+    let maxLen
     let fn
     let opaque
 
     if (Number.isInteger(args[0])) {
-      len = args[0]
+      maxLen = args[0]
       fn = args[1]
       opaque = args[2]
 
-      assert(len >= 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]
       }
 
-      const data = args
-
-      len = 0
-      for (const buf of data) {
-        len += buf.byteLength ?? buf.length * 3
-      }
-
+      maxLen = args.reduce((len, buf) => len + Buffer.byteLength(buf), 0)
       fn = (dst, data) => {
         let pos = 0
         for (const buf of data) {
@@ -159,15 +155,13 @@ export function writer({ sharedState, sharedBuffer }) {
             pos += buf.copy(dst, pos)
           }
         }
-        assert(pos <= len)
         return pos
       }
-
-      opaque = data
+      opaque = args
     }
 
-    if (!tryWrite(len, fn, opaque)) {
-      return _write(len, fn, opaque)
+    while (!_tryWrite(maxLen, fn, opaque)) {
+      Atomics.wait(state, READ_INDEX, readPos)
     }
   }
 

package/package.json

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