@nxtedition/shared 1.0.1 → 1.1.2

package/index.js

@@ -1,3 +1,5 @@
+import assert from 'node:assert'
+
 const WRITE_INDEX = 0
 const READ_INDEX = 1
 const END_OF_PACKET = -1
@@ -67,12 +69,25 @@ export function writer({ sharedState, sharedBuffer }) {
   let flushing = null
 
   function tryWrite(...raw) {
+    if (Array.isArray(raw[0])) {
+      raw = raw[0]
+    }
+
+    if (!raw.length) {
+      return true
+    }
+
     readPos = Atomics.load(state, READ_INDEX)
 
-    const len = raw.reduce((len, buf) => len + buf.byteLength, 4)
+    let maxLen = 4
+    for (const buf of raw) {
+      maxLen += buf.byteLength ?? buf.length * 3
+    }
 
-    if (size - writePos < len + 4) {
-      if (readPos < len + 4) {
+    assert(maxLen < size / 2)
+
+    if (size - writePos < maxLen + 4) {
+      if (readPos < maxLen + 4) {
         return false
       }
 
@@ -81,19 +96,29 @@ export function writer({ sharedState, sharedBuffer }) {
     } else {
       const available = writePos >= readPos ? size - writePos : readPos - writePos
 
-      if (available < len + 4) {
+      if (available < maxLen + 4) {
         return false
       }
     }
 
-    buffer.writeInt32LE(len, writePos)
+    const lenPos = writePos
     writePos += 4
 
     for (const buf of raw) {
-      buffer.set(buf, writePos)
-      writePos += buf.byteLength
+      if (typeof buf === 'string') {
+        writePos += buffer.write(buf, writePos)
+      } else {
+        buffer.set(buf, writePos)
+        writePos += buf.byteLength
+      }
     }
 
+    const len = writePos - lenPos
+
+    assert(len <= maxLen)
+
+    buffer.writeInt32LE(len, lenPos)
+
     Atomics.store(state, WRITE_INDEX, writePos)
     Atomics.notify(state, WRITE_INDEX)
 

package/package.json

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