@amityco/ts-sdk 7.7.1-99f7166.0 → 7.7.1-b56aa2f.0

package/dist/liveStreamPlayer/utils/eventRegister.d.ts

@@ -7,7 +7,8 @@ export declare class EventRegister {
     _controller: AbortController;
     _sessionId: null | string;
     _observer: MutationObserver;
-    constructor(player: HTMLVideoElement, resolution: string);
+    _SDKUnsubscribers: Amity.Unsubscriber[];
+    constructor(player: HTMLVideoElement, resolution: string, streamId: string);
     _resetStartTime(): void;
     _shouldUpdateCollector(): boolean;
     _sendUsageToCollector(): void;

package/dist/liveStreamPlayer/utils/eventRegister.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventRegister.d.ts","sourceRoot":"","sources":["../../../src/liveStreamPlayer/utils/eventRegister.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAkB7D,qBAAa,aAAa;IACxB,MAAM,EAAE,gBAAgB,CAAC;IAEzB,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC;IAE1B,eAAe,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAEtD,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC;IAE1B,WAAW,EAAE,eAAe,CAAC;IAE7B,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC;IAE1B,SAAS,EAAE,gBAAgB,CAAC;gBAEhB,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM;IA2BxD,eAAe;IAIf,sBAAsB;IAatB,qBAAqB;IAsBrB,cAAc;IA4Dd,iBAAiB;CAMlB"}
+{"version":3,"file":"eventRegister.d.ts","sourceRoot":"","sources":["../../../src/liveStreamPlayer/utils/eventRegister.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAmB7D,qBAAa,aAAa;IACxB,MAAM,EAAE,gBAAgB,CAAC;IAEzB,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC;IAE1B,eAAe,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAEtD,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC;IAE1B,WAAW,EAAE,eAAe,CAAC;IAE7B,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC;IAE1B,SAAS,EAAE,gBAAgB,CAAC;IAE5B,iBAAiB,EAAE,KAAK,CAAC,YAAY,EAAE,CAAM;gBAEjC,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAuC1E,eAAe;IAIf,sBAAsB;IAatB,qBAAqB;IAsBrB,cAAc;IA4Dd,iBAAiB;CAMlB"}

package/dist/streamRepository/events/index.d.ts

@@ -3,4 +3,6 @@ export { onStreamStopped } from './onStreamStopped';
 export { onStreamRecorded } from './onStreamRecorded';
 export { onStreamFlagged } from './onStreamFlagged';
 export { onStreamTerminated } from './onStreamTerminated';
+export { onStreamViewerBanned } from './onStreamViewerBanned';
+export { onStreamViewerUnbanned } from './onStreamViewerUnbanned';
 //# sourceMappingURL=index.d.ts.map

package/dist/streamRepository/events/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/streamRepository/events/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/streamRepository/events/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/utils/linkedObject/channelLinkedObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channelLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/channelLinkedObject.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,YAAa,MAAM,eAAe,KAAG,MAAM,OAqB1E,CAAC"}
+{"version":3,"file":"channelLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/channelLinkedObject.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,mBAAmB,YAAa,MAAM,eAAe,KAAG,MAAM,OAuB1E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "7.7.1-99f7166.0",
+  "version": "7.7.1-b56aa2f.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/core/events.ts

@@ -64,7 +64,7 @@ declare global {
       'channel.updated': Amity.ChannelPayload;
       'channel.deleted': Amity.ChannelPayload;
       'channel.setMuted': Amity.ChannelSetMutedPayload;
-      'channel.setUserMuted': Amity.ChannelSetUserMutedPayload;
+      'channel.setMutedUsers': Amity.ChannelSetUserMutedPayload;
     } & MqttChannelUserEvents;
 
     type MqttSubChannelEvents = {

package/src/@types/core/payload.ts

@@ -619,6 +619,6 @@ declare global {
     type StreamViewerBanPayload = RawStreamViewerBan[];
     type StreamViewerUnbanPayload = RawStreamViewerBan[];
 
-    type ChannelSetUserMutedPayload = RawChannelSetUserMuted[];
+    type ChannelSetUserMutedPayload = RawChannelSetUserMuted;
   }
 }

package/src/@types/domains/channel.ts

@@ -100,6 +100,9 @@ declare global {
       messagePreview?: Amity.MessagePreview | null;
       markAsRead: () => Promise<boolean>;
       previewMembers: Amity.Membership<'channel'>[];
+      myMembership: (
+        callback: Amity.LiveObjectCallback<Amity.Membership<'channel'> | undefined>,
+      ) => Amity.Unsubscriber;
     };
 
     type QueryChannels = {

package/src/channelRepository/api/createChannel.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api/activeClient';
 
 import { ingestInCache } from '~/cache/api/ingestInCache';
 
-import { prepareChannelPayload } from '../utils/prepareChannelPayload';
+import { prepareChannelPayload } from '../utils';
 import { constructChannelObject } from '../utils/constructChannelObject';
 
 /* begin_public_function

package/src/channelRepository/events/onChannelSetUserMuted.ts

@@ -26,27 +26,25 @@ export const onChannelSetUserMuted = (
   if (callbacks.length === 0) {
     const client = getActiveClient();
 
-    const filter = async (payloads: Amity.ChannelSetUserMutedPayload) => {
-      payloads.forEach(payload => {
-        payload.userIds.forEach(userId =>
-          // If muteTimeout > now => user is muted
-          // Otherwise => user is unmuted
-          upsertInCache(['channelUsers', 'get', `${payload.channelId}#${userId}`], {
-            isMuted: Date.parse(payload.muteTimeout) > Date.now(),
-          }),
-        );
-      });
+    const filter = async (payload: Amity.ChannelSetUserMutedPayload) => {
+      payload.userIds.forEach(userId =>
+        // If muteTimeout > now => user is muted
+        // Otherwise => user is unmuted
+        upsertInCache(['channelUsers', 'get', `${payload.channelId}#${userId}`], {
+          isMuted: Date.parse(payload.muteTimeout) > Date.now(),
+        }),
+      );
 
       const channel = pullFromCache<Amity.StaticInternalChannel>([
         'channel',
         'get',
-        payloads[0].channelId,
+        payload.channelId,
       ])?.data;
 
       const channelUser = pullFromCache<Amity.Membership<'channel'>>([
         'channelUsers',
         'get',
-        `${payloads[0].channelId}#${payloads[0].userIds[0]}`,
+        `${payload.channelId}#${payload.userIds[0]}`,
       ])?.data;
 
       if (channel && channelUser) {
@@ -57,7 +55,7 @@ export const onChannelSetUserMuted = (
     mainDisposer = createEventSubscriber(
       client,
       'onChannelUserMute',
-      'channel.setUserMuted',
+      'channel.setMutedUsers',
       filter,
     );
   }

package/src/channelRepository/internalApi/getMyMembership.ts

@@ -0,0 +1,37 @@
+import { pullFromCache } from '~/cache/api/pullFromCache';
+import { getActiveClient } from '~/client/api/activeClient';
+import { ASCApiError } from '~/core/errors';
+
+/**
+ *
+ * get current user's membership data
+ *
+ * @returns the {@link Amity.Membership<'channel'>} objects
+ *
+ * @category Channel API
+ * @async
+ */
+
+export const getMyMembership = (channelId: string): Amity.Cached<Amity.Membership<'channel'>> => {
+  const client = getActiveClient();
+  client.log('channel/getMyMembership.locally');
+
+  const cacheChannelUser = pullFromCache<Amity.Membership<'channel'>>([
+    'channelUsers',
+    'get',
+    `${channelId}#${client.userId}`,
+  ]);
+
+  if (!cacheChannelUser) {
+    throw new ASCApiError(
+      'Item not found!',
+      Amity.ServerError.ITEM_NOT_FOUND,
+      Amity.ErrorLevel.ERROR,
+    );
+  }
+
+  return {
+    data: cacheChannelUser.data,
+    cachedAt: cacheChannelUser.cachedAt,
+  };
+};

package/src/channelRepository/observers/getMyMembership.ts

@@ -0,0 +1,98 @@
+import { getActiveUser } from '~/client/api/activeUser';
+import { getMyMembership as _getMyMembership } from '../internalApi/getMyMembership';
+import { ASCApiError, ASCError } from '~/core/errors';
+import { getActiveClient } from '~/client/api/activeClient';
+import { isEqual } from '~/utils/isEqual';
+import { createQuery, runQuery } from '~/core/query';
+import {
+  UNSYNCED_OBJECT_CACHED_AT_MESSAGE,
+  UNSYNCED_OBJECT_CACHED_AT_VALUE,
+} from '~/utils/constants';
+import { channelMemberLinkedObject } from '~/utils/linkedObject/channelMemberLinkedObject';
+import { onChannelMemberBanned, onChannelMemberUnbanned } from '../events';
+import { onChannelSetUserMuted } from '../events/onChannelSetUserMuted';
+
+export const getMyMembership = (
+  channelId: string,
+  callback: Amity.LiveObjectCallback<Amity.Membership<'channel'> | undefined>,
+): Amity.Unsubscriber => {
+  const { _id: userId } = getActiveUser();
+
+  if (!userId)
+    throw new ASCError(
+      'The _id has not been defined in ActiveUser',
+      Amity.ClientError.UNKNOWN_ERROR,
+      Amity.ErrorLevel.ERROR,
+    );
+
+  const { log, cache } = getActiveClient();
+
+  if (!cache) {
+    console.log('This observable object need the cache data!');
+  }
+
+  const timestamp = Date.now();
+  log(`liveMymembership(tmpid: ${timestamp}) > listen`);
+
+  const disposers: Amity.Unsubscriber[] = [];
+
+  let isUnsyncedModel = false; // for messages
+
+  let model: Amity.Membership<'channel'> | undefined;
+
+  const dispatcher = (data: Amity.LiveObject<Amity.Membership<'channel'> | undefined>) => {
+    callback({
+      ...data,
+      data: data.data ? channelMemberLinkedObject(data.data) : data.data,
+    });
+  };
+
+  const realtimeRouter = (_: Amity.StaticInternalChannel, __: Amity.RawMembership<'channel'>) => {
+    const { data } = _getMyMembership(channelId);
+
+    if (isEqual(model, data)) return;
+
+    dispatcher({
+      loading: false,
+      data,
+    });
+  };
+
+  const onFetch = () => {
+    const query = createQuery(async () => _getMyMembership(channelId));
+
+    runQuery(query, ({ error, data, loading, origin, cachedAt }) => {
+      if (cachedAt === UNSYNCED_OBJECT_CACHED_AT_VALUE) {
+        dispatcher({
+          data,
+          origin,
+          loading: false,
+          error: new ASCApiError(
+            UNSYNCED_OBJECT_CACHED_AT_MESSAGE,
+            Amity.ClientError.DISALOOW_UNSYNCED_OBJECT,
+            Amity.ErrorLevel.ERROR,
+          ),
+        });
+
+        isUnsyncedModel = true;
+        disposers.forEach(fn => fn());
+      } else if (!isUnsyncedModel) {
+        dispatcher({ loading, data, origin, error });
+      }
+
+      if (error) {
+        disposers.forEach(fn => fn());
+      }
+    });
+  };
+
+  disposers.push(onChannelMemberBanned(realtimeRouter));
+  disposers.push(onChannelMemberUnbanned(realtimeRouter));
+  disposers.push(onChannelSetUserMuted(realtimeRouter));
+
+  onFetch();
+
+  return () => {
+    disposers.forEach(fn => fn());
+  };
+};

package/src/core/events.ts

@@ -32,7 +32,9 @@ const MQTT_EVENTS = [
   'video-streaming.didFlag',
   'video-streaming.didTerminate',
 
-  // 'user.didGlobalBan' remove due to message event,
+  'video-streaming.viewerDidBan',
+  'video-streaming.viewerDidUnban',
+
   'liveReaction.created',
 ] as const;
 

package/src/liveStreamPlayer/api/getPlayer.ts

@@ -60,7 +60,7 @@ export const getPlayer = async (parameters: { streamId: string }): Promise<HTMLV
     video.src = recording.mp4.url;
   }
 
-  new EventRegister(video, resolution).registerEvents();
+  new EventRegister(video, resolution, streamId).registerEvents();
 
   return video;
 };

package/src/liveStreamPlayer/utils/eventRegister.ts

@@ -1,5 +1,6 @@
 import uuid from 'react-native-uuid';
 import { getUsageCollector } from '../api/getUsageCollector';
+import { onStreamViewerBanned } from '~/streamRepository/events';
 
 const SECOND = 1000;
 /*
@@ -32,7 +33,9 @@ export class EventRegister {
 
   _observer: MutationObserver;
 
-  constructor(player: HTMLVideoElement, resolution: string) {
+  _SDKUnsubscribers: Amity.Unsubscriber[] = [];
+
+  constructor(player: HTMLVideoElement, resolution: string, streamId: string) {
     this.player = player;
     this.resolution = resolution;
     this._startTime = null;
@@ -53,10 +56,22 @@ export class EventRegister {
         mutation.removedNodes.forEach(node => {
           if (node === player) {
             this._unregisterEvents();
+            this._SDKUnsubscribers.forEach(fn => fn?.());
           }
         });
       });
     });
+
+    this._SDKUnsubscribers.push(
+      onStreamViewerBanned(stream => {
+        // if still has stream.watcherUrl, the current user has not banned.
+        if (stream.watcherUrl) return;
+        this.player.pause();
+        this.player.removeAttribute('src');
+        this.player.load();
+        this.player.remove();
+      }),
+    );
   }
 
   _resetStartTime() {

package/src/streamRepository/events/index.ts

@@ -3,3 +3,5 @@ export { onStreamStopped } from './onStreamStopped';
 export { onStreamRecorded } from './onStreamRecorded';
 export { onStreamFlagged } from './onStreamFlagged';
 export { onStreamTerminated } from './onStreamTerminated';
+export { onStreamViewerBanned } from './onStreamViewerBanned';
+export { onStreamViewerUnbanned } from './onStreamViewerUnbanned';

package/src/utils/linkedObject/channelLinkedObject.ts

@@ -2,6 +2,7 @@ import { markAsRead } from '~/channelRepository/internalApi/markAsRead';
 import { shallowClone } from '../shallowClone';
 import { queryCache } from '~/cache/api';
 import { channelMemberLinkedObject } from './channelMemberLinkedObject';
+import { getMyMembership } from '~/channelRepository/observers/getMyMembership';
 
 export const channelLinkedObject = (channel: Amity.InternalChannel): Amity.Channel => {
   let previewMembers: Amity.Membership<'channel'>[] = [];
@@ -23,5 +24,7 @@ export const channelLinkedObject = (channel: Amity.InternalChannel): Amity.Chann
   return shallowClone(channel, {
     markAsRead: () => markAsRead(channel.channelInternalId),
     previewMembers,
+    myMembership: (callback: Amity.LiveObjectCallback<Amity.Membership<'channel'> | undefined>) =>
+      getMyMembership(channel.channelId, callback),
   });
 };

package/src/utils/linkedObject/postLinkedObject.ts

@@ -76,7 +76,7 @@ export const postLinkedObject = (post: Amity.InternalPost): Amity.Post => {
         ? pullFromCache<Amity.File<'file'>>(['file', 'get', post?.data?.fileId])?.data
         : undefined;
     },
-    
+
     getLivestreamInfo(): Amity.Stream | undefined {
       if (!isAmityLivestreamPost(post)) return;
       const cache = pullFromCache<Amity.InternalStream>([
@@ -95,7 +95,7 @@ export const postLinkedObject = (post: Amity.InternalPost): Amity.Post => {
       if (!cache) return;
       return cache;
     },
-    
+
     getClipInfo(): Amity.File<'clip'> | undefined {
       return isAmityClipPost(post)
         ? pullFromCache<Amity.File<'clip'>>(['file', 'get', post?.data?.fileId])?.data