@fraym/streams 0.4.1 → 0.5.0

package/dist/client/allEvents.d.ts

@@ -1,3 +1,3 @@
 import { ServiceClient } from "@fraym/proto/freym/streams/clientchannel";
 import { HandlerFunc } from "./event";
-export declare const getAllEvents: (includedTopics: string[], excludedTopics: string[], handler: HandlerFunc, serviceClient: ServiceClient) => Promise<void>;
+export declare const getAllEvents: (tenantId: string, topic: string, includedEventTypes: string[], perPage: number, handler: HandlerFunc, serviceClient: ServiceClient) => Promise<void>;

package/dist/client/allEvents.js

@@ -2,24 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllEvents = void 0;
 const event_1 = require("./event");
-const getAllEvents = async (includedTopics, excludedTopics, handler, serviceClient) => {
-    const stream = serviceClient.getEventsFromStart({
-        excludedTopics,
-        includedTopics,
-    });
-    return new Promise((resolve, reject) => {
-        stream.on("data", (data) => {
-            const event = (0, event_1.getSubscriptionEvent)(data);
-            if (event) {
-                handler(event);
+const getAllEvents = async (tenantId, topic, includedEventTypes, perPage, handler, serviceClient) => {
+    let page = 0;
+    let finished = false;
+    while (!finished) {
+        await serviceClient.paginateEvents({
+            tenantId,
+            topic,
+            includedEventTypes,
+            page: page.toString(),
+            perPage: perPage.toString(),
+        }, async (error, data) => {
+            if (error) {
+                throw error;
+            }
+            if (data.events.length === 0) {
+                finished = true;
+                return;
+            }
+            for (const eventData of data.events) {
+                const event = (0, event_1.getSubscriptionEvent)(eventData);
+                if (event) {
+                    await handler(event);
+                }
             }
         });
-        stream.on("end", () => {
-            resolve();
-        });
-        stream.on("error", e => {
-            reject(e);
-        });
-    });
+        page++;
+    }
 };
 exports.getAllEvents = getAllEvents;

package/dist/client/client.d.ts

@@ -2,10 +2,9 @@ import { ServiceClient } from "@fraym/proto/freym/streams/clientchannel";
 import { ClientConfig } from "./config";
 import { HandlerFunc, PublishEvent, SubscriptionEvent } from "./event";
 export interface Client {
-    getAllEvents: (handler: HandlerFunc, includedTopics?: string[], excludedTopics?: string[]) => Promise<void>;
-    getAllEventsFiltered: (handler: HandlerFunc, includedTopics: string[], includedEventTypes: string[]) => Promise<void>;
+    getAllEvents: (tenantId: string, topic: string, includedEventTypes: string[], perPage: number, handler: HandlerFunc) => Promise<void>;
     getEvent: (tenantId: string, topic: string, eventId: string) => Promise<SubscriptionEvent>;
-    getStream: (tenantId: string, stream: string) => Promise<SubscriptionEvent[]>;
+    getStream: (tenantId: string, stream: string, perPage: number, handler: HandlerFunc) => Promise<void>;
     useEventHandler: (type: string, handler: HandlerFunc) => void;
     useEventHandlerForAllEventTypes: (handler: HandlerFunc) => void;
     subscribe: (includedTopics?: string[], excludedTopics?: string[]) => Promise<void>;

package/dist/client/client.js

@@ -15,7 +15,6 @@ const stream_1 = require("./stream");
 const subscribe_1 = require("./subscribe");
 const getEvent_1 = require("./getEvent");
 const introduceGdpr_1 = require("./introduceGdpr");
-const allEventsFiltered_1 = require("./allEventsFiltered");
 const newClient = async (config) => {
     config = (0, config_1.useConfigDefaults)(config);
     const serviceClient = new clientchannel_1.ServiceClient(config.serverAddress, grpc_js_1.credentials.createInsecure(), {
@@ -27,17 +26,14 @@ const newClient = async (config) => {
     const eventHandler = (0, handler_1.initEventHandler)(stream);
     let hasSubscribed = false;
     return {
-        getAllEvents: async (handler, includedTopics = [], excludedTopics = []) => {
-            await (0, allEvents_1.getAllEvents)(includedTopics, excludedTopics, handler, serviceClient);
-        },
-        getAllEventsFiltered: async (handler, includedTopics, includedEventTypes) => {
-            await (0, allEventsFiltered_1.getAllEventsFiltered)(includedTopics, includedEventTypes, handler, serviceClient);
+        getAllEvents: async (tenantId, topic, includedEventTypes, perPage, handler) => {
+            await (0, allEvents_1.getAllEvents)(tenantId, topic, includedEventTypes, perPage, handler, serviceClient);
         },
         getEvent: async (tenantId, topic, eventId) => {
             return await (0, getEvent_1.getEvent)(tenantId, topic, eventId, serviceClient);
         },
-        getStream: async (tenantId, stream) => {
-            return await (0, stream_1.getStream)(tenantId, stream, serviceClient);
+        getStream: async (tenantId, stream, perPage, handler) => {
+            return await (0, stream_1.getStream)(tenantId, stream, perPage, handler, serviceClient);
         },
         useEventHandler: (type, handler) => {
             eventHandler.addHandler(type, handler);

package/dist/client/event.js

@@ -37,7 +37,7 @@ const getSubscriptionEvent = (eventEnvelope) => {
         topic: eventEnvelope.topic,
         tenantId: eventEnvelope.tenantId,
         payload,
-        raisedAt: new Date(parseInt(event.raisedAt.toString().slice(0, -6))),
+        raisedAt: new Date(parseInt(event.raisedAt.slice(0, -6))),
         stream: event.stream || undefined,
         type: event.type || undefined,
         causationId: event.causationId || undefined,

package/dist/client/publish.js

@@ -49,7 +49,7 @@ const getEventEnvelopeFromPublishedEvent = (event) => {
             correlationId: (_f = event.correlationId) !== null && _f !== void 0 ? _f : "",
             causationId: (_g = event.causationId) !== null && _g !== void 0 ? _g : "",
             payload,
-            raisedAt: 0,
+            raisedAt: "0",
         },
     };
 };

package/dist/client/stream.d.ts

@@ -1,3 +1,3 @@
-import { SubscriptionEvent } from "./event";
+import { HandlerFunc } from "./event";
 import { ServiceClient } from "@fraym/proto/freym/streams/clientchannel";
-export declare const getStream: (tenantId: string, stream: string, serviceClient: ServiceClient) => Promise<SubscriptionEvent[]>;
+export declare const getStream: (tenantId: string, stream: string, perPage: number, handler: HandlerFunc, serviceClient: ServiceClient) => Promise<void>;

package/dist/client/stream.js

@@ -2,20 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStream = void 0;
 const event_1 = require("./event");
-const getStream = async (tenantId, stream, serviceClient) => {
-    return new Promise((resolve, reject) => {
-        serviceClient.getStream({
-            stream,
+const getStream = async (tenantId, stream, perPage, handler, serviceClient) => {
+    let page = 0;
+    let finished = false;
+    while (!finished) {
+        await serviceClient.paginateStream({
             tenantId,
-        }, (error, response) => {
+            stream,
+            page: page.toString(),
+            perPage: perPage.toString(),
+        }, async (error, data) => {
             if (error) {
-                reject(error.message);
+                throw error;
+            }
+            if (data.events.length === 0) {
+                finished = true;
                 return;
             }
-            resolve(response.events
-                .map(event_1.getSubscriptionEvent)
-                .filter(event => event !== null));
+            for (const eventData of data.events) {
+                const event = (0, event_1.getSubscriptionEvent)(eventData);
+                if (event) {
+                    await handler(event);
+                }
+            }
         });
-    });
+        page++;
+    }
 };
 exports.getStream = getStream;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraym/streams",
-    "version": "0.4.1",
+    "version": "0.5.0",
     "license": "MIT",
     "homepage": "https://github.com/fraym/streams-nodejs",
     "repository": {
@@ -26,15 +26,15 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "dependencies": {
-        "@fraym/proto": "^0.5.3",
-        "@grpc/grpc-js": "1.8.16",
-        "uuid": "^9.0.0"
+        "@fraym/proto": "^0.7.0",
+        "@grpc/grpc-js": "^1.9.12",
+        "uuid": "^9.0.1"
     },
     "devDependencies": {
         "@becklyn/prettier": "^1.0.2",
         "@types/uuid": "^8.3.4",
         "prettier": "^2.8.8",
-        "ts-node": "^10.9.1",
+        "ts-node": "^10.9.2",
         "typescript": "^4.9.5"
     },
     "prettier": "@becklyn/prettier"

package/dist/client/allEventsFiltered.d.ts

@@ -1,3 +0,0 @@
-import { ServiceClient } from "@fraym/proto/freym/streams/clientchannel";
-import { HandlerFunc } from "./event";
-export declare const getAllEventsFiltered: (includedTopics: string[], includedEventTypes: string[], handler: HandlerFunc, serviceClient: ServiceClient) => Promise<void>;

package/dist/client/allEventsFiltered.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllEventsFiltered = void 0;
-const event_1 = require("./event");
-const getAllEventsFiltered = async (includedTopics, includedEventTypes, handler, serviceClient) => {
-    const stream = serviceClient.getFilteredEventsFromStart({
-        includedTopics,
-        includedEventTypes,
-    });
-    return new Promise((resolve, reject) => {
-        stream.on("data", (data) => {
-            const event = (0, event_1.getSubscriptionEvent)(data);
-            if (event) {
-                handler(event);
-            }
-        });
-        stream.on("end", () => {
-            resolve();
-        });
-        stream.on("error", e => {
-            reject(e);
-        });
-    });
-};
-exports.getAllEventsFiltered = getAllEventsFiltered;