@quitting/core 1.2.0 → 1.3.0

package/dist/im-core.es.js

@@ -1,8 +1,8 @@
 import { Centrifuge as e } from "centrifuge";
-import { Room as t, Track as n, setLogLevel as r } from "livekit-client";
+import { Room as t, Track as n, createLocalAudioTrack as r, createLocalVideoTrack as i, setLogLevel as a } from "livekit-client";
 export * from "@quitting/contract";
 //#region src/events.ts
-var i = class {
+var o = class {
 	listeners = /* @__PURE__ */ new Map();
 	on(e, t) {
 		return this.listeners.has(e) || this.listeners.set(e, /* @__PURE__ */ new Set()), this.listeners.get(e).add(t), () => this.off(e, t);
@@ -21,13 +21,13 @@ var i = class {
 	removeAllListeners() {
 		this.listeners.clear();
 	}
-}, a = class extends Error {
+}, s = class extends Error {
 	code;
 	httpStatus;
 	constructor(e, t, n) {
 		super(n), this.name = "ApiError", this.code = e, this.httpStatus = t;
 	}
-}, o = class {
+}, c = class {
 	apiBase;
 	tokenGetter;
 	constructor(e, t) {
@@ -39,19 +39,19 @@ var i = class {
 			...t.headers
 		}, i = this.tokenGetter();
 		i && (r.Authorization = `Bearer ${i}`), r["X-Trace-Id"] = crypto.randomUUID?.() || Math.random().toString(36).slice(2);
-		let o = await fetch(n, {
+		let a = await fetch(n, {
 			...t,
 			headers: r
 		});
-		if (!o.ok) {
-			let e = 0, t = `HTTP ${o.status}`;
+		if (!a.ok) {
+			let e = 0, t = `HTTP ${a.status}`;
 			try {
-				let n = await o.json();
+				let n = await a.json();
 				n?.code && (e = Number(n.code)), n?.message && (t = n.message);
 			} catch {}
-			throw new a(e, o.status, t);
+			throw new s(e, a.status, t);
 		}
-		return o.json();
+		return a.json();
 	}
 	async sendBeacon(e, t) {
 		let n = `${this.apiBase}${e}`, r = { "Content-Type": "application/json" }, i = this.tokenGetter();
@@ -209,7 +209,7 @@ var i = class {
 			body: JSON.stringify({ md5: e })
 		});
 	}
-}, s = class {
+}, l = class {
 	transport;
 	sessionToken = null;
 	centrifugoToken = null;
@@ -262,7 +262,7 @@ var i = class {
 	logout() {
 		this.refreshTimer &&= (clearTimeout(this.refreshTimer), null), this.sessionToken = null, this.centrifugoToken = null;
 	}
-}, c = class extends i {
+}, u = class extends o {
 	client = null;
 	subscriptions = /* @__PURE__ */ new Map();
 	refCount = /* @__PURE__ */ new Map();
@@ -387,20 +387,23 @@ var i = class {
 	disconnect() {
 		this.client &&= (this.client.disconnect(), null), this.subscriptions.clear(), this.refCount.clear(), this.currentState = "disconnected";
 	}
-}, l = null;
-async function u(e) {
-	r("silent"), l &&= (clearTimeout(l), null);
+}, d = null;
+function f() {
+	a("silent"), d &&= (clearTimeout(d), null);
+}
+async function p(e) {
+	f();
 	try {
 		await e.disconnect();
 	} finally {
-		l = setTimeout(() => {
-			r("warn"), l = null;
+		d = setTimeout(() => {
+			a("warn"), d = null;
 		}, 1500);
 	}
 }
 //#endregion
 //#region src/call.ts
-var d = class extends i {
+var m = class extends o {
 	callId;
 	callType;
 	roomName;
@@ -494,11 +497,11 @@ var d = class extends i {
 			} catch (e) {
 				console.error("[im] callEnd 失败", e);
 			}
-			await u(this.room), this.emitSession("ended", { reason: t });
+			await p(this.room), this.emitSession("ended", { reason: t });
 		}
 	}
 	async end(e) {
-		this.ended || (this.ended = !0, await u(this.room), this.emitSession("ended", { reason: e }));
+		this.ended || (this.ended = !0, await p(this.room), this.emitSession("ended", { reason: e }));
 	}
 	registerRpcMethod(e, t) {
 		this.room.localParticipant.registerRpcMethod(e, (e) => t(e.payload));
@@ -528,7 +531,7 @@ var d = class extends i {
 		return this.token;
 	}
 	token;
-}, f = class {
+}, h = class {
 	transport;
 	livekitWs;
 	identity;
@@ -538,7 +541,7 @@ var d = class extends i {
 		this.transport = e, this.livekitWs = t, this.identity = n, this.iceServers = r;
 	}
 	async init(e, t) {
-		let n = await this.transport.callInit(e, t), r = new d({
+		let n = await this.transport.callInit(e, t), r = new m({
 			callId: n.callId,
 			callType: t,
 			roomName: n.roomName,
@@ -550,7 +553,7 @@ var d = class extends i {
 		return this.currentSession = r, r;
 	}
 	async accept(e, t) {
-		let n = await this.transport.callAccept(e), r = new d({
+		let n = await this.transport.callAccept(e), r = new m({
 			callId: e,
 			callType: t,
 			roomName: n.roomName,
@@ -580,8 +583,8 @@ var d = class extends i {
 };
 //#endregion
 //#region src/meeting.ts
-r("warn");
-var p = class e extends i {
+a("warn");
+var g = class e extends o {
 	meetingId;
 	title;
 	roomName;
@@ -598,6 +601,8 @@ var p = class e extends i {
 	membersCacheAt = 0;
 	static MEMBERS_CACHE_TTL = 8e3;
 	pendingAttach = /* @__PURE__ */ new Map();
+	preparedMic = null;
+	preparedCamera = null;
 	constructor(e) {
 		super(), this.meetingId = e.meetingId, this.title = e.title, this.roomName = e.roomName, this.identity = e.identity, this.token = e.token, this.isHost = e.isHost, this.hostIdentity = e.hostIdentity, this.livekitWs = e.livekitWs, this.iceServers = e.iceServers, this.room = new t({
 			adaptiveStream: !0,
@@ -657,15 +662,30 @@ var p = class e extends i {
 		let e = this.room.localParticipant.identity;
 		e && (this.identity = e, this.hostIdentity ||= e), this.emitSession("connected", {});
 	}
+	async prepareLocalTracks() {
+		try {
+			this.preparedMic = await r();
+		} catch {
+			this.preparedMic = null;
+		}
+		try {
+			this.preparedCamera = await i();
+		} catch {
+			this.preparedCamera = null;
+		}
+	}
+	discardPreparedTracks() {
+		this.preparedMic?.stop(), this.preparedMic = null, this.preparedCamera?.stop(), this.preparedCamera = null;
+	}
 	async enableDevices() {
 		let e = [], t = !1, n = !1;
 		try {
-			await this.room.localParticipant.setMicrophoneEnabled(!0), t = !0;
+			this.preparedMic ? (await this.room.localParticipant.publishTrack(this.preparedMic), this.preparedMic = null) : await this.room.localParticipant.setMicrophoneEnabled(!0), t = !0;
 		} catch (t) {
 			e.push(`mic: ${t?.message || String(t)}`), console.warn("[im] 麦克风开启失败，会议继续（音频不可用）", t);
 		}
 		try {
-			await this.room.localParticipant.setCameraEnabled(!0), n = !0;
+			this.preparedCamera ? (await this.room.localParticipant.publishTrack(this.preparedCamera), this.preparedCamera = null) : await this.room.localParticipant.setCameraEnabled(!0), n = !0;
 		} catch (t) {
 			e.push(`camera: ${t?.message || String(t)}`), console.warn("[im] 摄像头开启失败，会议继续（视频不可用）", t);
 		}
@@ -684,17 +704,17 @@ var p = class e extends i {
 	}
 	async leave(e) {
 		if (!this.ended) {
-			this.ended = !0;
+			this.ended = !0, f();
 			try {
 				await e.meetingLeave(this.meetingId);
 			} catch (e) {
 				console.error("[im] meetingLeave 失败", e);
 			}
-			await u(this.room), this.emitSession("ended", {});
+			await p(this.room), this.emitSession("ended", {});
 		}
 	}
 	async end() {
-		this.ended || (this.ended = !0, await u(this.room), this.emitSession("ended", {}));
+		this.ended || (this.ended = !0, await p(this.room), this.emitSession("ended", {}));
 	}
 	getRemoteParticipants() {
 		let e = [];
@@ -768,7 +788,7 @@ var p = class e extends i {
 			console.error(`[im] session handler error: ${e}`, t);
 		}
 	}
-}, m = class {
+}, _ = class {
 	transport;
 	livekitWs;
 	identity;
@@ -781,7 +801,7 @@ var p = class e extends i {
 		let n = await this.transport.meetingCreate({
 			inviteeUids: e,
 			title: t
-		}), r = new p({
+		}), r = new g({
 			meetingId: n.meetingId,
 			title: t,
 			roomName: n.roomName,
@@ -794,9 +814,10 @@ var p = class e extends i {
 		});
 		this.currentSession = r;
 		try {
-			await r.connect(), r.enableDevices().catch((e) => console.warn("[im] enableDevices 异常", e));
+			let e = r.prepareLocalTracks().catch((e) => console.warn("[im] 设备预获取失败", e));
+			await r.connect(), await e, r.enableDevices().catch((e) => console.warn("[im] enableDevices 异常", e));
 		} catch (e) {
-			throw this.currentSession = null, this.transport.meetingLeave(n.meetingId).catch(() => {}), e;
+			throw this.currentSession = null, r.discardPreparedTracks(), this.transport.meetingLeave(n.meetingId).catch(() => {}), e;
 		}
 		return {
 			meetingId: n.meetingId,
@@ -805,7 +826,7 @@ var p = class e extends i {
 		};
 	}
 	async join(e, t = "") {
-		let n = await this.transport.meetingJoin(e), r = new p({
+		let n = await this.transport.meetingJoin(e), r = new g({
 			meetingId: e,
 			title: t,
 			roomName: n.roomName,
@@ -818,16 +839,17 @@ var p = class e extends i {
 		});
 		this.currentSession = r;
 		try {
-			await r.connect(), r.enableDevices().catch((e) => console.warn("[im] enableDevices 异常", e));
+			let e = r.prepareLocalTracks().catch((e) => console.warn("[im] 设备预获取失败", e));
+			await r.connect(), await e, r.enableDevices().catch((e) => console.warn("[im] enableDevices 异常", e));
 		} catch (t) {
-			throw this.currentSession = null, this.transport.meetingLeave(e).catch(() => {}), t;
+			throw this.currentSession = null, r.discardPreparedTracks(), this.transport.meetingLeave(e).catch(() => {}), t;
 		}
 		return r;
 	}
 	async respond(e, t, n) {
 		let r = await this.transport.meetingRespond(e, t);
 		if (t !== "accept" || !r?.token || !r?.roomName) return null;
-		let i = new p({
+		let i = new g({
 			meetingId: e,
 			title: r.title || n || "",
 			roomName: r.roomName,
@@ -840,9 +862,10 @@ var p = class e extends i {
 		});
 		this.currentSession = i;
 		try {
-			await i.connect(), i.enableDevices().catch((e) => console.warn("[im] enableDevices 异常", e));
+			let e = i.prepareLocalTracks().catch((e) => console.warn("[im] 设备预获取失败", e));
+			await i.connect(), await e, i.enableDevices().catch((e) => console.warn("[im] enableDevices 异常", e));
 		} catch (t) {
-			throw this.currentSession = null, this.transport.meetingLeave(e).catch(() => {}), t;
+			throw this.currentSession = null, i.discardPreparedTracks(), this.transport.meetingLeave(e).catch(() => {}), t;
 		}
 		return i;
 	}
@@ -852,7 +875,7 @@ var p = class e extends i {
 	async dissolve() {
 		if (!this.currentSession) return !1;
 		let e = this.currentSession;
-		return await this.transport.meetingDissolve(e.meetingId), this.currentSession = null, await e.end().catch(() => {}), !0;
+		return f(), await this.transport.meetingDissolve(e.meetingId), this.currentSession = null, await e.end().catch(() => {}), !0;
 	}
 	async getParticipantCount() {
 		return this.currentSession ? (await this.transport.meetingParticipantCount(this.currentSession.meetingId)).count : 0;
@@ -870,7 +893,7 @@ var p = class e extends i {
 	async getMembers(e = !1) {
 		return this.currentSession ? this.currentSession.refreshMembers(this.transport, e) : [];
 	}
-}, h = class {
+}, v = class {
 	transport;
 	realtime;
 	uid;
@@ -940,7 +963,7 @@ var p = class e extends i {
 	dialogChannel(e) {
 		return `dialog#${[this.uid, e].sort()[0]},${[this.uid, e].sort()[1]}`;
 	}
-}, g = class {
+}, y = class {
 	transport;
 	constructor(e) {
 		this.transport = e;
@@ -968,7 +991,7 @@ var p = class e extends i {
 		}
 		return { mediaId: i.mediaId };
 	}
-}, _ = class {
+}, b = class {
 	transport;
 	byExternal = /* @__PURE__ */ new Map();
 	byUid = /* @__PURE__ */ new Map();
@@ -997,7 +1020,7 @@ var p = class e extends i {
 		let n = this.byExternal.get(e);
 		n && n.online !== t && (n.online = t);
 	}
-}, v = [
+}, x = [
 	"message",
 	"message_preview",
 	"message:revoked",
@@ -1022,7 +1045,7 @@ var p = class e extends i {
 	"session:kicked",
 	"connection:state",
 	"presence:update"
-], y = class extends i {
+], S = class extends o {
 	auth;
 	transport;
 	realtime;
@@ -1042,7 +1065,7 @@ var p = class e extends i {
 	name = "";
 	avatar = "";
 	constructor(e) {
-		super(), this.appId = e.appId, this.apiBase = e.apiBase, this.livekitWs = e.livekitWs, this.auth = new s(null), this.transport = new o(e.apiBase, () => this.auth.getToken()), this.auth = new s(this.transport), this.realtime = new c(e.centrifugoWs, async () => await this.auth.getCentrifugoToken(this.name, this.avatar));
+		super(), this.appId = e.appId, this.apiBase = e.apiBase, this.livekitWs = e.livekitWs, this.auth = new l(null), this.transport = new c(e.apiBase, () => this.auth.getToken()), this.auth = new l(this.transport), this.realtime = new u(e.centrifugoWs, async () => await this.auth.getCentrifugoToken(this.name, this.avatar));
 	}
 	async connect(e) {
 		e.name && (this.name = e.name), e.avatar && (this.avatar = e.avatar), this.clientType = e.clientType ?? 4;
@@ -1055,7 +1078,7 @@ var p = class e extends i {
 	async initAfterAuth() {
 		await this.loadClientConfig();
 		let e = this.clientConfig?.iceServers ?? [];
-		this.call = new f(this.transport, this.livekitWs, this.uid, e), this.meeting = new m(this.transport, this.livekitWs, this.uid, e), this.message = new h(this.transport, this.realtime, this.uid), this.media = new g(this.transport), this.users = new _(this.transport), await this.realtime.connect(this.uid);
+		this.call = new h(this.transport, this.livekitWs, this.uid, e), this.meeting = new _(this.transport, this.livekitWs, this.uid, e), this.message = new v(this.transport, this.realtime, this.uid), this.media = new y(this.transport), this.users = new b(this.transport), await this.realtime.connect(this.uid);
 		try {
 			let e = await this.transport.getSessionState();
 			this.sessionState = e.state, this.emit("session:state", {
@@ -1075,10 +1098,14 @@ var p = class e extends i {
 			t && e?.meetingId === t.meetingId && e?.hostUid && (t.hostIdentity = e.hostUid);
 		}), this.realtime.on("meeting:dissolved", (e) => {
 			let t = this.meeting?.currentSession;
-			t && e?.meetingId === t.meetingId && t.end().catch((e) => console.warn("[im] dissolved end session 失败", e));
+			t && e?.meetingId === t.meetingId && t.end().catch((e) => console.warn("[im] dissolved end session 失败", e)).finally(() => {
+				this.meeting?.currentSession === t && (this.meeting.currentSession = null);
+			});
 		}), this.realtime.on("meeting:kicked", (e) => {
 			let t = this.meeting?.currentSession;
-			t && e?.meetingId === t.meetingId && t.end().catch((e) => console.warn("[im] kicked end session 失败", e));
+			t && e?.meetingId === t.meetingId && t.end().catch((e) => console.warn("[im] kicked end session 失败", e)).finally(() => {
+				this.meeting?.currentSession === t && (this.meeting.currentSession = null);
+			});
 		}), this.realtime.on("session:kicked", (e) => {
 			if (!(e?.clientType !== void 0 && e.clientType !== this.clientType)) {
 				console.warn("[im] 会话被踢（同端新登录），断开连接");
@@ -1117,7 +1144,7 @@ var p = class e extends i {
 		}
 	}
 	forwardRealtimeEvents() {
-		for (let e of v) this.realtime.on(e, (t) => {
+		for (let e of x) this.realtime.on(e, (t) => {
 			this.emit(e, t);
 		});
 	}
@@ -1126,6 +1153,6 @@ var p = class e extends i {
 	}
 };
 //#endregion
-export { a as ApiError, s as AuthManager, f as CallController, d as CallSession, i as EventEmitter, y as ImClient, g as MediaUploader, m as MeetingController, p as MeetingSession, h as MessageController, c as RealtimeConnection, o as Transport, _ as UserDirectory };
+export { s as ApiError, l as AuthManager, h as CallController, m as CallSession, o as EventEmitter, S as ImClient, y as MediaUploader, _ as MeetingController, g as MeetingSession, v as MessageController, u as RealtimeConnection, c as Transport, b as UserDirectory };
 
 //# sourceMappingURL=im-core.es.js.map