tuikit-atomicx-vue3 3.4.1 → 3.5.0-beta.7

package/dist/states/CoGuestState.d.ts

@@ -1,106 +1,36 @@
-import { TUIMediaDevice, TUIRequestCallback } from '@tencentcloud/tuiroom-engine-js';
-import { CoGuestStatus, AudienceInfo, CoGuestRequestInfo, SeatUserInfo } from '../types';
+import { HostEvent, GuestEvent, SeatUserInfo, LiveUserInfo } from '../types';
 
 export declare function useCoGuestState(): {
-    localCoGuestStatus: import('vue').ComputedRef<CoGuestStatus>;
-    userListInCoGuest: import('vue').ComputedRef<SeatUserInfo[]>;
-    receivedCoGuestUserList: import('vue').ComputedRef<AudienceInfo[]>;
-    availableCoGuestUserList: import('vue').ComputedRef<AudienceInfo[]>;
-    sentCoGuestUserList: import('vue').ComputedRef<AudienceInfo[]>;
-    latestReceivedCoGuestRequest: import('vue').Ref<{
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null, CoGuestRequestInfo | {
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null>;
-    latestCancelledCoGuestRequest: import('vue').Ref<{
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null, CoGuestRequestInfo | {
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null>;
-    latestAcceptedCoGuestRequest: import('vue').Ref<{
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null, CoGuestRequestInfo | {
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null>;
-    latestRejectedCoGuestRequest: import('vue').Ref<{
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null, CoGuestRequestInfo | {
-        timestamp: number;
-        requestId: string;
-        userId: string;
-        userName: string;
-        nameCard: string;
-        avatarUrl: string;
-    } | null>;
-    sendCoGuestRequest: (options?: {
-        seatIndex?: number;
-        timeout?: number;
-        userId?: string;
-        requestCallback?: (callbackInfo: TUIRequestCallback) => void;
-    }) => Promise<void>;
-    cancelCoGuestRequest: (options: {
-        userId?: string;
+    connected: import('vue').ComputedRef<SeatUserInfo[]>;
+    invitees: import('vue').ComputedRef<LiveUserInfo[]>;
+    applicants: import('vue').ComputedRef<LiveUserInfo[]>;
+    candidates: import('vue').Ref<never[], never[]>;
+    applyForSeat: (options: {
+        seatIndex: number;
+        timeout: number;
     }) => Promise<void>;
-    acceptCoGuestRequest: (options: {
-        userId?: string;
-    }) => Promise<void>;
-    rejectCoGuestRequest: (options: {
-        userId?: string;
+    cancelApplication: () => Promise<void>;
+    acceptApplication: (options: {
+        userId: string;
     }) => Promise<void>;
-    disconnect: (userId?: string) => Promise<void>;
-    sendOpenDeviceRequest: (options: {
-        type: TUIMediaDevice;
-        timeout?: number;
+    rejectApplication: (options: {
         userId: string;
-        requestCallback?: (callbackInfo: TUIRequestCallback) => void;
     }) => Promise<void>;
-    cancelOpenDeviceRequest: (options: {
-        type: TUIMediaDevice;
+    inviteToSeat: (options: {
         userId: string;
+        seatIndex: number;
+        timeout: number;
     }) => Promise<void>;
-    acceptOpenDeviceRequest: (options: {
-        type: TUIMediaDevice;
+    cancelInvitation: (options: {
+        inviteeId: string;
     }) => Promise<void>;
-    rejectOpenDeviceRequest: (options: {
-        type: TUIMediaDevice;
+    acceptInvitation: (options: {
+        inviterId: string;
     }) => Promise<void>;
-    closeRemoteDevice: (options: {
-        type: TUIMediaDevice;
-        userId: string;
+    rejectInvitation: (options: {
+        inviterId: string;
     }) => Promise<void>;
+    disConnect: () => Promise<void | undefined>;
+    subscribeEvent: (event: HostEvent | GuestEvent, callback: (eventInfo: any) => void) => void;
+    unsubscribeEvent: (event: HostEvent | GuestEvent, callback: (eventInfo: any) => void) => void;
 };

package/dist/states/CoGuestState.js

@@ -1,229 +1,337 @@
-import { ref as I, computed as m, watch as A } from "vue";
-import $, { TUIRoomEvents as S, TUIRequestAction as q, TUIMediaDevice as U } from "@tencentcloud/tuiroom-engine-js";
-import { useRoomEngine as h } from "../hooks/useRoomEngine.js";
-import { useLiveAudienceState as D } from "./LiveAudienceState.js";
-import { useLiveState as O } from "./LiveState/index.js";
-import { useLoginState as T } from "./LoginState.js";
-import { useSeatStore as M } from "./SeatStore.js";
-import { CoGuestStatus as k } from "../types/coGuest.js";
-import { LiveStatus as b } from "../types/live.js";
-const i = h(), { loginUserInfo: d } = T(), { audienceList: x } = D(), { localLiveStatus: E } = O(), {
-  sentDeviceRequestMap: C,
-  receivedDeviceRequestMap: y,
-  seatList: p,
-  liveOwnerUserId: v,
-  localUserId: g,
-  userInfoMap: R,
-  getUserInfo: w
-} = M(), G = I(null), l = I(/* @__PURE__ */ new Map()), c = I(/* @__PURE__ */ new Map()), B = m(() => {
+import { ref as k, computed as g, watch as h } from "vue";
+import b, { TUIRoomEvents as q, TUIRequestAction as R, TUIRequestCallbackType as d } from "@tencentcloud/tuiroom-engine-js";
+import { useRoomEngine as S } from "../hooks/useRoomEngine.js";
+import { dataReport as w } from "../report/dataReport.js";
+import { MetricsKey as E } from "../report/MetricsKey.js";
+import { useLoginState as C } from "./LoginState.js";
+import { useSeatStore as O } from "./SeatStore.js";
+import { useLiveListState as G } from "./LiveListState/LiveListState.js";
+import { NoResponseReason as T, HostEvent as v, GuestEvent as p } from "../types/coGuest.js";
+const i = S(), { loginUserInfo: _ } = C(), { currentLive: H } = G(), {
+  seatList: L,
+  localUserId: A,
+  userInfoMap: N,
+  getUserInfo: y
+} = O(), n = k(/* @__PURE__ */ new Map()), c = k(/* @__PURE__ */ new Map()), m = /* @__PURE__ */ new Map(), M = (e, t) => {
   var s;
-  const e = p.value.some((a) => {
-    var u, o;
-    return ((u = a.userInfo) == null ? void 0 : u.userId) === ((o = d.value) == null ? void 0 : o.userId);
-  }), t = l.value.has(((s = d.value) == null ? void 0 : s.userId) || ""), n = c.value.has(v.value);
-  return e ? k.Connected : t ? k.UserApplying : n ? k.AdminInviting : k.Disconnected;
-}), P = m(() => Array.from(c.value.keys()).map((e) => {
-  const t = R.value.get(e);
-  return t || console.error("[CoGuestState receivedCoGuestUserList] userInfo not found", e), t;
-})), j = m(() => Array.from(l.value.keys()).filter((e) => !e.startsWith("owner-")).map((e) => {
-  const t = R.value.get(e);
-  return t || console.error("[CoGuestState sentCoGuestUserList] userInfo not found", e), t;
-})), V = m(() => p.value.filter((e) => !!e.userInfo).map((e) => e.userInfo)), W = m(() => x.value.filter((e) => {
-  var u;
-  const t = e.userId === ((u = d.value) == null ? void 0 : u.userId), n = p.value.some((o) => {
-    var r;
-    return ((r = o.userInfo) == null ? void 0 : r.userId) === e.userId;
-  }), s = l.value.has(e.userId), a = c.value.has(e.userId);
-  return !t && !n && !s && !a;
-})), z = I(null), F = I(null), H = I(null), J = I(null), K = async (e) => {
-  var o, r;
-  const { seatIndex: t = -1, timeout: n = 30, userId: s = "", requestCallback: a } = e || {};
-  if (!s) {
-    const f = await ((o = i.instance) == null ? void 0 : o.takeSeat({
-      seatIndex: t,
-      timeout: n,
-      requestCallback: (L) => {
-        l.value.delete(g.value), a == null || a(L);
-      }
-    }));
-    f && l.value.set(g.value, f);
-    return;
-  }
-  const u = await ((r = i.instance) == null ? void 0 : r.takeUserOnSeatByAdmin({
-    seatIndex: t,
-    timeout: n,
-    userId: s,
-    requestCallback: (f) => {
-      l.value.delete(s), a == null || a(f);
+  m.has(e) || m.set(e, []), (s = m.get(e)) == null || s.push(t);
+}, K = (e, t) => {
+  const s = m.get(e);
+  s && (s.splice(s.indexOf(t), 1), s.length === 0 && m.delete(e));
+}, u = (e, t) => {
+  const s = m.get(e);
+  s && s.forEach((a) => {
+    try {
+      a(t);
+    } catch (o) {
+      console.error(`Error in event callback for ${e}:`, o);
+    }
+  });
+}, j = g(() => L.value.filter((e) => !!e.userInfo).map((e) => e.userInfo)), x = g(() => Array.from(c.value.keys()).map((e) => {
+  const t = c.value.get(e);
+  return {
+    userId: t.userId,
+    userName: t.userName,
+    avatarUrl: t.avatarUrl
+  };
+})), P = g(() => Array.from(n.value.keys()).map((e) => {
+  const t = n.value.get(e);
+  return {
+    userId: t.userId,
+    userName: t.userName,
+    avatarUrl: t.avatarUrl
+  };
+})), B = k([]), F = async (e) => {
+  var I;
+  const t = E.T_METRICS_STATE_API_CO_GUEST_REQUEST_CONNECTION_COUNT;
+  w.reportCount(t);
+  const { seatIndex: s, timeout: a } = e, o = await ((I = i.instance) == null ? void 0 : I.takeSeat({
+    seatIndex: s,
+    timeout: a,
+    requestCallback: async (f) => {
+      n.value.delete(A.value);
+      const { requestCallbackType: U, userId: r } = f, l = await y(r);
+      if (N.value.set(r, l), !!l)
+        switch (U) {
+          case d.kRequestAccepted:
+            u(
+              p.onGuestApplicationResponded,
+              {
+                isAccept: !0,
+                hostUser: {
+                  userId: l.userId,
+                  userName: l.userName,
+                  avatarUrl: l.avatarUrl
+                }
+              }
+            );
+            break;
+          case d.kRequestRejected:
+            u(
+              p.onGuestApplicationResponded,
+              {
+                isAccept: !1,
+                hostUser: {
+                  userId: l.userId,
+                  userName: l.userName,
+                  avatarUrl: l.avatarUrl
+                }
+              }
+            );
+            break;
+          case d.kRequestTimeout:
+            u(
+              p.onGuestApplicationNoResponse,
+              {
+                reason: T.timeout
+              }
+            );
+            break;
+        }
     }
   }));
-  if (u) {
-    const f = await w(s);
-    l.value.set(s, u), R.value.set(s, f);
-  }
-}, N = async (e) => {
+  o && n.value.set(A.value, o);
+}, Q = async () => {
   var s, a;
-  const { userId: t = ((s = d.value) == null ? void 0 : s.userId) || "" } = e, n = l.value.get(t);
-  n && (await ((a = i.instance) == null ? void 0 : a.cancelRequest({
-    requestId: n.requestId
-  })), l.value.delete(t));
-}, Q = async (e) => {
-  var s;
-  const { userId: t = v.value } = e, n = c.value.get(t);
-  n && (await ((s = i.instance) == null ? void 0 : s.responseRemoteRequest({
-    requestId: n.requestId,
-    agree: !0
-  })), c.value.delete(t));
-}, X = async (e) => {
-  var s;
-  const { userId: t = v.value } = e, n = c.value.get(t);
-  n && (await ((s = i.instance) == null ? void 0 : s.responseRemoteRequest({
-    requestId: n.requestId,
-    agree: !1
-  })), c.value.delete(t));
-}, Y = async (e) => {
-  var n, s, a, u;
+  const e = (s = _.value) == null ? void 0 : s.userId;
   if (!e)
-    return (n = i.instance) == null ? void 0 : n.leaveSeat();
-  const t = ((a = (s = p.value) == null ? void 0 : s.find((o) => {
-    var r;
-    return ((r = o.userInfo) == null ? void 0 : r.userId) === e;
-  })) == null ? void 0 : a.index) || -1;
-  if (t === -1) {
-    console.error("[CoGuestState disconnect] seatIndex not found", e);
     return;
-  }
-  return (u = i.instance) == null ? void 0 : u.kickUserOffSeatByAdmin({
-    userId: e,
-    seatIndex: t
-  });
-}, Z = async (e) => {
-  var o;
-  const { type: t, timeout: n = 30, userId: s, requestCallback: a } = e, u = await ((o = i.instance) == null ? void 0 : o.openRemoteDeviceByAdmin({
-    device: t,
-    timeout: n,
-    userId: s,
-    requestCallback: (r) => {
-      C.value.delete(`${s}-${t}`), a == null || a(r);
+  const t = n.value.get(e);
+  t && (await ((a = i.instance) == null ? void 0 : a.cancelRequest({
+    requestId: t.requestId
+  })), n.value.delete(e));
+}, $ = async (e) => {
+  var a;
+  const { userId: t } = e, s = n.value.get(t);
+  s && (await ((a = i.instance) == null ? void 0 : a.responseRemoteRequest({
+    requestId: s.requestId,
+    agree: !0
+  })), n.value.delete(t));
+}, z = async (e) => {
+  var a;
+  const { userId: t } = e, s = n.value.get(t);
+  s && (await ((a = i.instance) == null ? void 0 : a.responseRemoteRequest({
+    requestId: s.requestId,
+    agree: !1
+  })), n.value.delete(t));
+}, D = async (e) => {
+  var I;
+  const { userId: t, seatIndex: s, timeout: a } = e, o = await ((I = i.instance) == null ? void 0 : I.takeUserOnSeatByAdmin({
+    userId: t,
+    seatIndex: s,
+    timeout: a,
+    requestCallback: async (f) => {
+      c.value.delete(t);
+      const { requestCallbackType: U } = f, r = await y(t);
+      if (N.value.set(t, r), !!r)
+        switch (U) {
+          case d.kRequestAccepted:
+            u(
+              v.onHostInvitationResponded,
+              {
+                isAccept: !0,
+                guestUser: {
+                  userId: r.userId,
+                  userName: r.userName,
+                  avatarUrl: r.avatarUrl
+                }
+              }
+            );
+            break;
+          case d.kRequestRejected:
+            u(
+              v.onHostInvitationResponded,
+              {
+                isAccept: !1,
+                guestUser: {
+                  userId: r.userId,
+                  userName: r.userName,
+                  avatarUrl: r.avatarUrl
+                }
+              }
+            );
+            break;
+          case d.kRequestTimeout:
+            u(
+              v.onHostInvitationNoResponse,
+              {
+                guestUser: {
+                  userId: r.userId,
+                  userName: r.userName,
+                  avatarUrl: r.avatarUrl
+                },
+                reason: T.timeout
+              }
+            );
+            break;
+        }
     }
   }));
-  u && C.value.set(`${s}-${t}`, u);
-}, _ = async (e) => {
+  o && c.value.set(t, o);
+}, J = async (e) => {
   var a;
-  const { type: t, userId: n } = e, s = C.value.get(`${n}-${t}`);
+  const { inviteeId: t } = e, s = c.value.get(t);
   s && (await ((a = i.instance) == null ? void 0 : a.cancelRequest({
     requestId: s.requestId
-  })), C.value.delete(`${n}-${t}`));
-}, ee = async (e) => {
-  var s;
-  const { type: t } = e, n = y.value.get(`${v.value}-${t}`);
-  n && (await ((s = i.instance) == null ? void 0 : s.responseRemoteRequest({
-    requestId: n.requestId,
+  })), c.value.delete(t));
+}, V = async (e) => {
+  var a;
+  const { inviterId: t } = e, s = c.value.get(t);
+  s && (await ((a = i.instance) == null ? void 0 : a.responseRemoteRequest({
+    requestId: s.requestId,
     agree: !0
-  })), y.value.delete(`${v.value}-${t}`));
-}, te = async (e) => {
-  var s;
-  const { type: t } = e, n = y.value.get(`${v.value}-${t}`);
-  n && (await ((s = i.instance) == null ? void 0 : s.responseRemoteRequest({
-    requestId: n.requestId,
+  })), c.value.delete(t));
+}, W = async (e) => {
+  var a;
+  const { inviterId: t } = e, s = c.value.get(t);
+  s && (await ((a = i.instance) == null ? void 0 : a.responseRemoteRequest({
+    requestId: s.requestId,
     agree: !1
-  })), y.value.delete(`${v.value}-${t}`));
-}, se = async (e) => {
-  var a, u;
-  const { type: t, userId: n } = e, s = (a = p.value) == null ? void 0 : a.find((o) => {
-    var r;
-    return ((r = o.userInfo) == null ? void 0 : r.userId) === n;
-  });
-  s && await ((u = i.instance) == null ? void 0 : u.lockSeatByAdmin({
-    seatIndex: s.index,
-    lockParams: {
-      lockSeat: s.isLocked,
-      lockVideo: t === U.kCamera || s.isVideoLocked,
-      lockAudio: t === U.kMicrophone || s.isAudioLocked
-    }
-  }));
-}, ne = async ({ request: e }) => {
-  const { userId: t, requestAction: n } = e;
-  switch (R.value.set(t, await w(t)), n) {
-    case q.kRequestToTakeSeat:
-      c.value.set(t, e);
+  })), c.value.delete(t));
+}, X = async () => {
+  var e;
+  return (e = i.instance) == null ? void 0 : e.leaveSeat();
+}, Y = async ({ request: e }) => {
+  const { userId: t, requestAction: s, userName: a, avatarUrl: o } = e;
+  switch (N.value.set(t, await y(t)), s) {
+    case R.kRequestToTakeSeat:
+      u(
+        v.onGuestApplicationReceived,
+        {
+          guestUser: {
+            userId: t,
+            userName: a,
+            avatarUrl: o
+          }
+        }
+      ), n.value.set(t, e);
       break;
-    case q.kRequestRemoteUserOnSeat:
-      c.value.set(v.value, e);
+    case R.kRequestRemoteUserOnSeat:
+      u(
+        p.onHostInvitationReceived,
+        {
+          hostUser: {
+            userId: t,
+            userName: a,
+            avatarUrl: o
+          }
+        }
+      ), c.value.set(t, e);
       break;
   }
-}, ae = ({
-  userId: e,
+}, Z = ({
+  userInfo: e,
   request: t
 }) => {
-  const { requestAction: n } = t;
-  switch (n) {
-    case q.kRequestToTakeSeat:
-      c.value.delete(e);
-      break;
-    case q.kRequestRemoteUserOnSeat:
-      c.value.delete(v.value);
+  const { requestAction: s } = t;
+  switch (s) {
+    case R.kRequestToTakeSeat:
+      u(
+        v.onGuestApplicationProcessedByOtherHost,
+        {
+          guestUser: {
+            userId: t.userId,
+            userName: t.userName,
+            avatarUrl: t.avatarUrl
+          },
+          hostUser: {
+            userId: e.userId,
+            userName: e.userName,
+            avatarUrl: e.avatarUrl
+          }
+        }
+      ), n.value.delete(t.userId);
       break;
   }
-}, ue = ({
+}, ee = ({
   userId: e,
   request: t
 }) => {
-  const { requestAction: n } = t;
-  switch (n) {
-    case q.kRequestToTakeSeat:
-      c.value.delete(e);
+  const { requestAction: s, userName: a, avatarUrl: o } = t;
+  switch (s) {
+    case R.kRequestToTakeSeat:
+      u(
+        v.onGuestApplicationCancelled,
+        {
+          guestUser: {
+            userId: e,
+            userName: a,
+            avatarUrl: o
+          }
+        }
+      ), n.value.delete(e);
       break;
-    case q.kRequestRemoteUserOnSeat:
-      c.value.delete(v.value);
+    case R.kRequestRemoteUserOnSeat:
+      u(
+        p.onHostInvitationCancelled,
+        {
+          hostUser: {
+            userId: e,
+            userName: a,
+            avatarUrl: o
+          }
+        }
+      ), c.value.delete(e);
       break;
   }
-}, oe = [
-  { event: S.onRequestReceived, handler: ne },
-  { event: S.onRequestProcessed, handler: ae },
-  { event: S.onRequestCancelled, handler: ue }
-], ce = () => {
-  oe.forEach(({ event: e, handler: t }) => {
-    var n;
-    (n = i.instance) == null || n.on(e, t);
+}, te = ({ seatIndex: e, userInfo: t }) => {
+  u(
+    p.onKickedOffSeat,
+    {
+      seatIndex: e,
+      hostUser: {
+        userId: t.userId,
+        userName: t.userName,
+        avatarUrl: t.avatarUrl
+      }
+    }
+  );
+}, se = [
+  { event: q.onRequestReceived, handler: Y },
+  { event: q.onRequestProcessed, handler: Z },
+  { event: q.onRequestCancelled, handler: ee },
+  { event: q.onKickedOffSeat, handler: te }
+], ae = () => {
+  se.forEach(({ event: e, handler: t }) => {
+    var s;
+    (s = i.instance) == null || s.on(e, t);
   });
 };
-$.once("ready", () => {
-  ce();
+b.once("ready", () => {
+  ae();
 });
-A(
-  E,
+h(
+  () => {
+    var e;
+    return (e = H.value) == null ? void 0 : e.liveId;
+  },
   async (e) => {
-    var t;
-    e === b.Live ? (t = d.value) != null && t.userId && (G.value = await w(d.value.userId), R.value.set(d.value.userId, G.value)) : (l.value.clear(), c.value.clear(), R.value.clear(), G.value = null);
+    e || (n.value.clear(), c.value.clear());
   },
   { immediate: !0 }
 );
-function me() {
+function pe() {
   return {
     // state
-    localCoGuestStatus: B,
-    userListInCoGuest: V,
-    receivedCoGuestUserList: P,
-    availableCoGuestUserList: W,
-    sentCoGuestUserList: j,
-    latestReceivedCoGuestRequest: z,
-    latestCancelledCoGuestRequest: F,
-    latestAcceptedCoGuestRequest: H,
-    latestRejectedCoGuestRequest: J,
+    connected: j,
+    invitees: x,
+    applicants: P,
+    candidates: B,
     // action
-    sendCoGuestRequest: K,
-    cancelCoGuestRequest: N,
-    acceptCoGuestRequest: Q,
-    rejectCoGuestRequest: X,
-    disconnect: Y,
-    sendOpenDeviceRequest: Z,
-    cancelOpenDeviceRequest: _,
-    acceptOpenDeviceRequest: ee,
-    rejectOpenDeviceRequest: te,
-    closeRemoteDevice: se
+    applyForSeat: F,
+    cancelApplication: Q,
+    acceptApplication: $,
+    rejectApplication: z,
+    inviteToSeat: D,
+    cancelInvitation: J,
+    acceptInvitation: V,
+    rejectInvitation: W,
+    disConnect: X,
+    // event
+    subscribeEvent: M,
+    unsubscribeEvent: K
   };
 }
 export {
-  me as useCoGuestState
+  pe as useCoGuestState
 };