@honeybbq/teamspeak 1.0.0-beta.14 → 1.0.0-beta.16

package/README.md

@@ -2,7 +2,7 @@
 
 # @honeybbq/teamspeak
 
-**A clean-room TeamSpeak client protocol library written in pure TypeScript.**
+**An independent TeamSpeak client protocol library written in pure TypeScript.**
 
 Works with TeamSpeak 3 and TeamSpeak 6 servers. No proprietary SDK, no copied code.
 
@@ -32,6 +32,7 @@ Upgrading from 0.x? The package was renamed; see the [migration guide](https://g
 - **Identity management** — Generate, import/export, and upgrade security level of identities
 - **Full command set** — 111 typed functions covering every command the voice protocol answers
 - **Reconnection** — Opt-in retry with backoff, tuned for TeamSpeak's antiflood ban
+- **Streams** — TeamSpeak 6 screen share signalling: find, publish and watch streams, with SDP and ICE as strings for any WebRTC stack
 - **Server capabilities** — Reports the server version and the uid hash it uses (SHA-1 on TS3, SHA-256 on TS6), and the server's name, icon, banner and welcome message
 - **Custom transports** — Supply your own socket, for proxies, tunnels or tests
 - **ESM with types** — Ships ES modules with full TypeScript declarations
@@ -548,6 +549,339 @@ The uid hash matters because TS3 hashes a client's public key with SHA-1 and TS6
 with SHA-256 — a client that assumes either one computes an identifier the other
 server never sends.
 
+### Streams
+
+TeamSpeak 6 clients can share a screen, a window or a camera. `@honeybbq/teamspeak/stream`
+does the signalling of that: it finds the streams of the clients in view, publishes one,
+and watches one. The video itself travels between the publisher and each viewer over
+WebRTC, which is yours: `Streams` hands you the SDP and the ICE candidates as strings and
+takes them back, so any WebRTC stack plugs in, in a browser, in Electron or in Node. The
+package has no WebRTC dependency.
+
+TeamSpeak does not document this protocol. It was verified against the TeamSpeak 6 server
+6.0.0-beta13.1 and the TeamSpeak 6 client 6.0.0-beta5 (macOS), and a TeamSpeak update may
+break it. A TeamSpeak 3 server does not answer the stream
+commands at all, so `publish` and `watch` throw a `StreamsUnsupportedError` before sending
+anything.
+
+Watching: find a stream in `streams.list()` or wait for `started`, ask to watch it, and
+give the publisher's offer to a peer connection. The viewer's connection is receive-only.
+
+```ts
+import { Streams } from "@honeybbq/teamspeak/stream";
+
+const streams = new Streams(client);
+streams.on("started", (info) => console.log(`${info.name} is streaming`));
+
+const view = await streams.watch(info, { message: "may I watch?" });
+
+const pc = new RTCPeerConnection({ iceServers: [{ urls: "stun:stun.l.google.com:19302" }] });
+pc.ontrack = (event) => (video.srcObject = event.streams[0]);
+pc.onicecandidate = (event) => {
+  if (event.candidate) void view.sendCandidate(event.candidate.toJSON());
+};
+// Candidates that arrived with the offer are delivered to the first listener.
+view.on("candidate", (candidate) => void pc.addIceCandidate(candidate));
+view.on("closed", () => pc.close());
+
+await pc.setRemoteDescription({ type: "offer", sdp: view.offer });
+const answer = await pc.createAnswer();
+await pc.setLocalDescription(answer);
+await view.answer(answer.sdp!);
+```
+
+Publishing: the publisher makes the offer, one peer connection for each viewer. The server
+relays every request to watch, from any channel, and enforces neither `viewerLimit` nor
+`accessibility`: deciding who is let in is the publisher's job, and `request` is emitted
+for each one, with nothing accepted for you.
+
+```ts
+const stream = await streams.publish({ name: "My screen", source: "screen" });
+
+stream.on("request", async (request) => {
+  if (!allowed(request.viewer)) return request.deny("Not today");
+
+  const pc = new RTCPeerConnection({ iceServers });
+  for (const track of capture.getTracks()) pc.addTrack(track, capture);
+  // Always offer audio, even with no track to send (see the interop notes below).
+  if (!pc.getTransceivers().some((t) => t.receiver.track.kind === "audio")) {
+    pc.addTransceiver("audio", { direction: "sendonly" });
+  }
+  await pc.setLocalDescription(await pc.createOffer());
+
+  const viewer = await request.accept(pc.localDescription!.sdp);
+  pc.onicecandidate = (event) => {
+    if (event.candidate) void viewer.sendCandidate(event.candidate.toJSON());
+  };
+  viewer.on("answer", (sdp) => pc.setRemoteDescription({ type: "answer", sdp }));
+  viewer.on("candidate", (candidate) => void pc.addIceCandidate(candidate));
+  viewer.on("closed", () => pc.close());
+});
+
+await stream.stop();
+```
+
+A request that nobody has answered can end: the viewer withdraws it or goes out of view, or
+the stream ends. `request.on("closed", ({ cause }) => …)` fires then, with `"withdrawn"` or
+`"ended"`, so a UI can drop the request without polling `request.state`; `accept` and `deny`
+then throw. It is not emitted for a request that was accepted or denied.
+
+#### Interop with the TeamSpeak 6 client
+
+What follows was observed with the TeamSpeak 6 client 6.0.0-beta5 (macOS) against a
+TeamSpeak 6 server 6.0.0-beta13.1.
+
+- **Offer audio, always.** When you publish, the client answers an offer only if it has an
+  `m=audio` section. For a video-only offer it never answers: it shows a fallback picture and
+  keeps the "Join" button, which then does nothing, because the server already counts the
+  viewer as joined. Add a send-only audio transceiver even when there is no audio track; an
+  audio section before the video section was accepted. `accept` and `ViewerPeer.sendOffer`
+  send an offer without audio unchanged, and emit a `"warning"` event on `Streams` with the
+  code `"offer-without-audio"`.
+- **Trim the codecs.** The client's own offers carry one video and one audio section, about
+  3.9 KB. A browser's offer with every codec is about 6 KB with audio and video, and about
+  4.8 KB for video alone, against a limit of about 9.2 KB for a command line. Narrowing the
+  codecs keeps room for the candidates and the message:
+
+  ```ts
+  const video = pc.addTransceiver(track, { direction: "sendonly" });
+  const codecs = RTCRtpSender.getCapabilities("video")!.codecs;
+  video.setCodecPreferences(codecs.filter((c) => /^video\/(VP8|H264)$/.test(c.mimeType)));
+  ```
+
+- **Accept every request.** A viewer in the client shows "waiting" until the publisher
+  answers. When it withdraws and asks again, that is a new request, with a new `JoinRequest`.
+- **A channel switch ends the viewing, not the stream.** The client leaves a stream it
+  watches when it changes channel, so the publisher sees that viewer leave. The server does not end a stream when its publisher or a viewer changes channel.
+- Denying, stopping, leaving, disconnecting and several viewers at once, some of them the
+  client and some the SDK, behaved as they do between SDK clients.
+
+```ts
+streams.on("warning", (w) => console.warn(`${w.code}: ${w.message}`));
+```
+
+Things to know:
+
+- A client may run several streams, so every stream is known by its id. `list()` is what
+  this client has heard of. A stream that ends while its publisher is out of the channel is
+  reported to nobody there, and stays listed until the connection ends.
+- A stream survives its publisher changing channel, with no event. It ends when the
+  publisher stops it or disconnects.
+- The server drops a command line longer than about 9.2 KB without an answer. Streams
+  commands are checked first and throw a `StreamPayloadTooLargeError`; an SDP offer or an
+  ICE candidate is a few kilobytes at most.
+- The server lets anyone stop any stream. `Streams` sends `stopstream` only for streams it
+  published, and treats a `notifystreamstopped` for any stream as final.
+- The server remembers no decision, so a client can ask again, and every ask is relayed.
+  To refuse for good, pass `rememberDenied: true` (the 1024 most recent uids, in memory
+  only; a requester out of view is looked up with `clientgetuidfromclid`), or leave the
+  request unanswered. The server has no way to remove a viewer: closing a viewer's peer
+  ends your side of it, and stopping the stream ends it for everyone.
+- `dispose()` stops the streams published through that `Streams` and leaves the ones it
+  watched, while the client is connected. A stream whose `publish` gave up after the command
+  went out is stopped when its announcement arrives, so none is left running unseen.
+- A client whose `client_is_streaming` clears, or that comes into view not streaming, has
+  its streams dropped, after a grace of two seconds: `stopped` with the cause `"gone"`. The
+  server clears the flag right before it reports the stop, so a stop that arrives in that time
+  ends the stream with its own cause and reason instead, and a flag set again cancels the drop.
+- The bitrate the server reports for a stream is not the one requested.
+- A client announces that it streams only with `client_is_streaming`, and a stream that was
+  running before you came is not announced at all. `Streams` asks for the streams of each
+  client that sets the flag, once, on a TeamSpeak 6 server.
+
+## Design
+
+The conventions below hold across the whole package. Each is stated once here.
+
+### Errors
+
+An error is one of two kinds:
+
+- **A refusal the server reports.** It is a `ServerError` carrying the server's
+  numeric `code`, its text as `serverMessage`, and `extraMessage` and
+  `failedPermissionID` when the server names them.
+- **A condition the SDK detects itself**: not connected, no data, a timeout, a
+  failed handshake, a failed file transfer. Each has its own class.
+
+Every error the SDK throws on purpose extends `TeamspeakError`, so
+`instanceof TeamspeakError` tells its failures from anything else. A failure
+that wraps another keeps it in `cause`. Match a refusal by `error.code` against
+`ErrorCode`, and everything else by class:
+
+```typescript
+import {
+  ErrorCode,
+  NotConnectedError,
+  ServerError,
+  TeamspeakError,
+  asChannelID,
+  moveClient,
+} from "@honeybbq/teamspeak";
+
+try {
+  await moveClient(client, client.clientID, asChannelID(5), { password: "wrong" });
+} catch (err) {
+  if (err instanceof ServerError && err.code === ErrorCode.ChannelInvalidPassword) {
+    // ask for the password again
+  } else if (err instanceof NotConnectedError) {
+    // the connection is gone
+  } else if (err instanceof ServerError) {
+    console.log(err.code, err.serverMessage, err.extraMessage, err.failedPermissionID);
+  } else if (err instanceof TeamspeakError) {
+    console.log(err.name, err.message, err.cause);
+  } else {
+    throw err;
+  }
+}
+```
+
+`ErrorCode` names the server's codes as constants. It is the table `errcode`
+is in the Go SDK, with the same numbers. A server may send a code it does not
+name, so `code` is a plain `number`. `instanceof` also works between two
+installed copies of the package.
+
+Errors live with the code that produces them, so each entry point exports only
+the errors its own code throws:
+
+| Entry point                                        | Errors                                                                                                                                                                                 |
+| -------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `@honeybbq/teamspeak` (shared by every connection) | `TeamspeakError`, `ServerError`, `CommandTimeoutError`, `NotConnectedError`, `AlreadyConnectedError`, `NoDataError`                                                                    |
+| `@honeybbq/teamspeak/client` (voice only)          | `ConnectionTimeoutError`, `HandshakeError` and its `PuzzleTooHardError`, `InvalidAddressError`, `InvalidIdentityError`, `FileTransferError`, `RemovedError` (kick, ban or server stop) |
+| `@honeybbq/teamspeak/stream` (streams only)        | `StreamsUnsupportedError`, `StreamJoinDeniedError`, `StreamEndedError`, `StreamPayloadTooLargeError`                                                                                   |
+| `@honeybbq/teamspeak/query` (query only)           | `QueryAuthError`, `GuestAccessError`, `SshHostKeyError`, `MissingDependencyError`, `WebQueryHttpError`                                                                                 |
+
+A call that is given a value it cannot use, such as an out-of-range id or an
+option that contradicts another, throws the language's own `TypeError` or
+`RangeError` before anything is sent. Those are not `TeamspeakError`s: they are
+a bug in the caller, not a condition to handle. `WebQueryHttpError` carries the
+HTTP `status`; a refusal the server itself reports is a `ServerError` over every
+transport.
+
+**Cancellation.** An aborted `signal` is the caller's own cancellation, not an
+SDK error. `connect()`, the typed commands, `exec`, file transfers and `events()`
+reject with the signal's `reason` itself, unwrapped: a `DOMException` named
+`AbortError` after a bare `abort()`, a `TimeoutError` after
+`AbortSignal.timeout()`, or whatever value was passed to `abort(reason)`. A
+signal that is already aborted rejects before anything is sent. Aborting a
+`connect()` abandons the attempt and leaves the client disconnected; a command
+that was given up on may still have taken effect on the server. The signal and
+the command's own `timeoutMs` are separate: when `timeoutMs` (ten seconds by
+default) passes first, the command rejects with a `CommandTimeoutError`.
+
+**No data.** `NoDataError` means the command succeeded but its answer lacked the
+data it exists to return, such as the id of a channel just created. Treat the
+command as having taken effect and do not retry it blindly, or it creates a
+second object or is refused as a duplicate. `createChannel` and the group
+commands look the new object up themselves and throw it only when nothing
+matches. A list that comes back empty is `[]`, not this error.
+
+### Ids
+
+Every kind of id is a branded type: `ChannelID`, `ClientID`, `ClientDBID`,
+`ServerGroupID`, `ChannelGroupID`, `PermissionID`, `IconID`, `ServerID`,
+`BanID` and the rest, with `UID` and `ChannelUID` as branded strings. The
+brand costs nothing at runtime, and passing the wrong kind is a compile error.
+Make one with its constructor, which throws a `RangeError` for a value outside
+the id's wire range:
+
+```typescript
+import { asChannelID, asClientID, moveClient } from "@honeybbq/teamspeak";
+
+const cid = asChannelID(5); // or asChannelID(5n)
+await moveClient(client, client.clientID, cid);
+// moveClient(client, cid, client.clientID) does not compile.
+const clid = asClientID(3);
+```
+
+A `ClientID`, `PermissionID`, `IconID` and the file transfer ids are `number`s.
+The ones the protocol makes 64 bits wide are `bigint`s: `ChannelID`,
+`ClientDBID`, `ServerGroupID`, `ChannelGroupID`, `ServerID`, `BanID`,
+`MessageID` and `APIKeyID`. Their constructors take a `number` or a `bigint`.
+
+### Options and absent values
+
+**Options.** Required arguments are positional. Everything optional is one
+options object, the last argument. A field that is not set is not sent:
+`undefined` leaves the setting alone and `""` sends it empty.
+
+```typescript
+import { editChannel } from "@honeybbq/teamspeak";
+
+await editChannel(client, cid, {
+  name: "Lounge",
+  topic: "", // sent empty: clears the topic
+  // password is not set: not sent, so the password stays as it is.
+});
+```
+
+**Records.** In a record the server's answer fills in, an optional field is
+`undefined` when the server did not send it. That is not the same as `0` or
+`false`: `totalClients` is `undefined` in a `getChannelInfo` result, which does
+not carry it, and `0` in a `listChannels` result of an empty channel.
+
+```typescript
+import { getChannelInfo } from "@honeybbq/teamspeak";
+
+const info = await getChannelInfo(client, cid);
+if (info.totalClients !== undefined) console.log(info.totalClients, "clients");
+```
+
+**Durations and times** are numbers of milliseconds with an `Ms` suffix
+(`idleTimeMs`, `timeoutMs`) and `Date`. A `Date` field is `undefined` where the
+server sends 0 for "never". The Go SDK uses `time.Duration` and `time.Time`.
+
+### Events
+
+Each server event has a typed name (`"textMessage"`, `"clientEnter"`, ...;
+`EventName` has a constant for each), and `"notification"` delivers every
+notification as the server sent it, including those no typed event models. The
+notification arrives after the typed event it produced. `on()` returns a
+function that removes the listener; `events(name, { signal })` is the same as an
+async iterator.
+
+```typescript
+const off = client.on("textMessage", (message) => {
+  console.log(message.invokerName, message.message);
+});
+off();
+
+client.on("notification", (n) => console.log(n.name, n.params));
+```
+
+- **Order.** Listeners run one at a time, in the order the events arrived, so a
+  listener may call the client and await an answer.
+- **State.** The client updates its state, such as `client.view`, before it
+  queues the event that reports the change, so a listener sees state at least as
+  new as its event.
+- **A throw** in a listener does not stop the others. The exception is rethrown
+  from a microtask, as an uncaught exception, as an EventEmitter listener's
+  would be. The Go SDK recovers a panicking handler and logs it instead.
+- **Middleware.** `eventMiddleware` sees each server event before the listeners
+  and may pass it on, replace it or drop it; `connected`, `disconnected`,
+  `kicked` and the view events bypass it. `commandMiddleware` wraps the typed commands. Both are
+  described above.
+
+### Stability
+
+From 1.0 the package follows semver, as described under
+[Compatibility](#compatibility): a breaking change to `@honeybbq/teamspeak`,
+`/client` and `/versions` waits for 2.0. The enumerations, `ErrorCode` and the
+event map may gain members in a minor release; give a `switch` over them a
+default case.
+
+An API that may still change in a minor release is marked `@experimental` in its TSDoc,
+which editors and the API reference show. Today that is the whole
+`@honeybbq/teamspeak/query` entry point, the server view (`client.view` and the
+view events), the `previous` field of the client-left and channel-deleted
+events, and `getServerVariables`.
+
+### Server behaviour the SDK works around
+
+The servers answer some commands in ways that differ between TeamSpeak 3 and 6
+and between transports, and the SDK evens those out. The measured tables are in
+[voice-protocol-responses.md](https://github.com/HoneyBBQ/teamspeak-js/blob/main/docs/voice-protocol-responses.md)
+and [serverquery-responses.md](https://github.com/HoneyBBQ/teamspeak-js/blob/main/docs/serverquery-responses.md).
+
 ## ServerQuery
 
 The `@experimental` subpath `@honeybbq/teamspeak/query` administers a server
@@ -751,6 +1085,7 @@ with the same semantics, apart from what the languages make differ:
 | `@honeybbq/teamspeak`          | What every TeamSpeak connection shares: the command language, ids, errors, the typed commands, the event types and the status and reconnection types |
 | `@honeybbq/teamspeak/client`   | The voice client, identities, file transfers, diagnostics and its retry policy                                                                       |
 | `@honeybbq/teamspeak/versions` | Client versions a server accepts, for the client's `version` option; data only, one export each                                                      |
+| `@honeybbq/teamspeak/stream`   | TeamSpeak 6 streams, the screen share: finding, publishing and watching them; signalling only, no WebRTC code                                        |
 | `@honeybbq/teamspeak/query`    | The ServerQuery client, running the same typed commands over raw TCP, SSH or WebQuery; `@experimental`                                               |
 
 Each entry exports only its own symbols. The client entry does not re-export
@@ -769,7 +1104,8 @@ get no further releases. Coming from 0.x? The
 
 ```
 src/
-├── core/              # Shared: command language, ids, errors, typed commands
+├── core/              # Shared (@honeybbq/teamspeak): command language, ids, errors, typed commands
+├── versions/          # Client versions (@honeybbq/teamspeak/versions)
 ├── client/            # The voice client (@honeybbq/teamspeak/client)
 │   ├── client.ts          # Client lifecycle, connection management
 │   ├── commands.ts        # Command sending and response tracking
@@ -785,7 +1121,8 @@ src/
 │   ├── handshake/         # Crypto handshake and license verification
 │   ├── transport/         # UDP packet framing, ACK, compression
 │   └── discovery/         # SRV / TSDNS / direct address resolution
-└── query/             # ServerQuery client (not exported yet)
+├── stream/            # TeamSpeak 6 streams (@honeybbq/teamspeak/stream)
+└── query/             # The ServerQuery client (@honeybbq/teamspeak/query)
 examples/
 └── connect.ts  # Minimal connection example
 ```
@@ -800,9 +1137,11 @@ Protocol knowledge was primarily informed by the [TSLib](https://github.com/Spla
 
 ## Disclaimer
 
-TeamSpeak is a registered trademark of [TeamSpeak Systems GmbH](https://teamspeak.com/). This project is not affiliated with, endorsed by, or associated with TeamSpeak Systems GmbH in any way.
+TeamSpeak is a registered trademark of [TeamSpeak Systems, Inc.](https://teamspeak.com/). This project is not affiliated with, endorsed by, or associated with TeamSpeak Systems, Inc. in any way.
+
+This library is an **independent implementation** built from public documentation, observation of network traffic, and independent research. It contains no TeamSpeak proprietary code, headers, libraries, or binaries.
 
-This library is a **clean-room implementation** developed from publicly available documentation, protocol analysis of network traffic, and independent research. No proprietary TeamSpeak SDK code, headers, or libraries were used in its creation.
+The project implements the client side only and does not implement a TeamSpeak server.
 
 ## Contributing
 

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

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/client/commands.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACrC;AAsBD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,cAAc;;IAOzB,6EAA6E;IAC7E,YAAY,WAAW,GAAE,MAAM,MAAgB,EAE9C;IAED,QAAQ,CACN,IAAI,CAAC,EAAE,YAAY,EACnB,WAAW,CAAC,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,MAAM,GACZ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAO/C;IAED,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAE3B;IAED,2EAA2E;IAC3E,qBAAqB,IAAI,IAAI,CAG5B;IAED,oEAAoE;IACpE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM7B;IAED,wEAAwE;IACxE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,SAAK,GAAG,IAAI,CAIxD;IAED;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAiBlE;IAED,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI,CAkB3C;IAED,aAAa,IAAI,IAAI,CAEpB;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAOtB;CAkBF;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAMhE"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/client/commands.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC;IAClB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACrC;AAsBD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,cAAc;;IAOzB,6EAA6E;IAC7E,YAAY,WAAW,GAAE,MAAM,MAAgB,EAE9C;IAED,QAAQ,CACN,IAAI,CAAC,EAAE,YAAY,EACnB,WAAW,CAAC,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,MAAM,GACZ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAS/C;IAED,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAE3B;IAED,2EAA2E;IAC3E,qBAAqB,IAAI,IAAI,CAG5B;IAED,oEAAoE;IACpE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM7B;IAED,wEAAwE;IACxE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,SAAK,GAAG,IAAI,CAIxD;IAED;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAiBlE;IAED,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,IAAI,CAkB3C;IAED,aAAa,IAAI,IAAI,CAEpB;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAQtB;CAkBF;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAMhE"}

package/dist/client/commands.js

@@ -35,6 +35,9 @@ export class CommandTracker {
     register(spec, correlation, echo) {
         this.#nextRC++;
         const rc = this.#nextRC;
+        // The tracker's own number is the one request field no caller can supply.
+        if (spec?.correlated?.key === "return_code")
+            correlation = String(rc);
         const promise = new Promise((resolve) => {
             this.#pending.set(rc, { resolve, spec, correlation, echo, correlated: [] });
         });
@@ -127,7 +130,8 @@ export class CommandTracker {
             p.resolve({ err, data: [] });
         this.#buffer = [];
         this.#welcomeComplete = false;
-        this.#nextRC = 0;
+        // Not restarted: a row still in flight from before the reset carries an old
+        // number, which a restarted counter would hand to an unrelated command.
     }
     #answers(p, row) {
         if (row.source === "")

package/dist/client/commands.js.map

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

package/dist/client/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * A clean-room TeamSpeak client: it connects over the voice protocol, the way
+ * An independent TeamSpeak client: it connects over the voice protocol, the way
  * the TeamSpeak application does.
  *
  * Only what belongs to the voice protocol is exported here. The typed commands,

package/dist/client/index.js

@@ -1,5 +1,5 @@
 /**
- * A clean-room TeamSpeak client: it connects over the voice protocol, the way
+ * An independent TeamSpeak client: it connects over the voice protocol, the way
  * the TeamSpeak application does.
  *
  * Only what belongs to the voice protocol is exported here. The typed commands,

package/dist/client/transport/generation-window.d.ts

@@ -4,6 +4,12 @@ export declare class GenerationWindow {
     get generation(): number;
     advance(amount: number): void;
     advanceToExcluded(mappedValue: number): void;
+    /**
+     * Move the base to just past a packet that was just received. A stale packet,
+     * including one from the generation before a wrap, does not move the base
+     * backwards or treat the wait for the next generation as a full cycle.
+     */
+    advanceAfter(mappedValue: number): void;
     syncTo(mappedValue: number): void;
     isInWindow(mappedValue: number): boolean;
     /**

package/dist/client/transport/generation-window.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generation-window.d.ts","sourceRoot":"","sources":["../../../src/client/transport/generation-window.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;;IAM3B,YAAY,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAG1C;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAQ5B;IAED,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAI3C;IAED,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAIhC;IAED,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAMvC;IAED;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAMzC;IAgBD;;;;OAIG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAExC;IAED,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAE3C;IASD;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAIzC;IAED,KAAK,IAAI,IAAI,CAGZ;CACF"}
+{"version":3,"file":"generation-window.d.ts","sourceRoot":"","sources":["../../../src/client/transport/generation-window.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;;IAM3B,YAAY,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAG1C;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAQ5B;IAED,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAI3C;IAED;;;;OAIG;IACH,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAItC;IAED,MAAM,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAIhC;IAED,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAMvC;IAED;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAMzC;IAgBD;;;;OAIG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAExC;IAED,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAE3C;IASD;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAIzC;IAED,KAAK,IAAI,IAAI,CAGZ;CACF"}

package/dist/client/transport/generation-window.js

@@ -26,6 +26,17 @@ export class GenerationWindow {
             moveDist += this.#mod;
         this.advance(moveDist + 1);
     }
+    /**
+     * Move the base to just past a packet that was just received. A stale packet,
+     * including one from the generation before a wrap, does not move the base
+     * backwards or treat the wait for the next generation as a full cycle.
+     */
+    advanceAfter(mappedValue) {
+        const index = this.mappedToIndex(mappedValue);
+        if (index < 0)
+            return;
+        this.advance(index + 1);
+    }
     syncTo(mappedValue) {
         let moveDist = mappedValue - this.#mappedBaseOffset;
         if (moveDist < 0)

package/dist/client/transport/generation-window.js.map

@@ -1 +1 @@
-{"version":3,"file":"generation-window.js","sourceRoot":"","sources":["../../../src/client/transport/generation-window.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generation-window.js","sourceRoot":"","sources":["../../../src/client/transport/generation-window.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAgB;IAC3B,iBAAiB,GAAG,CAAC,CAAC;IACtB,WAAW,GAAG,CAAC,CAAC;IACP,IAAI,CAAS;IACb,cAAc,CAAS;IAEhC,YAAY,GAAW,EAAE,UAAkB;QACzC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;IACnC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,MAAc;QACpB,IAAI,MAAM,IAAI,CAAC;YAAE,OAAO;QACxB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,EAAE,WAAW,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,iBAAiB,GAAG,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,iBAAiB,CAAC,WAAmB;QACnC,IAAI,QAAQ,GAAG,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACpD,IAAI,QAAQ,GAAG,CAAC;YAAE,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,WAAmB;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,KAAK,GAAG,CAAC;YAAE,OAAO;QACtB,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,WAAmB;QACxB,IAAI,QAAQ,GAAG,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACpD,IAAI,QAAQ,GAAG,CAAC;YAAE,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,UAAU,CAAC,WAAmB;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC;QAC/D,IAAI,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAC1B,OAAO,WAAW,IAAI,IAAI,CAAC,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAAC;QAC1E,CAAC;QACD,OAAO,WAAW,IAAI,IAAI,CAAC,iBAAiB,IAAI,WAAW,GAAG,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IACtF,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,WAAmB;QAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,OAAO,WAAW,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAC1D,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACnD,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IACrE,CAAC;IAED;;;;;OAKG;IACH,mBAAmB,CAAC,KAAa;QAC/B,OAAO,CACL,IAAI,CAAC,WAAW,GAAG,CAAC;YACpB,KAAK,IAAI,IAAI,CAAC,cAAc;YAC5B,KAAK,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CACzC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,WAAmB;QAC7B,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC;IAChE,CAAC;IAED,UAAU,CAAC,WAAmB;QAC5B,OAAO,CACL,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc;YACxD,WAAW,GAAG,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI,CACvE,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,WAAmB;QAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,OAAO,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QAC9D,IAAI,IAAI,CAAC,mBAAmB,CAAC,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC;YAAE,OAAO,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QAChG,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IACvB,CAAC;CACF"}

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;AAwBtF;;;;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;IA8CzD,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;CA8gBF"}
+{"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"}

package/dist/client/transport/handler.js

@@ -12,6 +12,12 @@ import { RoundTripEstimator, TrafficMeter } from "./traffic.js";
 import { processInit1 } from "../handshake/crypt-handshake.js";
 const MAX_OUT_PACKET_SIZE = 500;
 const RECEIVE_PACKET_WINDOW_SIZE = 1024;
+// Voice, whisper, ping and pong are never sent again, so any number of them can
+// be lost in a row. Their window spans half the id space: a packet's generation
+// is the one that puts it nearest the last packet received, as long as fewer
+// than 32768 were lost, where a narrower window would place the first packet
+// after a long loss across the wrap in the old generation and never recover.
+const UNACKED_RECEIVE_WINDOW_SIZE = 1 << 15;
 const PING_INTERVAL_MS = 5_000;
 const PACKET_TIMEOUT_MS = 60_000;
 const MAX_RETRY_INTERVAL_MS = 1_000;
@@ -87,6 +93,10 @@ export class PacketHandler {
     #generationCounter = new Uint32Array(9);
     #recvWindowCommand = new GenerationWindow(1 << 16, RECEIVE_PACKET_WINDOW_SIZE);
     #recvWindowCommandLow = new GenerationWindow(1 << 16, RECEIVE_PACKET_WINDOW_SIZE);
+    #recvWindowVoice = new GenerationWindow(1 << 16, UNACKED_RECEIVE_WINDOW_SIZE);
+    #recvWindowVoiceWhisper = new GenerationWindow(1 << 16, UNACKED_RECEIVE_WINDOW_SIZE);
+    #recvWindowPing = new GenerationWindow(1 << 16, UNACKED_RECEIVE_WINDOW_SIZE);
+    #recvWindowPong = new GenerationWindow(1 << 16, UNACKED_RECEIVE_WINDOW_SIZE);
     #sendWindowCommand = new GenerationWindow(1 << 16, RECEIVE_PACKET_WINDOW_SIZE);
     #sendWindowCommandLow = new GenerationWindow(1 << 16, RECEIVE_PACKET_WINDOW_SIZE);
     #commandQueue = new Map();
@@ -505,11 +515,12 @@ export class PacketHandler {
         const decrypted = this.#decryptPacketData(p, header, ciphertext, tag);
         if (decrypted === null)
             return;
+        const pType = packetType(p);
+        this.#advanceReceiveGeneration(pType, p.id);
         p.data = decrypted.plaintext;
         // 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();
-        const pType = packetType(p);
         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);
@@ -538,14 +549,33 @@ export class PacketHandler {
             case PacketType.AckLow:
                 return this.#sendWindowCommandLow.getGeneration(id);
             case PacketType.Voice:
+                return this.#recvWindowVoice.getGeneration(id);
             case PacketType.VoiceWhisper:
+                return this.#recvWindowVoiceWhisper.getGeneration(id);
             case PacketType.Ping:
+                return this.#recvWindowPing.getGeneration(id);
             case PacketType.Pong:
+                return this.#recvWindowPong.getGeneration(id);
             case PacketType.Init1:
             default:
                 return 0;
         }
     }
+    /**
+     * Follow the packet id of an authenticated non-command packet. Voice has no
+     * retransmission or acknowledgement window, but its 16-bit id still wraps
+     * and changes the generation used by the encryption key.
+     */
+    #advanceReceiveGeneration(pType, id) {
+        if (pType === PacketType.Voice)
+            this.#recvWindowVoice.advanceAfter(id);
+        if (pType === PacketType.VoiceWhisper)
+            this.#recvWindowVoiceWhisper.advanceAfter(id);
+        if (pType === PacketType.Ping)
+            this.#recvWindowPing.advanceAfter(id);
+        if (pType === PacketType.Pong)
+            this.#recvWindowPong.advanceAfter(id);
+    }
     #decryptPacketData(p, header, ciphertext, tag) {
         const unencrypted = (packetFlags(p) & PacketFlags.Unencrypted) !== 0;
         const dummy = !this.#crypt.cryptoInitComplete;