@honeybbq/teamspeak 1.0.0-beta.19 → 1.0.0-beta.21

package/dist/client/transfer.d.ts

@@ -5,10 +5,17 @@
  * the bytes then go over a separate TCP connection to the server's file
  * transfer port, opened with the key the negotiation returned.
  */
-import { type Duplex, type Readable, type Writable } from "node:stream";
+import { Writable, type Duplex, type Readable } from "node:stream";
 import type { FileUploadInfo, FileDownloadInfo } from "@honeybbq/teamspeak";
 import type { FileTransferSocketFactory } from "./types.js";
 import { FileTransferError } from "./errors.js";
+/**
+ * Whether `error` is a dial that never got a connection: refused, unreachable,
+ * or timed out while connecting. Not one the caller's signal or the idle limit
+ * ended, nor one after the connection opened, where the key may have been
+ * written and the server may hold or have dropped the transfer.
+ */
+export declare function failedToConnect(error: unknown): boolean;
 /** Where a failed transfer failed. */
 export type FileTransferStage = "dial" | "transfer";
 /** The file transfer port is about to be dialled. */
@@ -29,7 +36,7 @@ export interface FileTransferDialDoneInfo {
 export interface FileTransferProgressInfo {
     /** The bytes moved so far. */
     readonly bytes: number;
-    /** The size the negotiation gave; 0 when it is not known, as for an upload. */
+    /** The bytes the transfer will move, as the negotiation fixed them. */
     readonly total: number;
 }
 /** The transfer succeeded. */
@@ -103,9 +110,35 @@ export interface FileTransferOptions {
  * The caller owns the returned stream and must end or destroy it.
  */
 export declare function dialFileTransfer(host: string, port: number, key: string, options?: FileTransferOptions): Promise<Duplex>;
-/** Upload `data` over a negotiated transfer. Resolves once every byte is sent. */
+/**
+ * Upload `data` over a negotiated transfer. `data` is the file from
+ * `info.seekPosition` on, and must give exactly the bytes left of
+ * `info.size`: a stream that gives fewer or more fails the transfer.
+ *
+ * Resolves once the server has closed the transfer connection, which it does
+ * when it has the file. Measured on TeamSpeak 3 3.13.8 and TeamSpeak 6 6.0.0:
+ * the server closes about 200 ms after the last byte of a 100 000-byte file,
+ * and at once after the declared size when more is sent. A connection that
+ * closes before every byte is written, or that stays open for the idle limit,
+ * fails the transfer.
+ *
+ * A close after the last byte is not proof that the file is stored: the server
+ * sends nothing on the transfer connection, and over the voice protocol its
+ * `notifystatusfiletransfer` comes only for a failure (2066 canceled, 2063
+ * lost connection, 2052 more than declared), after the close, never for
+ * success; over ServerQuery nothing comes. `uploadFile` therefore asks the
+ * server for the file's size with `ftgetfileinfo` before it resolves.
+ */
 export declare function uploadFileData(host: string, info: FileUploadInfo, data: Readable, options?: FileTransferOptions): Promise<void>;
-/** Download a negotiated transfer into `dest`. Resolves once the file is written. */
+/**
+ * Download a negotiated transfer into `dest`. Resolves once the file is
+ * written; `dest` is not ended, so it may take another download.
+ *
+ * A download from `info.seekPosition` brings the bytes from there to the end
+ * of the file: measured on TeamSpeak 3 3.13.8 and TeamSpeak 6 6.0.0, a
+ * `seekpos` of 40 000 on a 100 000-byte file is answered with the whole size
+ * and then 60 000 bytes.
+ */
 export declare function downloadFileData(host: string, info: FileDownloadInfo, dest: Writable, options?: FileTransferOptions): Promise<void>;
 export { FileTransferError };
 //# sourceMappingURL=transfer.d.ts.map

package/dist/client/transfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../src/client/transfer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAchD,sCAAsC;AACtC,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,UAAU,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,yBAAyB;IACxC,qCAAqC;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,iEAAiE;AACjE,MAAM,WAAW,wBAAwB;IACvC,+BAA+B;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,sCAAsC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,sBAAsB;AACtB,MAAM,WAAW,wBAAwB;IACvC,8BAA8B;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,8BAA8B;AAC9B,MAAM,WAAW,oBAAoB;IACnC,uBAAuB;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,2BAA2B;AAC3B,MAAM,WAAW,sBAAsB;IACrC,yDAAyD;IACzD,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,wCAAwC;IACxC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;CACnC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,iBAAiB;IAChC,gDAAgD;IAChD,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,yBAAyB,KAAK,IAAI,CAAC;IAC/D,gEAAgE;IAChE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAC7D,gGAAgG;IAChG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAC7D,sDAAsD;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACrD,6EAA6E;IAC7E,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,sBAAsB,KAAK,IAAI,CAAC;CAC1D;AAED,mCAAmC;AACnC,MAAM,WAAW,mBAAmB;IAClC,uEAAuE;IACvE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAC;IAC/D;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC/C;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7C;AAkED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,MAAM,CAAC,CAYjB;AA+LD,kFAAkF;AAClF,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CASf;AAED,qFAAqF;AACrF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB,EACtB,IAAI,EAAE,QAAQ,EACd,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../../src/client/transfer.ts"],"names":[],"mappings":"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"}

package/dist/client/transfer.js

@@ -7,7 +7,7 @@
  */
 import { connect } from "node:net";
 import { pipeline } from "node:stream/promises";
-import { Transform } from "node:stream";
+import { Transform, Writable } from "node:stream";
 import { FileTransferError } from "./errors.js";
 import { callHook } from "./hooks.js";
 import { joinHostPort } from "./address.js";
@@ -18,6 +18,22 @@ const DIAL_TIMEOUT_MS = 10_000;
 const DEFAULT_IDLE_TIMEOUT_MS = 30_000;
 /** How many bytes move between two calls of the `progress` hook, at least. */
 const PROGRESS_STEP_BYTES = 64 * 1024;
+/** The file transfer ports a connection can be made to. */
+const MAX_PORT = 65535;
+/**
+ * The errors of dials that failed before the connection opened. Nothing has
+ * reached the server then: not the key, and no byte of the file.
+ */
+const failedBeforeConnect = new WeakSet();
+/**
+ * Whether `error` is a dial that never got a connection: refused, unreachable,
+ * or timed out while connecting. Not one the caller's signal or the idle limit
+ * ended, nor one after the connection opened, where the key may have been
+ * written and the server may hold or have dropped the transfer.
+ */
+export function failedToConnect(error) {
+    return typeof error === "object" && error !== null && failedBeforeConnect.has(error);
+}
 function newIdleGuard(options) {
     const limitMs = options.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
     if (!Number.isFinite(limitMs) || limitMs < 0) {
@@ -79,6 +95,9 @@ export async function dialFileTransfer(host, port, key, options = {}) {
 }
 async function dial(host, port, key, options, t, idle) {
     const { signal, socketFactory } = options;
+    if (!Number.isInteger(port) || port < 1 || port > MAX_PORT) {
+        throw new FileTransferError(`the file transfer port is ${String(port)}, not 1 to ${MAX_PORT}`);
+    }
     // One budget for the connection and the key write: a peer that accepts the
     // connection and never reads would otherwise hold the write forever.
     const timeout = AbortSignal.timeout(DIAL_TIMEOUT_MS);
@@ -91,8 +110,10 @@ async function dial(host, port, key, options, t, idle) {
     // report: a stream's unhandled `error` event takes the process down.
     const swallow = () => { };
     socket.on("error", swallow);
+    let open = false;
     try {
         await abortable(connected(socket), dialSignal);
+        open = true;
         idle.touch();
         await abortable(new Promise((resolve, reject) => {
             socket.write(key, (err) => err
@@ -106,7 +127,12 @@ async function dial(host, port, key, options, t, idle) {
     catch (error) {
         socket.destroy();
         if (timeout.aborted && error === timeout.reason) {
-            throw new FileTransferError("file transfer connection timed out", { cause: error });
+            const timedOut = new FileTransferError("file transfer connection timed out", {
+                cause: error,
+            });
+            if (!open)
+                failedBeforeConnect.add(timedOut);
+            throw timedOut;
         }
         throw error;
     }
@@ -144,9 +170,10 @@ function countingStream(t, total, idle) {
 }
 /**
  * Passes exactly `expected` bytes. One more byte fails the transfer, and is
- * not passed on; a stream that ends before `expected` fails it too.
+ * not passed on; a stream that ends before `expected` fails it too. `what`
+ * says who fixed the size, for the message.
  */
-function exactSize(expected) {
+function exactSize(expected, what) {
     let received = 0;
     return new Transform({
         transform(chunk, _encoding, callback) {
@@ -154,7 +181,7 @@ function exactSize(expected) {
             if (chunk.length > room) {
                 this.push(chunk.subarray(0, room));
                 received = expected;
-                callback(new FileTransferError(`file transfer sent more than the announced ${expected} bytes`));
+                callback(new FileTransferError(`file transfer sent more than the ${what} ${expected} bytes`));
                 return;
             }
             received += chunk.length;
@@ -163,7 +190,7 @@ function exactSize(expected) {
         flush(callback) {
             callback(received === expected
                 ? null
-                : new FileTransferError(`file transfer ended after ${received} of the announced ${expected} bytes`));
+                : new FileTransferError(`file transfer ended after ${received} of the ${what} ${expected} bytes`));
         },
     });
 }
@@ -192,6 +219,11 @@ async function transfer(host, port, key, total, options, move) {
             reportFailed(t, failure, "transfer");
             throw failure;
         }
+        finally {
+            // The server ends a transfer it has finished, and a failed one is
+            // abandoned here; either way nothing is left to keep the socket for.
+            socket.destroy();
+        }
     }
     finally {
         idle.stop();
@@ -223,21 +255,129 @@ function connected(socket) {
                 reject(error);
         };
         const onConnect = () => done();
-        const onError = (error) => done(new FileTransferError(`file transfer connection failed: ${error.message}`, {
-            cause: error,
-        }));
+        const onError = (error) => {
+            const failure = new FileTransferError(`file transfer connection failed: ${error.message}`, {
+                cause: error,
+            });
+            failedBeforeConnect.add(failure);
+            done(failure);
+        };
         socket.once("connect", onConnect);
         socket.once("ready", onConnect);
         socket.once("error", onError);
     });
 }
-/** Upload `data` over a negotiated transfer. Resolves once every byte is sent. */
-export function uploadFileData(host, info, data, options = {}) {
-    return transfer(host, info.port, info.fileTransferKey, 0, options, (socket, counter, pipeOptions) => pipeline(data, counter, socket, pipeOptions));
+/**
+ * How many bytes a negotiated transfer moves: the file's size less the
+ * position it starts from.
+ */
+function bytesToMove(size, seekPosition) {
+    if (seekPosition < 0n || seekPosition > size) {
+        throw new FileTransferError(`the transfer starts at ${seekPosition}, outside a file of ${size} bytes`);
+    }
+    return Number(size - seekPosition);
+}
+/**
+ * A sink that hands what it is given to `dest`, one write at a time, without
+ * ever ending it: the stream is the caller's, and may take more transfers.
+ * `dest`'s errors fail the sink, so the pipeline sees them.
+ */
+function intoStream(dest) {
+    const sink = new Writable({
+        write(chunk, _encoding, callback) {
+            dest.write(chunk, callback);
+        },
+    });
+    const onError = (error) => {
+        sink.destroy(error);
+    };
+    dest.on("error", onError);
+    // A failed `dest` reports its error a tick after the write that failed, by
+    // which time this sink is closed: keep listening until that has been said.
+    sink.on("close", () => setImmediate(() => dest.off("error", onError)));
+    return sink;
+}
+/**
+ * The same for a socket that is not to be ended: an upload is over when the
+ * server says so, not when the last byte has left.
+ */
+function intoSocket(socket) {
+    // A write after the server closed the connection fails with the socket's own
+    // error (EPIPE, or "ended by the other party"): the transfer's failure.
+    const failure = (error) => new FileTransferError(`file transfer connection failed: ${error.message}`, {
+        cause: error,
+    });
+    const sink = new Writable({
+        write(chunk, _encoding, callback) {
+            socket.write(chunk, (error) => callback(error ? failure(error) : null));
+        },
+    });
+    socket.on("error", (error) => {
+        sink.destroy(failure(error));
+    });
+    return sink;
+}
+/** Resolves once the server has closed the transfer connection. */
+function serverClosed(socket, signal) {
+    if (socket.readableEnded || socket.destroyed)
+        return Promise.resolve();
+    const closed = new Promise((resolve, reject) => {
+        const done = (error) => {
+            socket.off("end", onEnd);
+            socket.off("close", onEnd);
+            socket.off("error", done);
+            if (error === undefined)
+                resolve();
+            else
+                reject(error);
+        };
+        const onEnd = () => done();
+        socket.once("end", onEnd);
+        socket.once("close", onEnd);
+        socket.once("error", done);
+    });
+    // Nothing is sent back, but the end of the stream is only seen by reading.
+    socket.resume();
+    return abortable(closed, signal);
+}
+/**
+ * Upload `data` over a negotiated transfer. `data` is the file from
+ * `info.seekPosition` on, and must give exactly the bytes left of
+ * `info.size`: a stream that gives fewer or more fails the transfer.
+ *
+ * Resolves once the server has closed the transfer connection, which it does
+ * when it has the file. Measured on TeamSpeak 3 3.13.8 and TeamSpeak 6 6.0.0:
+ * the server closes about 200 ms after the last byte of a 100 000-byte file,
+ * and at once after the declared size when more is sent. A connection that
+ * closes before every byte is written, or that stays open for the idle limit,
+ * fails the transfer.
+ *
+ * A close after the last byte is not proof that the file is stored: the server
+ * sends nothing on the transfer connection, and over the voice protocol its
+ * `notifystatusfiletransfer` comes only for a failure (2066 canceled, 2063
+ * lost connection, 2052 more than declared), after the close, never for
+ * success; over ServerQuery nothing comes. `uploadFile` therefore asks the
+ * server for the file's size with `ftgetfileinfo` before it resolves.
+ */
+export async function uploadFileData(host, info, data, options = {}) {
+    const expected = bytesToMove(info.size, info.seekPosition);
+    await transfer(host, info.port, info.fileTransferKey, expected, options, async (socket, counter, pipeOptions) => {
+        await pipeline(data, exactSize(expected, "declared"), counter, intoSocket(socket), pipeOptions);
+        await serverClosed(socket, pipeOptions.signal);
+    });
 }
-/** Download a negotiated transfer into `dest`. Resolves once the file is written. */
-export function downloadFileData(host, info, dest, options = {}) {
-    return transfer(host, info.port, info.fileTransferKey, Number(info.size), options, (socket, counter, pipeOptions) => pipeline(socket, exactSize(Number(info.size)), counter, dest, pipeOptions));
+/**
+ * Download a negotiated transfer into `dest`. Resolves once the file is
+ * written; `dest` is not ended, so it may take another download.
+ *
+ * A download from `info.seekPosition` brings the bytes from there to the end
+ * of the file: measured on TeamSpeak 3 3.13.8 and TeamSpeak 6 6.0.0, a
+ * `seekpos` of 40 000 on a 100 000-byte file is answered with the whole size
+ * and then 60 000 bytes.
+ */
+export async function downloadFileData(host, info, dest, options = {}) {
+    const expected = bytesToMove(info.size, info.seekPosition);
+    await transfer(host, info.port, info.fileTransferKey, expected, options, (socket, counter, pipeOptions) => pipeline(socket, exactSize(expected, "announced"), counter, intoStream(dest), pipeOptions));
 }
 export { FileTransferError };
 //# sourceMappingURL=transfer.js.map

package/dist/client/transfer.js.map

@@ -1 +1 @@
-{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../src/client/transfer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../src/client/transfer.ts"],"names":[],"mappings":"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"}

package/dist/client/transport/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/client/transport/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EACL,KAAK,MAAM,EACX,UAAU,EAMX,MAAM,aAAa,CAAC;AAMrB,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AA8BtF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAa,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAgB,CAAC;AA4BhD,qBAAa,aAAa;;IACxB,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC9C,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IACtD;;;;OAIG;IACH,cAAc,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IACzD,2FAA2F;IAC3F,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAkDzD,YAAY,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAmB,EAAE,aAAa,CAAC,EAAE,aAAa,EAInF;IAED,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAE5B;IAED;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAyD/D;IAOD,sGAAsG;IACtG,KAAK,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CA+ChC;IAED;;;;;;OAMG;IACH,oBAAoB,IAAI,IAAI,CAE3B;IAED,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAOnE;IAED,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CA6BrD;IAED;;;;OAIG;IACH,iBAAiB,CACf,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,SAAS,MAAM,EAAE,EAClC,KAAK,EAAE,MAAM,EACb,gBAAgB,GAAE,SAAS,MAAM,EAAO,GACvC,IAAI,CAiCN;IAED;;;;OAIG;IACH,sBAAsB,CACpB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,GACZ,IAAI,CAiBN;IA4BD,wEAAwE;IACxE,eAAe,IAAI,eAAe,CAEjC;IAED,oEAAoE;IACpE,IAAI,SAAS,IAAI;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAEhF;IAED,4EAA4E;IAC5E,iFAAiF;IACjF,IAAI,eAAe,IAAI,OAAO,CAE7B;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,iDAAiD;IACjD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,KAAK,IAAI,IAAI,CAmBZ;CA8hBF"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/client/transport/handler.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EACL,KAAK,MAAM,EACX,UAAU,EAMX,MAAM,aAAa,CAAC;AAMrB,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAoCtF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAAa,CAAC;AAE9C;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAgB,CAAC;AAkChD,qBAAa,aAAa;;IACxB,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC9C,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IACtD;;;;OAIG;IACH,cAAc,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IACzD,2FAA2F;IAC3F,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAkDzD,YAAY,KAAK,EAAE,KAAK,EAAE,MAAM,GAAE,MAAmB,EAAE,aAAa,CAAC,EAAE,aAAa,EAInF;IAED,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAE5B;IAED;;;;;;;OAOG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAyD/D;IAOD,sGAAsG;IACtG,KAAK,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CA+ChC;IAED;;;;;;OAMG;IACH,oBAAoB,IAAI,IAAI,CAE3B;IAED,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAOnE;IAED,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CA6BrD;IAED;;;;OAIG;IACH,iBAAiB,CACf,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,SAAS,MAAM,EAAE,EAClC,KAAK,EAAE,MAAM,EACb,gBAAgB,GAAE,SAAS,MAAM,EAAO,GACvC,IAAI,CAiCN;IAED;;;;OAIG;IACH,sBAAsB,CACpB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,GACZ,IAAI,CAiBN;IA4BD,wEAAwE;IACxE,eAAe,IAAI,eAAe,CAEjC;IAED,oEAAoE;IACpE,IAAI,SAAS,IAAI;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAEhF;IAED,4EAA4E;IAC5E,iFAAiF;IACjF,IAAI,eAAe,IAAI,OAAO,CAE7B;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,iDAAiD;IACjD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,KAAK,IAAI,IAAI,CAmBZ;CAqiBF"}

package/dist/client/transport/handler.js

@@ -3,7 +3,7 @@ import { lookup } from "node:dns/promises";
 import { parseConnectAddress } from "../address.js";
 import { noopLogger } from "@honeybbq/teamspeak";
 import { PacketType, PacketFlags, packetType, packetFlags, buildC2SHeader, parseS2CHeader, } from "./packet.js";
-import { ConnectionTimeoutError } from "../errors.js";
+import { ConnectionStalledError, ConnectionTimeoutError } from "../errors.js";
 import { abortable, abortReason } from "../abort.js";
 import { NotConnectedError, TeamspeakError } from "@honeybbq/teamspeak";
 import { GenerationWindow } from "./generation-window.js";
@@ -28,6 +28,12 @@ const WHISPER_HEADER_SIZE = 5;
 const GROUP_WHISPER_HEADER_SIZE = 13;
 const RESEND_BASE_INTERVAL_MS = 500;
 const RESEND_LOOP_INTERVAL_MS = 100;
+/**
+ * How long a command packet may stay missing while later ones wait for it. The
+ * server sends a command again until it is acknowledged, so a hole that stays
+ * this long is not going to fill.
+ */
+const COMMAND_HOLE_TIMEOUT_MS = 5_000;
 /**
  * The largest command reassembled from fragments. The receive window already
  * bounds how many fragments one command can span; this bounds their total
@@ -464,6 +470,7 @@ export class PacketHandler {
             lastSend: performance.now(),
             retryCount: 0,
             nextInterval: RESEND_BASE_INTERVAL_MS,
+            dummy,
         };
         this.#trackResend(pType, p, rp);
     }
@@ -499,7 +506,6 @@ export class PacketHandler {
         const header = raw.slice(TAG_SIZE, TAG_SIZE + 3);
         const ciphertext = raw.slice(TAG_SIZE + 3);
         const parsed = parseS2CHeader(header);
-        this.#traffic.recordReceived(parsed.typeFlagged & 0x0f, raw.length, performance.now());
         // Init1 belongs to the start of the handshake; once crypto init has
         // completed, another one can only restart a session that is already set up.
         const parsedType = parsed.typeFlagged & 0x0f;
@@ -521,6 +527,7 @@ export class PacketHandler {
         // Only a packet that decrypted shows the server is there: anyone can send
         // datagrams that do not, and they must not keep a dead session alive.
         this.#lastMessageReceived = performance.now();
+        this.#traffic.recordReceived(pType, raw.length, p.receivedAt);
         if (pType === PacketType.Pong && p.data.length >= 2) {
             const acked = new DataView(p.data.buffer, p.data.byteOffset).getUint16(0, false);
             const sentAt = this.#pingsSent.get(acked);
@@ -637,9 +644,13 @@ export class PacketHandler {
         }
         const queue = pType === PacketType.Command ? this.#commandQueue : this.#commandLowQueue;
         const held = queue.get(p.id)?.data.length ?? 0;
-        // The packet the queue waits for is always taken: it is what drains it.
-        const next = pType === PacketType.Command ? this.#nextCommandID : this.#nextCommandLowID;
-        if (p.id !== next && this.#queuedBytes - held + p.data.length > MAX_QUEUED_BYTES) {
+        // The packet the queue needs next, the first id from the next expected one
+        // that it does not hold, is always taken: it is what drains it, and what
+        // lets a command larger than the queue reach its last fragment.
+        let needed = pType === PacketType.Command ? this.#nextCommandID : this.#nextCommandLowID;
+        for (let i = 0; i < queue.size && queue.has(needed); i++)
+            needed = (needed + 1) & 0xffff;
+        if (p.id !== needed && this.#queuedBytes - held + p.data.length > MAX_QUEUED_BYTES) {
             // Not acknowledged: the server sends it again.
             this.#logger.debug("dropped a command packet: the receive queues are full", { id: p.id });
             return false;
@@ -667,12 +678,6 @@ export class PacketHandler {
         const queue = isCommand ? this.#commandQueue : this.#commandLowQueue;
         const win = isCommand ? this.#recvWindowCommand : this.#recvWindowCommandLow;
         this.#hold(queue, p);
-        if (isCommand) {
-            this.#fastForwardMissingPackets(queue, win, true);
-        }
-        else {
-            this.#fastForwardMissingPackets(queue, win, false);
-        }
         while (true) {
             const current = isCommand ? this.#nextCommandID : this.#nextCommandLowID;
             const packet = queue.get(current);
@@ -710,16 +715,19 @@ export class PacketHandler {
     }
     #nextCommandID = 0;
     #nextCommandLowID = 0;
-    #fastForwardMissingPackets(queue, win, isCommand) {
-        let nextID = isCommand ? this.#nextCommandID : this.#nextCommandLowID;
-        while (!queue.has(nextID) && hasOldNewerPacket(queue, nextID)) {
-            nextID = (nextID + 1) & 0xffff;
-            win.advance(1);
+    /**
+     * Whether a command packet is missing from `queue` while a later one has
+     * waited for it for COMMAND_HOLE_TIMEOUT_MS.
+     */
+    #hasStalledHole(queue, nextID, now) {
+        if (queue.has(nextID))
+            return false;
+        for (const [id, pkg] of queue) {
+            const diff = (id - nextID + 0x10000) & 0xffff;
+            if (diff < 0x8000 && now - pkg.receivedAt > COMMAND_HOLE_TIMEOUT_MS)
+                return true;
         }
-        if (isCommand)
-            this.#nextCommandID = nextID;
-        else
-            this.#nextCommandLowID = nextID;
+        return false;
     }
     #tryReassemble(startPacket, queue, nextID, win) {
         if ((packetFlags(startPacket) & PacketFlags.Fragmented) === 0) {
@@ -732,23 +740,15 @@ export class PacketHandler {
         let currID = nextID;
         let startSeen = false;
         // Ends at the fragment that closes the command, or returns while one is
-        // still missing.
+        // still missing. The size is checked once the whole command is there, so an
+        // oversize one is released to its end marker and never leaves the stream
+        // part-way through a command.
         while (true) {
             const frag = queue.get(currID);
             if (!frag)
                 return null;
             fragments.push(frag);
             totalSize += frag.data.length;
-            if (totalSize > MAX_REASSEMBLED_SIZE) {
-                // Dropped whole, so the window moves past it rather than waiting on
-                // the rest of a command that will never be accepted.
-                for (let i = 0; i < fragments.length; i++) {
-                    this.#release(queue, nextID);
-                    win.advance(1);
-                    nextID = (nextID + 1) & 0xffff;
-                }
-                return [null, nextID];
-            }
             const fragmented = (packetFlags(frag) & PacketFlags.Fragmented) !== 0;
             if (!startSeen) {
                 startSeen = true;
@@ -760,6 +760,15 @@ export class PacketHandler {
             }
             currID = (currID + 1) & 0xffff;
         }
+        if (totalSize > MAX_REASSEMBLED_SIZE) {
+            // Dropped whole, so the window moves past it.
+            for (let i = 0; i < fragments.length; i++) {
+                this.#release(queue, nextID);
+                win.advance(1);
+                nextID = (nextID + 1) & 0xffff;
+            }
+            return [null, nextID];
+        }
         const combined = new Uint8Array(totalSize);
         let pos = 0;
         for (const frag of fragments) {
@@ -836,6 +845,12 @@ export class PacketHandler {
             this.#triggerClose(new ConnectionTimeoutError());
             return;
         }
+        if (this.#hasStalledHole(this.#commandQueue, this.#nextCommandID, now) ||
+            this.#hasStalledHole(this.#commandLowQueue, this.#nextCommandLowID, now)) {
+            this.#logger.warn("a command from the server never arrived");
+            this.#triggerClose(new ConnectionStalledError());
+            return;
+        }
         if (this.#initPacketCheck) {
             this.#doResend(this.#initPacketCheck, now);
         }
@@ -855,11 +870,10 @@ export class PacketHandler {
         rp.retryCount++;
         this.#resends++;
         rp.nextInterval = Math.min(rp.nextInterval * 2, MAX_RETRY_INTERVAL_MS);
-        const dummy = !this.#crypt.cryptoInitComplete;
         const unencrypted = (packetFlags(rp.packet) & PacketFlags.Unencrypted) !== 0;
         const header = buildC2SHeader(rp.packet);
         const pType = packetType(rp.packet);
-        const [ciphertext, tag] = this.#crypt.encrypt(pType, rp.packet.id, rp.packet.generationID, header, rp.packet.data, dummy, unencrypted);
+        const [ciphertext, tag] = this.#crypt.encrypt(pType, rp.packet.id, rp.packet.generationID, header, rp.packet.data, rp.dummy, unencrypted);
         const final = new Uint8Array(TAG_SIZE + HEADER_SIZE + ciphertext.length);
         final.set(tag.slice(0, TAG_SIZE), 0);
         final.set(header, TAG_SIZE);
@@ -889,14 +903,4 @@ function applyProtocolFlags(pType, flags) {
     }
     return flags;
 }
-function hasOldNewerPacket(queue, nextID) {
-    const now = performance.now();
-    for (const [id, pkg] of queue) {
-        const diff = (id - nextID + 0x10000) & 0xffff;
-        if (diff < 0x8000 && now - pkg.receivedAt > 5_000) {
-            return true;
-        }
-    }
-    return false;
-}
 //# sourceMappingURL=handler.js.map