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

package/dist/index.esm.js

@@ -3,7 +3,6 @@ import mitt from 'mitt';
 import debug from 'debug';
 import axios from 'axios';
 import HttpAgent, { HttpsAgent } from 'agentkeepalive';
-import io from 'socket.io-client';
 import uuid$1 from 'react-native-uuid';
 import jwtDecode from 'jwt-decode';
 import hash from 'object-hash';
@@ -162,8 +161,8 @@ var FeedSourceEnum;
 
 function getVersion() {
     try {
-        // the string ''v7.8.2-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v7.8.2-esm';
+        // the string ''v7.8.3-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v7.8.3-esm';
     }
     catch (error) {
         return '__dev__';
@@ -1367,17 +1366,6 @@ const scheduleTask = (task) => {
 };
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-// need to sync up the list
-const WS_EVENTS = [
-    'disconnected',
-    'error',
-    'connect_error',
-    'reconnect_error',
-    'reconnect_failed',
-    'sessionStateChange',
-    // for internal use by accessTokenExpiryWatcher
-    'tokenExpired',
-];
 const MQTT_EVENTS = [
     'connect',
     'message',
@@ -1399,23 +1387,6 @@ const MQTT_EVENTS = [
 const createEventEmitter = () => {
     return mitt();
 };
-/**
- * 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
- */
-const proxyWebsocketEvents = (ws, emitter) => {
-    WS_EVENTS.forEach(event => {
-        ws === null || ws === void 0 ? void 0 : ws.on(event, (param) => {
-            emitter.emit(event, param);
-        });
-    });
-};
 const proxyMqttEvents = (mqttClient, emitter) => {
     MQTT_EVENTS.forEach(event => {
         mqttClient === null || mqttClient === void 0 ? void 0 : mqttClient.on(event, (...params) => {
@@ -1846,29 +1817,6 @@ const createHttpTransport = (endpoint) => {
     return instance;
 };
 
-/**
- * Creates a pre-configured socket.io instance
- *
- * @param endpoint The socket.io server's URL
- * @returns A pre-configured (non-connected) socket.io client instance
- *
- * @category Transport
- * @hidden
- */
-const createWebsocketTransport = (endpoint) => {
-    const socket = io(endpoint, {
-        autoConnect: false,
-        reconnectionDelay: 2000,
-        transports: ['websocket'],
-    });
-    // FIXME: disconnectClient removes this listener and client can get global ban event
-    socket.on('disconnect', (reason) => {
-        if (reason === 'io server disconnect')
-            socket.connect();
-    });
-    return socket;
-};
-
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 function getDefaultExportFromCjs (x) {
@@ -23391,9 +23339,6 @@ const setClientToken = async (params) => {
         isGlobalBanned: false,
         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("established" /* Amity.SessionStates.ESTABLISHED */);
     return { accessToken, users };
@@ -24663,15 +24608,12 @@ var reactionSyncEngineOnLoginHandler = () => {
  * @async
  */
 const logout = async () => {
-    var _a, _b;
+    var _a;
     const client = getActiveClient();
     client.log('client/api/disconnectClient');
     if (client.mqtt && client.mqtt.connected) {
         client.mqtt.disconnect();
     }
-    if (client.ws && client.ws.connected) {
-        client.ws.disconnect();
-    }
     /*
      * for cases when session state is terminated (example on ban) or token expired,
      * the terminating block will set session state to terminated or for the or
@@ -24687,9 +24629,7 @@ const logout = async () => {
     if (client.sessionState === "established" /* Amity.SessionStates.ESTABLISHED */)
         setSessionState("notLoggedIn" /* Amity.SessionStates.NOT_LOGGED_IN */);
     client.emitter.all.clear();
-    // FIXME: it removes listener in ws.ts, it breaks global ban event
-    (_a = client.ws) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
-    (_b = client.mqtt) === null || _b === void 0 ? void 0 : _b.removeAllListeners();
+    (_a = client.mqtt) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
     client.userId = undefined;
     client.token = undefined;
     client.http.defaults.headers.common.Authorization = '';
@@ -24698,8 +24638,6 @@ const logout = async () => {
         isGlobalBanned: false,
         isUserDeleted: false,
     };
-    if (client.ws)
-        client.ws.io.opts.query = { token: '' };
     if (typeof document !== 'undefined') {
         document.cookie = '_ascSession=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
     }
@@ -24897,7 +24835,6 @@ async function runMqtt$1() {
  * @async
  */
 const login = async (params, sessionHandler, config) => {
-    var _a;
     const client = getActiveClient();
     let unsubWatcher;
     client.log('client/api/connectClient', Object.assign({ apiKey: client.apiKey, sessionState: client.sessionState }, params));
@@ -24929,10 +24866,6 @@ const login = async (params, sessionHandler, config) => {
             terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
             return false;
         }
-        // FIXME: events are duplicated if connectClient is called few times without disconnectClient
-        // wire websocket events to our event emitter
-        proxyWebsocketEvents(client.ws, client.emitter);
-        (_a = client.ws) === null || _a === void 0 ? void 0 : _a.open();
         client.userId = user.userId;
         client.sessionHandler = sessionHandler;
         /*
@@ -25560,7 +25493,6 @@ const createClient = (apiKey, apiRegion = API_REGIONS.SG, { debugSession = DEFAU
     let ws;
     let mqtt;
     if (rteEnabled) {
-        ws = createWebsocketTransport(httpEndpoint);
         mqtt = createMqttTransport(mqttEndpoint);
     }
     const emitter = createEventEmitter();
@@ -25687,9 +25619,6 @@ const validateAccessToken = async ({ token, userId }) => {
         isGlobalBanned: false,
         isUserDeleted: false,
     };
-    // manually setup the token for ws transport
-    if (client.ws)
-        client.ws.io.opts.query = { token: token.accessToken };
     client.token = token;
     setSessionState("established" /* Amity.SessionStates.ESTABLISHED */);
     return user;
@@ -25719,7 +25648,6 @@ const validateAccessToken = async ({ token, userId }) => {
  * @async
  */
 const resumeSession = async (params, sessionHandler, config) => {
-    var _a;
     const client = getActiveClient();
     let unsubWatcher;
     client.log('client/api/resumeSession', Object.assign({ apiKey: client.apiKey, sessionState: client.sessionState }, params));
@@ -25730,9 +25658,6 @@ const resumeSession = async (params, sessionHandler, config) => {
             if (client.mqtt && client.mqtt.connected) {
                 client.mqtt.disconnect();
             }
-            if (client.ws && client.ws.connected) {
-                client.ws.disconnect();
-            }
             // Clear existing subscriptions
             subscriptions.forEach(fn => fn());
             subscriptions = [];
@@ -25758,10 +25683,6 @@ const resumeSession = async (params, sessionHandler, config) => {
             terminateClient("globalBan" /* Amity.TokenTerminationReason.GLOBAL_BAN */);
             return false;
         }
-        // FIXME: events are duplicated if connectClient is called few times without disconnectClient
-        // wire websocket events to our event emitter
-        proxyWebsocketEvents(client.ws, client.emitter);
-        (_a = client.ws) === null || _a === void 0 ? void 0 : _a.open();
         client.userId = user.userId;
         client.sessionHandler = sessionHandler;
         /*
@@ -25836,11 +25757,7 @@ const isConnected = () => {
     var _a, _b;
     const client = getActiveClient();
     client.log('client/api/isConnected', client);
-    // if client is connected to ws, it means client is connected. If ws is undefined, it means ws is not used.
-    const isWsConnected = (client.ws && client.ws.connected) || !!client.ws;
-    return !!(client.userId &&
-        ((_b = String((_a = client.http.defaults.headers.common) === null || _a === void 0 ? void 0 : _a.Authorization)) === null || _b === void 0 ? void 0 : _b.length) &&
-        isWsConnected);
+    return !!(client.userId && ((_b = String((_a = client.http.defaults.headers.common) === null || _a === void 0 ? void 0 : _a.Authorization)) === null || _b === void 0 ? void 0 : _b.length));
 };
 
 const enableUnreadCount = () => {
@@ -39049,10 +38966,10 @@ const queryCategories = async (query) => {
             'query',
             Object.assign(Object.assign({}, params), { includeDeleted, options }),
         ];
-        pushToCache(cacheKey, { categories: categories.map(getResolver('category')), paging });
+        pushToCache(cacheKey, { categories: categories === null || categories === void 0 ? void 0 : categories.map(getResolver('category')), paging });
     }
     return {
-        data: categories,
+        data: categories !== null && categories !== void 0 ? categories : [],
         cachedAt,
         paging,
     };
@@ -39210,14 +39127,16 @@ var index$b = /*#__PURE__*/Object.freeze({
 const queryGlobalFeed = async (query) => {
     const client = getActiveClient();
     client.log('feed/queryGlobalFeed', query);
-    const _a = query !== null && query !== void 0 ? query : {}, { queryToken, dataTypes, resolveParent } = _a, params = __rest(_a, ["queryToken", "dataTypes", "resolveParent"]);
+    const _a = query !== null && query !== void 0 ? query : {}, { queryToken, dataTypes } = _a, params = __rest(_a, ["queryToken", "dataTypes"]);
     const options = (() => {
         if (queryToken)
             return { token: queryToken };
         return undefined;
     })();
     const { data: queryPayload } = await client.http.get(`/api/v4/me/global-feeds`, {
-        params: Object.assign(Object.assign({}, params), { dataTypes, resolveParent: resolveParent !== null && resolveParent !== void 0 ? resolveParent : true, options }),
+        params: Object.assign(Object.assign({}, params), { dataTypes, 
+            // If dataTypes is specified, resolveParent will be true
+            resolveParent: dataTypes && dataTypes.length > 0 ? true : undefined, options }),
     });
     const { paging } = queryPayload, payload = __rest(queryPayload, ["paging"]);
     const data = prepareMembershipPayload(payload, 'communityUsers');
@@ -40532,10 +40451,10 @@ const getCustomRankingGlobalFeed = (params, callback, config) => {
 
 class GlobalFeedPaginationController extends PaginationController {
     async getRequest(queryParams, token) {
-        const { limit, resolveParent } = queryParams, params = __rest(queryParams, ["limit", "resolveParent"]);
+        const { limit, dataTypes } = queryParams, params = __rest(queryParams, ["limit", "dataTypes"]);
         const options = token ? { token } : { limit };
         const { data: queryResponse } = await this.http.get(`/api/v4/me/global-feeds`, {
-            params: Object.assign(Object.assign({}, params), { resolveParent: resolveParent !== null && resolveParent !== void 0 ? resolveParent : true, options }),
+            params: Object.assign(Object.assign({}, params), { dataTypes, resolveParent: dataTypes && dataTypes.length > 0 ? true : undefined, options }),
         });
         return queryResponse;
     }