@nxtedition/shared 1.2.0 → 1.2.1

package/index.js

@@ -68,17 +68,26 @@ export function writer({ sharedState, sharedBuffer }) {
   let writePos = 0
   let flushing = null
 
-  function acquire(len) {
-    if (!len) {
-      return Buffer.alloc(0)
+  function tryWrite(...raw) {
+    if (Array.isArray(raw[0])) {
+      raw = raw[0]
+    }
+
+    if (!raw.length) {
+      return true
     }
 
     readPos = Atomics.load(state, READ_INDEX)
 
-    assert(len < size / 2)
+    let maxLen = 4
+    for (const buf of raw) {
+      maxLen += buf.byteLength ?? buf.length * 3
+    }
+
+    assert(maxLen < size / 2)
 
-    if (size - writePos < len + 4) {
-      if (readPos < len + 4) {
+    if (size - writePos < maxLen + 4) {
+      if (readPos < maxLen + 4) {
         return false
       }
 
@@ -87,64 +96,31 @@ 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)
-    }
-  }
-
-  function release(len) {
-    buffer.writeInt32LE(len, writePos)
-    writePos += 4 + len
-
-    Atomics.store(state, WRITE_INDEX, writePos)
-    Atomics.notify(state, WRITE_INDEX)
-  }
+    const lenPos = writePos
+    writePos += 4
 
-  function tryWrite(...raw) {
-    if (Array.isArray(raw[0])) {
-      raw = raw[0]
-    }
-
-    if (!raw.length) {
-      return true
-    }
-
-    let maxLen = 4
-    for (const buf of raw) {
-      maxLen += buf.byteLength ?? buf.length * 3
-    }
-
-    const dst = acquire(maxLen)
-    if (!dst) {
-      return false
-    }
-
-    let pos = 0
     for (const buf of raw) {
       if (typeof buf === 'string') {
-        pos += buffer.write(buf, pos)
+        writePos += buffer.write(buf, writePos)
       } else {
-        buffer.set(buf, pos)
-        pos += buf.byteLength
+        buffer.set(buf, writePos)
+        writePos += buf.byteLength
       }
     }
 
-    assert(pos <= maxLen)
+    const len = writePos - lenPos
 
-    release(pos)
+    assert(len <= maxLen)
+
+    buffer.writeInt32LE(len, lenPos)
+
+    Atomics.store(state, WRITE_INDEX, writePos)
+    Atomics.notify(state, WRITE_INDEX)
 
     return true
   }
@@ -173,10 +149,5 @@ export function writer({ sharedState, sharedBuffer }) {
     return (flushing ??= flush())
   }
 
-  write.acquireSync = acquireSync
-  write.acquire = acquire
-  write.release = release
-  write.flush = flush
-
   return write
 }

package/package.json

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