@fraym/streams 0.10.4 → 0.10.6

package/dist/client/client.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.newClient = void 0;
 const management_1 = require("@fraym/proto/freym/streams/management");
 const grpc_js_1 = require("@grpc/grpc-js");
+const allEvents_1 = require("./allEvents");
 const config_1 = require("./config");
 const getEvent_1 = require("./getEvent");
-const allEvents_1 = require("./allEvents");
-const publish_1 = require("./publish");
+const getLastEvent_1 = require("./getLastEvent");
+const getLastEventByTypes_1 = require("./getLastEventByTypes");
 const introduceGdpr_1 = require("./introduceGdpr");
 const invalidateGdpr_1 = require("./invalidateGdpr");
+const publish_1 = require("./publish");
 const stream_1 = require("./stream");
 const subscribe_1 = require("./subscribe");
-const getLastEvent_1 = require("./getLastEvent");
-const getLastEventByTypes_1 = require("./getLastEventByTypes");
 const newClient = async (config) => {
     config = (0, config_1.useConfigDefaults)(config);
     const serviceClient = new management_1.ServiceClient(config.serverAddress, grpc_js_1.credentials.createInsecure(), {

package/dist/client/publish.d.ts

@@ -1,4 +1,4 @@
-import { PublishEvent } from "./event";
 import { PublishEvent as ProtobufPublishEvent, ServiceClient } from "@fraym/proto/freym/streams/management";
+import { PublishEvent } from "./event";
 export declare const sendPublish: (topic: string, events: PublishEvent[], serviceClient: ServiceClient) => Promise<void>;
 export declare const getProtobufPublishEventFromPublishedEvent: (event: PublishEvent) => ProtobufPublishEvent;

package/dist/client/stream.d.ts

@@ -1,5 +1,5 @@
-import { HandlerFunc, PublishEvent } from "./event";
 import { ServiceClient } from "@fraym/proto/freym/streams/management";
+import { HandlerFunc, PublishEvent } from "./event";
 import { StopLoadingMoreFunc } from "./util";
 export declare const getStream: (topic: string, tenantId: string, stream: string, perPage: number, handler: HandlerFunc, stopLoadingMore: StopLoadingMoreFunc, serviceClient: ServiceClient) => Promise<void>;
 export declare const getStreamAfterEvent: (topic: string, tenantId: string, stream: string, eventId: string, perPage: number, handler: HandlerFunc, stopLoadingMore: StopLoadingMoreFunc, serviceClient: ServiceClient) => Promise<void>;

package/dist/client/stream.js

@@ -2,34 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStreamSnapshot = exports.isStreamEmpty = exports.getStreamAfterEvent = exports.getStream = void 0;
 const event_1 = require("./event");
-const util_1 = require("./util");
 const publish_1 = require("./publish");
+const util_1 = require("./util");
 const getStream = async (topic, tenantId, stream, perPage, handler, stopLoadingMore, serviceClient) => {
-    let lastEventId = null;
-    let possibleSnapshotEventId = null;
-    let events = [];
+    let page = 0;
+    let snapshotEventId = null;
     while (true) {
-        if (!lastEventId) {
-            events = await getStreamPage(topic, tenantId, stream, perPage, 0, serviceClient);
-            if (events.length > 0) {
-                possibleSnapshotEventId = events[0].id;
-            }
-        }
-        else {
-            events = await getStreamPageAfterEvent(topic, tenantId, stream, lastEventId, perPage, 0, serviceClient);
-        }
+        const response = await getStreamPage(topic, tenantId, stream, perPage, page, snapshotEventId, serviceClient);
+        snapshotEventId = response.snapshotEventId;
+        page++;
         let lastEvent = null;
-        for (const eventData of events) {
+        for (const eventData of response.events) {
             const event = (0, event_1.getSubscriptionEvent)(eventData);
             if (event) {
-                if (lastEventId != null && possibleSnapshotEventId) {
-                    if (event.id === possibleSnapshotEventId) {
-                        continue;
-                    }
-                }
                 await handler(event);
                 lastEvent = event;
-                lastEventId = event.id;
             }
         }
         if (stopLoadingMore(lastEvent)) {
@@ -38,7 +25,7 @@ const getStream = async (topic, tenantId, stream, perPage, handler, stopLoadingM
     }
 };
 exports.getStream = getStream;
-const getStreamPage = async (topic, tenantId, stream, perPage, page, serviceClient) => {
+const getStreamPage = async (topic, tenantId, stream, perPage, page, snapshotEventId, serviceClient) => {
     return (0, util_1.retry)(() => new Promise((resolve, reject) => {
         serviceClient.paginateStream({
             stream,
@@ -46,22 +33,25 @@ const getStreamPage = async (topic, tenantId, stream, perPage, page, serviceClie
             topic,
             page: page.toString(),
             perPage: perPage.toString(),
+            snapshotEventId: snapshotEventId !== null && snapshotEventId !== void 0 ? snapshotEventId : "",
         }, async (error, data) => {
             if (error) {
                 reject(error);
                 return;
             }
-            resolve(data.events);
+            resolve(data);
         });
     }));
 };
 const getStreamAfterEvent = async (topic, tenantId, stream, eventId, perPage, handler, stopLoadingMore, serviceClient) => {
     let page = 0;
+    let snapshotEventId = null;
     while (true) {
-        const events = await getStreamPageAfterEvent(topic, tenantId, stream, eventId, perPage, page, serviceClient);
+        const response = await getStreamPageAfterEvent(topic, tenantId, stream, eventId, perPage, page, snapshotEventId, serviceClient);
+        snapshotEventId = response.snapshotEventId;
         page++;
         let lastEvent = null;
-        for (const eventData of events) {
+        for (const eventData of response.events) {
             const event = (0, event_1.getSubscriptionEvent)(eventData);
             if (event) {
                 await handler(event);
@@ -74,7 +64,7 @@ const getStreamAfterEvent = async (topic, tenantId, stream, eventId, perPage, ha
     }
 };
 exports.getStreamAfterEvent = getStreamAfterEvent;
-const getStreamPageAfterEvent = async (topic, tenantId, stream, eventId, perPage, page, serviceClient) => {
+const getStreamPageAfterEvent = async (topic, tenantId, stream, eventId, perPage, page, snapshotEventId, serviceClient) => {
     return (0, util_1.retry)(() => new Promise((resolve, reject) => {
         serviceClient.paginateStreamAfterEventId({
             stream,
@@ -83,12 +73,13 @@ const getStreamPageAfterEvent = async (topic, tenantId, stream, eventId, perPage
             eventId,
             page: page.toString(),
             perPage: perPage.toString(),
+            snapshotEventId: snapshotEventId !== null && snapshotEventId !== void 0 ? snapshotEventId : "",
         }, async (error, data) => {
             if (error) {
                 reject(error);
                 return;
             }
-            resolve(data.events);
+            resolve(data);
         });
     }));
 };
@@ -109,7 +100,6 @@ const isStreamEmpty = async (topic, tenantId, stream, serviceClient) => {
 };
 exports.isStreamEmpty = isStreamEmpty;
 const createStreamSnapshot = async (tenantId, topic, stream, lastSnapshottedEventId, snapshotEvent, serviceClient) => {
-    console.log("creating snapshot", tenantId, topic, stream, lastSnapshottedEventId);
     return new Promise((resolve, reject) => {
         serviceClient.createStreamSnapshot({
             topic,

package/dist/client/subscribe.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initStream = exports.newSubscription = void 0;
-const constants_1 = require("@grpc/grpc-js/build/src/constants");
 const uuid_1 = require("uuid");
+const constants_1 = require("@grpc/grpc-js/build/src/constants");
 const event_1 = require("./event");
 const newSubscription = (topics, ignoreUnhandledEvents, config, serviceClient) => {
     let stream = null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraym/streams",
-    "version": "0.10.4",
+    "version": "0.10.6",
     "license": "MIT",
     "homepage": "https://github.com/fraym/streams-nodejs",
     "repository": {
@@ -26,16 +26,16 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "dependencies": {
-        "@fraym/proto": "^0.20.0",
-        "@grpc/grpc-js": "^1.11.1",
-        "uuid": "^9.0.1"
+        "@fraym/proto": "^0.28.2",
+        "@grpc/grpc-js": "^1.12.6",
+        "uuid": "^11.0.5"
     },
     "devDependencies": {
-        "@becklyn/prettier": "^1.0.2",
-        "@types/uuid": "^8.3.4",
-        "prettier": "^2.8.8",
+        "@becklyn/prettier": "^2.1.1",
+        "@types/uuid": "^10.0.0",
+        "prettier": "^3.5.0",
         "ts-node": "^10.9.2",
-        "typescript": "^4.9.5"
+        "typescript": "^5.7.3"
     },
     "prettier": "@becklyn/prettier"
 }