@fraym/streams 0.1.8 → 0.2.0

package/dist/client/client.js

@@ -43,13 +43,13 @@ const newClient = async (config) => {
             return await (0, subscribe_1.sendSubscribe)(includedTopics, excludedTopics, config, stream);
         },
         publish: async (topic, events) => {
-            return (0, publish_1.sendPublish)(topic, events, config, stream);
+            return (0, publish_1.sendPublish)(topic, events, serviceClient);
         },
         invalidateGdprData: async (tenantId, topic, gdprId) => {
-            return await (0, invalidateGdpr_1.sendInvalidateGdpr)(tenantId, topic, gdprId, config, stream);
+            return await (0, invalidateGdpr_1.sendInvalidateGdpr)(tenantId, topic, gdprId, serviceClient);
         },
         createSnapshot: async (topic, toTime) => {
-            return await (0, snapshot_1.sendSnapshot)(topic, toTime, config, stream);
+            return await (0, snapshot_1.sendSnapshot)(topic, toTime, serviceClient);
         },
         close: () => {
             stream.end();

package/dist/client/init.d.ts

@@ -1,5 +1,5 @@
 import { ClientConfig } from "./config";
 import { ClientDuplexStream } from "@grpc/grpc-js";
-import { Request, ServiceClient, Response } from "@fraym/streams-proto";
-export type Stream = ClientDuplexStream<Request, Response>;
+import { SubscribeRequest, ServiceClient, SubscribeResponse } from "@fraym/streams-proto";
+export type Stream = ClientDuplexStream<SubscribeRequest, SubscribeResponse>;
 export declare const initStream: (config: ClientConfig, serviceClient: ServiceClient) => Promise<Stream>;

package/dist/client/init.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initStream = void 0;
 const uuid_1 = require("uuid");
 const initStream = async (config, serviceClient) => {
-    const stream = serviceClient.connect();
+    const stream = serviceClient.subscribe();
     stream.on("end", stream.end);
     return new Promise((resolve, reject) => {
         stream.once("data", (data) => {

package/dist/client/invalidateGdpr.d.ts

@@ -1,3 +1,2 @@
-import { ClientConfig } from "./config";
-import { Stream } from "./init";
-export declare const sendInvalidateGdpr: (tenantId: string, topic: string, gdprId: string, config: ClientConfig, stream: Stream) => Promise<void>;
+import { ServiceClient } from "@fraym/streams-proto";
+export declare const sendInvalidateGdpr: (tenantId: string, topic: string, gdprId: string, serviceClient: ServiceClient) => Promise<void>;

package/dist/client/invalidateGdpr.js

@@ -1,49 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendInvalidateGdpr = void 0;
-const sendInvalidateGdpr = async (tenantId, topic, gdprId, config, stream) => {
-    stream.write(newInvalidateGdprRequest(tenantId, topic, gdprId));
+const sendInvalidateGdpr = async (tenantId, topic, gdprId, serviceClient) => {
     return new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-            stream.off("data", fn);
-            reject("did not receive invalidate gdpr ack in configured timeout range");
-        }, config.ackTimeout);
-        const fn = (data) => {
-            var _a, _b;
-            if (((_a = data.data) === null || _a === void 0 ? void 0 : _a.$case) === "invalidateGdprNotAck") {
-                const notAck = data.data.invalidateGdprNotAck;
-                if (notAck.tenantId === tenantId &&
-                    notAck.topic === topic &&
-                    notAck.gdprId === gdprId) {
-                    clearTimeout(timeout);
-                    stream.off("data", fn);
-                    reject(`did receive invalidate gdpr not ack message, reason: ${notAck.reason}`);
-                    return;
-                }
+        serviceClient.invalidateGdpr({
+            tenantId,
+            topic,
+            gdprId,
+        }, error => {
+            if (error) {
+                reject(error.message);
+                return;
             }
-            if (((_b = data.data) === null || _b === void 0 ? void 0 : _b.$case) === "invalidateGdprAck") {
-                const ack = data.data.invalidateGdprAck;
-                if (ack.tenantId === tenantId && ack.topic === topic && ack.gdprId === gdprId) {
-                    clearTimeout(timeout);
-                    stream.off("data", fn);
-                    resolve();
-                    return;
-                }
-            }
-        };
-        stream.on("data", fn);
+            resolve();
+        });
     });
 };
 exports.sendInvalidateGdpr = sendInvalidateGdpr;
-const newInvalidateGdprRequest = (tenantId, topic, gdprId) => {
-    return {
-        payload: {
-            $case: "invalidateGdpr",
-            invalidateGdpr: {
-                tenantId,
-                topic,
-                gdprId,
-            },
-        },
-    };
-};

package/dist/client/publish.d.ts

@@ -1,4 +1,3 @@
-import { Stream } from "./init";
-import { ClientConfig } from "./config";
 import { PublishEvent } from "./event";
-export declare const sendPublish: (topic: string, events: PublishEvent[], config: ClientConfig, stream: Stream) => Promise<void>;
+import { ServiceClient } from "@fraym/streams-proto";
+export declare const sendPublish: (topic: string, events: PublishEvent[], serviceClient: ServiceClient) => Promise<void>;

package/dist/client/publish.js

@@ -1,48 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendPublish = void 0;
-const uuid_1 = require("uuid");
-const sendPublish = async (topic, events, config, stream) => {
-    const publishActionId = (0, uuid_1.v4)();
-    stream.write(newPublishRequest(publishActionId, topic, events));
+const sendPublish = async (topic, events, serviceClient) => {
     return new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-            stream.off("data", fn);
-            reject("did not receive publish ack in configured timeout range");
-        }, config.ackTimeout);
-        const fn = (data) => {
-            var _a, _b;
-            if (((_a = data.data) === null || _a === void 0 ? void 0 : _a.$case) === "publishAck" &&
-                data.data.publishAck.publishActionId === publishActionId) {
-                clearTimeout(timeout);
-                stream.off("data", fn);
-                resolve();
+        serviceClient.publish({
+            events: events.map(getEventEnvelopeFromPublishedEvent),
+            topic,
+        }, error => {
+            if (error) {
+                reject(error.message);
                 return;
             }
-            if (((_b = data.data) === null || _b === void 0 ? void 0 : _b.$case) === "publishNotAck" &&
-                data.data.publishNotAck.publishActionId === publishActionId) {
-                clearTimeout(timeout);
-                stream.off("data", fn);
-                reject(`did receive publish not ack message: ${data.data.publishNotAck.reason}`);
-                return;
-            }
-        };
-        stream.on("data", fn);
+            resolve();
+        });
     });
 };
 exports.sendPublish = sendPublish;
-const newPublishRequest = (publishActionId, topic, events) => {
-    return {
-        payload: {
-            $case: "publish",
-            publish: {
-                topic,
-                publishActionId,
-                events: events.map(getEventEnvelopeFromPublishedEvent),
-            },
-        },
-    };
-};
 const getEventEnvelopeFromPublishedEvent = (event) => {
     var _a, _b, _c, _d, _e, _f;
     const payload = {};

package/dist/client/snapshot.d.ts

@@ -1,3 +1,2 @@
-import { ClientConfig } from "./config";
-import { Stream } from "./init";
-export declare const sendSnapshot: (topic: string, toTime: Date, config: ClientConfig, stream: Stream) => Promise<void>;
+import { ServiceClient } from "@fraym/streams-proto";
+export declare const sendSnapshot: (topic: string, toTime: Date, serviceClient: ServiceClient) => Promise<void>;

package/dist/client/snapshot.js

@@ -1,53 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendSnapshot = void 0;
-const sendSnapshot = async (topic, toTime, config, stream) => {
-    stream.write(newSnapshotRequest(topic, toTime));
+const sendSnapshot = async (topic, toTime, serviceClient) => {
     return new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-            stream.off("data", fn);
-            reject("did not receive snapshot started in configured timeout range");
-        }, config.ackTimeout);
-        const fn = (data) => {
-            var _a, _b, _c, _d;
-            if (((_a = data.data) === null || _a === void 0 ? void 0 : _a.$case) === "snapshotNotStarted" &&
-                data.data.snapshotNotStarted.topic === topic) {
-                clearTimeout(timeout);
-                stream.off("data", fn);
-                reject(`did receive snapshot not started message, reason: ${data.data.snapshotNotStarted.reason}`);
+        serviceClient.snapshot({
+            topic,
+            toTime: toTime.toISOString(),
+        }, error => {
+            if (error) {
+                reject(error.message);
                 return;
             }
-            if (((_b = data.data) === null || _b === void 0 ? void 0 : _b.$case) === "snapshotNotFinished" &&
-                data.data.snapshotNotFinished.topic === topic) {
-                clearTimeout(timeout);
-                stream.off("data", fn);
-                reject(`did receive snapshot not finished message, reason: ${data.data.snapshotNotFinished.reason}`);
-                return;
-            }
-            if (((_c = data.data) === null || _c === void 0 ? void 0 : _c.$case) === "snapshotStarted" &&
-                data.data.snapshotStarted.topic === topic) {
-                clearTimeout(timeout);
-                return;
-            }
-            if (((_d = data.data) === null || _d === void 0 ? void 0 : _d.$case) === "snapshotFinished" &&
-                data.data.snapshotFinished.topic === topic) {
-                stream.off("data", fn);
-                resolve();
-                return;
-            }
-        };
-        stream.on("data", fn);
+            resolve();
+        });
     });
 };
 exports.sendSnapshot = sendSnapshot;
-const newSnapshotRequest = (topic, toTime) => {
-    return {
-        payload: {
-            $case: "snapshot",
-            snapshot: {
-                topic,
-                toTime: toTime.toISOString(),
-            },
-        },
-    };
-};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraym/streams",
-    "version": "0.1.8",
+    "version": "0.2.0",
     "license": "UNLICENSED",
     "homepage": "https://github.com/fraym/streams-nodejs",
     "repository": {
@@ -24,8 +24,8 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "dependencies": {
-        "@fraym/streams-proto": "^6.0.0-alpha.10",
-        "@grpc/grpc-js": "1.8.7",
+        "@fraym/streams-proto": "^7.0.0-alpha.1",
+        "@grpc/grpc-js": "^1.8.7",
         "ts-node": "^10.9.1",
         "uuid": "^9.0.0"
     },