terrier-engine 4.14.1 → 4.14.2

package/package.json

@@ -4,7 +4,7 @@
   "files": [
     "*"
   ],
-  "version": "4.14.1",
+  "version": "4.14.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/Terrier-Tech/terrier-engine"

package/terrier/api-subscriber.ts

@@ -2,6 +2,7 @@ import Api, {ApiResponse, noArgListener, Streamer} from "./api"
 import {LogEntry} from "./logging"
 import dayjs from "dayjs"
 import duration from "dayjs/plugin/duration"
+import {Logger} from "tuff-core/logging";
 
 dayjs.extend(duration)
 
@@ -73,10 +74,7 @@ export type CloseEvent = BaseSubscriptionEvent & { _type: '_close' }
  * Each subclass is responsible for providing a constructor with whatever dependencies are required, but all subclasses
  * must implement `params` and `options` properties and handle them appropriately.
  */
-export abstract class ApiSubscriber<TResult, TParams extends SubscriptionParams> {
-
-    public abstract params: TParams
-    public abstract options?: SubscriptionOptions
+export abstract class ApiSubscriber<TResult, TParams extends SubscriptionParams, TOptions extends SubscriptionOptions = SubscriptionOptions> {
 
     protected isSubscribed: boolean = false
 
@@ -84,6 +82,17 @@ export abstract class ApiSubscriber<TResult, TParams extends SubscriptionParams>
     protected lifecycleHandlers: SubscriptionLifecycleHandlers = { onSubscribe: [], onUnsubscribe: [], onClose: [] }
     protected otherHandlers: Record<string, ((event: unknown) => boolean | void)[]> = {}
 
+    /**
+     * @param params   parameters sent with subscription requests to customize server-side behavior
+     * @param options  options that customize client-side behavior of the subscriber
+     * @param logger
+     * @protected
+     */
+    protected constructor(public params: TParams, public options?: TOptions, public logger?: Logger) {
+        this.options ??= {} as TOptions
+        this.logger ??= new Logger(this.constructor.name)
+    }
+
     // Handler registration
 
     /** Register a handler for a custom event type */
@@ -153,9 +162,7 @@ export abstract class ApiSubscriber<TResult, TParams extends SubscriptionParams>
 
     /** Stops the subscription and closes the connection. */
     public unsubscribe(): void {
-        if (!this.isSubscribed) {
-            throw new Error("Can't unsubscribe from a un-started subscription!")
-        }
+        if (!this.isSubscribed) return
         this.unsubscribeImpl()
         this.isSubscribed = false
         this.notifyLifecycle('onUnsubscribe')
@@ -176,6 +183,7 @@ export abstract class ApiSubscriber<TResult, TParams extends SubscriptionParams>
     protected notifyLifecycle(key: keyof SubscriptionLifecycleHandlers): void
     protected notifyLifecycle(key: 'onClose', reason: string | undefined): void
     protected notifyLifecycle(key: keyof SubscriptionLifecycleHandlers, reason: string | undefined = undefined): void {
+        this.logNotification(key, reason)
         if (key == 'onClose') {
             this.lifecycleHandlers[key].forEach(handler => handler(reason))
         } else {
@@ -183,10 +191,47 @@ export abstract class ApiSubscriber<TResult, TParams extends SubscriptionParams>
         }
     }
 
+    protected notifyResult(event: ResultEvent<TResult>) {
+        this.logNotification('_result', event)
+        const shouldContinue = this.eventHandlers.onResult
+            .map(handler => handler(event))
+            .every(b => b)
+        if (!shouldContinue) this.unsubscribe()
+    }
+
+    protected notifyError(event: ErrorEvent) {
+        this.logNotification('_error', event)
+        const shouldContinue = this.eventHandlers.onError
+            .map(handler => handler(event))
+            .every(b => b)
+        if (!shouldContinue) this.unsubscribe()
+    }
+
+    protected notifyLog(event: LogEvent) {
+        this.logNotification('_log', event)
+        this.eventHandlers.onLog.forEach(handler => handler(event))
+    }
+
+    protected notifyOther(key: string, event: any) {
+        this.logNotification(key, event)
+        const shouldContinue = this.otherHandlers[key]
+            .map(handler => handler(event) !== false)
+            .every(b => b)
+        if (!shouldContinue) this.unsubscribe()
+    }
+
+    protected logNotification(key: string, event: any) {
+        if (event === undefined) {
+            this.logger?.debug('notify', key)
+        } else {
+            this.logger?.debug('notify', key, event)
+        }
+    }
+
     /** Subclasses implement this method to start the subscription */
     protected abstract subscribeImpl(): void
 
-    /** Subclasses imlpement this method to end the subscription */
+    /** Subclasses implement this method to end the subscription */
     protected abstract unsubscribeImpl(): void
 }
 
@@ -194,10 +239,12 @@ export abstract class ApiSubscriber<TResult, TParams extends SubscriptionParams>
 // Polling Subscriber
 ////////////////////////////////////////////////////////////////////////////////
 
+type PollingResponse<TResult> = (ApiResponse & SubscriptionEvent<TResult>) | { events: SubscriptionEvent<TResult>[] }
+
 /**
  * An implementation of ApiSubscriber that uses polling to periodically make a request to the server
  */
-export class PollingSubscriber<TResult, TParams extends SubscriptionParams> extends ApiSubscriber<TResult, TParams> {
+export class PollingSubscriber<TResult, TParams extends SubscriptionParams> extends ApiSubscriber<TResult, TParams, (SubscriptionOptions & GetSubscriberOptions)> {
 
     // used to ensure we only schedule one interval at a time and allows for cancellation.
     private timeoutHandle: NodeJS.Timeout | null = null
@@ -207,14 +254,16 @@ export class PollingSubscriber<TResult, TParams extends SubscriptionParams> exte
      * @param params params to use to make the request.
      * @param interval the interval on which to poll. Either a number of milliseconds or a dayjs Duration.
      * @param options extra subscription options
+     * @param logger a specific logger to use
      */
     constructor(
         public url: string,
-        public params: TParams,
         public interval: number | duration.Duration,
-        public options: (SubscriptionOptions & GetSubscriberOptions) | undefined = undefined
+        params: TParams,
+        options?: (SubscriptionOptions & GetSubscriberOptions),
+        logger?: Logger
     ) {
-        super()
+        super(params, options, logger)
     }
 
     subscribeImpl() {
@@ -234,63 +283,49 @@ export class PollingSubscriber<TResult, TParams extends SubscriptionParams> exte
     private makeRequest() {
         this.clearTimeout()
         this.request().then(response => {
-            let shouldContinuePolling = true
             if ('events' in response) {
                 for (const event of response.events) {
-                    shouldContinuePolling &&= this.handleEvent(event)
+                   this.handleEvent(event)
                 }
             } else {
                 if (response.status == 'error') response._type = '_error'
-                shouldContinuePolling = this.handleEvent(response)
+                this.handleEvent(response)
             }
 
-            if (shouldContinuePolling) {
-                this.startTimeout()
-            } else {
-                this.unsubscribe()
-            }
+            this.startTimeout()
         })
     }
 
-    protected request(): Promise<((ApiResponse & SubscriptionEvent<TResult>) | { events: SubscriptionEvent<TResult>[] })> {
+    protected async request(): Promise<PollingResponse<TResult>> {
         const params = Api.objectToQueryParams(this.params, this.options?.snakifyKeys)
-        return Api.get<((ApiResponse & SubscriptionEvent<TResult>) | { events: SubscriptionEvent<TResult>[] })>(this.url, params)
-    }
 
-    protected handleEvent(event: SubscriptionEvent<TResult>): boolean {
-        let shouldContinuePolling = true
+        // Add _polling param so that the server-side can adjust behavior based on whether it is being polled or requested normally.
+        params._polling = true.toString()
+        const result = await Api.get<PollingResponse<TResult>>(this.url, params);
+        this.logger?.debug("polling request", params, result)
+        return result
+    }
 
+    protected handleEvent(event: SubscriptionEvent<TResult>) {
         switch (event._type) {
             case '_result':
             case undefined:
-                for (const handler of this.eventHandlers.onResult) {
-                    const r = handler(event)
-                    shouldContinuePolling &&= r
-                }
+                this.notifyResult(event)
                 break
             case '_error':
-                for (const handler of this.eventHandlers.onError) {
-                    const r = handler(event)
-                    shouldContinuePolling &&= r
-                }
+                this.notifyError(event)
                 break
             case '_log':
-                this.eventHandlers.onLog.forEach(handler => handler(event))
+                this.notifyLog(event)
                 break
             case '_close':
                 this.notifyLifecycle('onClose')
                 this.close()
-                shouldContinuePolling = this.options?.keepAlive ?? false
                 break
             default:
                 const otherEvent = event as any
-                for (const handler of this.otherHandlers[otherEvent._type]) {
-                    const r = handler(otherEvent) ?? true
-                    shouldContinuePolling &&= r
-                }
+                this.notifyOther(otherEvent._type, otherEvent)
         }
-
-        return shouldContinuePolling
     }
 
     protected clearTimeout() {
@@ -301,8 +336,12 @@ export class PollingSubscriber<TResult, TParams extends SubscriptionParams> exte
     }
 
     protected startTimeout() {
+        if (!this.isSubscribed) return
         if (this.timeoutHandle) return
         const intervalMs = (dayjs.isDuration(this.interval)) ? this.interval.asMilliseconds() : this.interval
+
+        this.logger?.debug("polling in", intervalMs, "milliseconds")
+
         this.timeoutHandle = setTimeout(this.makeRequest.bind(this), intervalMs)
     }
 }
@@ -319,11 +358,12 @@ export class CableSubscriber<TResult, TParams extends SubscriptionParams> extend
 
     constructor(
         public channelName: string,
-        public params: TParams,
-        public options: SubscriptionOptions | undefined = undefined
+        params: TParams,
+        options?: SubscriptionOptions,
+        logger?: Logger,
     ) {
         throw new Error("Method not implemented.")
-        super()
+        super(params, options, logger)
     }
 
     public updateParams(_newParams: TParams): void {
@@ -341,72 +381,59 @@ export class CableSubscriber<TResult, TParams extends SubscriptionParams> extend
 // Event Stream Subscriber
 ////////////////////////////////////////////////////////////////////////////////
 
-export class StreamingSubscriber<TResult, TParams extends SubscriptionParams> extends ApiSubscriber<TResult, TParams> {
+export class StreamingSubscriber<TResult, TParams extends SubscriptionParams> extends ApiSubscriber<TResult, TParams, (SubscriptionOptions & GetSubscriberOptions)> {
 
     private streamer?: Streamer
 
     constructor(
         public url: string,
-        public params: TParams,
-        public options: (SubscriptionOptions & GetSubscriberOptions) | undefined = undefined,
+        params: TParams,
+        options?: (SubscriptionOptions & GetSubscriberOptions),
+        logger?: Logger
     ) {
-        super()
+        super(params, options, logger)
     }
 
     public on<EventType>(eventType: string, handler: (event: EventType) => boolean | void): this {
-        this.streamer?.on(eventType, handler)
+        if (!(eventType in this.otherHandlers) && this.streamer) {
+            this.listenOther(eventType, this.streamer)
+        }
         return super.on(eventType, handler)
     }
 
-    public onResult(handler: (result: ResultEvent<TResult>) => boolean): this {
-        this.streamer?.on<ResultEvent<TResult>>('_result', handler)
-        return super.onResult(handler)
-    }
-
-    public onError(handler: (error: ErrorEvent) => boolean): this {
-        this.streamer?.on<ErrorEvent>('_error', handler)
-        return super.onError(handler)
-    }
-
-    public onLog(handler: (logEntry: LogEvent) => void): this {
-        this.streamer?.on<LogEvent>('_log', handler)
-        return super.onLog(handler)
+    public updateParams(newParams: TParams): void {
+        this.unsubscribeImpl()
+        this.params = newParams
+        this.subscribeImpl()
     }
 
     protected subscribeImpl(): void {
         const params = Api.objectToQueryParams(this.params, this.options?.snakifyKeys)
-        const fullUrl = new URLSearchParams(params).toString()
-        const streamer = new Streamer(fullUrl, this.options ?? {})
-
-        this.eventHandlers.onResult.forEach(handler => streamer.on<ResultEvent<TResult>>('_result', this.wrapHandler(handler)))
-        this.eventHandlers.onError.forEach(handler => streamer.on<ErrorEvent>('_error', this.wrapHandler(handler)))
-        this.eventHandlers.onLog.forEach(handler => streamer.on<LogEvent>('_log', handler))
-        this.lifecycleHandlers.onClose.forEach(handler => streamer.onClose(handler))
-        streamer.onClose(() => {
-            this.close()
+        const paramsString = new URLSearchParams(params).toString()
+        const streamer = new Streamer(`${this.url}?${paramsString}`, this.options ?? {})
+
+        streamer
+            .on<ResultEvent<TResult>>('_result', this.notifyResult.bind(this))
+            .on<ErrorEvent>('_error', this.notifyError.bind(this))
+            .on<LogEvent>('_log', this.notifyLog.bind(this))
+            .onClose(() => {
+                this.close()
+                this.notifyLifecycle('onClose')
+            })
+
+        Object.keys(this.otherHandlers).forEach(key => {
+            this.listenOther(key, streamer)
         })
-        Object.entries(this.otherHandlers)
-            .forEach(([key, handlers]) =>
-                handlers.forEach(handler => streamer.on(key, this.wrapHandler(handler)))
-            )
 
         this.streamer = streamer
     }
+
     protected unsubscribeImpl(): void {
         this.streamer?.sse.close()
         this.streamer = undefined
     }
 
-    public updateParams(newParams: TParams): void {
-        this.unsubscribeImpl()
-        this.params = newParams
-        this.subscribeImpl()
-    }
-
-    private wrapHandler<T>(handler: (param: T) => boolean | void): (param: T) => void {
-        return (param: T) => {
-            const shouldContinue = handler(param) ?? true
-            if (!shouldContinue) this.unsubscribe()
-        }
+    protected listenOther(key: string, streamer: Streamer) {
+        streamer.on(key, (event) => this.notifyOther(key, event))
     }
-}
+}