@nxtedition/shared 2.0.2 → 2.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.js +28 -18
  2. package/package.json +1 -1
package/index.js CHANGED
@@ -2,7 +2,6 @@ import assert from 'node:assert'
2
2
 
3
3
  const WRITE_INDEX = 0
4
4
  const READ_INDEX = 1
5
- const END_OF_PACKET = -1
6
5
 
7
6
  export function alloc(size) {
8
7
  return {
@@ -26,19 +25,28 @@ async function* _reader({ sharedState, sharedBuffer }, cb) {
26
25
  writePos = Atomics.load(state, WRITE_INDEX)
27
26
 
28
27
  while (readPos !== writePos) {
28
+ const tag = buffer.readInt32LE(readPos)
29
+ readPos += 4
30
+
31
+ if (tag === -1) {
32
+ readPos = 0
33
+ continue
34
+ }
35
+
36
+ assert.equal(tag, -2)
37
+
29
38
  const len = buffer.readInt32LE(readPos)
39
+ readPos += 4
40
+
30
41
  assert(len > 0)
31
42
 
32
- if (len === END_OF_PACKET) {
33
- readPos = 0
43
+ const raw = buffer.subarray(readPos, readPos + len)
44
+ readPos += len
45
+
46
+ if (cb) {
47
+ await cb(raw)
34
48
  } else {
35
- const raw = buffer.subarray(readPos + 4, readPos + len)
36
- readPos += len
37
- if (cb) {
38
- await cb(raw)
39
- } else {
40
- yield raw
41
- }
49
+ yield raw
42
50
  }
43
51
 
44
52
  Atomics.store(state, READ_INDEX, readPos)
@@ -65,12 +73,12 @@ export function writer({ sharedState, sharedBuffer }) {
65
73
  let writePos = 0
66
74
 
67
75
  function tryWrite(maxLen, fn, opaque) {
68
- readPos = Atomics.load(state, READ_INDEX)
76
+ assert(maxLen < size - 12)
69
77
 
70
- maxLen += 4 // len
78
+ readPos = Atomics.load(state, READ_INDEX)
71
79
 
72
- if (size - writePos < maxLen + 4) {
73
- if (readPos < maxLen + 4) {
80
+ if (size - writePos < maxLen + 12) {
81
+ if (readPos < maxLen + 12) {
74
82
  return false
75
83
  }
76
84
 
@@ -79,17 +87,19 @@ export function writer({ sharedState, sharedBuffer }) {
79
87
  } else {
80
88
  const available = writePos >= readPos ? size - writePos : readPos - writePos
81
89
 
82
- if (available < maxLen + 4) {
90
+ if (available < maxLen + 12) {
83
91
  return false
84
92
  }
85
93
  }
86
94
 
87
- const lenPos = writePos
95
+ buffer.writeInt32LE(-2, writePos)
88
96
  writePos += 4
89
97
 
90
- writePos += fn(buffer.subarray(writePos, writePos + maxLen), opaque)
98
+ const lenPos = writePos
99
+ writePos += 4
91
100
 
92
- const len = writePos - lenPos
101
+ const len = fn(buffer.subarray(writePos, writePos + maxLen), opaque)
102
+ writePos += len
93
103
 
94
104
  assert(len <= maxLen)
95
105
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nxtedition/shared",
3
- "version": "2.0.2",
3
+ "version": "2.0.3",
4
4
  "description": "Ring Buffer for NodeJS cross Worker communication",
5
5
  "main": "index.js",
6
6
  "repository": {