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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "0.0.1-beta.14",
+  "version": "0.0.1-beta.15",
   "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

@@ -6,7 +6,7 @@ declare global {
   namespace Amity {
     type Listener<T = any> = (params: T) => void
 
-    type ObjectListener<T, K extends string[]> = {
+    type ObjectListener<T, K extends string[]> = Listener<T> | {
       onEvent?: (event: K[number], params: T) => void
     } & {
       [P in K[number]]?: Listener<T>

package/src/client/api/createClient.ts

@@ -2,7 +2,7 @@ import { VERSION } from '~/version'
 
 import { createLogger } from '~/core/debug'
 
-import { API_ENDPOINT, getUrlFromTemplate, UrlTemplate } from '~/core/network'
+import { API_REGIONS, computeUrl } from '~/client/utils/endpoints'
 import { createHttpTransport, createMqttTransport, createWebsocketTransport } from '~/core/transports'
 
 import { createEventEmitter } from '~/core/events'
@@ -18,7 +18,7 @@ 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
  *
@@ -26,19 +26,19 @@ import { getActiveClient, setActiveClient } from './activeClient'
  **/
 export const createClient = (
   apiKey: string,
-  apiEndpoint: typeof API_ENDPOINT[keyof typeof API_ENDPOINT]|string = API_ENDPOINT.SG,
+  apiRegion: typeof API_REGIONS[keyof typeof API_REGIONS] = API_REGIONS.SG,
   debugSession: string = 'amity'
 ): Amity.Client => {
   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()
 

package/src/client/utils/endpoints.ts

@@ -0,0 +1,14 @@
+export const API_REGIONS = {
+  EU: 'eu',
+  SG: 'sg',
+  US: 'us',
+} as const
+
+const URLS = {
+  http: 'https://api.{region}.amity.co',
+  mqtt: 'wss://sse.{region}.amity.co:443/mqtt',
+} as const
+
+export function computeUrl(type: keyof typeof URLS, region: string) {
+  return URLS[type].replace('{region}', region)
+}

package/src/index.ts

@@ -10,6 +10,7 @@ export * from './cache/api'
 
 export * from './client/api'
 export * from './client/events'
+export { API_REGIONS } from './client/utils/endpoints'
 
 // asc core
 export * from './user/api'

package/dist/core/network.d.ts

@@ -1,11 +0,0 @@
-export declare const API_ENDPOINT: {
-    readonly EU: "eu";
-    readonly SG: "sg";
-    readonly US: "us";
-};
-export declare enum UrlTemplate {
-    HTTP = "https://api.{region}.amity.co",
-    MQTT = "wss://sse.{region}.amity.co:443/mqtt"
-}
-export declare const getUrlFromTemplate: (template: UrlTemplate, region: string) => string;
-//# sourceMappingURL=network.d.ts.map

package/dist/core/network.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/core/network.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY;;;;CAIf,CAAA;AAEV,oBAAY,WAAW;IACrB,IAAI,kCAAkC;IACtC,IAAI,yCAAyC;CAC9C;AAED,eAAO,MAAM,kBAAkB,aAAe,WAAW,UAAU,MAAM,WAExE,CAAA"}

package/src/core/network.ts

@@ -1,14 +0,0 @@
-export const API_ENDPOINT = {
-  EU: 'eu',
-  SG: 'sg',
-  US: 'us',
-} as const
-
-export enum UrlTemplate {
-  HTTP = 'https://api.{region}.amity.co',
-  MQTT = 'wss://sse.{region}.amity.co:443/mqtt',
-}
-
-export const getUrlFromTemplate = ( template: UrlTemplate, region: string ) => {
-  return template.replace( '{region}', region);
-}