@amityco/ts-sdk 7.8.3-b5109db.0 → 7.8.4-0055f5bc.0

package/src/client/utils/setClientToken.ts

@@ -38,9 +38,6 @@ export const setClientToken = async (params: Parameters<typeof getToken>[0]) =>
     isUserDeleted: false,
   };
 
-  // manually setup the token for ws transport
-  if (client.ws) client.ws.io.opts.query = { token: accessToken };
-
   client.token = { accessToken, issuedAt, expiresAt };
 
   setSessionState(Amity.SessionStates.ESTABLISHED);

package/src/core/events.ts

@@ -43,24 +43,6 @@ export const createEventEmitter = () => {
   return mitt<Amity.Events>();
 };
 
-/**
- * Wraps the websocket events into the client's event emitter for
- * abstraction of transport.
- *
- * @param ws A websocket connection to listen from
- * @param emitter An event emitter to wire the events to
- *
- * @category Transport
- * @hidden
- */
-export const proxyWebsocketEvents = (ws: Amity.Client['ws'], emitter: Amity.Client['emitter']) => {
-  WS_EVENTS.forEach(event => {
-    ws?.on(event, (param: Amity.Events[typeof event]) => {
-      emitter.emit(event, param);
-    });
-  });
-};
-
 export const proxyMqttEvents = (
   mqttClient: Amity.Client['mqtt'],
   emitter: Amity.Client['emitter'],

package/src/core/transports/index.ts

@@ -1,3 +1,2 @@
 export * from './http';
-export * from './ws';
 export * from './mqtt';

package/src/feedRepository/api/queryGlobalFeed.ts

@@ -35,7 +35,7 @@ export const queryGlobalFeed = async (
   const client = getActiveClient();
   client.log('feed/queryGlobalFeed', query);
 
-  const { queryToken, dataTypes, resolveParent, ...params } = query ?? {};
+  const { queryToken, dataTypes, ...params } = query ?? {};
 
   const options = (() => {
     if (queryToken) return { token: queryToken };
@@ -48,7 +48,8 @@ export const queryGlobalFeed = async (
       params: {
         ...params,
         dataTypes,
-        resolveParent: resolveParent ?? true,
+        // If dataTypes is specified, resolveParent will be true
+        resolveParent: dataTypes && dataTypes.length > 0 ? true : undefined,
         options,
       },
     },

package/src/feedRepository/observers/getGlobalFeed/PaginationController.ts

@@ -5,7 +5,7 @@ export class GlobalFeedPaginationController extends PaginationController<
   Amity.GlobalFeedLiveCollection
 > {
   async getRequest(queryParams: Amity.GlobalFeedLiveCollection, token: string | undefined) {
-    const { limit, resolveParent, ...params } = queryParams;
+    const { limit, dataTypes, ...params } = queryParams;
     const options = token ? { token } : { limit };
 
     const { data: queryResponse } = await this.http.get<Amity.PostPayload & Amity.Pagination>(
@@ -13,7 +13,8 @@ export class GlobalFeedPaginationController extends PaginationController<
       {
         params: {
           ...params,
-          resolveParent: resolveParent ?? true,
+          dataTypes,
+          resolveParent: dataTypes && dataTypes.length > 0 ? true : undefined,
           options,
         },
       },

package/src/utils/tests/client.ts

@@ -42,17 +42,11 @@ export const connectClient = async () => {
     },
   });
 
-  // test will fail randomly if we have this
-  setTimeout(() => {
-    client.ws.io.emit('connect');
-    // fixes jest warning of open handles
-  }, 500).unref();
-
   await sdkConnectClient({ userId: client.userId! }, sessionHandler);
 };
 
 export const disconnectClient = async () => {
-  sdkDisconnectClient().then(() => client.ws.emit('disconnect'));
+  sdkDisconnectClient();
 };
 
 export default {};