@nxtedition/shared 2.0.15 → 2.0.16

package/index.js

@@ -66,6 +66,18 @@ export function reader(options, cb) {
   }
 }
 
+function arrayWrite(dst, data) {
+  let pos = 0
+  for (const buf of data) {
+    if (typeof buf === 'string') {
+      pos += dst.write(buf, pos)
+    } else {
+      pos += buf.copy(dst, pos)
+    }
+  }
+  return pos
+}
+
 export function writer({ sharedState, sharedBuffer }) {
   const state = new Int32Array(sharedState)
   const buffer = Buffer.from(sharedBuffer)
@@ -74,29 +86,23 @@ export function writer({ sharedState, sharedBuffer }) {
   let readPos = 0
   let writePos = 0
 
-  return function write(...args) {
-    if (!args.length) {
+  return function write(len, fn, opaque) {
+    if (!len) {
       return
     }
 
-    let len
-    let fn
-
-    if (Number.isInteger(args[0])) {
-      len = args.shift()
-      fn = args.shift()
-
+    if (Number.isInteger(len)) {
       assert(len >= 0, `len: ${len} >= 0`)
       assert(typeof fn === 'function', `fn: ${typeof fn} === 'function`)
     } else {
-      if (Array.isArray(args[0])) {
-        args = args[0]
-      }
+      opaque = Array.isArray(len) ? len : arguments
 
       len = 0
-      for (const buf of args) {
+      for (const buf of opaque) {
         len += Buffer.byteLength(buf)
       }
+
+      fn = arrayWrite
     }
 
     assert(len <= size)
@@ -120,21 +126,9 @@ export function writer({ sharedState, sharedBuffer }) {
 
     buffer.writeInt32LE(-2, writePos)
     writePos += 4
-
     buffer.writeInt32LE(-3, writePos)
 
-    let pos = 0
-    if (fn) {
-      pos += fn(buffer.subarray(writePos + 4, writePos + 4 + len), ...args)
-    } else {
-      for (const buf of args) {
-        if (typeof buf === 'string') {
-          pos += buffer.write(buf, writePos + 4 + pos)
-        } else {
-          pos += buf.copy(buffer, writePos + 4 + pos)
-        }
-      }
-    }
+    const pos = fn(buffer.subarray(writePos + 4, writePos + 4 + len), opaque)
 
     assert(pos > 0, `pos: ${pos} > 0`)
     assert(pos <= len, `pos: ${pos} <= len: ${len}`)

package/package.json

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