@honeybbq/teamspeak-client 0.1.1 → 0.2.1

package/dist/index.mjs

@@ -1,16 +1,16 @@
 import { n as e, r as t, t as n } from "./types-CGKgXvpG.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 ee, w as h, x as g, y as _ } from "./primitives-BIAYfJ2Y.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-BIAYfJ2Y.js";
 import { t as v } from "./crypto-VC7n6YJb.js";
 import { t as y } from "./resolver-DDZWomrF.js";
 import { a as b, t as x } from "./handler-C_JhqGTd.js";
 import { i as S, n as C, t as w } from "./command-caXc4h0n.js";
-import { n as T } from "./crypt-handshake-CHmvZ2qs.js";
-import { t as E } from "./crypt-init2-DWX7Tp-_.js";
-import { t as D } from "./parser-CJjP3LlO.js";
-import { createHash as O } from "node:crypto";
-import { createConnection as k } from "node:net";
+import { n as te } from "./crypt-handshake-CHmvZ2qs.js";
+import { t as T } from "./crypt-init2-DWX7Tp-_.js";
+import { t as E } from "./parser-CJjP3LlO.js";
+import { createHash as D } from "node:crypto";
+import { createConnection as O } from "node:net";
 //#region src/commands.ts
-var A = class {
+var k = class {
 	#e = /* @__PURE__ */ new Map();
 	#t = 0;
 	#n = [];
@@ -50,7 +50,7 @@ var A = class {
 		this.#e.clear(), this.#n = [], this.#r = !1, this.#t = 0;
 	}
 };
-function j(e) {
+function A(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 j(e) {
 		rc: o
 	};
 }
-function M(e, t) {
+function j(e, t) {
 	return e.includes("return_code=") ? e : `${e} return_code=${t}`;
 }
 //#endregion
 //#region src/transfer.ts
-var N = class {
+var M = class {
 	#e = /* @__PURE__ */ new Map();
 	#t = 0;
 	register() {
@@ -89,9 +89,9 @@ var N = class {
 		this.#e.clear(), this.#t = 0;
 	}
 };
-function P(e, t, n) {
+function N(e, t, n) {
 	return new Promise((r, i) => {
-		let a = k({
+		let a = O({
 			host: e,
 			port: t
 		}, () => {
@@ -104,19 +104,19 @@ function P(e, t, n) {
 		});
 	});
 }
-async function F(e, t, n) {
-	let r = await P(e, t.port, t.fileTransferKey);
+async function P(e, t, n) {
+	let r = await N(e, t.port, t.fileTransferKey);
 	await new Promise((e, t) => {
 		n.pipe(r), r.on("finish", e), r.on("error", t);
 	});
 }
-async function I(e, t, n) {
-	let r = await P(e, t.port, t.fileTransferKey);
+async function F(e, t, n) {
+	let r = await N(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 L(e, t, n, r, i, a) {
+function I(e, t, n, r, i, a) {
 	let o = t.startsWith("/") ? t : `/${t}`;
 	return w("ftinitupload", {
 		cid: String(e),
@@ -128,7 +128,7 @@ function L(e, t, n, r, i, a) {
 		resume: "0"
 	});
 }
-function R(e, t, n, r) {
+function L(e, t, n, r) {
 	let i = t.startsWith("/") ? t : `/${t}`;
 	return w("ftinitdownload", {
 		cid: String(e),
@@ -140,28 +140,28 @@ function R(e, t, n, r) {
 }
 //#endregion
 //#region src/events.ts
-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;
 }
-function B(e, t) {
+function z(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 V(e, t) {
+function B(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"), G(e);
+	e.crypt.initCrypto(n, r, i), e.logger.info("crypto initialized (P-256 path), sending clientinit"), K(e);
 }
-function H(e, t) {
+function V(e, t) {
 	e.logger.info("received initivexpand2"), e.handler.receivedFinalInitAck();
-	let n = t.l ?? "", r = t.omega ?? "", i = t.proof ?? "", a = t.beta ?? "", o = te(e, a);
-	E(e.crypt, n, r, i, a, o), G(e);
+	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);
 }
-function U(e, t) {
+function H(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,8 +171,8 @@ function U(e, t) {
 		e.sendCommandNoWait(t).catch(() => {});
 	});
 }
-function te(e, t) {
-	let [n, r] = p(), i = Buffer.from(n).toString("base64"), a = W(e, n, t), o = C("clientek", [["ek", i], ["proof", a]]);
+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]]);
 	return e.handler.sendPacket(b.Command, Buffer.from(o), 0), r;
 }
 function W(e, t, n) {
@@ -182,27 +182,34 @@ function W(e, t, n) {
 	return Buffer.from(a).toString("base64");
 }
 function G(e) {
-	let t = e.crypt.identity.publicKeyBase64(), n = O("sha1").update(t).digest().toString("base64"), r = C("clientinit", [
+	return e === "" ? "" : D("sha1").update(e).digest().toString("base64");
+}
+function K(e) {
+	let t = q(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");
+	return C("clientinit", [
 		["client_nickname", e.nickname],
 		["client_version", "3.?.? [Build: 5680278000]"],
 		["client_platform", "Windows"],
 		["client_input_hardware", "1"],
 		["client_output_hardware", "1"],
-		["client_default_channel", ""],
-		["client_default_channel_password", ""],
-		["client_server_password", ""],
+		["client_default_channel", n.defaultChannel],
+		["client_default_channel_password", r],
+		["client_server_password", i],
 		["client_meta_data", ""],
 		["client_version_sign", "DX5NIYLvfJEUjuIbCidnoeozxIDRRkpq3I9vVMBmE9L2qnekOoBzSenkzsg2lC9CMv8K5hkEzhr2TYUYSwUXCg=="],
 		["client_key_offset", String(e.crypt.identity.offset)],
 		["client_nickname_phonetic", ""],
 		["client_default_token", ""],
-		["hwid", n]
+		["hwid", a]
 	]);
-	e.handler.sendPacket(b.Command, Buffer.from(r), 0);
 }
 //#endregion
 //#region src/helpers.ts
-function K(e) {
+function J(e) {
 	if (e === "" || e === void 0) return 0n;
 	try {
 		return BigInt(e);
@@ -210,21 +217,21 @@ function K(e) {
 		return 0n;
 	}
 }
-function q(e) {
+function Y(e) {
 	let t = parseInt(e, 10);
 	return isNaN(t) || t < 0 || t > 65535 ? 0 : t;
 }
-function J(e) {
+function X(e) {
 	let t = parseInt(e, 10);
 	return isNaN(t) ? 0 : t;
 }
-function Y(e, t) {
+function Z(e, t) {
 	if (t === e) return !0;
 	if (!t.startsWith(e)) return !1;
 	let n = t.slice(e.length);
 	return /^\d+$/.test(n);
 }
-function X(e) {
+function Q(e) {
 	let t = e.indexOf(" ");
 	if (t < 0) return [e];
 	let n = e.slice(0, t), r = e.slice(t + 1);
@@ -235,30 +242,30 @@ function X(e) {
 }
 //#endregion
 //#region src/notifications.ts
-function Z(e, t, n, r) {
+function ne(e, t, n, r) {
 	switch (e.name) {
-		case "notifycliententerview": return Q(e, n, r);
-		case "notifyclientleftview": return ne(e, t, n);
-		case "notifyclientmoved": return re(e, n);
-		case "notifytextmessage": return ie(e, n);
-		case "notifyclientpoke": return se(e);
+		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 "notifystartupload": return {
 			kind: "startUpload",
-			info: ae(e)
+			info: se(e)
 		};
 		case "notifystartdownload": return {
 			kind: "startDownload",
-			info: oe(e)
+			info: ce(e)
 		};
 		case "notifystatusfiletransfer": return {
 			kind: "fileTransferStatus",
-			info: $(e)
+			info: le(e)
 		};
 		default: return { kind: "unknown" };
 	}
 }
-function Q(e, t, n) {
-	let r = q(e.params.clid ?? ""), i = K(e.params.cid ?? ""), a = J(e.params.client_type ?? ""), o = e.params.client_servergroups ?? "", s = {
+function re(e, t, n) {
+	let r = Y(e.params.clid ?? ""), i = J(e.params.cid ?? ""), a = X(e.params.client_type ?? ""), o = e.params.client_servergroups ?? "", s = {
 		id: r,
 		nickname: e.params.client_nickname ?? "",
 		uid: e.params.client_unique_identifier ?? "",
@@ -271,21 +278,21 @@ function Q(e, t, n) {
 		info: s
 	};
 }
-function ne(e, t, n) {
-	let r = q(e.params.clid ?? ""), i = J(e.params.reasonid ?? ""), a = r === t;
+function ie(e, t, n) {
+	let r = Y(e.params.clid ?? ""), i = X(e.params.reasonid ?? ""), a = r === t;
 	return r !== 0 && n.delete(r), {
 		kind: "clientLeave",
 		event: {
 			id: r,
 			reasonID: i,
 			reasonMsg: e.params.reasonmsg ?? "",
-			targetID: q(e.params.targetid ?? "")
+			targetID: Y(e.params.targetid ?? "")
 		},
 		isSelf: a
 	};
 }
-function re(e, t) {
-	let n = q(e.params.clid ?? ""), r = K(e.params.ctid ?? "");
+function ae(e, t) {
+	let n = Y(e.params.clid ?? ""), r = J(e.params.ctid ?? "");
 	if (n !== 0) {
 		let e = t.get(n);
 		e && t.set(n, {
@@ -298,20 +305,20 @@ function re(e, t) {
 		event: {
 			id: n,
 			targetChannelID: r,
-			reasonID: J(e.params.reasonid ?? ""),
-			invokerID: q(e.params.invokerid ?? ""),
+			reasonID: X(e.params.reasonid ?? ""),
+			invokerID: Y(e.params.invokerid ?? ""),
 			invokerName: e.params.invokername ?? "",
 			invokerUID: e.params.invokeruid ?? ""
 		}
 	};
 }
-function ie(e, t) {
-	let n = q(e.params.invokerid ?? ""), r = t.get(n);
+function oe(e, t) {
+	let n = Y(e.params.invokerid ?? ""), r = t.get(n);
 	return {
 		kind: "textMessage",
 		message: {
-			targetMode: J(e.params.targetmode ?? ""),
-			targetID: K(e.params.target ?? ""),
+			targetMode: X(e.params.targetmode ?? ""),
+			targetID: J(e.params.target ?? ""),
 			invokerID: n,
 			invokerName: e.params.invokername ?? "",
 			invokerUID: e.params.invokeruid ?? r?.uid ?? "",
@@ -320,36 +327,36 @@ function ie(e, t) {
 		}
 	};
 }
-function ae(e) {
+function se(e) {
 	return {
-		clientFileTransferID: q(e.params.clientftfid ?? ""),
-		serverFileTransferID: q(e.params.serverftfid ?? ""),
+		clientFileTransferID: Y(e.params.clientftfid ?? ""),
+		serverFileTransferID: Y(e.params.serverftfid ?? ""),
 		fileTransferKey: e.params.ftkey ?? "",
-		port: q(e.params.port ?? ""),
-		seekPosition: K(e.params.seekpos ?? "")
+		port: Y(e.params.port ?? ""),
+		seekPosition: J(e.params.seekpos ?? "")
 	};
 }
-function oe(e) {
+function ce(e) {
 	return {
-		clientFileTransferID: q(e.params.clientftfid ?? ""),
-		serverFileTransferID: q(e.params.serverftfid ?? ""),
+		clientFileTransferID: Y(e.params.clientftfid ?? ""),
+		serverFileTransferID: Y(e.params.serverftfid ?? ""),
 		fileTransferKey: e.params.ftkey ?? "",
-		port: q(e.params.port ?? ""),
-		size: K(e.params.size ?? "")
+		port: Y(e.params.port ?? ""),
+		size: J(e.params.size ?? "")
 	};
 }
-function $(e) {
+function le(e) {
 	return {
-		clientFileTransferID: q(e.params.clientftfid ?? ""),
-		status: J(e.params.status ?? ""),
+		clientFileTransferID: Y(e.params.clientftfid ?? ""),
+		status: X(e.params.status ?? ""),
 		message: e.params.msg ?? ""
 	};
 }
-function se(e) {
+function ue(e) {
 	return {
 		kind: "poked",
 		event: {
-			invokerID: q(e.params.invokerid ?? ""),
+			invokerID: Y(e.params.invokerid ?? ""),
 			invokerName: S(e.params.invokername ?? ""),
 			invokerUID: e.params.invokeruid ?? "",
 			message: S(e.params.msg ?? "")
@@ -358,7 +365,7 @@ function se(e) {
 }
 //#endregion
 //#region src/throttle.ts
-var ce = class e {
+var de = class e {
 	static TOKEN_RATE = 4;
 	static TOKEN_MAX = 8;
 	#e = 5;
@@ -380,7 +387,17 @@ var ce = class e {
 			});
 		}
 	}
-}, le = class {
+};
+//#endregion
+//#region src/client.ts
+function fe(e) {
+	return {
+		serverPassword: e.serverPassword ?? "",
+		defaultChannel: e.defaultChannel ?? "",
+		defaultChannelPassword: e.defaultChannelPassword ?? ""
+	};
+}
+var pe = class {
 	crypt;
 	handler;
 	logger;
@@ -389,12 +406,12 @@ var ce = class e {
 	#e;
 	#t;
 	#n;
-	#r = n.Disconnected;
-	#i = new ce();
-	#a = new A();
-	#o = new N();
-	#s = /* @__PURE__ */ new Map();
-	#c = [];
+	#r;
+	#i = n.Disconnected;
+	#a = new de();
+	#o = new k();
+	#s = new M();
+	#c = /* @__PURE__ */ new Map();
 	#l = [];
 	#u = [];
 	#d = [];
@@ -406,108 +423,112 @@ var ce = class e {
 	#_ = [];
 	#v = [];
 	#y = [];
-	#b;
+	#b = [];
 	#x;
+	#S;
 	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.crypt = new v(t), this.handler = new x(this.crypt, this.logger), this.handler.onPacket = (e) => this.#w(e), this.handler.onClosed = (e) => this.#N(e), i.commandMiddleware && this.#v.push(...i.commandMiddleware), i.eventMiddleware && this.#y.push(...i.eventMiddleware), this.#b = this.#P(), this.#x = this.#F();
+		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();
 	}
 	get status() {
+		return this.#i;
+	}
+	getClientInitOptions() {
 		return this.#r;
 	}
 	async connect() {
-		if (this.#r !== n.Disconnected) throw new l();
-		this.#S(), this.#r = n.Connecting;
-		let e = await this.#C();
+		if (this.#i !== n.Disconnected) throw new l();
+		this.#C(), this.#i = n.Connecting;
+		let e = await this.#w();
 		this.logger.info("connecting to server", { address: e }), await this.handler.connect(e);
 	}
 	async disconnect() {
-		if (this.#r === n.Disconnected) return;
-		let e = this.#r === n.Connected;
-		if (this.#r = n.Disconnected, this.logger.info("disconnecting from server"), e) try {
+		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 {
 			await this.execCommand("clientdisconnect reasonmsg=Shutdown", 1e3);
 		} catch {}
 		this.handler.close();
-		let t = this.#g.slice();
+		let t = this.#_.slice();
 		for (let e of t) setImmediate(() => e(void 0));
 	}
 	waitConnected(e) {
-		return this.#r === n.Connected ? Promise.resolve() : new Promise((t, n) => {
-			this.#c.push(t), e && e.addEventListener("abort", () => n(e.reason), { once: !0 });
+		return this.#i === n.Connected ? Promise.resolve() : new Promise((t, n) => {
+			this.#l.push(t), e && e.addEventListener("abort", () => n(e.reason), { once: !0 });
 		});
 	}
 	async sendCommandNoWait(e) {
-		await this.#i.wait(), await this.#b(e);
+		await this.#a.wait(), await this.#x(e);
 	}
 	async execCommand(e, t = 1e4) {
 		await this.execCommandWithResponse(e, t);
 	}
 	async execCommandWithResponse(e, t = 1e4) {
-		let [n, r] = this.#a.register(), i = M(e, n);
+		let [n, r] = this.#o.register(), i = j(e, n);
 		try {
-			await this.#i.wait(), await this.#b(i);
+			await this.#a.wait(), await this.#x(i);
 		} catch (e) {
-			throw this.#a.unregister(n), e;
+			throw this.#o.unregister(n), e;
 		}
 		let a = await Promise.race([r, new Promise((n, r) => setTimeout(() => r(new c(e)), t))]);
-		if (this.#a.unregister(n), a.err) throw a.err;
+		if (this.#o.unregister(n), a.err) throw a.err;
 		return a.data;
 	}
 	on(e, t) {
 		switch (e) {
 			case "textMessage":
-				this.#l.push(t);
+				this.#u.push(t);
 				break;
 			case "clientEnter":
-				this.#u.push(t);
+				this.#d.push(t);
 				break;
 			case "clientLeave":
-				this.#d.push(t);
+				this.#f.push(t);
 				break;
 			case "clientMoved":
-				this.#f.push(t);
+				this.#p.push(t);
 				break;
 			case "poked":
-				this.#p.push(t);
+				this.#m.push(t);
 				break;
 			case "voiceData":
-				this.#m.push(t);
+				this.#h.push(t);
 				break;
 			case "connected":
-				this.#h.push(t);
+				this.#g.push(t);
 				break;
 			case "disconnected":
-				this.#g.push(t);
+				this.#_.push(t);
 				break;
 			case "kicked":
-				this.#_.push(t);
+				this.#v.push(t);
 				break;
 		}
 		return this;
 	}
 	useCommandMiddleware(...e) {
-		return this.#v.push(...e), this.#b = this.#P(), this;
+		return this.#y.push(...e), this.#x = this.#F(), this;
 	}
 	useEventMiddleware(...e) {
-		return this.#y.push(...e), this.#x = this.#F(), this;
+		return this.#b.push(...e), this.#S = this.#I(), this;
 	}
 	clientID() {
 		return this.clid;
 	}
 	channelID() {
-		return this.#s.get(this.clid)?.channelID ?? 0n;
+		return this.#c.get(this.clid)?.channelID ?? 0n;
 	}
 	sendVoice(e, t) {
 		this.handler.sendVoicePacket(e, t);
 	}
 	async fileTransferInitUpload(e, t, n, r, i = !1) {
-		let [a, s] = this.#o.register(), c = L(e, t, n, r, a, i);
+		let [a, s] = this.#s.register(), c = I(e, t, n, r, a, i);
 		try {
 			await this.execCommand(c, 1e4);
 		} catch (e) {
-			throw this.#o.unregister(a), e;
+			throw this.#s.unregister(a), e;
 		}
 		let l = await Promise.race([s, new Promise((e, t) => setTimeout(() => t(new g()), 1e4))]);
-		if (this.#o.unregister(a), "size" in l) throw new o("unexpected download response");
+		if (this.#s.unregister(a), "size" in l) throw new o("unexpected download response");
 		if ("status" in l) {
 			let e = l;
 			throw new o(`${e.message} (status=${e.status})`);
@@ -515,14 +536,14 @@ var ce = class e {
 		return l;
 	}
 	async fileTransferInitDownload(e, t, n) {
-		let [r, i] = this.#o.register(), a = R(e, t, n, r);
+		let [r, i] = this.#s.register(), a = L(e, t, n, r);
 		try {
 			await this.execCommand(a, 1e4);
 		} catch (e) {
-			throw this.#o.unregister(r), e;
+			throw this.#s.unregister(r), e;
 		}
 		let s = await Promise.race([i, new Promise((e, t) => setTimeout(() => t(new g()), 1e4))]);
-		if (this.#o.unregister(r), "seekPosition" in s) throw new o("unexpected upload response");
+		if (this.#s.unregister(r), "seekPosition" in s) throw new o("unexpected upload response");
 		if ("status" in s) {
 			let e = s;
 			throw new o(`${e.message} (status=${e.status})`);
@@ -530,22 +551,22 @@ var ce = class e {
 		return s;
 	}
 	uploadFileData(e, t, n) {
-		return F(e, t, n);
+		return P(e, t, n);
 	}
 	downloadFileData(e, t, n) {
-		return I(e, t, n);
+		return F(e, t, n);
 	}
 	_markConnected() {
-		this.#r = n.Connected;
-		for (let e of this.#c) e();
-		this.#c = [];
-		let e = this.#h.slice();
+		this.#i = n.Connected;
+		for (let e of this.#l) e();
+		this.#l = [];
+		let e = this.#g.slice();
 		for (let t of e) setImmediate(() => t());
 	}
-	#S() {
-		this.handler.close(), this.crypt = new v(this.#e), this.handler = new x(this.crypt, this.logger), this.handler.onPacket = (e) => this.#w(e), this.handler.onClosed = (e) => this.#N(e), this.#a.reset(), this.#o.reset(), this.#s.clear(), this.clid = 0, this.#b = this.#P();
+	#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();
 	}
-	async #C() {
+	async #w() {
 		let e = this.#t.includes(":") ? this.#t : `${this.#t}:9987`;
 		try {
 			return (await this.#n.resolve(this.#t))[0]?.addr ?? e;
@@ -553,24 +574,24 @@ var ce = class e {
 			return e;
 		}
 	}
-	#w(e) {
-		this.#T(e);
-	}
 	#T(e) {
+		this.#E(e);
+	}
+	#E(e) {
 		let t = e.typeFlagged & 15;
 		if (t === 8) {
-			let t = T(this.crypt, e.data);
+			let t = te(this.crypt, e.data);
 			t && this.handler.sendPacket(b.Init1, t, 0);
 			return;
 		}
 		if ((t === 0 || t === 1) && e.data.length > 5) {
-			this.#E(e.data);
+			this.#D(e.data);
 			return;
 		}
-		(t === 2 || t === 3) && e.data.length > 0 && this.#D(Buffer.from(e.data).toString("utf8"));
+		(t === 2 || t === 3) && e.data.length > 0 && this.#O(Buffer.from(e.data).toString("utf8"));
 	}
-	#E(e) {
-		if (this.#m.length === 0) return;
+	#D(e) {
+		if (this.#h.length === 0) return;
 		let t = new DataView(e.buffer, e.byteOffset, e.byteLength).getUint16(2, !1);
 		if (t === this.clid) return;
 		let n = {
@@ -578,36 +599,36 @@ var ce = class e {
 			codec: e[4],
 			data: e.subarray(5)
 		};
-		for (let e of this.#m) setImmediate(() => e(n));
+		for (let e of this.#h) setImmediate(() => e(n));
 	}
-	#D(e) {
+	#O(e) {
 		if (!e) return;
 		let t = e.split(/[\n\0]/);
 		for (let e of t) {
 			let t = e.replace(/\r$/, "");
-			if (t) for (let e of X(t)) this.#O(e);
+			if (t) for (let e of Q(t)) this.#k(e);
 		}
 	}
-	#O(e) {
-		let t = D(e);
+	#k(e) {
+		let t = E(e);
 		if (!(!t || !t.name)) {
 			if (t.name.startsWith("notify")) {
-				let e = Z(t, this.clid, this.#s, this.nickname);
-				this.#A(e, t.params);
+				let e = ne(t, this.clid, this.#c, this.nickname);
+				this.#j(e, t.params);
 				return;
 			}
 			switch (t.name) {
 				case "clientinitiv":
-					V(this, t.params);
+					B(this, t.params);
 					break;
 				case "initivexpand2":
-					H(this, t.params);
+					V(this, t.params);
 					break;
 				case "initserver":
-					U(this, t.params);
+					H(this, t.params);
 					break;
 				case "error":
-					this.#k(t.params);
+					this.#A(t.params);
 					break;
 				default: {
 					let e = t.params;
@@ -618,91 +639,91 @@ var ce = class e {
 							...t.params
 						};
 					}
-					this.#a.buffer(e);
+					this.#o.buffer(e);
 					break;
 				}
 			}
 		}
 	}
-	#k(e) {
-		let { err: t, rc: n } = j(e);
-		n === null ? this.#a.discardBuffer() : this.#a.resolve(n, t), (e.id ?? "0") === "3329" && setImmediate(() => this.disconnect().catch(() => {}));
+	#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(() => {}));
 	}
-	#A(e, t) {
+	#j(e, t) {
 		switch (e.kind) {
 			case "clientEnter": {
 				let t = e.info;
-				t.id !== 0 && Y(this.nickname, t.nickname) && (this.clid = t.id, this.handler.setClientID(t.id), this.#a.signalWelcomeComplete()), this.#j("clientEnter", t);
+				t.id !== 0 && Z(this.nickname, t.nickname) && (this.clid = t.id, this.handler.setClientID(t.id), this.#o.signalWelcomeComplete()), this.#M("clientEnter", t);
 				break;
 			}
 			case "clientLeave":
-				if (this.#j("clientLeave", e.event), e.isSelf && (e.event.reasonID === 4 || e.event.reasonID === 5)) {
+				if (this.#M("clientLeave", e.event), e.isSelf && (e.event.reasonID === 4 || e.event.reasonID === 5)) {
 					let t = e.event.reasonMsg;
-					for (let e of this.#_) setImmediate(() => e(t));
+					for (let e of this.#v) setImmediate(() => e(t));
 				}
 				break;
 			case "clientMoved":
-				this.#j("clientMoved", e.event);
+				this.#M("clientMoved", e.event);
 				break;
 			case "textMessage":
-				this.#j("textMessage", e.message);
+				this.#M("textMessage", e.message);
 				break;
 			case "poked":
-				this.#j("poked", e.event);
+				this.#M("poked", e.event);
 				break;
 			case "startUpload":
-				this.#o.notify(e.info.clientFileTransferID, e.info);
+				this.#s.notify(e.info.clientFileTransferID, e.info);
 				break;
 			case "startDownload":
-				this.#o.notify(e.info.clientFileTransferID, e.info);
+				this.#s.notify(e.info.clientFileTransferID, e.info);
 				break;
 			case "fileTransferStatus":
-				this.#o.notify(e.info.clientFileTransferID, e.info);
+				this.#s.notify(e.info.clientFileTransferID, e.info);
 				break;
 		}
 	}
-	#j(e, t) {
-		this.#x(t);
-	}
 	#M(e, t) {
+		this.#S(t);
+	}
+	#N(e, t) {
 		switch (e) {
 			case "textMessage":
-				for (let e of this.#l) setImmediate(() => e(t));
+				for (let e of this.#u) setImmediate(() => e(t));
 				break;
 			case "clientEnter":
-				for (let e of this.#u) setImmediate(() => e(t));
+				for (let e of this.#d) setImmediate(() => e(t));
 				break;
 			case "clientLeave":
-				for (let e of this.#d) setImmediate(() => e(t));
+				for (let e of this.#f) setImmediate(() => e(t));
 				break;
 			case "clientMoved":
-				for (let e of this.#f) setImmediate(() => e(t));
+				for (let e of this.#p) setImmediate(() => e(t));
 				break;
 			case "poked":
-				for (let e of this.#p) setImmediate(() => e(t));
+				for (let e of this.#m) setImmediate(() => e(t));
 				break;
 		}
 	}
-	#N(e) {
-		if (this.#r === n.Disconnected) return;
-		this.#r = n.Disconnected;
-		let t = this.#g.slice();
+	#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));
 	}
-	#P() {
-		return z(this.#v, async (e) => {
+	#F() {
+		return R(this.#y, async (e) => {
 			this.handler.sendPacket(b.Command, Buffer.from(e), 0);
 		});
 	}
-	#F() {
-		return B(this.#y, (e) => {
-			typeof e == "object" && e && "invokerName" in e && "message" in e && "targetMode" in e ? this.#M("textMessage", e) : typeof e == "object" && e && "invokerName" in e && "message" in e && !("targetMode" in e) ? this.#M("poked", e) : typeof e == "object" && e && "id" in e && "uid" in e ? this.#M("clientEnter", e) : typeof e == "object" && e && "id" in e && "reasonID" in e && "targetChannelID" in e ? this.#M("clientMoved", e) : typeof e == "object" && e && "id" in e && "reasonID" in e && this.#M("clientLeave", e);
+	#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);
 		});
 	}
 };
 //#endregion
 //#region src/api.ts
-async function ue(e, t, n, r) {
+async function $(e, t, n, r) {
 	let i = C("sendtextmessage", [
 		["targetmode", String(t)],
 		["target", String(n)],
@@ -710,22 +731,22 @@ async function ue(e, t, n, r) {
 	]);
 	await e.sendCommandNoWait(i);
 }
-async function de(e, t, n, r = "") {
+async function me(e, t, n, r = "") {
 	let i = [["clid", String(t)], ["cid", String(n)]];
 	r && i.push(["cpw", r]);
 	let a = C("clientmove", i);
 	await e.execCommand(a, 1e4);
 }
-async function fe(e, t, n) {
+async function he(e, t, n) {
 	let r = C("clientpoke", [["clid", String(t)], ["msg", n]]);
 	await e.execCommand(r, 1e4);
 }
-async function pe(e, t) {
+async function ge(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 me(e) {
+async function _e(e) {
 	return (await e.execCommandWithResponse("channellist", 5e3)).map((e) => ({
 		id: BigInt(e.cid ?? "0"),
 		parentID: BigInt(e.pid ?? "0"),
@@ -733,7 +754,7 @@ async function me(e) {
 		description: ""
 	}));
 }
-async function he(e) {
+async function ve(e) {
 	return (await e.execCommandWithResponse("clientlist -uid -away -voice -groups", 5e3)).map((e) => {
 		let t = e.client_servergroups ?? "";
 		return {
@@ -746,7 +767,7 @@ async function he(e) {
 		};
 	});
 }
-async function ge(e, t, n) {
+async function ye(e, t, n) {
 	if (n.length === 0) return;
 	let r = n.join("|"), i = w("ftdeletefile", {
 		cid: String(t),
@@ -756,6 +777,6 @@ async function ge(e, t, n) {
 	await e.execCommand(i, 1e4);
 }
 //#endregion
-export { l as AlreadyConnectedError, le as Client, n as ClientStatus, c as CommandTimeoutError, a as CryptoInitError, ee as EAXTagMismatchError, _ as FakeSignatureMismatchError, o as FileTransferError, g as FileTransferTimeoutError, u as Identity, i as InvalidIdentityError, r as ServerError, h as TeamspeakError, de as clientMove, e as consoleLogger, P as dialFileTransfer, I as downloadFileData, ge as fileTransferDeleteFile, m as generateIdentity, pe as getClientInfo, s as getUidFromPublicKey, f as identityFromString, me as listChannels, he as listClients, t as noopLogger, fe as poke, ue as sendTextMessage, F as uploadFileData };
+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 };
 
 //# sourceMappingURL=index.mjs.map