@haathie/pgmb 0.2.4 → 0.2.5

package/lib/client.d.ts

@@ -1,7 +1,7 @@
 import { type Logger } from 'pino';
 import { PGMBEventBatcher } from './batcher.ts';
 import type { PgClientLike } from './query-types.ts';
-import type { GetWebhookInfoFn, IEphemeralListener, IEventData, IEventHandler, IReadEvent, IReadNextEventsFn, ISplitFn, Pgmb2ClientOpts, registerReliableHandlerParams, RegisterSubscriptionParams } from './types.ts';
+import type { GetWebhookInfoFn, IEphemeralListener, IEventData, IEventHandler, IFindEventsFn, IReadEvent, IReadNextEventsFn, ISplitFn, Pgmb2ClientOpts, registerReliableHandlerParams, RegisterSubscriptionParams } from './types.ts';
 type IReliableListener<T extends IEventData> = {
     type: 'reliable';
     handler: IEventHandler<T>;
@@ -39,12 +39,13 @@ export declare class PgmbClient<T extends IEventData = IEventData> extends PGMBE
     readonly tableMaintenanceMs: number;
     readonly maxActiveCheckpoints: number;
     readonly readNextEvents: IReadNextEventsFn;
+    readonly findEvents?: IFindEventsFn;
     readonly getWebhookInfo: GetWebhookInfoFn;
     readonly webhookHandler: IEventHandler<T>;
     readonly listeners: {
         [subId: string]: IListenerStore<T>;
     };
-    constructor({ client, groupId, logger, sleepDurationMs, readChunkSize, maxActiveCheckpoints, poll, subscriptionMaintenanceMs, webhookHandlerOpts: { splitBy: whSplitBy, ...whHandlerOpts }, getWebhookInfo, tableMaintainanceMs, readNextEvents, ...batcherOpts }: Pgmb2ClientOpts<T>);
+    constructor({ client, groupId, logger, sleepDurationMs, readChunkSize, maxActiveCheckpoints, poll, subscriptionMaintenanceMs, webhookHandlerOpts: { splitBy: whSplitBy, ...whHandlerOpts }, getWebhookInfo, tableMaintainanceMs, readNextEvents, findEvents, ...batcherOpts }: Pgmb2ClientOpts<T>);
     init(): Promise<void>;
     end(): Promise<void>;
     publish(events: T[], client?: PgClientLike): Promise<import("./queries.ts").IWriteEventsResult[]>;

package/lib/client.js

@@ -22,6 +22,7 @@ class PgmbClient extends batcher_ts_1.PGMBEventBatcher {
     tableMaintenanceMs;
     maxActiveCheckpoints;
     readNextEvents;
+    findEvents;
     getWebhookInfo;
     webhookHandler;
     listeners = {};
@@ -35,7 +36,7 @@ class PgmbClient extends batcher_ts_1.PGMBEventBatcher {
     #tableMaintainTask;
     #inMemoryCursor = null;
     #activeCheckpoints = [];
-    constructor({ client, groupId, logger = (0, pino_1.pino)(), sleepDurationMs = 750, readChunkSize = 1000, maxActiveCheckpoints = 10, poll, subscriptionMaintenanceMs = 60 * 1000, webhookHandlerOpts: { splitBy: whSplitBy, ...whHandlerOpts } = {}, getWebhookInfo = () => ({}), tableMaintainanceMs = 5 * 60 * 1000, readNextEvents = queries_ts_1.readNextEvents.run.bind(queries_ts_1.readNextEvents), ...batcherOpts }) {
+    constructor({ client, groupId, logger = (0, pino_1.pino)(), sleepDurationMs = 750, readChunkSize = 1000, maxActiveCheckpoints = 10, poll, subscriptionMaintenanceMs = 60 * 1000, webhookHandlerOpts: { splitBy: whSplitBy, ...whHandlerOpts } = {}, getWebhookInfo = () => ({}), tableMaintainanceMs = 5 * 60 * 1000, readNextEvents = queries_ts_1.readNextEvents.run.bind(queries_ts_1.readNextEvents), findEvents, ...batcherOpts }) {
         super({
             ...batcherOpts,
             logger,
@@ -54,6 +55,7 @@ class PgmbClient extends batcher_ts_1.PGMBEventBatcher {
         this.getWebhookInfo = getWebhookInfo;
         this.tableMaintenanceMs = tableMaintainanceMs;
         this.readNextEvents = readNextEvents;
+        this.findEvents = findEvents;
     }
     async init() {
         this.#endAc = new AbortController();
@@ -230,7 +232,7 @@ class PgmbClient extends batcher_ts_1.PGMBEventBatcher {
                 webhookCount++;
             }
         }
-        const { map: subToEventMap, retryEvents, retryItemCount, } = await (0, retry_handler_ts_1.normaliseRetryEventsInReadEventMap)(rows, this.client);
+        const { map: subToEventMap, retryEvents, retryItemCount } = await (0, retry_handler_ts_1.normaliseRetryEventsInReadEventMap)(rows, this.client, this.findEvents);
         const subs = Object.entries(subToEventMap);
         const checkpoint = {
             activeTasks: 0,

package/lib/retry-handler.d.ts

@@ -1,8 +1,8 @@
 import type { IReadNextEventsResult } from './queries.ts';
 import type { PgClientLike } from './query-types.ts';
-import type { IEventData, IEventHandler, IReadEvent, IRetryHandlerOpts } from './types.ts';
+import type { IEventData, IEventHandler, IFindEventsFn, IReadEvent, IRetryHandlerOpts } from './types.ts';
 export declare function createRetryHandler<T extends IEventData>({ retriesS }: IRetryHandlerOpts, handler: IEventHandler<T>): IEventHandler<T>;
-export declare function normaliseRetryEventsInReadEventMap<T extends IEventData>(rows: IReadNextEventsResult[], client: PgClientLike): Promise<{
+export declare function normaliseRetryEventsInReadEventMap<T extends IEventData>(rows: IReadNextEventsResult[], client: PgClientLike, findEvents?: IFindEventsFn): Promise<{
     map: {
         [sid: string]: IReadEvent<T>[];
     };

package/lib/retry-handler.js

@@ -4,6 +4,7 @@ exports.createRetryHandler = createRetryHandler;
 exports.normaliseRetryEventsInReadEventMap = normaliseRetryEventsInReadEventMap;
 const consts_ts_1 = require("./consts.js");
 const queries_ts_1 = require("./queries.js");
+const defaultFindEvents = queries_ts_1.findEvents.run.bind(queries_ts_1.findEvents);
 function createRetryHandler({ retriesS }, handler) {
     return async (ev, ctx) => {
         const { name, client, subscriptionId, logger } = ctx;
@@ -27,7 +28,7 @@ function createRetryHandler({ retriesS }, handler) {
         }
     };
 }
-async function normaliseRetryEventsInReadEventMap(rows, client) {
+async function normaliseRetryEventsInReadEventMap(rows, client, findEvents = defaultFindEvents) {
     const map = {};
     const evsToPopulate = [];
     const idsToLoad = [];
@@ -67,7 +68,7 @@ async function normaliseRetryEventsInReadEventMap(rows, client) {
     if (!idsToLoad.length) {
         return { map, retryEvents: 0, retryItemCount: 0 };
     }
-    const fetchedEvents = await queries_ts_1.findEvents.run({ ids: idsToLoad }, client);
+    const fetchedEvents = await findEvents({ ids: idsToLoad }, client);
     const fetchedEventMap = fetchedEvents.reduce((map, ev) => {
         map[ev.id] = ev;
         return map;

package/lib/types.d.ts

@@ -3,7 +3,7 @@ import type { IncomingMessage } from 'node:http';
 import type { Logger } from 'pino';
 import type { HeaderRecord } from 'undici-types/header.js';
 import type { AbortableAsyncIterator } from './abortable-async-iterator.ts';
-import type { IAssertSubscriptionParams, IReadNextEventsParams, IReadNextEventsResult } from './queries.ts';
+import type { IAssertSubscriptionParams, IFindEventsParams, IFindEventsResult, IReadNextEventsParams, IReadNextEventsResult } from './queries.ts';
 import type { PgClientLike } from './query-types.ts';
 export type ISplitFn<T extends IEventData> = (event: IReadEvent<T>) => IReadEvent<T>[];
 export type SerialisedEvent = {
@@ -68,6 +68,7 @@ export type PGMBEventBatcherOpts<T extends IEventData> = {
     maxBatchSize?: number;
 };
 export type IReadNextEventsFn = (parmas: IReadNextEventsParams, db: IDatabaseConnection) => Promise<IReadNextEventsResult[]>;
+export type IFindEventsFn = (parmas: IFindEventsParams, db: IDatabaseConnection) => Promise<IFindEventsResult[]>;
 export type Pgmb2ClientOpts<T extends IEventData> = {
     client: PgClientLike;
     /**
@@ -110,6 +111,10 @@ export type Pgmb2ClientOpts<T extends IEventData> = {
      * Override the default readNextEvents implementation
      */
     readNextEvents?: IReadNextEventsFn;
+    /**
+     * Override the default findEvents implementation
+     */
+    findEvents?: IFindEventsFn;
 } & Pick<PGMBEventBatcherOpts<IEventData>, 'flushIntervalMs' | 'maxBatchSize' | 'shouldLog'>;
 export type IReadEvent<T extends IEventData = IEventData> = {
     items: IEvent<T>[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haathie/pgmb",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "PG message broker, with a type-safe typescript client with built-in webhook & SSE support.",
   "main": "lib/index.js",
   "publishConfig": {