@honeybbq/teamspeak-client 0.2.0 → 0.2.1

package/dist/index.mjs

@@ -1,10 +1,10 @@
 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 ee, r as f, u as p, v as te, w as m, x as h, y as g } from "./primitives-BIAYfJ2Y.js";
-import { t as _ } from "./crypto-VC7n6YJb.js";
-import { t as v } from "./resolver-DDZWomrF.js";
-import { a as y, t as b } from "./handler-C_JhqGTd.js";
-import { i as x, n as S, t as C } from "./command-caXc4h0n.js";
-import { n as w } from "./crypt-handshake-CHmvZ2qs.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 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";
@@ -118,7 +118,7 @@ async function F(e, t, n) {
 }
 function I(e, t, n, r, i, a) {
 	let o = t.startsWith("/") ? t : `/${t}`;
-	return C("ftinitupload", {
+	return w("ftinitupload", {
 		cid: String(e),
 		name: o,
 		cpw: n,
@@ -130,7 +130,7 @@ function I(e, t, n, r, i, a) {
 }
 function L(e, t, n, r) {
 	let i = t.startsWith("/") ? t : `/${t}`;
-	return C("ftinitdownload", {
+	return w("ftinitdownload", {
 		cid: String(e),
 		name: i,
 		cpw: n,
@@ -154,17 +154,17 @@ function z(e, t) {
 //#region src/handshake.ts
 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 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 = U(e, a);
-	T(e.crypt, n, r, i, a, o), G(e);
+	T(e.crypt, n, r, i, a, o), K(e);
 }
 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 = C("clientupdate", {
+		let t = w("clientupdate", {
 			client_input_muted: "0",
 			client_output_muted: "0"
 		});
@@ -172,8 +172,8 @@ function H(e, t) {
 	});
 }
 function U(e, t) {
-	let [n, r] = f(), i = Buffer.from(n).toString("base64"), a = W(e, n, t), o = S("clientek", [["ek", i], ["proof", a]]);
-	return e.handler.sendPacket(y.Command, Buffer.from(o), 0), r;
+	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) {
 	let r = Buffer.from(n, "base64"), i = new Uint8Array(86);
@@ -182,31 +182,34 @@ function W(e, t, n) {
 	return Buffer.from(a).toString("base64");
 }
 function G(e) {
-	let t = K(e);
-	e.handler.sendPacket(y.Command, Buffer.from(t), 0);
+	return e === "" ? "" : D("sha1").update(e).digest().toString("base64");
 }
 function K(e) {
-	let t = e.crypt.identity.publicKeyBase64(), n = e.getClientInitOptions(), r = D("sha1").update(t).digest().toString("base64");
-	return S("clientinit", [
+	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", n.defaultChannel],
-		["client_default_channel_password", n.defaultChannelPassword],
-		["client_server_password", n.serverPassword],
+		["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", r]
+		["hwid", a]
 	]);
 }
 //#endregion
 //#region src/helpers.ts
-function q(e) {
+function J(e) {
 	if (e === "" || e === void 0) return 0n;
 	try {
 		return BigInt(e);
@@ -214,21 +217,21 @@ function q(e) {
 		return 0n;
 	}
 }
-function J(e) {
+function Y(e) {
 	let t = parseInt(e, 10);
 	return isNaN(t) || t < 0 || t > 65535 ? 0 : t;
 }
-function Y(e) {
+function X(e) {
 	let t = parseInt(e, 10);
 	return isNaN(t) ? 0 : t;
 }
-function X(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 Z(e) {
+function Q(e) {
 	let t = e.indexOf(" ");
 	if (t < 0) return [e];
 	let n = e.slice(0, t), r = e.slice(t + 1);
@@ -239,30 +242,30 @@ function Z(e) {
 }
 //#endregion
 //#region src/notifications.ts
-function Q(e, t, n, r) {
+function ne(e, t, n, r) {
 	switch (e.name) {
-		case "notifycliententerview": return ne(e, n, r);
-		case "notifyclientleftview": return re(e, t, n);
-		case "notifyclientmoved": return ie(e, n);
-		case "notifytextmessage": return ae(e, n);
-		case "notifyclientpoke": return le(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: oe(e)
+			info: se(e)
 		};
 		case "notifystartdownload": return {
 			kind: "startDownload",
-			info: se(e)
+			info: ce(e)
 		};
 		case "notifystatusfiletransfer": return {
 			kind: "fileTransferStatus",
-			info: ce(e)
+			info: le(e)
 		};
 		default: return { kind: "unknown" };
 	}
 }
-function ne(e, t, n) {
-	let r = J(e.params.clid ?? ""), i = q(e.params.cid ?? ""), a = Y(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 ?? "",
@@ -275,21 +278,21 @@ function ne(e, t, n) {
 		info: s
 	};
 }
-function re(e, t, n) {
-	let r = J(e.params.clid ?? ""), i = Y(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: J(e.params.targetid ?? "")
+			targetID: Y(e.params.targetid ?? "")
 		},
 		isSelf: a
 	};
 }
-function ie(e, t) {
-	let n = J(e.params.clid ?? ""), r = q(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, {
@@ -302,67 +305,67 @@ function ie(e, t) {
 		event: {
 			id: n,
 			targetChannelID: r,
-			reasonID: Y(e.params.reasonid ?? ""),
-			invokerID: J(e.params.invokerid ?? ""),
+			reasonID: X(e.params.reasonid ?? ""),
+			invokerID: Y(e.params.invokerid ?? ""),
 			invokerName: e.params.invokername ?? "",
 			invokerUID: e.params.invokeruid ?? ""
 		}
 	};
 }
-function ae(e, t) {
-	let n = J(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: Y(e.params.targetmode ?? ""),
-			targetID: q(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 ?? "",
-			message: x(e.params.msg ?? ""),
+			message: S(e.params.msg ?? ""),
 			invokerGroups: r?.serverGroups ?? []
 		}
 	};
 }
-function oe(e) {
+function se(e) {
 	return {
-		clientFileTransferID: J(e.params.clientftfid ?? ""),
-		serverFileTransferID: J(e.params.serverftfid ?? ""),
+		clientFileTransferID: Y(e.params.clientftfid ?? ""),
+		serverFileTransferID: Y(e.params.serverftfid ?? ""),
 		fileTransferKey: e.params.ftkey ?? "",
-		port: J(e.params.port ?? ""),
-		seekPosition: q(e.params.seekpos ?? "")
+		port: Y(e.params.port ?? ""),
+		seekPosition: J(e.params.seekpos ?? "")
 	};
 }
-function se(e) {
+function ce(e) {
 	return {
-		clientFileTransferID: J(e.params.clientftfid ?? ""),
-		serverFileTransferID: J(e.params.serverftfid ?? ""),
+		clientFileTransferID: Y(e.params.clientftfid ?? ""),
+		serverFileTransferID: Y(e.params.serverftfid ?? ""),
 		fileTransferKey: e.params.ftkey ?? "",
-		port: J(e.params.port ?? ""),
-		size: q(e.params.size ?? "")
+		port: Y(e.params.port ?? ""),
+		size: J(e.params.size ?? "")
 	};
 }
-function ce(e) {
+function le(e) {
 	return {
-		clientFileTransferID: J(e.params.clientftfid ?? ""),
-		status: Y(e.params.status ?? ""),
+		clientFileTransferID: Y(e.params.clientftfid ?? ""),
+		status: X(e.params.status ?? ""),
 		message: e.params.msg ?? ""
 	};
 }
-function le(e) {
+function ue(e) {
 	return {
 		kind: "poked",
 		event: {
-			invokerID: J(e.params.invokerid ?? ""),
-			invokerName: x(e.params.invokername ?? ""),
+			invokerID: Y(e.params.invokerid ?? ""),
+			invokerName: S(e.params.invokername ?? ""),
 			invokerUID: e.params.invokeruid ?? "",
-			message: x(e.params.msg ?? "")
+			message: S(e.params.msg ?? "")
 		}
 	};
 }
 //#endregion
 //#region src/throttle.ts
-var ue = class e {
+var de = class e {
 	static TOKEN_RATE = 4;
 	static TOKEN_MAX = 8;
 	#e = 5;
@@ -387,14 +390,14 @@ var ue = class e {
 };
 //#endregion
 //#region src/client.ts
-function de(e) {
+function fe(e) {
 	return {
 		serverPassword: e.serverPassword ?? "",
 		defaultChannel: e.defaultChannel ?? "",
 		defaultChannelPassword: e.defaultChannelPassword ?? ""
 	};
 }
-var fe = class {
+var pe = class {
 	crypt;
 	handler;
 	logger;
@@ -405,7 +408,7 @@ var fe = class {
 	#n;
 	#r;
 	#i = n.Disconnected;
-	#a = new ue();
+	#a = new de();
 	#o = new k();
 	#s = new M();
 	#c = /* @__PURE__ */ new Map();
@@ -424,7 +427,7 @@ var fe = class {
 	#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 v(this.logger), this.#r = de(i), this.crypt = new _(t), this.handler = new b(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 = 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;
@@ -524,7 +527,7 @@ var fe = class {
 		} catch (e) {
 			throw this.#s.unregister(a), e;
 		}
-		let l = await Promise.race([s, new Promise((e, t) => setTimeout(() => t(new h()), 1e4))]);
+		let l = await Promise.race([s, new Promise((e, t) => setTimeout(() => t(new g()), 1e4))]);
 		if (this.#s.unregister(a), "size" in l) throw new o("unexpected download response");
 		if ("status" in l) {
 			let e = l;
@@ -539,7 +542,7 @@ var fe = class {
 		} catch (e) {
 			throw this.#s.unregister(r), e;
 		}
-		let s = await Promise.race([i, new Promise((e, t) => setTimeout(() => t(new h()), 1e4))]);
+		let s = await Promise.race([i, new Promise((e, t) => setTimeout(() => t(new g()), 1e4))]);
 		if (this.#s.unregister(r), "seekPosition" in s) throw new o("unexpected upload response");
 		if ("status" in s) {
 			let e = s;
@@ -561,7 +564,7 @@ var fe = class {
 		for (let t of e) setImmediate(() => t());
 	}
 	#C() {
-		this.handler.close(), this.crypt = new _(this.#e), this.handler = new b(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();
+		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 #w() {
 		let e = this.#t.includes(":") ? this.#t : `${this.#t}:9987`;
@@ -577,8 +580,8 @@ var fe = class {
 	#E(e) {
 		let t = e.typeFlagged & 15;
 		if (t === 8) {
-			let t = w(this.crypt, e.data);
-			t && this.handler.sendPacket(y.Init1, t, 0);
+			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) {
@@ -603,14 +606,14 @@ var fe = class {
 		let t = e.split(/[\n\0]/);
 		for (let e of t) {
 			let t = e.replace(/\r$/, "");
-			if (t) for (let e of Z(t)) this.#k(e);
+			if (t) for (let e of Q(t)) this.#k(e);
 		}
 	}
 	#k(e) {
 		let t = E(e);
 		if (!(!t || !t.name)) {
 			if (t.name.startsWith("notify")) {
-				let e = Q(t, this.clid, this.#c, this.nickname);
+				let e = ne(t, this.clid, this.#c, this.nickname);
 				this.#j(e, t.params);
 				return;
 			}
@@ -650,7 +653,7 @@ var fe = class {
 		switch (e.kind) {
 			case "clientEnter": {
 				let t = e.info;
-				t.id !== 0 && X(this.nickname, t.nickname) && (this.clid = t.id, this.handler.setClientID(t.id), this.#o.signalWelcomeComplete()), this.#M("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":
@@ -709,7 +712,7 @@ var fe = class {
 	}
 	#F() {
 		return R(this.#y, async (e) => {
-			this.handler.sendPacket(y.Command, Buffer.from(e), 0);
+			this.handler.sendPacket(b.Command, Buffer.from(e), 0);
 		});
 	}
 	#I() {
@@ -720,43 +723,43 @@ var fe = class {
 };
 //#endregion
 //#region src/api.ts
-async function pe(e, t, n, r) {
-	let i = S("sendtextmessage", [
+async function $(e, t, n, r) {
+	let i = C("sendtextmessage", [
 		["targetmode", String(t)],
 		["target", String(n)],
 		["msg", r]
 	]);
 	await e.sendCommandNoWait(i);
 }
-async function $(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 = S("clientmove", i);
+	let a = C("clientmove", i);
 	await e.execCommand(a, 1e4);
 }
-async function me(e, t, n) {
-	let r = S("clientpoke", [["clid", String(t)], ["msg", n]]);
+async function he(e, t, n) {
+	let r = C("clientpoke", [["clid", String(t)], ["msg", n]]);
 	await e.execCommand(r, 1e4);
 }
-async function he(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 ge(e) {
+async function _e(e) {
 	return (await e.execCommandWithResponse("channellist", 5e3)).map((e) => ({
 		id: BigInt(e.cid ?? "0"),
 		parentID: BigInt(e.pid ?? "0"),
-		name: x(e.channel_name ?? ""),
+		name: S(e.channel_name ?? ""),
 		description: ""
 	}));
 }
-async function _e(e) {
+async function ve(e) {
 	return (await e.execCommandWithResponse("clientlist -uid -away -voice -groups", 5e3)).map((e) => {
 		let t = e.client_servergroups ?? "";
 		return {
 			id: parseInt(e.clid ?? "0", 10),
-			nickname: x(e.client_nickname ?? ""),
+			nickname: S(e.client_nickname ?? ""),
 			uid: e.client_unique_identifier ?? "",
 			channelID: BigInt(e.cid ?? "0"),
 			type: parseInt(e.client_type ?? "0", 10),
@@ -764,9 +767,9 @@ async function _e(e) {
 		};
 	});
 }
-async function ve(e, t, n) {
+async function ye(e, t, n) {
 	if (n.length === 0) return;
-	let r = n.join("|"), i = C("ftdeletefile", {
+	let r = n.join("|"), i = w("ftdeletefile", {
 		cid: String(t),
 		cpw: "",
 		name: r
@@ -774,6 +777,6 @@ async function ve(e, t, n) {
 	await e.execCommand(i, 1e4);
 }
 //#endregion
-export { l as AlreadyConnectedError, fe as Client, n as ClientStatus, c as CommandTimeoutError, a as CryptoInitError, te as EAXTagMismatchError, g as FakeSignatureMismatchError, o as FileTransferError, h as FileTransferTimeoutError, u as Identity, i as InvalidIdentityError, r as ServerError, m as TeamspeakError, $ as clientMove, e as consoleLogger, N as dialFileTransfer, F as downloadFileData, ve as fileTransferDeleteFile, p as generateIdentity, he as getClientInfo, s as getUidFromPublicKey, ee as identityFromString, ge as listChannels, _e as listClients, t as noopLogger, me as poke, pe as sendTextMessage, P 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