@honeybbq/teamspeak-client 0.3.0 → 0.3.1

package/dist/index.mjs

@@ -426,7 +426,7 @@ var $ = class {
 	#s = new j();
 	#c = /* @__PURE__ */ new Map();
 	#l = [];
-	#u = [];
+	#u = null;
 	#d = [];
 	#f = [];
 	#p = [];
@@ -437,10 +437,11 @@ var $ = 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 = pe(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;
@@ -450,8 +451,8 @@ var $ = class {
 	}
 	async connect() {
 		if (this.#i !== t.Disconnected) throw new l();
-		this.#C(), this.#i = t.Connecting;
-		let e = await this.#w();
+		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() {
@@ -461,16 +462,29 @@ var $ = class {
 			await this.execCommand("clientdisconnect reasonmsg=Shutdown", 1e3);
 		} catch {}
 		this.handler.close();
-		let n = this.#_.slice();
+		let n = this.#v.slice();
 		for (let e of n) setImmediate(() => e(void 0));
 	}
 	waitConnected(e) {
-		return this.#i === t.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);
@@ -478,7 +492,7 @@ var $ = class {
 	async execCommandWithResponse(e, t = 1e4) {
 		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;
 		}
@@ -489,38 +503,38 @@ var $ = class {
 	on(e, t) {
 		switch (e) {
 			case "textMessage":
-				this.#u.push(t);
+				this.#d.push(t);
 				break;
 			case "clientEnter":
-				this.#d.push(t);
+				this.#f.push(t);
 				break;
 			case "clientLeave":
-				this.#f.push(t);
+				this.#p.push(t);
 				break;
 			case "clientMoved":
-				this.#p.push(t);
+				this.#m.push(t);
 				break;
 			case "poked":
-				this.#m.push(t);
+				this.#h.push(t);
 				break;
 			case "voiceData":
-				this.#h.push(t);
+				this.#g.push(t);
 				break;
 			case "connected":
-				this.#g.push(t);
+				this.#_.push(t);
 				break;
 			case "disconnected":
-				this.#_.push(t);
+				this.#v.push(t);
 				break;
-			case "kicked": this.#v.push(t);
+			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;
@@ -571,16 +585,16 @@ var $ = class {
 		return P(e, t, n);
 	}
 	_markConnected() {
-		this.#i = t.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;
@@ -588,10 +602,10 @@ var $ = 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);
@@ -599,13 +613,13 @@ var $ = 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 = {
@@ -613,22 +627,22 @@ var $ = 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 Z(t)) this.#k(e);
+			if (t) for (let e of Z(t)) this.#A(e);
 		}
 	}
-	#k(e) {
+	#A(e) {
 		let t = T(e);
 		if (t && t.name) {
 			if (t.name.startsWith("notify")) {
 				let e = re(t, this.clid, this.#c, this.nickname);
-				this.#j(e, t.params);
+				this.#M(e, t.params);
 				return;
 			}
 			switch (t.name) {
@@ -642,7 +656,7 @@ var $ = class {
 					V(this, t.params);
 					break;
 				case "error":
-					this.#A(t.params);
+					this.#j(t.params);
 					break;
 				default: {
 					let e = t.params;
@@ -659,31 +673,35 @@ var $ = class {
 			}
 		}
 	}
-	#A(e) {
-		let { err: t, rc: n } = k(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 && X(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);
@@ -694,40 +712,53 @@ var $ = class {
 			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));
+				for (let e of this.#d) setImmediate(() => e(t));
 				break;
 			case "clientEnter":
-				for (let e of this.#d) setImmediate(() => e(t));
+				for (let e of this.#f) setImmediate(() => e(t));
 				break;
 			case "clientLeave":
-				for (let e of this.#f) setImmediate(() => e(t));
+				for (let e of this.#p) setImmediate(() => e(t));
 				break;
 			case "clientMoved":
-				for (let e of this.#p) setImmediate(() => e(t));
+				for (let e of this.#m) setImmediate(() => e(t));
 				break;
-			case "poked": for (let e of this.#m) setImmediate(() => e(t));
+			case "poked": for (let e of this.#h) setImmediate(() => e(t));
 		}
 	}
-	#P(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.#_.slice();
+		let n = this.#v.slice();
 		for (let t of n) setImmediate(() => t(e ?? void 0));
 	}
-	#F() {
-		return L(this.#y, async (e) => {
+	#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 R(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);
 		});
 	}
 };