@nxtedition/shared 2.0.10 → 2.0.13

package/index.js

@@ -44,7 +44,10 @@ async function* _reader({ sharedState, sharedBuffer }, cb) {
       readPos += len
 
       if (cb) {
-        await cb(raw)
+        const thenable = cb(raw)
+        if (thenable) {
+          await thenable
+        }
       } else {
         yield raw
       }
@@ -110,19 +113,17 @@ export function writer({ sharedState, sharedBuffer }) {
     return true
   }
 
-  // async function _write(maxLen, fn, opaque) {
-  //   assert(maxLen <= size)
-
-  //   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 defaultWrite(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
+  }
 
   function write(...args) {
     if (!args.length) {
@@ -145,23 +146,19 @@ export function writer({ sharedState, sharedBuffer }) {
         args = args[0]
       }
 
-      maxLen = args.reduce((len, buf) => len + Buffer.byteLength(buf), 0)
-      fn = (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
+      maxLen = 0
+      for (const buf of args) {
+        maxLen += Buffer.byteLength(buf)
       }
+
+      fn = defaultWrite
+
       opaque = args
     }
 
     while (!_tryWrite(maxLen, fn, opaque)) {
-      Atomics.wait(state, READ_INDEX, readPos)
+      // TODO (fix): Async? Warn? Timeout?
+      Atomics.wait(state, READ_INDEX, readPos, 1e3)
     }
   }
 

package/package.json

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