@fraym/streams 0.1.9 → 0.2.1

package/README.md

@@ -37,6 +37,9 @@ await client.publish("topic", [
         tenantId: "tenantId",
         payload: {
             key: "value",
+			object: {
+				key: "objectKeyValue"
+			},
         },
         // set `broadcast` to true if you want all subscribers of a group to process the event.
         // set to false (or remove) if you want this event to be handled only once by a group of subscribers.
@@ -135,38 +138,3 @@ You won't lose any data if you don't. Use it for your peace of mind.
 ```typescript
 client.close();
 ```
-
-## Development
-
-You'll need the following apps for a smooth development experience:
-
--   minikube
--   lens
--   okteto
--   helm
-
-### Running the dev environment
-
--   Start minikube if not already done:
-
-```shell
-minikube start
-```
-
--   add mongodb and minio to your lokal kubernetes
-    -   use Makefiles in `./.dev/*`
--   copy `.env.build` to `.env.build.local`
-    -   add your personal access token (needs read access for private fraym org repositories)
--   deploy the app to your cluster
-
-```
-make init
-```
-
--   start okteto
-
-```
-make dev
-```
-
--   connect your IDE to that okteto instance

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/event.d.ts

@@ -16,10 +16,11 @@ export interface BaseEvent {
     causationId?: string;
     reason?: string;
 }
-export type EventData = string | GdprEventData;
+export type EventData = any | GdprEventData;
 export interface GdprEventData {
-    value: string;
-    gdprDefault: string;
+    value: any;
+    gdprDefault: any;
 }
+export declare const isGdprEventData: (value: EventData) => value is GdprEventData;
 export type HandlerFunc = (event: SubscriptionEvent) => Promise<void>;
 export declare const getSubscriptionEvent: (eventEnvelope: PublishEventEnvelope) => SubscriptionEvent | null;

package/dist/client/event.js

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSubscriptionEvent = void 0;
+exports.getSubscriptionEvent = exports.isGdprEventData = void 0;
+const isGdprEventData = (value) => {
+    return (value &&
+        typeof value === "object" &&
+        Object.keys(value).length == 2 &&
+        value.hasOwnProperty("value") &&
+        value.hasOwnProperty("gdprDefault"));
+};
+exports.isGdprEventData = isGdprEventData;
 const getSubscriptionEvent = (eventEnvelope) => {
-    var _a;
     const event = eventEnvelope.event;
     if (!event) {
         return null;
@@ -13,12 +20,14 @@ const getSubscriptionEvent = (eventEnvelope) => {
             const data = event.payload[key];
             if (data.metadata && data.metadata.gdpr) {
                 payload[key] = {
-                    value: data.value,
-                    gdprDefault: (_a = data.metadata.gdpr.default) !== null && _a !== void 0 ? _a : "",
+                    value: JSON.parse(data.value),
+                    gdprDefault: data.metadata.gdpr.default
+                        ? JSON.parse(data.metadata.gdpr.default)
+                        : "",
                 };
             }
             else {
-                payload[key] = data.value;
+                payload[key] = JSON.parse(data.value);
             }
         }
     }

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,68 +1,41 @@
 "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 event_1 = require("./event");
+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 = {};
     for (const key in event.payload) {
         const currentData = event.payload[key];
-        payload[key] =
-            typeof currentData === "string"
-                ? {
-                    value: currentData,
-                }
-                : {
-                    value: currentData.value,
-                    metadata: {
-                        $case: "gdpr",
-                        gdpr: {
-                            default: currentData.gdprDefault,
-                            id: "",
-                        },
+        payload[key] = (0, event_1.isGdprEventData)(currentData)
+            ? {
+                value: JSON.stringify(currentData.value),
+                metadata: {
+                    $case: "gdpr",
+                    gdpr: {
+                        default: JSON.stringify(currentData.gdprDefault),
+                        id: "",
                     },
-                };
+                },
+            }
+            : {
+                value: JSON.stringify(currentData),
+            };
     }
     return {
         broadcast: (_a = event.broadcast) !== null && _a !== void 0 ? _a : false,

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.9",
+    "version": "0.2.1",
     "license": "UNLICENSED",
     "homepage": "https://github.com/fraym/streams-nodejs",
     "repository": {
@@ -24,7 +24,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "dependencies": {
-        "@fraym/streams-proto": "^6.0.0-alpha.10",
+        "@fraym/streams-proto": "^7.0.0-alpha.1",
         "@grpc/grpc-js": "^1.8.7",
         "ts-node": "^10.9.1",
         "uuid": "^9.0.0"