@tellescope/sdk 1.13.0 → 1.13.2

package/src/sdk.ts

@@ -14,6 +14,7 @@ import {
   AccessPermissions,
   OrganizationLimits,
   SortBy,
+  AnalyticsQuery,
 } from "@tellescope/types-models"
 
 import {
@@ -27,7 +28,7 @@ import {
   CreateFields,
   User,
 } from "@tellescope/types-client"
-import { CustomUpdateOptions, SortOption, S3PresignedPost, UserIdentity, FileDetails, ReactNativeFile, SessionType } from "@tellescope/types-utilities"
+import { CustomUpdateOptions, SortOption, UserIdentity, FileDetails, ReactNativeFile, SessionType } from "@tellescope/types-utilities"
 import { url_safe_path } from "@tellescope/utilities"
 
 import { Session as SessionManager, SessionOptions } from "./session"
@@ -35,6 +36,29 @@ import { Session as SessionManager, SessionOptions } from "./session"
 export * from "./public"
 export * from "./enduser"
 
+
+export const load_all_pages = async <T extends { id: string }>(load: LoadFunction<T>, o?: LoadFunctionArguments<T> & { maxPages?: number }, ) => {
+  const toReturn = [] as T[]
+  const maxPages = o?.maxPages ?? 100000
+
+  let i = 0
+  while (true) {
+    if (i++ > maxPages) break;
+
+    const loaded = await load({ 
+      ...o,
+      limit: 1000, 
+      lastId: toReturn[toReturn.length - 1]?.id,
+    })
+
+    toReturn.push(...loaded)
+
+    if (loaded.length < 1000) break; 
+  }
+
+  return toReturn
+}
+
 export interface LoadFunctionArguments <T> {
   lastId?: string, 
   limit?: number, 
@@ -43,6 +67,7 @@ export interface LoadFunctionArguments <T> {
   from?: Date | number,
   threadKey?: string, 
   filter?: ReadFilter<T>,
+  analyticsQuery?: AnalyticsQuery,
   search?: SearchOptions,
   ids?: string[],
 }
@@ -52,7 +77,6 @@ export type LoadFunction<T> = (o?: LoadFunctionArguments<T>) => Promise<T[]>
 export interface APIQuery<
   N extends keyof ClientModelForName, 
   T=ClientModelForName[N], 
-  Req=ClientModelForName_required[N], 
   CREATE=CreateFields<N>, 
   UPDATE=Omit<Partial<T>, keyof (ClientModelForName_readonly[N] & ClientModelForName_updatesDisabled[N])> & { organizationIds?: string[], sharedWithOrganizations?: string[][] },
 > 

package/src/session.ts

@@ -24,7 +24,7 @@ export interface SessionOptions {
   cacheKey?: string;
   expirationInSeconds?: number,
   enableSocketLogging?: boolean,
-  handleUnauthenticated?: () => Promise<void>;
+  handleUnauthenticated?: () => Promise<any>;
   autoRefreshInMS?: number,
 }
 
@@ -81,6 +81,8 @@ export class Session {
   sessionStart = Date.now();
   AUTO_REFRESH_MS = 3600000 // 1hr elapsed
   lastSocketConnection: number;
+  handlers: Record<string, Function>
+  loadedSocketEvents: Record<string, any[]>
 
   config: { headers: { Authorization: string }};
 
@@ -93,6 +95,9 @@ export class Session {
 
     this.lastSocketConnection = 0;
 
+    this.handlers = {};
+    this.loadedSocketEvents = {};
+
     this.host= o.host ?? DEFAULT_HOST
     this.apiKey = o.apiKey ?? '';
     this.servicesSecret = o.servicesSecret;
@@ -173,8 +178,10 @@ export class Session {
   errorHandler = async (_err: any) => {
     const err = parseError(_err)
     if (err === 'Unauthenticated') {
-      this.clearState()
-      await this.handleUnauthenticated?.()
+      const refreshed = await this.handleUnauthenticated?.()
+      if (!refreshed) {
+        this.clearState()
+      }
     }
 
     return err
@@ -280,25 +287,29 @@ export class Session {
 
   handle_events = ( handlers: { [index: string]: (a: any) => void } ) => {
     for (const handler in handlers) {
-      //todo: Delete me
-      // this.ON(handler, () => console.log("got socket for handler", handler))
+      // load any data that was pushed to this event while handler was off
+      const loadedData = this.loadedSocketEvents[handler]
+      if (Array.isArray(loadedData) && loadedData.length > 0) {
+        this.loadedSocketEvents[handler] = []
 
-      this.ON(handler, handlers[handler])
-    }
+        handlers[handler](loadedData)
+      }
 
-    // this.socket?.onAny((e, v) => console.log('got event', e, v))
-    // console.log('handle_events', Object.keys(handlers))
-    // for (const handler in handlers) this.ON(handler, r => console.log(r, handler))
+      // set handler on to load data directly for an event
+      this.handlers[handler] = handlers[handler]
+    }
   } 
 
   unsubscribe = (roomIds: string[]) => this.EMIT('leave-rooms', { roomIds })
   removeAllSocketListeners = () => {
     if (this.enableSocketLogging) { console.log('removeAllSocketListeners') }
     this.socket?.removeAllListeners()
+    this.handlers = {}
   }
 
   removeListenersForEvent = (event: string) => {
     this.socket?.removeListener(event)
+    delete this.handlers[event]
   }
 
   socket_log = (message: string) => {
@@ -342,9 +353,17 @@ export class Session {
       if (this.enableSocketLogging) { this.socket_log("pong") }
     })
 
-    if (this.enableSocketLogging) {
-      this.socket?.onAny(e => console.log('got socket event in catchall:', e))
-    }
+    // handle events which are sent when handlers may be off
+    this.socket?.onAny((e, v)=> {
+      if (this.handlers[e] && v) {
+        this.handlers[e](v)
+      } else if (Array.isArray(v)) {
+        if (!this.loadedSocketEvents[e]) {
+          this.loadedSocketEvents[e] = []
+        }
+        this.loadedSocketEvents[e].push(...v)
+      }
+    })
 
     this.socket.on('connect', () => {
       if (this.enableSocketLogging) { this.socket_log(`connect, authenticated=${this.socketAuthenticated}`) }

package/src/tests/tests.ts

@@ -3682,15 +3682,18 @@ export const self_serve_appointment_booking_tests = async () => {
     confirmationSMSDisabled: true,
   })
 
+  // ensure it doesn't match current day, to avoid errors on testing
+  const dayOfWeekStartingSundayIndexedByZero = (new Date().getDay() + 1) % 7 
+
   await sdk.api.users.updateOne(sdk.userInfo.id, { 
     weeklyAvailabilities: [
       { 
-        dayOfWeekStartingSundayIndexedByZero: 0, // sunday
+        dayOfWeekStartingSundayIndexedByZero,
         startTimeInMinutes: 60 * 12, // noon,
         endTimeInMinutes: 60 * 13, // 1pm,
       },
       { // include as duplicate of above to ensure it doesn't produce extra availability slots 
-        dayOfWeekStartingSundayIndexedByZero: 0, // sunday
+        dayOfWeekStartingSundayIndexedByZero, // sunday
         startTimeInMinutes: 60 * 12, // noon,
         endTimeInMinutes: 60 * 13, // 1pm,
       },
@@ -3704,7 +3707,7 @@ export const self_serve_appointment_booking_tests = async () => {
   await sdkNonAdmin.api.users.updateOne(sdkNonAdmin.userInfo.id, { 
     weeklyAvailabilities: [
       { 
-        dayOfWeekStartingSundayIndexedByZero: 0, // sunday
+        dayOfWeekStartingSundayIndexedByZero, // sunday
         startTimeInMinutes: 60 * 12, // noon,
         endTimeInMinutes: 60 * 13, // 1pm,
       },

package/src/tests/webhooks_tests.ts

@@ -227,6 +227,7 @@ const endusers_tests = async (isSubscribed: boolean) => {
       delete a.updates?.[0]?.recordBeforeUpdate.lockId
       delete a.updates?.[0]?.recordBeforeUpdate.updatedAt
       delete (enduser as any).updatedAt
+      delete (enduser as any).___didInsert
 
       return (
          objects_equivalent(a.updates?.[0]?.recordBeforeUpdate, enduser)