bare-ws 2.0.2 → 2.0.3

package/lib/errors.d.ts

@@ -8,21 +8,22 @@ declare class WebSocketError extends Error {
   )
 
   static NETWORK_ERROR(msg: string, cause?: unknown): WebSocketError
-  static NOT_CONNECTED(msg?: string, cause?: unknown): WebSocketError
-  static UNEXPECTED_RSV1(msg?: string, cause?: unknown): WebSocketError
-  static UNEXPECTED_RSV2(msg?: string, cause?: unknown): WebSocketError
-  static UNEXPECTED_RSV3(msg?: string, cause?: unknown): WebSocketError
-  static EXPECTED_MASK(msg?: string, cause?: unknown): WebSocketError
-  static EXPECTED_CONTINUATION(msg?: string, cause?: unknown): WebSocketError
-  static UNEXPECTED_CONTINUATION(msg?: string, cause?: unknown): WebSocketError
-  static UNEXPECTED_CONTROL(msg?: string, cause?: unknown): WebSocketError
-  static INVALID_ENCODING(msg?: string, cause?: unknown): WebSocketError
-  static INVALID_UPGRADE_HEADER(msg?: string, cause?: unknown): WebSocketError
-  static INVALID_VERSION_HEADER(msg?: string, cause?: unknown): WebSocketError
-  static INVALID_KEY_HEADER(msg?: string, cause?: unknown): WebSocketError
-  static INVALID_ACCEPT_HEADER(msg?: string, cause?: unknown): WebSocketError
-  static INVALID_OPCODE(msg?: string, cause?: unknown): WebSocketError
-  static INVALID_PAYLOAD_LENGTH(msg?: string, cause?: unknown): WebSocketError
+  static NOT_CONNECTED(msg?: string): WebSocketError
+  static UNEXPECTED_RSV1(msg?: string): WebSocketError
+  static UNEXPECTED_RSV2(msg?: string): WebSocketError
+  static UNEXPECTED_RSV3(msg?: string): WebSocketError
+  static EXPECTED_MASK(msg?: string): WebSocketError
+  static EXPECTED_CONTINUATION(msg?: string): WebSocketError
+  static UNEXPECTED_CONTINUATION(msg?: string): WebSocketError
+  static UNEXPECTED_CONTROL(msg?: string): WebSocketError
+  static INVALID_ENCODING(msg?: string): WebSocketError
+  static INVALID_UPGRADE_HEADER(msg?: string): WebSocketError
+  static INVALID_VERSION_HEADER(msg?: string): WebSocketError
+  static INVALID_KEY_HEADER(msg?: string): WebSocketError
+  static INVALID_ACCEPT_HEADER(msg?: string): WebSocketError
+  static INVALID_OPCODE(msg?: string): WebSocketError
+  static INVALID_PAYLOAD_LENGTH(msg?: string): WebSocketError
+  static INCOMPLETE_FRAME(msg?: string, length?: number): WebSocketError
 }
 
 export = WebSocketError

package/lib/errors.js

@@ -168,4 +168,13 @@ module.exports = class WebSocketError extends Error {
       WebSocketError.INVALID_PAYLOAD_LENGTH
     )
   }
+
+  static INCOMPLETE_FRAME(msg = 'Incomplete frame', length = -1) {
+    return new WebSocketError(
+      msg,
+      'INCOMPLETE_FRAME',
+      length,
+      WebSocketError.INCOMPLETE_FRAME
+    )
+  }
 }

package/lib/frame.js

@@ -136,12 +136,13 @@ exports.encode = function encode(state, f) {
 }
 
 exports.decode = function decode(state) {
+  const s = state.start
   const b = state.buffer
 
-  let i = state.start
-  let n = b.length
+  let i = s
+  let n = b.byteLength
 
-  if (n < 2) return null
+  if (n < 2) throw errors.INCOMPLETE_FRAME()
 
   const view = new DataView(b.buffer, b.byteOffset, b.byteLength)
 
@@ -164,14 +165,14 @@ exports.decode = function decode(state) {
   n--
 
   if (length === 0x7e) {
-    if (n < 2) return null
+    if (n < 2) throw errors.INCOMPLETE_FRAME()
 
     length = view.getUint16(i, false)
 
     i += 2
     n -= 2
   } else if (length === 0x7f) {
-    if (n < 8) return null
+    if (n < 8) throw errors.INCOMPLETE_FRAME()
 
     const high = view.getUint32(i, false)
 
@@ -191,7 +192,7 @@ exports.decode = function decode(state) {
   let mask = null
 
   if (masked) {
-    if (n < 4) return null
+    if (n < 4) throw errors.INCOMPLETE_FRAME()
 
     mask = b.subarray(i, i + 4)
 
@@ -199,7 +200,9 @@ exports.decode = function decode(state) {
     n -= 4
   }
 
-  if (n < length) return null
+  if (n < length) {
+    throw errors.INCOMPLETE_FRAME('Incomplete frame', i - s + length)
+  }
 
   const payload = b.subarray(i, i + length)
 

package/lib/socket.js

@@ -40,7 +40,9 @@ module.exports = exports = class WebSocket extends Duplex {
     this._pendingOpen = null
     this._pendingWrite = null
 
-    this._buffer = null
+    this._buffer = []
+    this._buffered = 0
+    this._frame = -1
 
     if (socket !== null) this._attach(socket)
     else this._connect(opts)
@@ -101,29 +103,30 @@ module.exports = exports = class WebSocket extends Duplex {
   }
 
   _ondata(data) {
-    if (this._buffer === null) this._buffer = data
-    else this._buffer = Buffer.concat([this._buffer, data])
+    this._buffer.push(data)
+    this._buffered += data.byteLength
 
-    while (this._buffer !== null) {
-      const state = { start: 0, end: this._buffer.length, buffer: this._buffer }
+    while (this._frame === -1 || this._frame <= this._buffered) {
+      const buffer =
+        this._buffer.length === 1
+          ? this._buffer[0]
+          : Buffer.concat(this._buffer)
 
-      let frame
-      try {
-        frame = Frame.decode(state)
-      } catch (err) {
-        return this.destroy(err)
-      }
+      this._buffer = [buffer]
 
-      if (frame === null) return
-
-      this._buffer =
-        state.start === state.end ? null : this._buffer.subarray(state.start)
+      const state = { start: 0, end: buffer.length, buffer }
 
       try {
-        this._onframe(frame)
+        this._onframe(Frame.decode(state))
       } catch (err) {
-        return this.destroy(err)
+        if (err.code === 'INCOMPLETE_FRAME') this._frame = err.status
+        else this.destroy(err)
+        return
       }
+
+      this._buffered -= state.start
+      this._buffer = this._buffered > 0 ? [buffer.subarray(state.start)] : []
+      this._frame = -1
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-ws",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "WebSocket library for JavaScript",
   "exports": {
     ".": {