@amityco/ts-sdk 0.0.1-beta.14 → 0.0.1-beta.17

package/src/channel/events/onChannelCreated.ts

@@ -1,7 +1,7 @@
-import { getActiveClient } from '~/client/api'
-import { createEventSubscriber } from '~/core/events'
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 /**
  * ```js
@@ -19,17 +19,12 @@ import { ingestInCache } from '~/cache/api/ingestInCache'
  * @category Channel Events
  */
 export const onChannelCreated = (callback: Amity.Listener<Amity.Channel>) => {
-  const client = getActiveClient()
+  const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelPayload) => {
-    ingestInCache(payload)
-    callback(payload.channels[0])
-  }
+    ingestInCache(payload);
+    callback(payload.channels[0]);
+  };
 
-  return createEventSubscriber(
-    client,
-    'onChannelCreated',
-    'v3.channel.didCreate',
-    filter
-  )
-}
+  return createEventSubscriber(client, 'onChannelCreated', 'v3.channel.didCreate', filter);
+};

package/src/channel/events/onChannelDeleted.ts

@@ -1,7 +1,7 @@
-import { getActiveClient } from '~/client/api'
-import { createEventSubscriber } from '~/core/events'
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 /**
  * ```js
@@ -19,17 +19,12 @@ import { ingestInCache } from '~/cache/api/ingestInCache'
  * @category Channel Events
  */
 export const onChannelDeleted = (callback: Amity.Listener<Amity.Channel>) => {
-  const client = getActiveClient()
+  const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelPayload) => {
-    ingestInCache(payload)
-    callback(payload.channels[0])
-  }
+    ingestInCache(payload);
+    callback(payload.channels[0]);
+  };
 
-  return createEventSubscriber(
-    client,
-    'onChannelDeleted',
-    'v3.channel.didDelete',
-    filter
-  )
-}
+  return createEventSubscriber(client, 'onChannelDeleted', 'v3.channel.didDelete', filter);
+};

package/src/channel/events/onChannelJoined.ts

@@ -1,7 +1,7 @@
-import { getActiveClient } from '~/client/api'
-import { createEventSubscriber } from '~/core/events'
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 /**
  * ```js
@@ -19,17 +19,12 @@ import { ingestInCache } from '~/cache/api/ingestInCache'
  * @category Channel Events
  */
 export const onChannelJoined = (callback: Amity.Listener<Amity.Channel>) => {
-  const client = getActiveClient()
+  const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelPayload) => {
-    ingestInCache(payload)
-    callback(payload.channels[0])
-  }
+    ingestInCache(payload);
+    callback(payload.channels[0]);
+  };
 
-  return createEventSubscriber(
-    client,
-    'onChannelJoined',
-    'v3.channel.didJoin',
-    filter
-  )
-}
+  return createEventSubscriber(client, 'onChannelJoined', 'v3.channel.didJoin', filter);
+};

package/src/channel/events/onChannelLeft.ts

@@ -1,7 +1,7 @@
-import { getActiveClient } from '~/client/api'
-import { createEventSubscriber } from '~/core/events'
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 /**
  * ```js
@@ -19,17 +19,12 @@ import { ingestInCache } from '~/cache/api/ingestInCache'
  * @category Channel Events
  */
 export const onChannelLeft = (callback: Amity.Listener<Amity.Channel>) => {
-  const client = getActiveClient()
+  const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelPayload) => {
-    ingestInCache(payload)
-    callback(payload.channels[0])
-  }
+    ingestInCache(payload);
+    callback(payload.channels[0]);
+  };
 
-  return createEventSubscriber(
-    client,
-    'onChannelLeft',
-    'v3.channel.didLeave',
-    filter
-  )
-}
+  return createEventSubscriber(client, 'onChannelLeft', 'v3.channel.didLeave', filter);
+};

package/src/channel/events/onChannelUpdated.ts

@@ -1,7 +1,7 @@
-import { getActiveClient } from '~/client/api'
-import { createEventSubscriber } from '~/core/events'
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 /**
  * ```js
@@ -19,17 +19,12 @@ import { ingestInCache } from '~/cache/api/ingestInCache'
  * @category Channel Events
  */
 export const onChannelUpdated = (callback: Amity.Listener<Amity.Channel>) => {
-  const client = getActiveClient()
+  const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelPayload) => {
-    ingestInCache(payload)
-    callback(payload.channels[0])
-  }
+    ingestInCache(payload);
+    callback(payload.channels[0]);
+  };
 
-  return createEventSubscriber(
-    client,
-    'onChannelUpdated',
-    'v3.channel.didUpdate',
-    filter
-  )
-}
+  return createEventSubscriber(client, 'onChannelUpdated', 'v3.channel.didUpdate', filter);
+};

package/src/channel/events/onMemberAdded.ts

@@ -1,7 +1,7 @@
-import { getActiveClient } from '~/client/api'
-import { createEventSubscriber } from '~/core/events'
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 /**
  * ```js
@@ -19,17 +19,12 @@ import { ingestInCache } from '~/cache/api/ingestInCache'
  * @category Channel Events
  */
 export const onMemberAdded = (callback: Amity.Listener<Amity.Channel>) => {
-  const client = getActiveClient()
+  const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelPayload) => {
-    ingestInCache(payload)
-    callback(payload.channels[0])
-  }
+    ingestInCache(payload);
+    callback(payload.channels[0]);
+  };
 
-  return createEventSubscriber(
-    client,
-    'onMemberAdded',
-    'v3.channel.didAddUsers',
-    filter
-  )
-}
+  return createEventSubscriber(client, 'onMemberAdded', 'v3.channel.didAddUsers', filter);
+};

package/src/channel/events/onMemberRemoved.ts

@@ -1,7 +1,7 @@
-import { getActiveClient } from '~/client/api'
-import { createEventSubscriber } from '~/core/events'
+import { getActiveClient } from '~/client/api';
+import { createEventSubscriber } from '~/core/events';
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 /**
  * ```js
@@ -19,17 +19,12 @@ import { ingestInCache } from '~/cache/api/ingestInCache'
  * @category Channel Events
  */
 export const onMemberRemoved = (callback: Amity.Listener<Amity.Channel>) => {
-  const client = getActiveClient()
+  const client = getActiveClient();
 
   const filter = (payload: Amity.ChannelPayload) => {
-    ingestInCache(payload)
-    callback(payload.channels[0])
-  }
+    ingestInCache(payload);
+    callback(payload.channels[0]);
+  };
 
-  return createEventSubscriber(
-    client,
-    'onMemberRemoved',
-    'v3.channel.didRemoveUsers',
-    filter
-  )
-}
+  return createEventSubscriber(client, 'onMemberRemoved', 'v3.channel.didRemoveUsers', filter);
+};

package/src/channel/observers/index.ts

@@ -1 +1 @@
-export * from './observeChannel'
+export * from './observeChannel';

package/src/channel/observers/observeChannel.ts

@@ -1,8 +1,8 @@
-import { createQuery, runQuery } from '~/core/query/query'
+import { createQuery, runQuery } from '~/core/query/query';
 
-import { getActiveClient } from '~/client/api'
+import { getActiveClient } from '~/client/api';
 
-import { getChannel } from '../api'
+import { getChannel } from '../api';
 
 import {
   onChannelUpdated,
@@ -11,7 +11,7 @@ import {
   onChannelLeft,
   onMemberAdded,
   onMemberRemoved,
-} from '../events'
+} from '../events';
 
 /**
  * ```js
@@ -37,33 +37,30 @@ export const observeChannel = <
     'onJoin',
     'onLeft',
     'onMemberAdded',
-    'onMemberRemoved'
-  ]
+    'onMemberRemoved',
+  ],
 >(
   channelId: string,
-  callback: Amity.ObjectListener<Amity.Snapshot<Amity.Channel>, Events>
+  callback: Amity.ObjectListener<Amity.Snapshot<Amity.Channel>, Events>,
 ): Amity.Unsubscriber => {
-  const { log } = getActiveClient()
+  const { log } = getActiveClient();
 
-  const timestamp = Date.now()
-  log(`observeChannel(tmpid: ${timestamp}) > listen`)
+  const timestamp = Date.now();
+  log(`observeChannel(tmpid: ${timestamp}) > listen`);
 
   // wrapper function to make sure
-  const router = (
-    result: Amity.Snapshot<Amity.Channel>,
-    action: Events[number]
-  ) => {
+  const router = (result: Amity.Snapshot<Amity.Channel>, action: Events[number]) => {
     // filter function
-    if (result.data?.channelId !== channelId) return
+    if (result.data?.channelId !== channelId) return;
 
-    if (callback instanceof Function) return callback(result)
+    if (callback instanceof Function) return callback(result);
 
-    if (action !== 'onFetch') callback.onEvent?.(action, result)
+    if (action !== 'onFetch') callback.onEvent?.(action, result);
 
-    callback[action]?.(result)
-  }
+    callback[action]?.(result);
+  };
 
-  const disposers: Amity.Unsubscriber[] = []
+  const disposers: Amity.Unsubscriber[] = [];
 
   disposers.push(
     onChannelUpdated(data => router({ data, loading: false, origin: 'event' }, 'onUpdate')),
@@ -71,16 +68,13 @@ export const observeChannel = <
     onChannelJoined(data => router({ data, loading: false, origin: 'event' }, 'onJoin')),
     onChannelLeft(data => router({ data, loading: false, origin: 'event' }, 'onLeft')),
     onMemberAdded(data => router({ data, loading: false, origin: 'event' }, 'onMemberAdded')),
-    onMemberRemoved(data => router({ data, loading: false, origin: 'event' }, 'onMemberRemoved'))
-  )
+    onMemberRemoved(data => router({ data, loading: false, origin: 'event' }, 'onMemberRemoved')),
+  );
 
-  runQuery(
-    createQuery(getChannel, channelId),
-    result => result.data && router(result, 'onFetch')
-  )
+  runQuery(createQuery(getChannel, channelId), result => result.data && router(result, 'onFetch'));
 
   return () => {
-    log(`observeChannel(tmpid: ${timestamp}) > dispose`)
-    disposers.forEach(fn => fn())
-  }
-}
+    log(`observeChannel(tmpid: ${timestamp}) > dispose`);
+    disposers.forEach(fn => fn());
+  };
+};

package/src/client/api/activeClient.ts

@@ -1,6 +1,6 @@
-import { ASCError } from '~/core/errors'
+import { ASCError } from '~/core/errors';
 
-let activeClient: Amity.Client | null = null
+let activeClient: Amity.Client | null = null;
 
 /**
  * Get the active client
@@ -15,11 +15,11 @@ export const getActiveClient = () => {
       'There is no active client',
       Amity.ClientError.UNKNOWN_ERROR,
       Amity.ErrorLevel.FATAL,
-    )
+    );
   }
 
-  return activeClient!
-}
+  return activeClient!;
+};
 
 /**
  * Sets the active client
@@ -29,5 +29,5 @@ export const getActiveClient = () => {
  * @hidden
  */
 export const setActiveClient = (client: Amity.Client) => {
-  activeClient = client
-}
+  activeClient = client;
+};

package/src/client/api/activeUser.ts

@@ -0,0 +1,26 @@
+import { ASCError } from '~/core/errors';
+
+let activeUser: Pick<Amity.User, '_id' | 'userId' | 'path'> | null = null;
+
+/**
+ * for internal use
+ */
+export const getActiveUser = () => {
+  if (!activeUser) {
+    throw new ASCError(
+      'Connect client first',
+      Amity.ClientError.UNKNOWN_ERROR,
+      Amity.ErrorLevel.FATAL,
+    );
+  }
+
+  return activeUser!;
+};
+
+export const setActiveUser = (user: Amity.User) => {
+  activeUser = {
+    _id: user._id,
+    userId: user.userId,
+    path: user.path,
+  };
+};

package/src/client/api/connectClient.ts

@@ -1,11 +1,14 @@
-import { disconnectClient } from '~/client/api/disconnectClient'
-import { getDeviceId } from '~/core/device'
-import { proxyMqttEvents, proxyWebsocketEvents } from '~/core/events'
+/* eslint-disable no-param-reassign */
+/* eslint-disable require-atomic-updates */
+import { disconnectClient } from '~/client/api/disconnectClient';
+import { getDeviceId } from '~/core/device';
+import { proxyWebsocketEvents } from '~/core/events';
 
-import { getActiveClient } from './activeClient'
+import { getActiveClient } from './activeClient';
+import { setActiveUser } from './activeUser';
 
-import { getToken } from './getToken'
-import { onClientBanned } from '../events'
+import { getToken } from './getToken';
+import { onClientBanned } from '../events';
 
 /**
  * ```js
@@ -27,47 +30,48 @@ import { onClientBanned } from '../events'
  * @async
  */
 export const connectClient = async (params: {
-  userId: Amity.User['userId'],
-  displayName?: Amity.User['displayName'],
-  authToken?: string,
-  deviceId?: Amity.Device['deviceId'],
+  userId: Amity.User['userId'];
+  displayName?: Amity.User['displayName'];
+  authToken?: string;
+  deviceId?: Amity.Device['deviceId'];
 }): Promise<boolean> => {
-  const client = getActiveClient()
-  client.log('client/api/connectClient', {apiKey: client.apiKey, ...params})
+  const client = getActiveClient();
+  client.log('client/api/connectClient', { apiKey: client.apiKey, ...params });
 
   // default values
-  params.displayName ??= params.userId
-  params.deviceId ??= getDeviceId()
+  params.displayName ??= params.userId;
+  params.deviceId ??= getDeviceId();
 
   // @ts-ignore: in that particular case, typing can be
   // ignored since we enforce default values just before.
-  const { accessToken, users } = await getToken(params)
+  const { accessToken, users } = await getToken(params);
 
   // manually setup the token for http transport
-  client.http.defaults.headers.common['Authorization'] = `Bearer ${accessToken}`
+  client.http.defaults.headers.common.Authorization = `Bearer ${accessToken}`;
 
   // manually setup the token for ws transport
-  client.ws.io.opts.query = {token: accessToken}
+  client.ws.io.opts.query = { token: accessToken };
 
   // FIXME: events are duplicated if connectClient is called few times without disconnectClient
   // wire websocket events to our event emitter
-  proxyWebsocketEvents(client.ws, client.emitter)
+  proxyWebsocketEvents(client.ws, client.emitter);
 
   // TODO: in phase 2, this should not be necessary. we should have WS
   // to be connected "on demand" rather than "by default"
   await new Promise(resolve => {
-    client.ws.once('connect', resolve)
-    client.ws.open()
-  })
+    client.ws.once('connect', resolve);
+    client.ws.open();
+  });
 
   const unsubscribe = onClientBanned(() => {
-    disconnectClient()
-    unsubscribe()
-  })
+    disconnectClient();
+    unsubscribe();
+  });
 
-  client.userId = params.userId
-  client._internalUserId = users[0]._id
-  client.accessToken = accessToken
+  client.userId = params.userId;
+  client.accessToken = accessToken;
 
-  return client.ws.connected
-}
+  setActiveUser(users[0]);
+
+  return client.ws.connected;
+};

package/src/client/api/createClient.ts

@@ -1,13 +1,17 @@
-import { VERSION } from '~/version'
+import { VERSION } from '~/version';
 
-import { createLogger } from '~/core/debug'
+import { createLogger } from '~/core/debug';
 
-import { API_ENDPOINT, getUrlFromTemplate, UrlTemplate } from '~/core/network'
-import { createHttpTransport, createMqttTransport, createWebsocketTransport } from '~/core/transports'
+import { API_REGIONS, computeUrl } from '~/client/utils/endpoints';
+import {
+  createHttpTransport,
+  createMqttTransport,
+  createWebsocketTransport,
+} from '~/core/transports';
 
-import { createEventEmitter } from '~/core/events'
+import { createEventEmitter } from '~/core/events';
 
-import { getActiveClient, setActiveClient } from './activeClient'
+import { getActiveClient, setActiveClient } from './activeClient';
 
 /**
  * ```js
@@ -18,29 +22,29 @@ import { getActiveClient, setActiveClient } from './activeClient'
  * Creates a new {@link Amity.Client} instance
  *
  * @param apiKey for the {@link Amity.Client} instance
- * @param apiEndpoint endpoint to connect to
+ * @param apiRegion endpoint to connect to
  * @param debugSession session's identifier for the client's logger instance
  * @returns A {@link Amity.Client} instance
  *
  * @category Client API
- **/
+ * */
 export const createClient = (
   apiKey: string,
-  apiEndpoint: typeof API_ENDPOINT[keyof typeof API_ENDPOINT]|string = API_ENDPOINT.SG,
-  debugSession: string = 'amity'
+  apiRegion: typeof API_REGIONS[keyof typeof API_REGIONS] = API_REGIONS.SG,
+  debugSession = 'amity',
 ): Amity.Client => {
-  const log = createLogger(debugSession)
+  const log = createLogger(debugSession);
 
   log('client/api/createClient', {
     apiKey: apiKey.replace(/.{5}$/g, 'xxxxx'),
-    apiEndpoint,
-  })
+    apiRegion,
+  });
 
-  const http = createHttpTransport(getUrlFromTemplate(UrlTemplate.HTTP, apiEndpoint))
-  const ws = createWebsocketTransport(getUrlFromTemplate(UrlTemplate.HTTP, apiEndpoint))
-  const mqtt = createMqttTransport(getUrlFromTemplate(UrlTemplate.MQTT, apiEndpoint));
+  const http = createHttpTransport(computeUrl('http', apiRegion));
+  const ws = createWebsocketTransport(computeUrl('http', apiRegion));
+  const mqtt = createMqttTransport(computeUrl('mqtt', apiRegion));
 
-  const emitter = createEventEmitter()
+  const emitter = createEventEmitter();
 
   const client = {
     version: `${VERSION}`,
@@ -52,13 +56,13 @@ export const createClient = (
     mqtt,
     emitter,
     use: () => setActiveClient(client),
-  }
+  };
 
   try {
-    getActiveClient()
+    getActiveClient();
   } catch {
-    setActiveClient(client)
+    setActiveClient(client);
   }
 
-  return client
-}
+  return client;
+};

package/src/client/api/disconnectClient.ts

@@ -1,4 +1,4 @@
-import { getActiveClient } from './activeClient'
+import { getActiveClient } from './activeClient';
 
 /**
  * ```js
@@ -15,21 +15,21 @@ import { getActiveClient } from './activeClient'
  * @async
  */
 export const disconnectClient = async (): Promise<boolean> => {
-  const client = getActiveClient()
-  client.log('client/api/disconnectClient')
+  const client = getActiveClient();
+  client.log('client/api/disconnectClient');
 
   await new Promise(resolve => {
-    client.ws.once('disconnect', resolve)
-    client.ws.disconnect()
-    client.mqtt.disconnect()
-  })
+    client.ws.once('disconnect', resolve);
+    client.ws.disconnect();
+    client.mqtt.disconnect();
+  });
 
-  client.emitter.all.clear()
+  client.emitter.all.clear();
   // FIXME: it removes listener in ws.ts, it breaks global ban event
-  client.ws.removeAllListeners()
-  client.mqtt.removeAllListeners()
-  client.userId = undefined
-  client.accessToken = undefined
+  client.ws.removeAllListeners();
+  client.mqtt.removeAllListeners();
+  client.userId = undefined;
+  client.accessToken = undefined;
 
-  return !client.ws.connected
-}
+  return !client.ws.connected;
+};