Revert "use FixedQueue"

This reverts commit 0e415b2.
nodejs · May 21, 2024 · c05988c · c05988c
1 parent 826c84c
commit c05988c
Showing 1 changed file with 30 additions and 12 deletions.
diff --git a/lib/web/websocket/sender.js b/lib/web/websocket/sender.js
@@ -2,23 +2,27 @@
 
 const { WebsocketFrameSend } = require('./frame')
 const { opcodes, sendHints } = require('./constants')
-const FixedQueue = require('../../dispatcher/fixed-queue')
 
 /** @type {typeof Uint8Array} */
 const FastBuffer = Buffer[Symbol.species]
 
 /**
- * @typedef {object} QueueNode
+ * @typedef {object} SendQueueNode
+ * @property {SendQueueNode | null} next
  * @property {Promise<void> | null} promise
  * @property {((...args: any[]) => any)} callback
  * @property {Buffer | null} frame
  */
 
 class SendQueue {
   /**
-   * @type {FixedQueue | null}
+   * @type {SendQueueNode | null}
    */
-  #queue = null
+  #head = null
+  /**
+   * @type {SendQueueNode | null}
+   */
+  #tail = null
 
   /**
    * @type {boolean}
@@ -39,19 +43,24 @@ class SendQueue {
         // fast-path
         this.#socket.write(frame, cb)
       } else {
-        /** @type {QueueNode} */
+        /** @type {SendQueueNode} */
         const node = {
+          next: null,
           promise: null,
           callback: cb,
           frame
         }
-        (this.#queue ??= new FixedQueue()).push(node)
+        if (this.#tail !== null) {
+          this.#tail.next = node
+        }
+        this.#tail = node
       }
       return
     }
 
-    /** @type {QueueNode} */
+    /** @type {SendQueueNode} */
     const node = {
+      next: null,
       promise: item.arrayBuffer().then((ab) => {
         node.promise = null
         node.frame = createFrame(ab, hint)
@@ -60,7 +69,13 @@ class SendQueue {
       frame: null
     }
 
-    (this.#queue ??= new FixedQueue()).push(node)
+    if (this.#tail === null) {
+      this.#tail = node
+    }
+
+    if (this.#head === null) {
+      this.#head = node
+    }
 
     if (!this.#running) {
       this.#run()
@@ -69,10 +84,9 @@ class SendQueue {
 
   async #run () {
     this.#running = true
-    /** @type {FixedQueue} */
-    const queue = this.#queue
-    while (!queue.isEmpty()) {
-      const node = queue.shift()
+    /** @type {SendQueueNode | null} */
+    let node = this.#head
+    while (node !== null) {
       // wait pending promise
       if (node.promise !== null) {
         await node.promise
@@ -81,7 +95,11 @@ class SendQueue {
       this.#socket.write(node.frame, node.callback)
       // cleanup
       node.callback = node.frame = null
+      // set next
+      node = node.next
     }
+    this.#head = null
+    this.#tail = null
     this.#running = false
   }
 }