@nxtedition/shared 1.2.0 → 1.4.0

package/index.js

@@ -31,7 +31,7 @@ async function* _reader({ sharedState, sharedBuffer }, cb) {
       if (len === END_OF_PACKET) {
         readPos = 0
       } else {
-        const raw = buffer.slice(readPos + 4, readPos + len)
+        const raw = buffer.subarray(readPos + 4, readPos + len)
         readPos += len
         if (cb) {
           const thenable = cb(raw)
@@ -68,17 +68,11 @@ export function writer({ sharedState, sharedBuffer }) {
   let writePos = 0
   let flushing = null
 
-  function acquire(len) {
-    if (!len) {
-      return Buffer.alloc(0)
-    }
-
+  function tryWrite(maxLen, fn, opaque) {
     readPos = Atomics.load(state, READ_INDEX)
 
-    assert(len < size / 2)
-
-    if (size - writePos < len + 4) {
-      if (readPos < len + 4) {
+    if (size - writePos < maxLen + 4) {
+      if (readPos < maxLen + 4) {
         return false
       }
 
@@ -87,71 +81,48 @@ export function writer({ sharedState, sharedBuffer }) {
     } else {
       const available = writePos >= readPos ? size - writePos : readPos - writePos
 
-      if (available < len + 4) {
+      if (available < maxLen + 4) {
         return false
       }
     }
 
-    return buffer.subarray(writePos + 4, writePos + 4 + len)
-  }
-
-  function acquireSync (len) {
-    while (true) {
-      const buf = acquire(len)
-      if (buf) {
-        return buf
-      }
-      Atomics.wait(state, READ_INDEX, readPos)
-    }
-  }
+    const lenPos = writePos
+    writePos += 4
 
-  function release(len) {
-    buffer.writeInt32LE(len, writePos)
-    writePos += 4 + len
+    writePos += fn(buffer.subarray(writePos, writePos + maxLen), opaque)
 
-    Atomics.store(state, WRITE_INDEX, writePos)
-    Atomics.notify(state, WRITE_INDEX)
-  }
+    const len = writePos - lenPos
 
-  function tryWrite(...raw) {
-    if (Array.isArray(raw[0])) {
-      raw = raw[0]
-    }
+    assert(len <= maxLen)
 
-    if (!raw.length) {
-      return true
-    }
+    buffer.writeInt32LE(len, lenPos)
 
-    let maxLen = 4
-    for (const buf of raw) {
-      maxLen += buf.byteLength ?? buf.length * 3
-    }
+    Atomics.store(state, WRITE_INDEX, writePos)
+    Atomics.notify(state, WRITE_INDEX)
 
-    const dst = acquire(maxLen)
-    if (!dst) {
-      return false
-    }
+    return true
+  }
 
-    let pos = 0
-    for (const buf of raw) {
-      if (typeof buf === 'string') {
-        pos += buffer.write(buf, pos)
-      } else {
-        buffer.set(buf, pos)
-        pos += buf.byteLength
-      }
+  function flush() {
+    if (queue.length && !flushing) {
+      flushing = _flush()
     }
-
-    assert(pos <= maxLen)
-
-    release(pos)
-
-    return true
+    return flushing
   }
 
-  async function flush() {
+  async function _flush() {
     while (queue.length) {
-      while (!tryWrite(queue[0])) {
+      const buf = queue[0]
+      while (
+        !tryWrite(
+          buf.byteLength,
+          (dst, buf) => {
+            dst.set(buf)
+            return buf.byteLength
+          },
+          queue[0]
+        )
+      ) {
         const { async, value } = Atomics.waitAsync(state, READ_INDEX, readPos)
         if (async) {
           await value
@@ -163,19 +134,56 @@ export function writer({ sharedState, sharedBuffer }) {
     flushing = null
   }
 
-  function write(...raw) {
-    if (!queue.length && tryWrite(...raw)) {
+  function write(...args) {
+    if (!args.length) {
+      return
+    }
+
+    let len
+    let fn
+    let opaque
+
+    if (Number.isInteger(args[0])) {
+      len = args[0]
+      fn = args[1]
+      opaque = args[2]
+    } else {
+      if (Array.isArray(args[0])) {
+        args = args[0]
+      }
+
+      len = 4
+      for (const buf of args) {
+        len += buf.byteLength ?? buf.length * 3
+      }
+
+      fn = (dst, data) => {
+        let pos = 0
+        for (const buf of data) {
+          if (typeof buf === 'string') {
+            pos += dst.write(buf, pos)
+          } else {
+            dst.set(buf, pos)
+            pos += buf.byteLength
+          }
+        }
+        return pos
+      }
+
+      opaque = args
+    }
+
+    if (!queue.length && tryWrite(len, fn, opaque)) {
       return
     }
 
-    queue.push(Buffer.concat(raw))
+    const buf = Buffer.allocUnsafe(len)
+    queue.push(buf.subarray(0, fn(0, buf)))
 
-    return (flushing ??= flush())
+    return flush()
   }
 
-  write.acquireSync = acquireSync
-  write.acquire = acquire
-  write.release = release
+  write.write = write
   write.flush = flush
 
   return write

package/package.json

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