@honeybbq/teamspeak-client 0.2.3 → 0.3.1

package/dist/index.mjs

@@ -1,16 +1,16 @@
-import { n as e, r as t, t as n } from "./types-Xm1vrW4s.js";
-import { C as r, S as i, _ as a, b as o, d as s, g as c, h as l, l as u, o as d, p as ee, r as f, u as p, v as m, w as h, x as g, y as _ } from "./primitives-Bt-L4BZa.js";
-import { t as v } from "./crypto-CwIMggQG.js";
-import { t as y } from "./resolver-BDCF2KbM.js";
-import { a as b, t as x } from "./handler-BP38rMNl.js";
-import { i as S, n as C, t as w } from "./command-CTDmBXd_.js";
-import { n as te } from "./crypt-handshake-DIj51kno.js";
-import { t as T } from "./crypt-init2-C2X9oK4i.js";
-import { t as E } from "./parser-BPzO8py_.js";
-import { createHash as D } from "node:crypto";
-import { createConnection as O } from "node:net";
+import { a as e, i as t, o as n } from "./address-BfmovVpp.js";
+import { C as r, S as i, _ as a, b as o, d as s, g as c, h as l, l as u, o as d, p as f, r as p, u as m, v as h, w as ee, x as g, y as _ } from "./primitives-xIr6Tjk4.js";
+import { t as v } from "./crypto-Bg02m4ZE.js";
+import { t as y } from "./resolver-6B8dI9gr.js";
+import { a as b, t as x } from "./handler-DI_abe9c.js";
+import { i as S, n as C, t as w } from "./command-BLe-C2L2.js";
+import { n as te } from "./crypt-handshake-DziOY4Lq.js";
+import { t as ne } from "./crypt-init2-D70ha4LB.js";
+import { t as T } from "./parser-DZMv3Jm-.js";
+import { createHash as E } from "node:crypto";
+import { createConnection as D } from "node:net";
 //#region src/commands.ts
-var k = class {
+var O = class {
 	#e = /* @__PURE__ */ new Map();
 	#t = 0;
 	#n = [];
@@ -50,7 +50,7 @@ var k = class {
 		this.#e.clear(), this.#n = [], this.#r = !1, this.#t = 0;
 	}
 };
-function A(e) {
+function k(e) {
 	let t = e.id ?? "0", n = e.msg ?? "", i = e.return_code, a = null;
 	t !== "0" && (a = new r(t, n));
 	let o = null;
@@ -63,12 +63,12 @@ function A(e) {
 		rc: o
 	};
 }
-function j(e, t) {
+function A(e, t) {
 	return e.includes("return_code=") ? e : `${e} return_code=${t}`;
 }
 //#endregion
 //#region src/transfer.ts
-var M = class {
+var j = class {
 	#e = /* @__PURE__ */ new Map();
 	#t = 0;
 	register() {
@@ -89,9 +89,9 @@ var M = class {
 		this.#e.clear(), this.#t = 0;
 	}
 };
-function N(e, t, n) {
+function M(e, t, n) {
 	return new Promise((r, i) => {
-		let a = O({
+		let a = D({
 			host: e,
 			port: t
 		}, () => {
@@ -104,19 +104,19 @@ function N(e, t, n) {
 		});
 	});
 }
-async function P(e, t, n) {
-	let r = await N(e, t.port, t.fileTransferKey);
+async function N(e, t, n) {
+	let r = await M(e, t.port, t.fileTransferKey);
 	await new Promise((e, t) => {
 		n.pipe(r), r.on("finish", e), r.on("error", t);
 	});
 }
-async function F(e, t, n) {
-	let r = await N(e, t.port, t.fileTransferKey);
+async function P(e, t, n) {
+	let r = await M(e, t.port, t.fileTransferKey);
 	await new Promise((e, t) => {
 		r.pipe(n), n.on("finish", e), r.on("error", t), n.on("error", t);
 	});
 }
-function I(e, t, n, r, i, a) {
+function F(e, t, n, r, i, a) {
 	let o = t.startsWith("/") ? t : `/${t}`;
 	return w("ftinitupload", {
 		cid: String(e),
@@ -128,7 +128,7 @@ function I(e, t, n, r, i, a) {
 		resume: "0"
 	});
 }
-function L(e, t, n, r) {
+function I(e, t, n, r) {
 	let i = t.startsWith("/") ? t : `/${t}`;
 	return w("ftinitdownload", {
 		cid: String(e),
@@ -140,28 +140,28 @@ function L(e, t, n, r) {
 }
 //#endregion
 //#region src/events.ts
-function R(e, t) {
+function L(e, t) {
 	let n = t;
 	for (let t = e.length - 1; t >= 0; t--) n = e[t](n);
 	return n;
 }
-function z(e, t) {
+function R(e, t) {
 	let n = t;
 	for (let t = e.length - 1; t >= 0; t--) n = e[t](n);
 	return n;
 }
 //#endregion
 //#region src/handshake.ts
-function B(e, t) {
+function z(e, t) {
 	let n = t.alpha ?? "", r = t.beta ?? "", i = t.omega ?? "";
-	e.crypt.initCrypto(n, r, i), e.logger.info("crypto initialized (P-256 path), sending clientinit"), K(e);
+	e.crypt.initCrypto(n, r, i), e.logger.info("crypto initialized (P-256 path), sending clientinit"), G(e);
 }
-function V(e, t) {
+function B(e, t) {
 	e.logger.info("received initivexpand2"), e.handler.receivedFinalInitAck();
-	let n = t.l ?? "", r = t.omega ?? "", i = t.proof ?? "", a = t.beta ?? "", o = U(e, a);
-	T(e.crypt, n, r, i, a, o), K(e);
+	let n = t.l ?? "", r = t.omega ?? "", i = t.proof ?? "", a = t.beta ?? "", o = H(e, a);
+	ne(e.crypt, n, r, i, a, o), G(e);
 }
-function H(e, t) {
+function V(e, t) {
 	let n = t.aclid ?? t.clid ?? "", r = n ? parseInt(n, 10) : 0;
 	r > 0 && (e.clid = r, e.handler.setClientID(r)), e.logger.info("connected to server", { selfId: e.clid }), e._markConnected(), setImmediate(() => {
 		let t = w("clientupdate", {
@@ -171,25 +171,25 @@ function H(e, t) {
 		e.sendCommandNoWait(t).catch(() => {});
 	});
 }
-function U(e, t) {
-	let [n, r] = f(), i = Buffer.from(n).toString("base64"), a = W(e, n, t), o = C("clientek", [["ek", i], ["proof", a]]);
+function H(e, t) {
+	let [n, r] = p(), i = Buffer.from(n).toString("base64"), a = U(e, n, t), o = C("clientek", [["ek", i], ["proof", a]]);
 	return e.handler.sendPacket(b.Command, Buffer.from(o), 0), r;
 }
-function W(e, t, n) {
+function U(e, t, n) {
 	let r = Buffer.from(n, "base64"), i = /* @__PURE__ */ new Uint8Array(86);
 	i.set(t.slice(0, 32)), i.set(r.slice(0, Math.min(54, r.length)), 32);
 	let a = d(e.crypt.identity.privateKey, i);
 	return Buffer.from(a).toString("base64");
 }
-function G(e) {
-	return e === "" ? "" : D("sha1").update(e).digest().toString("base64");
+function W(e) {
+	return e === "" ? "" : E("sha1").update(e).digest().toString("base64");
 }
-function K(e) {
-	let t = q(e);
+function G(e) {
+	let t = K(e);
 	e.handler.sendPacket(b.Command, Buffer.from(t), 0);
 }
-function q(e) {
-	let t = e.crypt.identity.publicKeyBase64(), n = e.getClientInitOptions(), r = G(n.defaultChannelPassword), i = G(n.serverPassword), a = D("sha1").update(t).digest().toString("base64");
+function K(e) {
+	let t = e.crypt.identity.publicKeyBase64(), n = e.getClientInitOptions(), r = W(n.defaultChannelPassword), i = W(n.serverPassword), a = E("sha1").update(t).digest().toString("base64");
 	return C("clientinit", [
 		["client_nickname", e.nickname],
 		["client_version", "3.?.? [Build: 5680278000]"],
@@ -209,7 +209,7 @@ function q(e) {
 }
 //#endregion
 //#region src/helpers.ts
-function J(e) {
+function q(e) {
 	if (e === "" || e === void 0) return 0n;
 	try {
 		return BigInt(e);
@@ -217,55 +217,68 @@ function J(e) {
 		return 0n;
 	}
 }
-function Y(e) {
+function J(e) {
 	let t = parseInt(e, 10);
 	return isNaN(t) || t < 0 || t > 65535 ? 0 : t;
 }
-function X(e) {
+function Y(e) {
 	let t = parseInt(e, 10);
 	return isNaN(t) ? 0 : t;
 }
-function Z(e, t) {
+function X(e, t) {
 	if (t === e) return !0;
 	if (!t.startsWith(e)) return !1;
 	let n = t.slice(e.length);
 	return /^\d+$/.test(n);
 }
-function Q(e) {
+function Z(e) {
 	let t = e.indexOf(" ");
 	if (t < 0) return [e];
 	let n = e.slice(0, t), r = e.slice(t + 1);
 	if (!r.includes("|")) return [e];
-	let i = r.split("|"), a = [];
-	for (let e of i) e !== "" && a.push(`${n} ${e}`);
+	let i = r.split("|"), a = [], o = /* @__PURE__ */ new Map();
+	for (let e of i) {
+		if (e === "") continue;
+		let t = e.split(" ").filter(Boolean), r = /* @__PURE__ */ new Set();
+		for (let e of t) r.add(Q(e));
+		let i = [];
+		for (let [e, t] of o) r.has(e) || i.push(t);
+		let s = [...i, ...t];
+		a.push(`${n} ${s.join(" ")}`), o = /* @__PURE__ */ new Map();
+		for (let e of s) o.set(Q(e), e);
+	}
 	return a.length === 0 ? [e] : a;
 }
+function Q(e) {
+	let t = e.indexOf("=");
+	return t > 0 ? e.slice(0, t) : e;
+}
 //#endregion
 //#region src/notifications.ts
-function ne(e, t, n, r) {
+function re(e, t, n, r) {
 	switch (e.name) {
-		case "notifycliententerview": return re(e, n, r);
-		case "notifyclientleftview": return ie(e, t, n);
-		case "notifyclientmoved": return ae(e, n);
-		case "notifytextmessage": return oe(e, n);
-		case "notifyclientpoke": return ue(e);
+		case "notifycliententerview": return ie(e, n, r);
+		case "notifyclientleftview": return ae(e, t, n);
+		case "notifyclientmoved": return oe(e, n);
+		case "notifytextmessage": return se(e, n);
+		case "notifyclientpoke": return de(e);
 		case "notifystartupload": return {
 			kind: "startUpload",
-			info: se(e)
+			info: ce(e)
 		};
 		case "notifystartdownload": return {
 			kind: "startDownload",
-			info: ce(e)
+			info: le(e)
 		};
 		case "notifystatusfiletransfer": return {
 			kind: "fileTransferStatus",
-			info: le(e)
+			info: ue(e)
 		};
 		default: return { kind: "unknown" };
 	}
 }
-function re(e, t, n) {
-	let r = Y(e.params.clid ?? ""), i = J(e.params.ctid ?? ""), a = X(e.params.client_type ?? ""), o = e.params.client_servergroups ?? "", s = {
+function ie(e, t, n) {
+	let r = J(e.params.clid ?? ""), i = q(e.params.ctid ?? ""), a = Y(e.params.client_type ?? ""), o = e.params.client_servergroups ?? "", s = {
 		id: r,
 		nickname: e.params.client_nickname ?? "",
 		uid: e.params.client_unique_identifier ?? "",
@@ -278,21 +291,21 @@ function re(e, t, n) {
 		info: s
 	};
 }
-function ie(e, t, n) {
-	let r = Y(e.params.clid ?? ""), i = X(e.params.reasonid ?? ""), a = r === t;
+function ae(e, t, n) {
+	let r = J(e.params.clid ?? ""), i = Y(e.params.reasonid ?? ""), a = r === t;
 	return r !== 0 && n.delete(r), {
 		kind: "clientLeave",
 		event: {
 			id: r,
 			reasonID: i,
 			reasonMsg: e.params.reasonmsg ?? "",
-			targetID: Y(e.params.targetid ?? "")
+			targetID: J(e.params.targetid ?? "")
 		},
 		isSelf: a
 	};
 }
-function ae(e, t) {
-	let n = Y(e.params.clid ?? ""), r = J(e.params.ctid ?? "");
+function oe(e, t) {
+	let n = J(e.params.clid ?? ""), r = q(e.params.ctid ?? "");
 	if (n !== 0) {
 		let e = t.get(n);
 		e && t.set(n, {
@@ -305,20 +318,20 @@ function ae(e, t) {
 		event: {
 			id: n,
 			targetChannelID: r,
-			reasonID: X(e.params.reasonid ?? ""),
-			invokerID: Y(e.params.invokerid ?? ""),
+			reasonID: Y(e.params.reasonid ?? ""),
+			invokerID: J(e.params.invokerid ?? ""),
 			invokerName: e.params.invokername ?? "",
 			invokerUID: e.params.invokeruid ?? ""
 		}
 	};
 }
-function oe(e, t) {
-	let n = Y(e.params.invokerid ?? ""), r = t.get(n);
+function se(e, t) {
+	let n = J(e.params.invokerid ?? ""), r = t.get(n);
 	return {
 		kind: "textMessage",
 		message: {
-			targetMode: X(e.params.targetmode ?? ""),
-			targetID: J(e.params.target ?? ""),
+			targetMode: Y(e.params.targetmode ?? ""),
+			targetID: q(e.params.target ?? ""),
 			invokerID: n,
 			invokerName: e.params.invokername ?? "",
 			invokerUID: e.params.invokeruid ?? r?.uid ?? "",
@@ -327,36 +340,36 @@ function oe(e, t) {
 		}
 	};
 }
-function se(e) {
+function ce(e) {
 	return {
-		clientFileTransferID: Y(e.params.clientftfid ?? ""),
-		serverFileTransferID: Y(e.params.serverftfid ?? ""),
+		clientFileTransferID: J(e.params.clientftfid ?? ""),
+		serverFileTransferID: J(e.params.serverftfid ?? ""),
 		fileTransferKey: e.params.ftkey ?? "",
-		port: Y(e.params.port ?? ""),
-		seekPosition: J(e.params.seekpos ?? "")
+		port: J(e.params.port ?? ""),
+		seekPosition: q(e.params.seekpos ?? "")
 	};
 }
-function ce(e) {
+function le(e) {
 	return {
-		clientFileTransferID: Y(e.params.clientftfid ?? ""),
-		serverFileTransferID: Y(e.params.serverftfid ?? ""),
+		clientFileTransferID: J(e.params.clientftfid ?? ""),
+		serverFileTransferID: J(e.params.serverftfid ?? ""),
 		fileTransferKey: e.params.ftkey ?? "",
-		port: Y(e.params.port ?? ""),
-		size: J(e.params.size ?? "")
+		port: J(e.params.port ?? ""),
+		size: q(e.params.size ?? "")
 	};
 }
-function le(e) {
+function ue(e) {
 	return {
-		clientFileTransferID: Y(e.params.clientftfid ?? ""),
-		status: X(e.params.status ?? ""),
+		clientFileTransferID: J(e.params.clientftfid ?? ""),
+		status: Y(e.params.status ?? ""),
 		message: e.params.msg ?? ""
 	};
 }
-function ue(e) {
+function de(e) {
 	return {
 		kind: "poked",
 		event: {
-			invokerID: Y(e.params.invokerid ?? ""),
+			invokerID: J(e.params.invokerid ?? ""),
 			invokerName: S(e.params.invokername ?? ""),
 			invokerUID: e.params.invokeruid ?? "",
 			message: S(e.params.msg ?? "")
@@ -365,7 +378,7 @@ function ue(e) {
 }
 //#endregion
 //#region src/throttle.ts
-var de = class e {
+var fe = class e {
 	static TOKEN_RATE = 4;
 	static TOKEN_MAX = 8;
 	#e = 5;
@@ -390,14 +403,14 @@ var de = class e {
 };
 //#endregion
 //#region src/client.ts
-function fe(e) {
+function pe(e) {
 	return {
 		serverPassword: e.serverPassword ?? "",
 		defaultChannel: e.defaultChannel ?? "",
 		defaultChannelPassword: e.defaultChannelPassword ?? ""
 	};
 }
-var pe = class {
+var $ = class {
 	crypt;
 	handler;
 	logger;
@@ -407,13 +420,13 @@ var pe = class {
 	#t;
 	#n;
 	#r;
-	#i = n.Disconnected;
-	#a = new de();
-	#o = new k();
-	#s = new M();
+	#i = t.Disconnected;
+	#a = new fe();
+	#o = new O();
+	#s = new j();
 	#c = /* @__PURE__ */ new Map();
 	#l = [];
-	#u = [];
+	#u = null;
 	#d = [];
 	#f = [];
 	#p = [];
@@ -424,10 +437,11 @@ var pe = class {
 	#v = [];
 	#y = [];
 	#b = [];
-	#x;
+	#x = [];
 	#S;
+	#C;
 	constructor(t, n, r, i = {}) {
-		this.#e = t, this.#t = n, this.nickname = r, this.logger = i.logger ?? e, this.#n = i.resolver ?? new y(this.logger), this.#r = fe(i), this.crypt = new v(t), this.handler = new x(this.crypt, this.logger), this.handler.onPacket = (e) => this.#T(e), this.handler.onClosed = (e) => this.#P(e), i.commandMiddleware && this.#y.push(...i.commandMiddleware), i.eventMiddleware && this.#b.push(...i.eventMiddleware), this.#x = this.#F(), this.#S = this.#I();
+		this.#e = t, this.#t = n, this.nickname = r, this.logger = i.logger ?? e, this.#n = i.resolver ?? new y(this.logger), this.#r = pe(i), this.crypt = new v(t), this.handler = new x(this.crypt, this.logger), this.handler.onPacket = (e) => this.#E(e), this.handler.onClosed = (e) => this.#F(e), i.commandMiddleware && this.#b.push(...i.commandMiddleware), i.eventMiddleware && this.#x.push(...i.eventMiddleware), this.#S = this.#L(), this.#C = this.#R();
 	}
 	get status() {
 		return this.#i;
@@ -436,36 +450,49 @@ var pe = class {
 		return this.#r;
 	}
 	async connect() {
-		if (this.#i !== n.Disconnected) throw new l();
-		this.#C(), this.#i = n.Connecting;
-		let e = await this.#w();
+		if (this.#i !== t.Disconnected) throw new l();
+		this.#w(), this.#i = t.Connecting;
+		let e = await this.#T();
 		this.logger.info("connecting to server", { address: e }), await this.handler.connect(e);
 	}
 	async disconnect() {
-		if (this.#i === n.Disconnected) return;
-		let e = this.#i === n.Connected;
-		if (this.#i = n.Disconnected, this.logger.info("disconnecting from server"), e) try {
+		if (this.#i === t.Disconnected) return;
+		let e = this.#i === t.Connected;
+		if (this.#i = t.Disconnected, this.logger.info("disconnecting from server"), e) try {
 			await this.execCommand("clientdisconnect reasonmsg=Shutdown", 1e3);
 		} catch {}
 		this.handler.close();
-		let t = this.#_.slice();
-		for (let e of t) setImmediate(() => e(void 0));
+		let n = this.#v.slice();
+		for (let e of n) setImmediate(() => e(void 0));
 	}
 	waitConnected(e) {
-		return this.#i === n.Connected ? Promise.resolve() : new Promise((t, n) => {
-			this.#l.push(t), e && e.addEventListener("abort", () => n(e.reason), { once: !0 });
+		return this.#i === t.Connected ? Promise.resolve() : this.#u ? Promise.reject(this.#u) : new Promise((t, n) => {
+			let r = {
+				resolve: () => {
+					e?.removeEventListener("abort", i), t();
+				},
+				reject: (t) => {
+					e?.removeEventListener("abort", i), n(t);
+				}
+			}, i = () => {
+				let t = this.#l.indexOf(r);
+				t >= 0 && this.#l.splice(t, 1);
+				let n = e?.reason;
+				r.reject(n instanceof Error ? n : Error(String(n ?? "Connection wait aborted")));
+			};
+			this.#l.push(r), e?.aborted ? i() : e?.addEventListener("abort", i, { once: !0 });
 		});
 	}
 	async sendCommandNoWait(e) {
-		await this.#a.wait(), await this.#x(e);
+		await this.#a.wait(), await this.#S(e);
 	}
 	async execCommand(e, t = 1e4) {
 		await this.execCommandWithResponse(e, t);
 	}
 	async execCommandWithResponse(e, t = 1e4) {
-		let [n, r] = this.#o.register(), i = j(e, n);
+		let [n, r] = this.#o.register(), i = A(e, n);
 		try {
-			await this.#a.wait(), await this.#x(i);
+			await this.#a.wait(), await this.#S(i);
 		} catch (e) {
 			throw this.#o.unregister(n), e;
 		}
@@ -476,40 +503,38 @@ var pe = class {
 	on(e, t) {
 		switch (e) {
 			case "textMessage":
-				this.#u.push(t);
-				break;
-			case "clientEnter":
 				this.#d.push(t);
 				break;
-			case "clientLeave":
+			case "clientEnter":
 				this.#f.push(t);
 				break;
-			case "clientMoved":
+			case "clientLeave":
 				this.#p.push(t);
 				break;
-			case "poked":
+			case "clientMoved":
 				this.#m.push(t);
 				break;
-			case "voiceData":
+			case "poked":
 				this.#h.push(t);
 				break;
-			case "connected":
+			case "voiceData":
 				this.#g.push(t);
 				break;
-			case "disconnected":
+			case "connected":
 				this.#_.push(t);
 				break;
-			case "kicked":
+			case "disconnected":
 				this.#v.push(t);
 				break;
+			case "kicked": this.#y.push(t);
 		}
 		return this;
 	}
 	useCommandMiddleware(...e) {
-		return this.#y.push(...e), this.#x = this.#F(), this;
+		return this.#b.push(...e), this.#S = this.#L(), this;
 	}
 	useEventMiddleware(...e) {
-		return this.#b.push(...e), this.#S = this.#I(), this;
+		return this.#x.push(...e), this.#C = this.#R(), this;
 	}
 	clientID() {
 		return this.clid;
@@ -517,11 +542,14 @@ var pe = class {
 	channelID() {
 		return this.#c.get(this.clid)?.channelID ?? 0n;
 	}
+	sendWhisper(e, t, n) {
+		this.handler.sendWhisperPacket(e, t, n);
+	}
 	sendVoice(e, t) {
 		this.handler.sendVoicePacket(e, t);
 	}
 	async fileTransferInitUpload(e, t, n, r, i = !1) {
-		let [a, s] = this.#s.register(), c = I(e, t, n, r, a, i);
+		let [a, s] = this.#s.register(), c = F(e, t, n, r, a, i);
 		try {
 			await this.execCommand(c, 1e4);
 		} catch (e) {
@@ -536,7 +564,7 @@ var pe = class {
 		return l;
 	}
 	async fileTransferInitDownload(e, t, n) {
-		let [r, i] = this.#s.register(), a = L(e, t, n, r);
+		let [r, i] = this.#s.register(), a = I(e, t, n, r);
 		try {
 			await this.execCommand(a, 1e4);
 		} catch (e) {
@@ -551,22 +579,22 @@ var pe = class {
 		return s;
 	}
 	uploadFileData(e, t, n) {
-		return P(e, t, n);
+		return N(e, t, n);
 	}
 	downloadFileData(e, t, n) {
-		return F(e, t, n);
+		return P(e, t, n);
 	}
 	_markConnected() {
-		this.#i = n.Connected;
-		for (let e of this.#l) e();
+		this.#i = t.Connected, this.#u = null;
+		for (let e of this.#l) e.resolve();
 		this.#l = [];
-		let e = this.#g.slice();
+		let e = this.#_.slice();
 		for (let t of e) setImmediate(() => t());
 	}
-	#C() {
-		this.handler.close(), this.crypt = new v(this.#e), this.handler = new x(this.crypt, this.logger), this.handler.onPacket = (e) => this.#T(e), this.handler.onClosed = (e) => this.#P(e), this.#o.reset(), this.#s.reset(), this.#c.clear(), this.clid = 0, this.#x = this.#F();
+	#w() {
+		this.#u = null, this.handler.close(), this.crypt = new v(this.#e), this.handler = new x(this.crypt, this.logger), this.handler.onPacket = (e) => this.#E(e), this.handler.onClosed = (e) => this.#F(e), this.#o.reset(), this.#s.reset(), this.#c.clear(), this.clid = 0, this.#S = this.#L();
 	}
-	async #w() {
+	async #T() {
 		let e = this.#t.includes(":") ? this.#t : `${this.#t}:9987`;
 		try {
 			return (await this.#n.resolve(this.#t))[0]?.addr ?? e;
@@ -574,10 +602,10 @@ var pe = class {
 			return e;
 		}
 	}
-	#T(e) {
-		this.#E(e);
-	}
 	#E(e) {
+		this.#D(e);
+	}
+	#D(e) {
 		let t = e.typeFlagged & 15;
 		if (t === 8) {
 			let t = te(this.crypt, e.data);
@@ -585,13 +613,13 @@ var pe = class {
 			return;
 		}
 		if ((t === 0 || t === 1) && e.data.length > 5) {
-			this.#D(e.data);
+			this.#O(e.data);
 			return;
 		}
-		(t === 2 || t === 3) && e.data.length > 0 && this.#O(Buffer.from(e.data).toString("utf8"));
+		(t === 2 || t === 3) && e.data.length > 0 && this.#k(Buffer.from(e.data).toString("utf8"));
 	}
-	#D(e) {
-		if (this.#h.length === 0) return;
+	#O(e) {
+		if (this.#g.length === 0) return;
 		let t = new DataView(e.buffer, e.byteOffset, e.byteLength).getUint16(2, !1);
 		if (t === this.clid) return;
 		let n = {
@@ -599,36 +627,36 @@ var pe = class {
 			codec: e[4],
 			data: e.subarray(5)
 		};
-		for (let e of this.#h) setImmediate(() => e(n));
+		for (let e of this.#g) setImmediate(() => e(n));
 	}
-	#O(e) {
+	#k(e) {
 		if (!e) return;
 		let t = e.split("\0").join("\n").split("\n");
 		for (let e of t) {
 			let t = e.replace(/\r$/, "");
-			if (t) for (let e of Q(t)) this.#k(e);
+			if (t) for (let e of Z(t)) this.#A(e);
 		}
 	}
-	#k(e) {
-		let t = E(e);
-		if (!(!t || !t.name)) {
+	#A(e) {
+		let t = T(e);
+		if (t && t.name) {
 			if (t.name.startsWith("notify")) {
-				let e = ne(t, this.clid, this.#c, this.nickname);
-				this.#j(e, t.params);
+				let e = re(t, this.clid, this.#c, this.nickname);
+				this.#M(e, t.params);
 				return;
 			}
 			switch (t.name) {
 				case "clientinitiv":
-					B(this, t.params);
+					z(this, t.params);
 					break;
 				case "initivexpand2":
-					V(this, t.params);
+					B(this, t.params);
 					break;
 				case "initserver":
-					H(this, t.params);
+					V(this, t.params);
 					break;
 				case "error":
-					this.#A(t.params);
+					this.#j(t.params);
 					break;
 				default: {
 					let e = t.params;
@@ -645,31 +673,35 @@ var pe = class {
 			}
 		}
 	}
-	#A(e) {
-		let { err: t, rc: n } = A(e);
-		n === null ? this.#o.discardBuffer() : this.#o.resolve(n, t), (e.id ?? "0") === "3329" && setImmediate(() => this.disconnect().catch(() => {}));
+	#j(e) {
+		let { err: n, rc: r } = k(e);
+		if (r === null ? this.#o.discardBuffer() : this.#o.resolve(r, n), n && this.#i !== t.Connected) {
+			this.#I(n);
+			return;
+		}
+		(e.id ?? "0") === "3329" && setImmediate(() => this.disconnect().catch(() => {}));
 	}
-	#j(e, t) {
+	#M(e, t) {
 		switch (e.kind) {
 			case "clientEnter": {
 				let t = e.info;
-				t.id !== 0 && Z(this.nickname, t.nickname) && (this.clid = t.id, this.handler.setClientID(t.id), this.#o.signalWelcomeComplete()), this.#M("clientEnter", t);
+				t.id !== 0 && t.id === this.clid ? (this.nickname = t.nickname, this.#o.signalWelcomeComplete()) : t.id !== 0 && this.clid === 0 && X(this.nickname, t.nickname) && (this.clid = t.id, this.handler.setClientID(t.id), this.nickname = t.nickname, this.#o.signalWelcomeComplete()), this.#N("clientEnter", t);
 				break;
 			}
 			case "clientLeave":
-				if (this.#M("clientLeave", e.event), e.isSelf && (e.event.reasonID === 4 || e.event.reasonID === 5)) {
+				if (this.#N("clientLeave", e.event), e.isSelf && (e.event.reasonID === 4 || e.event.reasonID === 5)) {
 					let t = e.event.reasonMsg;
-					for (let e of this.#v) setImmediate(() => e(t));
+					for (let e of this.#y) setImmediate(() => e(t));
 				}
 				break;
 			case "clientMoved":
-				this.#M("clientMoved", e.event);
+				this.#N("clientMoved", e.event);
 				break;
 			case "textMessage":
-				this.#M("textMessage", e.message);
+				this.#N("textMessage", e.message);
 				break;
 			case "poked":
-				this.#M("poked", e.event);
+				this.#N("poked", e.event);
 				break;
 			case "startUpload":
 				this.#s.notify(e.info.clientFileTransferID, e.info);
@@ -677,53 +709,62 @@ var pe = class {
 			case "startDownload":
 				this.#s.notify(e.info.clientFileTransferID, e.info);
 				break;
-			case "fileTransferStatus":
-				this.#s.notify(e.info.clientFileTransferID, e.info);
-				break;
+			case "fileTransferStatus": this.#s.notify(e.info.clientFileTransferID, e.info);
 		}
 	}
-	#M(e, t) {
-		this.#S(t);
-	}
 	#N(e, t) {
+		this.#C(t);
+	}
+	#P(e, t) {
 		switch (e) {
 			case "textMessage":
-				for (let e of this.#u) setImmediate(() => e(t));
-				break;
-			case "clientEnter":
 				for (let e of this.#d) setImmediate(() => e(t));
 				break;
-			case "clientLeave":
+			case "clientEnter":
 				for (let e of this.#f) setImmediate(() => e(t));
 				break;
-			case "clientMoved":
+			case "clientLeave":
 				for (let e of this.#p) setImmediate(() => e(t));
 				break;
-			case "poked":
+			case "clientMoved":
 				for (let e of this.#m) setImmediate(() => e(t));
 				break;
+			case "poked": for (let e of this.#h) setImmediate(() => e(t));
 		}
 	}
-	#P(e) {
-		if (this.#i === n.Disconnected) return;
-		this.#i = n.Disconnected;
-		let t = this.#_.slice();
-		for (let n of t) setImmediate(() => n(e ?? void 0));
-	}
-	#F() {
-		return R(this.#y, async (e) => {
+	#F(e) {
+		if (this.#i === t.Disconnected) return;
+		if (this.#i !== t.Connected) {
+			this.#I(e ?? /* @__PURE__ */ Error("Connection closed before the TeamSpeak handshake completed"));
+			return;
+		}
+		this.#i = t.Disconnected;
+		let n = this.#v.slice();
+		for (let t of n) setImmediate(() => t(e ?? void 0));
+	}
+	#I(e) {
+		this.#u = e;
+		let n = this.#l.splice(0);
+		for (let t of n) t.reject(e);
+		if (this.#i === t.Disconnected) return;
+		this.#i = t.Disconnected, this.handler.close();
+		let r = this.#v.slice();
+		for (let t of r) setImmediate(() => t(e));
+	}
+	#L() {
+		return L(this.#b, async (e) => {
 			this.handler.sendPacket(b.Command, Buffer.from(e), 0);
 		});
 	}
-	#I() {
-		return z(this.#b, (e) => {
-			typeof e == "object" && e && "invokerName" in e && "message" in e && "targetMode" in e ? this.#N("textMessage", e) : typeof e == "object" && e && "invokerName" in e && "message" in e && !("targetMode" in e) ? this.#N("poked", e) : typeof e == "object" && e && "id" in e && "uid" in e ? this.#N("clientEnter", e) : typeof e == "object" && e && "id" in e && "reasonID" in e && "targetChannelID" in e ? this.#N("clientMoved", e) : typeof e == "object" && e && "id" in e && "reasonID" in e && this.#N("clientLeave", e);
+	#R() {
+		return R(this.#x, (e) => {
+			typeof e == "object" && e && "invokerName" in e && "message" in e && "targetMode" in e ? this.#P("textMessage", e) : typeof e == "object" && e && "invokerName" in e && "message" in e && !("targetMode" in e) ? this.#P("poked", e) : typeof e == "object" && e && "id" in e && "uid" in e ? this.#P("clientEnter", e) : typeof e == "object" && e && "id" in e && "reasonID" in e && "targetChannelID" in e ? this.#P("clientMoved", e) : typeof e == "object" && e && "id" in e && "reasonID" in e && this.#P("clientLeave", e);
 		});
 	}
 };
 //#endregion
 //#region src/api.ts
-async function $(e, t, n, r) {
+async function me(e, t, n, r) {
 	let i = C("sendtextmessage", [
 		["targetmode", String(t)],
 		["target", String(n)],
@@ -731,30 +772,34 @@ async function $(e, t, n, r) {
 	]);
 	await e.sendCommandNoWait(i);
 }
-async function me(e, t, n, r = "") {
+async function he(e, t, n, r = "") {
 	let i = [["clid", String(t)], ["cid", String(n)]];
-	r && i.push(["cpw", r]);
+	r && i.push(["cpw", ge(r)]);
 	let a = C("clientmove", i);
 	await e.execCommand(a, 1e4);
 }
-async function he(e, t, n) {
+function ge(e) {
+	return E("sha1").update(e).digest("base64");
+}
+async function _e(e, t, n) {
 	let r = C("clientpoke", [["clid", String(t)], ["msg", n]]);
 	await e.execCommand(r, 1e4);
 }
-async function ge(e, t) {
+async function ve(e, t) {
 	let n = (await e.execCommandWithResponse(`clientinfo clid=${t}`, 5e3))[0];
 	if (!n) throw Error(`no data returned for client ${t}`);
 	return n;
 }
-async function _e(e) {
+async function ye(e) {
 	return (await e.execCommandWithResponse("channellist", 5e3)).map((e) => ({
 		id: BigInt(e.cid ?? "0"),
-		parentID: BigInt(e.pid ?? "0"),
+		parentID: BigInt(e.pid ?? e.cpid ?? "0"),
+		order: BigInt(e.channel_order ?? "0"),
 		name: S(e.channel_name ?? ""),
 		description: ""
 	}));
 }
-async function ve(e) {
+async function be(e) {
 	return (await e.execCommandWithResponse("clientlist -uid -away -voice -groups", 5e3)).map((e) => {
 		let t = e.client_servergroups ?? "";
 		return {
@@ -767,7 +812,7 @@ async function ve(e) {
 		};
 	});
 }
-async function ye(e, t, n) {
+async function xe(e, t, n) {
 	if (n.length === 0) return;
 	let r = n.join("|"), i = w("ftdeletefile", {
 		cid: String(t),
@@ -777,6 +822,6 @@ async function ye(e, t, n) {
 	await e.execCommand(i, 1e4);
 }
 //#endregion
-export { l as AlreadyConnectedError, pe as Client, n as ClientStatus, c as CommandTimeoutError, a as CryptoInitError, m as EAXTagMismatchError, _ as FakeSignatureMismatchError, o as FileTransferError, g as FileTransferTimeoutError, u as Identity, i as InvalidIdentityError, r as ServerError, h as TeamspeakError, me as clientMove, e as consoleLogger, N as dialFileTransfer, F as downloadFileData, ye as fileTransferDeleteFile, p as generateIdentity, ge as getClientInfo, s as getUidFromPublicKey, ee as identityFromString, _e as listChannels, ve as listClients, t as noopLogger, he as poke, $ as sendTextMessage, P as uploadFileData };
+export { l as AlreadyConnectedError, $ as Client, t as ClientStatus, c as CommandTimeoutError, a as CryptoInitError, h as EAXTagMismatchError, _ as FakeSignatureMismatchError, o as FileTransferError, g as FileTransferTimeoutError, u as Identity, i as InvalidIdentityError, r as ServerError, ee as TeamspeakError, he as clientMove, e as consoleLogger, M as dialFileTransfer, P as downloadFileData, xe as fileTransferDeleteFile, m as generateIdentity, ve as getClientInfo, s as getUidFromPublicKey, f as identityFromString, ye as listChannels, be as listClients, n as noopLogger, _e as poke, me as sendTextMessage, N as uploadFileData };
 
 //# sourceMappingURL=index.mjs.map