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

package/dist/message/api/createMessage.d.ts

@@ -16,7 +16,7 @@
  * @async
  */
 export declare const createMessage: {
-    <T extends Amity.MessageContentType>(bundle: Pick<Amity.Message<T>, "type" | "channelId" | "data" | "metadata">): Promise<Amity.Cached<Amity.Message>>;
+    <T extends Amity.MessageContentType>(bundle: Pick<Amity.Message<T>, "type" | "channelId" | "data" | "metadata" | "mentionees">): Promise<Amity.Cached<Amity.Message>>;
     /**
      * ```js
      * import { createMessage } from '@amityco/ts-sdk'
@@ -33,6 +33,6 @@ export declare const createMessage: {
      *
      * @category Message API
      */
-    optimistically(bundle: Pick<Amity.Message, 'channelId' | 'type' | 'data' | 'metadata'>): Amity.Cached<Amity.Message> | undefined;
+    optimistically(bundle: Pick<Amity.Message, 'channelId' | 'type' | 'data' | 'metadata' | 'mentionees'>): Amity.Cached<Amity.Message> | undefined;
 };
 //# sourceMappingURL=createMessage.d.ts.map

package/dist/message/api/createMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createMessage.d.ts","sourceRoot":"","sources":["../../../src/message/api/createMessage.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,aAAa;sHAEvB,QAAQ,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC;IAoBvC;;;;;;;;;;;;;;;OAeG;2BAEO,KAAK,MAAM,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,GACtE,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,SAAS;CApBzC,CAAA"}
+{"version":3,"file":"createMessage.d.ts","sourceRoot":"","sources":["../../../src/message/api/createMessage.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,aAAa;qIAEvB,QAAQ,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC;IAoBvC;;;;;;;;;;;;;;;OAeG;2BAEO,KAAK,MAAM,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,CAAC,GACrF,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,SAAS;CApBzC,CAAA"}

package/dist/message/api/updateMessage.d.ts

@@ -16,7 +16,7 @@
  * @async
  */
 export declare const updateMessage: {
-    (messageId: Amity.Message['messageId'], patch: Patch<Amity.Message, 'data' | 'metadata'>): Promise<Amity.Cached<Amity.Message>>;
+    (messageId: Amity.Message['messageId'], patch: Patch<Amity.Message, 'data' | 'metadata' | 'mentionees'>): Promise<Amity.Cached<Amity.Message>>;
     /**
      * ```js
      * import { updateMessage } from '@amityco/ts-sdk'
@@ -33,6 +33,6 @@ export declare const updateMessage: {
      *
      * @category Message API
      */
-    optimistically(messageId: Amity.Message['messageId'], patch: Patch<Amity.Message, 'data' | 'metadata'>): Amity.Cached<Amity.Message> | undefined;
+    optimistically(messageId: Amity.Message['messageId'], patch: Patch<Amity.Message, 'data' | 'metadata' | 'mentionees'>): Amity.Cached<Amity.Message> | undefined;
 };
 //# sourceMappingURL=updateMessage.d.ts.map

package/dist/message/api/updateMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateMessage.d.ts","sourceRoot":"","sources":["../../../src/message/api/updateMessage.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,aAAa;gBACb,MAAM,OAAO,CAAC,WAAW,CAAC,SAC9B,MAAM,MAAM,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,GAC/C,QAAQ,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC;IAmBvC;;;;;;;;;;;;;;;OAeG;8BAEU,MAAM,OAAO,CAAC,WAAW,CAAC,SAC9B,MAAM,MAAM,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,GAC/C,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,SAAS;CArBzC,CAAA"}
+{"version":3,"file":"updateMessage.d.ts","sourceRoot":"","sources":["../../../src/message/api/updateMessage.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,aAAa;gBACb,MAAM,OAAO,CAAC,WAAW,CAAC,SAC9B,MAAM,MAAM,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,YAAY,CAAC,GAC9D,QAAQ,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,CAAC;IAmBvC;;;;;;;;;;;;;;;OAeG;8BAEU,MAAM,OAAO,CAAC,WAAW,CAAC,SAC9B,MAAM,MAAM,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,YAAY,CAAC,GAC9D,MAAM,MAAM,CAAC,MAAM,OAAO,CAAC,GAAG,SAAS;CArBzC,CAAA"}

package/dist/post/api/createPost.d.ts

@@ -16,10 +16,14 @@
  * @category Post API
  * @async
  */
-export declare const createPost: <T extends string>(bundle: Pick<Amity.Post<any>, "targetType" | "targetId" | "metadata"> & {
+export declare const createPost: <T extends string>(bundle: Pick<Amity.Post<any>, "targetType" | "targetId" | "metadata" | "mentionees"> & {
     dataType?: T | undefined;
-    data: {
+    data?: {
         [k: string]: any;
-    };
+    } | undefined;
+    attachments?: {
+        type: T;
+        fileId: Amity.File['fileId'];
+    }[] | undefined;
 }) => Promise<Amity.Cached<Amity.Post>>;
 //# sourceMappingURL=createPost.d.ts.map

package/dist/post/api/createPost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPost.d.ts","sourceRoot":"","sources":["../../../src/post/api/createPost.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU;;;;;MAIpB,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAuBlC,CAAA"}
+{"version":3,"file":"createPost.d.ts","sourceRoot":"","sources":["../../../src/post/api/createPost.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU;;;;;;;gBAIc,UAAU,CAAC,QAAQ,CAAC;;MAEtD,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAuBlC,CAAA"}

package/dist/post/api/queryPosts.d.ts

@@ -23,8 +23,8 @@ export declare const queryPosts: {
         feedType?: 'reviewing' | 'published';
         tags?: Amity.Taggable['tags'];
         matchingOnlyParentPost?: boolean;
-        page?: Amity.Page;
-    }): Promise<Amity.Cached<Amity.PagedRaw<Amity.Post>>>;
+        page?: Amity.PageRaw;
+    }): Promise<Amity.Cached<Amity.Paged<Amity.Post>>>;
     /**
      * ```js
      * import { queryPosts } from '@amityco/ts-sdk'
@@ -38,6 +38,6 @@ export declare const queryPosts: {
      *
      * @category Post API
      */
-    locally(query: Parameters<typeof queryPosts>[0]): Amity.Cached<Amity.PagedRaw<Amity.Post>> | undefined;
+    locally(query: Parameters<typeof queryPosts>[0]): Amity.Cached<Amity.Paged<Amity.Post>> | undefined;
 };
 //# sourceMappingURL=queryPosts.d.ts.map

package/dist/post/api/queryPosts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryPosts.d.ts","sourceRoot":"","sources":["../../../src/post/api/queryPosts.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU;YACd;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;QACrC,MAAM,CAAC,EAAE,aAAa,GAAG,cAAc,GAAG,aAAa,GAAG,cAAc,CAAA;QACxE,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC,WAAW,CAAC,CAAA;QACnC,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,QAAQ,CAAC,EAAE,WAAW,GAAG,WAAW,CAAA;QACpC,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAA;QAChC,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;KAClB,GACA,QAAQ,MAAM,MAAM,CAAC,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAuCpD;;;;;;;;;;;;OAYG;mBAEM,WAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,MAAM,CAAC,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,SAAS;CAjBtD,CAAA"}
+{"version":3,"file":"queryPosts.d.ts","sourceRoot":"","sources":["../../../src/post/api/queryPosts.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,UAAU;YACd;QACL,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;QACrC,MAAM,CAAC,EAAE,aAAa,GAAG,cAAc,GAAG,aAAa,GAAG,cAAc,CAAA;QACxE,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC,WAAW,CAAC,CAAA;QACnC,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,QAAQ,CAAC,EAAE,WAAW,GAAG,WAAW,CAAA;QACpC,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAA;QAChC,IAAI,CAAC,EAAE,MAAM,OAAO,CAAA;KACrB,GACA,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAuCjD;;;;;;;;;;;;OAYG;mBAEM,WAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,GACtC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,SAAS;CAjBnD,CAAA"}

package/dist/post/api/updatePost.d.ts

@@ -15,5 +15,5 @@
  * @category Post API
  * @async
  */
-export declare const updatePost: (postId: Amity.Post['postId'], patch: Patch<Amity.Post, 'data' | 'metadata'>) => Promise<Amity.Cached<Amity.Post>>;
+export declare const updatePost: (postId: Amity.Post['postId'], patch: Patch<Amity.Post, 'data' | 'metadata' | 'mentionees'>) => Promise<Amity.Cached<Amity.Post>>;
 //# sourceMappingURL=updatePost.d.ts.map

package/dist/post/api/updatePost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updatePost.d.ts","sourceRoot":"","sources":["../../../src/post/api/updatePost.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,IAAI,CAAC,QAAQ,CAAC,SACrB,MAAM,MAAM,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC,KAC5C,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAoBlC,CAAA"}
+{"version":3,"file":"updatePost.d.ts","sourceRoot":"","sources":["../../../src/post/api/updatePost.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,WACb,MAAM,IAAI,CAAC,QAAQ,CAAC,SACrB,MAAM,MAAM,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,YAAY,CAAC,KAC3D,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAoBlC,CAAA"}

package/dist/role/api/queryRoles.d.ts

@@ -17,7 +17,7 @@ export declare const queryRoles: {
     (query?: {
         displayName?: string | undefined;
         sortBy?: "displayName" | "firstCreated" | "lastCreated" | undefined;
-        page?: Amity.Page | undefined;
+        page?: Amity.Page<number> | undefined;
     } | undefined): Promise<Amity.Cached<Amity.Paged<Amity.Role>>>;
     /**
      * ```js

package/dist/stream/api/queryStreams.d.ts

@@ -19,7 +19,7 @@ export declare const queryStreams: {
         userPublicIds?: string[] | undefined;
         sortBy?: "lastCreated" | "firstCreated" | undefined;
         isDeleted?: Amity.Stream['isDeleted'];
-        page?: Amity.Page | undefined;
+        page?: Amity.Page<number> | undefined;
     } | undefined): Promise<Amity.Cached<Amity.Paged<Amity.Stream>>>;
     /**
      * ```js

package/dist/utils/env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+export declare const safeProcess: Partial<NodeJS.Process>;
+export declare function getEnv(): NodeJS.ProcessEnv;
+export declare const isProduction: boolean;
+//# sourceMappingURL=env.d.ts.map

package/dist/utils/env.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/utils/env.ts"],"names":[],"mappings":";AAEA,eAAO,MAAiB,WAAW,yBAAyD,CAAA;AAE5F,wBAAgB,MAAM,sBAAmC;AAEzD,eAAO,MAAM,YAAY,SAA6C,CAAA"}

package/dist/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,OAAO,QAAmC,CAAA"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,OAAO,QAAwC,CAAA"}

package/package.json

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

@@ -43,6 +43,7 @@ export default [
     plugins: [
       ...config.plugins,
       replace({
+        'process.env.NODE_ENV': `'${process.env.NODE_ENV}'`,
         'process.env.VERSION': `'v${pkg.version}-esm'`,
       }),
     ],
@@ -59,6 +60,7 @@ export default [
     plugins: [
       ...config.plugins,
       replace({
+        'process.env.NODE_ENV': `'${process.env.NODE_ENV}'`,
         'process.env.VERSION': `'v${pkg.version}-cjs'`,
       }),
     ],
@@ -73,6 +75,7 @@ export default [
     plugins: [
       ...config.plugins,
       replace({
+        'process.env.NODE_ENV': `'${process.env.NODE_ENV}'`,
         'process.env.VERSION': `'v${pkg.version}-umd'`,
       }),
       terser(),

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

@@ -49,11 +49,11 @@ declare global {
      * Minimal CacheEntry alias, used mostly
      */
      type Cached<T extends unknown = unknown> = (
-      T extends (Amity.PagedRaw<any> | Amity.Paged<any>)
+      T extends Amity.Paged<any>
         ? T
         : { data: T }
      ) & {
-      cachedAt?: CacheOptions['cachedAt']
+      cachedAt: CacheOptions['cachedAt']
     }
 
     /**

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/@types/core/paging.ts

@@ -2,6 +2,32 @@ export {}
 
 declare global {
   namespace Amity {
+    type PaginationStyles = 'skiplimit' | 'afterbefore' | 'afterbeforeraw'
+
+    type Paging = {
+      limit: number
+    }
+
+    type PrevPage<T extends number | string = number> = Paging & {
+      after?: never
+      before?: T
+    }
+
+    type NextPage<T extends number | string = number> = Paging & {
+      after?: T
+      before?: never
+    }
+
+    type Page<T extends number | string = number> = (PrevPage<T> | NextPage<T>)
+
+    /*
+      updatedAt is here because if you need sort by updatedAt you
+      need to include this data in query also
+    */
+    type PageRaw = Page<string> & {
+      updatedAt?: string
+    }
+
     type SkipLimitPagination = {
       skip?: number
       limit?: number
@@ -22,54 +48,13 @@ declare global {
       last?: number
     }
 
-    type PrevPage = {
-      after?: never
-      before?: number
-      limit: number
-    }
-
-    type NextPage = {
-      after?: number
-      before?: never
-      limit: number
-    }
-
-    type Page = (PrevPage | NextPage)
+    type AfterBeforeRawPagination = PageRaw
 
     type Pages = {
-      nextPage?: Page | null
-      prevPage?: Page | null
+      nextPage?: (Page | PageRaw) | null
+      prevPage?: (Page | PageRaw) | null
     }
 
     type Paged<T> = { data: T[] } & Pages
-
-    type AfterBeforeRawPagination = {
-      before?: string
-      after?: string
-      updatedAt?: string
-    }
-
-    type PrevPageRaw = {
-      after?: never
-      before?: string
-      limit: number
-      updatedAt?: string
-    }
-
-    type NextPageRaw = {
-      after?: string
-      before?: never
-      limit: number
-      updatedAt?: string
-    }
-
-    type PageRaw = (PrevPageRaw | NextPageRaw)
-
-    type PagesRaw = {
-      nextPage?: PageRaw | null
-      prevPage?: PageRaw | null
-    }
-
-    type PagedRaw<T> = { data: T[] } & PagesRaw
   }
 }

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

@@ -46,9 +46,13 @@ declare global {
     }
 
     type Snapshot<T> = (
-      T extends Amity.Cached<infer K> ? { data: K } :
-      T extends (Amity.PagedRaw<any> | Amity.Paged<any>) ? T :
-      { data: T }
+      T extends Amity.Cached<infer T2>
+        ? T2 extends Amity.Paged<infer T3>
+          ? { data: T3[] | undefined } & Pages & { cachedAt?: CacheOptions['cachedAt'] }
+          : { data: T2 }  & { cachedAt?: CacheOptions['cachedAt'] }
+        : T extends Amity.Paged<infer T3>
+          ? { data: T3[] | undefined } & Pages
+          : { data: T | undefined }
     ) & SnapshotOptions
   }
 }

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

@@ -18,7 +18,7 @@ declare global {
 
       apiKey?: string
       userId?: string
-      user?: Amity.User
+      _internalUserId?: string
       accessToken?: string
 
       use: () => void

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

@@ -22,5 +22,6 @@ declare global {
     & Amity.Timestamps
     & Amity.SoftDelete
     & Amity.Subscribable
+    & Amity.Mentionable<'user'>
   }
 }

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

@@ -2,7 +2,7 @@ export {}
 
 declare global {
   namespace Amity {
-    type FileType = 'file' | 'image'
+    type FileType = 'file' | 'image' | 'video'
 
     type FileMetadata = {}
 
@@ -19,6 +19,7 @@ declare global {
     type MetadataFor<T extends FileType> = (
       T extends 'file' ? FileMetadata :
       T extends 'image' ? ImageMetadata :
+      T extends 'video' ? VideoMetadata :
       never
     )
 

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

@@ -0,0 +1,26 @@
+export {}
+
+declare global {
+  namespace Amity {
+    type Mention = {
+      type: "user" | "channel"
+    }
+
+    type ChannelMention = Mention & {
+      type: "channel"
+    }
+
+    type UserMention = Mention & {
+      type: "user", userIds: string[]
+    }
+
+    type MentionType = {
+      "channel": ChannelMention
+      "user": UserMention
+    }
+
+    type Mentionable<T extends keyof MentionType = 'channel' | 'user'> = {
+      mentionees?: (MentionType[T])[]
+    }
+  }
+}

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

@@ -22,5 +22,6 @@ declare global {
     & Amity.Timestamps
     & Amity.SoftDelete
     & Amity.Reactable
+    & Amity.Mentionable<'user' | 'channel'>
   }
 }

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

@@ -5,7 +5,7 @@ declare global {
     // bad hack until we get proper feed objects in backend
     type PostTargetType = Amity.FeedType | 'content'
 
-    type PostContentType = ('text' | 'image' | 'file')
+    type PostContentType = ('text' | 'image' | 'file' | 'video')
 
     type Post<T extends PostContentType = any> = {
       postId: string
@@ -28,5 +28,6 @@ declare global {
     & Amity.Timestamps
     & Amity.SoftDelete
     & Amity.Subscribable
+    & Amity.Mentionable<'user'>
   }
 }

package/src/@types/index.ts

@@ -29,3 +29,5 @@ import './domains/post'
 import './domains/comment'
 
 import './domains/stream'
+
+import './domains/mention'

package/src/channel/api/queryChannelMembers.ts

@@ -44,6 +44,7 @@ export const queryChannelMembers = async (query: {
   const { paging, ...payload } = data
   const { channelUsers } = payload
 
+  const cachedAt = client.cache && Date.now()
   if (client.cache) {
     ingestInCache(payload as Amity.ChannelMembershipPayload)
   }
@@ -51,7 +52,7 @@ export const queryChannelMembers = async (query: {
   const nextPage = toPage(paging.next)
   const prevPage = toPage(paging.previous)
 
-  return { data: channelUsers, nextPage, prevPage }
+  return { data: channelUsers, cachedAt, nextPage, prevPage }
 }
 
 /**

package/src/client/api/connectClient.ts

@@ -66,7 +66,7 @@ export const connectClient = async (params: {
   })
 
   client.userId = params.userId
-  client.user = users[0]
+  client._internalUserId = users[0]._id
   client.accessToken = accessToken
 
   return client.ws.connected

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/api/disconnectClient.ts

@@ -29,7 +29,6 @@ export const disconnectClient = async (): Promise<boolean> => {
   client.ws.removeAllListeners()
   client.mqtt.removeAllListeners()
   client.userId = undefined
-  client.user = undefined
   client.accessToken = undefined
 
   return !client.ws.connected

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/comment/api/createComment.ts

@@ -20,7 +20,7 @@ import { getPost } from '~/post/api/getPost'
  * @async
  */
 export const createComment = async <T extends Amity.CommentContentType>(
-  bundle: Pick<Amity.Comment<T>, 'referenceType' | 'referenceId' | 'parentId' | 'data' | 'metadata'>,
+  bundle: Pick<Amity.Comment<T>, 'referenceType' | 'referenceId' | 'parentId' | 'data' | 'metadata' | 'mentionees'>,
 ): Promise<Amity.Cached<Amity.Comment>> => {
   const client = getActiveClient()
   client.log('comment/createComment', bundle)
@@ -29,7 +29,6 @@ export const createComment = async <T extends Amity.CommentContentType>(
     '/api/v3/comments', bundle,
   )
 
-
   const cachedAt = client.cache && Date.now()
   if (client.cache) ingestInCache(data, { cachedAt })
 

package/src/comment/api/updateComment.ts

@@ -22,7 +22,7 @@ import { fireEvent } from '~/core/events'
  */
 export const updateComment = async (
   commentId: Amity.Comment['commentId'],
-  patch: Patch<Amity.Comment, 'data' | 'metadata'>,
+  patch: Patch<Amity.Comment, 'data' | 'metadata' | 'mentionees'>,
 ): Promise<Amity.Cached<Amity.Comment>> => {
   const client = getActiveClient()
   client.log('user/updateComment', patch)

package/src/community/api/queryCommunityMembers.ts

@@ -51,7 +51,7 @@ export const queryCommunityMembers = async (query: {
   const nextPage = toPage(paging.next)
   const prevPage = toPage(paging.previous)
 
-  return { data: communityUsers, nextPage, prevPage }
+  return { data: communityUsers, cachedAt, nextPage, prevPage }
 }
 
 /**

package/src/core/debug.ts

@@ -1,5 +1,7 @@
 import debug from 'debug'
 
+import { isProduction } from '~/utils/env'
+
 /**
  * Creates a pre-configured logger instance
  *
@@ -12,7 +14,7 @@ import debug from 'debug'
 export const createLogger = (session?: string) => {
   const active = (
       `${session?.trim()}`.length > 0
-    && process.env.NODE_ENV !== 'production'
+    && !isProduction
   )
 
   const logger = debug(session!)

package/src/core/device.ts

@@ -1,5 +1,6 @@
 // TODO: find a way to uniquely identify the device
 // import { getStorage } from './storage'
+import { safeProcess } from '~/utils/env'
 
 /** @hidden */
 const VERSION = '11.0.0'
@@ -16,8 +17,8 @@ export const getDeviceId = () => {
 
 /** @hidden */
 export const getDeviceModel = () => {
-  if (process?.versions?.node)
-    return process.versions.node
+  if (safeProcess.versions?.node)
+    return safeProcess.versions.node
 
   if (navigator)
     return `${navigator.product.toLowerCase()}#${navigator.userAgent ?? 'unknown_agent'}`

package/src/core/events.ts

@@ -2,6 +2,8 @@ import mitt from 'mitt'
 
 import { getActiveClient } from '~/client/api/activeClient'
 
+import { scheduleTask } from './microtasks'
+
 // need to sync up the list
 const WS_EVENTS = [
   'disconnected',
@@ -134,5 +136,5 @@ export const fireEvent = <T extends keyof Amity.Events>(
   payload: Amity.Events[T],
 ) => {
   const { emitter } = getActiveClient()
-  setTimeout(() => { emitter.emit(event, payload) }, 0)
+  scheduleTask(() => { emitter.emit(event, payload) })
 }

package/src/core/microtasks.ts

@@ -0,0 +1,27 @@
+let tasks: Function[] = []
+let timer: NodeJS.Timeout
+
+/**
+ * Add a function to run just before the next tick
+ *
+ * @param task function to schedule for later execution
+ */
+export const scheduleTask = (task: Function) => {
+  clearTimeout(timer)
+  tasks.push(task)
+
+  timer = setTimeout(() => {
+    tasks.forEach(fn => fn())
+    tasks = []
+  }, 0)
+}
+
+/**
+ * Cancel the scheduling operation
+ *
+ * @param task function to be removed from later execution
+ */
+export const cancelTask = (task: Function) => {
+  tasks = tasks.filter(fn => fn !== task)
+  if (!tasks.length) clearTimeout(timer)
+}