woonplan-packages-redishelper 2.0.2 → 2.0.5

package/dist/tsc/classes/Broker.d.ts

@@ -0,0 +1,42 @@
+/// <reference types="node" />
+import { Redis } from "ioredis";
+import Rollbar from "rollbar";
+import Listener from "./Listener";
+export default class Broker {
+    redisConfig: RedisConfig;
+    rollbar?: Rollbar;
+    consumername: string;
+    listeners: Map<string, Listener>;
+    writer: Redis;
+    reader: Redis;
+    listprefix: string;
+    service: string;
+    subscriptions: string[];
+    requestendpoint?: Function;
+    constructor(redisConfig: RedisConfig, rollbarConfig: RollbarConfig, service: string, consumer: string);
+    get requeststream(): string;
+    getRequestStream(service: string): string;
+    setRequestEndpoint(callback: Function): this;
+    getRequestCallback(callback: Function): (id: string, parameters: DecypheredParameters) => Promise<number | null>;
+    publish(channel: string, result: string): Promise<number>;
+    addListener(stream: string, callback: Function, group?: string): this;
+    addListListener(event: string, callback: Function): this;
+    throwError(error: Error): void;
+    sendMessage(stream: string, data: Struct): Promise<string | null>;
+    getRequest(targetservice: string, key: string, data: Struct): Promise<unknown>;
+    requestMessageResponse(resolve: (value?: any) => void, timeout: NodeJS.Timeout): void;
+    unsubscribe(channel: string): void;
+    setupTimeout(resolve: (value?: any) => void, channel: string, n?: number): NodeJS.Timeout;
+    subscribe(channel: string): Promise<unknown>;
+    getRequestSubscriptionName(messageid: string): string;
+    sendListEvent(event: string, listitems: any[], data?: Struct): Promise<string | null>;
+    addToList(listitems: any[], listname?: string): Promise<string>;
+    getListChannel(event: string): string;
+    sanitizeValue(value: any): any;
+    createRedisMessage(struct: Struct): string[];
+    getStreamMessages(stream: string): Promise<DecypheredMessage[]>;
+    getStreamInfo(stream: string, count?: number): Promise<any[] | null>;
+    filterStream(stream: string, key: string, value: any): Promise<DecypheredMessage[]>;
+    decypherResponse(...responses: StreamResponse[]): DecypheredResponse[];
+    decypherParameters(parameters: string[]): DecypheredParameters;
+}

package/dist/tsc/classes/Broker.js

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const class_validator_1 = require("class-validator");
+const ioredis_1 = tslib_1.__importDefault(require("ioredis"));
+const rollbar_1 = tslib_1.__importDefault(require("rollbar"));
+const types_1 = require("util/types");
+const utils_1 = require("../services/utils");
+const Listener_1 = tslib_1.__importDefault(require("./Listener"));
+const ListListener_1 = tslib_1.__importDefault(require("./ListListener"));
+const uuid_1 = require("uuid");
+class Broker {
+    constructor(redisConfig, rollbarConfig, service, consumer) {
+        this.consumername = '';
+        this.listeners = new Map();
+        this.listprefix = 'listUpdated';
+        this.subscriptions = [];
+        this.redisConfig = redisConfig;
+        this.rollbar = new rollbar_1.default({
+            accessToken: rollbarConfig.accessToken,
+            environment: rollbarConfig.environment,
+        });
+        this.writer = new ioredis_1.default(redisConfig.REDISURL);
+        this.reader = new ioredis_1.default(redisConfig.REDISURL);
+        this.consumername = consumer;
+        this.service = service;
+    }
+    get requeststream() {
+        return this.getRequestStream(this.service);
+    }
+    getRequestStream(service) {
+        return `keyRequestedFrom${(0, utils_1.capitalizeFirstLetter)(service)}Service`;
+    }
+    setRequestEndpoint(callback) {
+        return this.addListener(this.requeststream, this.getRequestCallback(callback), this.service);
+    }
+    getRequestCallback(callback) {
+        return async (id, parameters) => {
+            const result = await callback(id, parameters);
+            if (!parameters.messageid)
+                return null;
+            const channel = this.getRequestSubscriptionName(parameters.messageid);
+            return this.publish(channel, result);
+        };
+    }
+    publish(channel, result) {
+        return this.writer.publish(channel, result);
+    }
+    addListener(stream, callback, group) {
+        const client = new ioredis_1.default(this.redisConfig.REDISURL);
+        this.listeners.set(stream, new Listener_1.default(this, client, stream, callback, group));
+        return this;
+    }
+    addListListener(event, callback) {
+        const client = new ioredis_1.default(this.redisConfig.REDISURL);
+        const channel = this.getListChannel(event);
+        this.listeners.set(channel, new ListListener_1.default(this, client, channel, callback));
+        return this;
+    }
+    throwError(error) {
+        if (!this.rollbar)
+            throw new Error('Rollbar not initialized');
+        this.rollbar.error(error);
+    }
+    sendMessage(stream, data) {
+        return this.writer.xadd(stream, '*', ...this.createRedisMessage(data));
+    }
+    async getRequest(targetservice, key, data) {
+        // create a message id to subscribe to
+        const messageid = (0, uuid_1.v4)();
+        //subscribe to message response     
+        const channel = this.getRequestSubscriptionName(messageid);
+        await this.subscribe(channel);
+        // send the message to the correct service
+        this.sendMessage(this.getRequestStream(targetservice), {
+            request: key,
+            messageid: messageid,
+            data: data
+        });
+        let resolver;
+        // create a promise to be able to pass on to resolve later
+        const promise = new Promise((r) => {
+            resolver = r;
+        });
+        if (!resolver)
+            return null;
+        //setup a timeout
+        const timeout = this.setupTimeout(resolver, channel);
+        //setup a response
+        this.requestMessageResponse(resolver, timeout);
+        // return a promise that will resolve when the message returns or times out
+        return promise;
+    }
+    requestMessageResponse(resolve, timeout) {
+        this.reader.once('message', (channel, message) => {
+            if (message.length)
+                resolve(message);
+            else
+                resolve(null);
+            this.unsubscribe(channel);
+            clearTimeout(timeout);
+        });
+    }
+    unsubscribe(channel) {
+        this.reader.unsubscribe(channel);
+        this.subscriptions = this.subscriptions.filter(s => s != channel);
+    }
+    setupTimeout(resolve, channel, n = 2000) {
+        return setTimeout(() => {
+            if (!this.subscriptions.includes(channel))
+                return;
+            console.log(`sub timedout: ${channel}`);
+            resolve(null);
+            this.unsubscribe(channel);
+        }, n);
+    }
+    subscribe(channel) {
+        this.subscriptions.push(channel);
+        return this.reader.subscribe(channel);
+    }
+    getRequestSubscriptionName(messageid) {
+        return `messageresponse${messageid}`;
+    }
+    async sendListEvent(event, listitems, data = {}) {
+        const list = await this.addToList.call(this, listitems);
+        return this.sendMessage(this.getListChannel(event), {
+            ...data,
+            listname: list
+        });
+    }
+    async addToList(listitems, listname) {
+        const list = listname ?? (0, uuid_1.v4)();
+        await this.writer.lpush(list, ...listitems.map(this.sanitizeValue));
+        return list;
+    }
+    getListChannel(event) {
+        return `${this.listprefix}${event}`;
+    }
+    sanitizeValue(value) {
+        if ((0, types_1.isMap)(value))
+            return (0, utils_1.stringifyMap)(value);
+        if ((0, class_validator_1.isObject)(value))
+            return JSON.stringify(value);
+        if ((0, class_validator_1.isArray)(value))
+            return JSON.stringify(value);
+        return value;
+    }
+    createRedisMessage(struct) {
+        return Object.keys(struct).reduce((arr, key) => [...arr, key, this.sanitizeValue(struct[key])], []);
+    }
+    async getStreamMessages(stream) {
+        const streaminfo = await this.getStreamInfo.call(this, stream);
+        if (!streaminfo || !(0, class_validator_1.isArray)(streaminfo) || streaminfo.length < 10)
+            return [];
+        const streamresponses = streaminfo[9];
+        return this.decypherResponse(...streamresponses).flatMap(r => r.messages);
+    }
+    getStreamInfo(stream, count = 0) {
+        return this.reader.xinfo('STREAM', stream, 'FULL', 'COUNT', count);
+    }
+    async filterStream(stream, key, value) {
+        const messages = await this.getStreamMessages.call(this, stream);
+        return messages.filter(message => message.parameters?.[key] != null && message.parameters[key] == value);
+    }
+    decypherResponse(...responses) {
+        return responses.reduce((resp, response) => [
+            ...resp,
+            {
+                stream: response[0],
+                messages: response[1].map((message) => ({
+                    id: message[0],
+                    parameters: this.decypherParameters(message[1])
+                }))
+            }
+        ], []);
+    }
+    decypherParameters(parameters) {
+        return parameters.reduce((params, v, n) => (n == 0 || (n % 2 == 0)) && parameters.length >= n + 1 ? ({
+            ...params,
+            [v]: parameters[n + 1]
+        }) : params, {});
+    }
+}
+exports.default = Broker;
+//# sourceMappingURL=Broker.js.map

package/dist/tsc/classes/Broker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Broker.js","sourceRoot":"","sources":["../../../src/classes/Broker.ts"],"names":[],"mappings":"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"}

package/dist/tsc/classes/BrokerClient.d.ts

@@ -0,0 +1,17 @@
+import { Redis } from "ioredis";
+import Broker from "./Broker";
+export default abstract class BrokerClient {
+    broker: Broker;
+    client: Redis;
+    group: string | null;
+    stream: string | null;
+    list: string | null;
+    callback: Function;
+    constructor(broker: Broker, client: Redis, callback: Function, list: string | null, stream?: string | null, group?: string | null);
+    throwError(error: any): void;
+    decypherResponse(...responses: StreamResponse[]): DecypheredResponse[];
+    getGroupResponse(): Promise<StreamResponse[] | null>;
+    getResponse(lastid: string): Promise<StreamResponse[] | null>;
+    listenToStream(lastid?: string): Promise<Function | null>;
+    abstract streamCallback(message: DecypheredMessage): Promise<any | null>;
+}

package/dist/tsc/classes/BrokerClient.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class BrokerClient {
+    constructor(broker, client, callback, list, stream = null, group = null) {
+        this.group = null;
+        this.stream = null;
+        this.list = null;
+        this.broker = broker;
+        this.client = client;
+        this.list = list;
+        this.stream = stream;
+        this.group = group;
+        this.callback = callback;
+        this.listenToStream.call(this);
+    }
+    throwError(error) {
+        return this.broker.throwError(error);
+    }
+    decypherResponse(...responses) {
+        return this.broker.decypherResponse(...responses);
+    }
+    async getGroupResponse() {
+        if (!this.group || !this.stream)
+            return null;
+        return await this.client.xreadgroup('GROUP', this.group, this.broker.consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', this.stream, '>');
+    }
+    async getResponse(lastid) {
+        if (!this.stream)
+            return null;
+        return await this.client.xread("BLOCK", 0, "STREAMS", this.stream, lastid);
+    }
+    async listenToStream(lastid = '$') {
+        const responses = await this.getResponse.call(this, lastid);
+        if (!responses)
+            return null;
+        const streamResponses = this.decypherResponse(...responses);
+        const messages = streamResponses.flatMap(r => r.messages);
+        await Promise.all(messages.map(async (message) => {
+            try {
+                await this.streamCallback(message);
+            }
+            catch (e) {
+                this.broker.throwError(e);
+            }
+            finally {
+            }
+        }));
+        return this.listenToStream.call(this, messages[messages.length - 1]?.id ?? '$');
+    }
+}
+exports.default = BrokerClient;
+//# sourceMappingURL=BrokerClient.js.map

package/dist/tsc/classes/BrokerClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BrokerClient.js","sourceRoot":"","sources":["../../../src/classes/BrokerClient.ts"],"names":[],"mappings":";;AAGA,MAA8B,YAAY;IAQxC,YAAa,MAAa,EAAE,MAAY,EAAE,QAAiB,EAAE,IAAkB,EAAE,SAAuB,IAAI,EAAE,QAAuB,IAAI;QALzI,UAAK,GAAmB,IAAI,CAAA;QAC5B,WAAM,GAAmB,IAAI,CAAA;QAC7B,SAAI,GAAmB,IAAI,CAAA;QAIzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QAExB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAE,IAAI,CAAE,CAAA;IAClC,CAAC;IAED,UAAU,CAAE,KAAS;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAE,KAAK,CAAE,CAAA;IACxC,CAAC;IAED,gBAAgB,CAAE,GAAG,SAA0B;QAC7C,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAE,GAAG,SAAS,CAAE,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM;YAAG,OAAO,IAAI,CAAA;QAC7C,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAE,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAuB,CAAA;IAChK,CAAC;IAED,KAAK,CAAC,WAAW,CAAE,MAAa;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM;YAAG,OAAO,IAAI,CAAA;QAC9B,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,CAAE,CAAA;IAC7E,CAAC;IAGD,KAAK,CAAC,cAAc,CAAE,SAAgB,GAAG;QACvC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAE,IAAI,EAAE,MAAM,CAAE,CAAA;QAC7D,IAAI,CAAC,SAAS;YAAG,OAAO,IAAI,CAAA;QAE5B,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAE,GAAG,SAAS,CAAE,CAAA;QAC7D,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAE,CAAA;QAC3D,MAAM,OAAO,CAAC,GAAG,CAAE,QAAQ,CAAC,GAAG,CAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACjD,IAAG;gBACD,MAAM,IAAI,CAAC,cAAc,CAAE,OAAO,CAAE,CAAA;aAErC;YAAA,OAAO,CAAK,EAAE;gBACb,IAAI,CAAC,MAAM,CAAC,UAAU,CAAE,CAAC,CAAE,CAAA;aAC5B;oBAAO;aAEP;QACH,CAAC,CAAC,CAAE,CAAA;QAEJ,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAE,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAC,CAAC,CAAC,EAAE,EAAE,IAAE,GAAG,CAAE,CAAA;IAC/E,CAAC;CAGF;AA3DD,+BA2DC"}

package/dist/tsc/classes/ListListener.d.ts

@@ -0,0 +1,8 @@
+import { Redis } from "ioredis";
+import Broker from "./Broker";
+import BrokerClient from "./BrokerClient";
+import ListRunner from "./ListRunner";
+export default class Listener extends BrokerClient {
+    constructor(broker: Broker, client: Redis, list: string, callback: Function);
+    streamCallback(message: DecypheredMessage): Promise<ListRunner | null>;
+}

package/dist/tsc/classes/ListListener.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const BrokerClient_1 = tslib_1.__importDefault(require("./BrokerClient"));
+const ListRunner_1 = tslib_1.__importDefault(require("./ListRunner"));
+class Listener extends BrokerClient_1.default {
+    constructor(broker, client, list, callback) {
+        super(broker, client, callback, list);
+    }
+    async streamCallback(message) {
+        const listrunnercallback = await this.callback(message.id, message.parameters);
+        if (message.parameters.listname)
+            return new ListRunner_1.default(this.client, message.parameters.listname, listrunnercallback);
+        return null;
+    }
+}
+exports.default = Listener;
+//# sourceMappingURL=ListListener.js.map

package/dist/tsc/classes/ListListener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ListListener.js","sourceRoot":"","sources":["../../../src/classes/ListListener.ts"],"names":[],"mappings":";;;AAEA,0EAAyC;AACzC,sEAAqC;AAErC,MAAqB,QAAS,SAAQ,sBAAY;IAChD,YAAa,MAAa,EAAE,MAAY,EAAE,IAAW,EAAE,QAAiB;QACtE,KAAK,CAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAE,CAAA;IACzC,CAAC;IAED,KAAK,CAAC,cAAc,CAAE,OAAyB;QAC7C,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAAE,CAAA;QAEhF,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ;YAC7B,OAAO,IAAI,oBAAU,CAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAA;QAEtF,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAbD,2BAaC"}

package/dist/tsc/classes/ListRunner.d.ts

@@ -0,0 +1,11 @@
+import { Redis } from "ioredis";
+export default class ListRunner {
+    listname: string;
+    itemsDone: number;
+    itemsPerCall: number;
+    callback: Function;
+    client: Redis;
+    constructor(client: Redis, listname: string, callback: Function, itemsPerCall?: number);
+    run(): Promise<Function | void>;
+    nextitems(listname: string): Promise<string[] | null>;
+}

package/dist/tsc/classes/ListRunner.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class ListRunner {
+    constructor(client, listname, callback, itemsPerCall = 1) {
+        this.itemsDone = 0;
+        this.client = client;
+        this.callback = callback;
+        this.listname = listname;
+        this.itemsPerCall = itemsPerCall;
+        this.run.call(this);
+    }
+    async run() {
+        const items = await this.nextitems.call(this, this.listname);
+        if (!items) {
+            console.log(`finished with ${this.itemsDone} jobs`);
+            return;
+        }
+        try {
+            await this.callback(items);
+        }
+        catch (e) {
+            console.log(e);
+        }
+        finally {
+            this.itemsDone += this.itemsPerCall;
+            return this.run.call(this);
+        }
+    }
+    async nextitems(listname) {
+        return this.client.lpop(listname, this.itemsPerCall);
+    }
+}
+exports.default = ListRunner;
+//# sourceMappingURL=ListRunner.js.map

package/dist/tsc/classes/ListRunner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ListRunner.js","sourceRoot":"","sources":["../../../src/classes/ListRunner.ts"],"names":[],"mappings":";;AAEA,MAAqB,UAAU;IAQ7B,YAAa,MAAY,EAAE,QAAe,EAAE,QAAiB,EAAE,eAAwB,CAAC;QANxF,cAAS,GAAU,CAAC,CAAA;QAOlB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAEhC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,CAAE,CAAA;IACvB,CAAC;IAGD,KAAK,CAAC,GAAG;QACP,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAE,CAAA;QAC9D,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,CAAC,GAAG,CAAE,iBAAiB,IAAI,CAAC,SAAS,OAAO,CAAC,CAAA;YACpD,OAAM;SACP;QAED,IAAG;YACD,MAAM,IAAI,CAAC,QAAQ,CAAE,KAAK,CAAE,CAAA;SAC7B;QAAA,OAAO,CAAK,EAAE;YACb,OAAO,CAAC,GAAG,CAAE,CAAC,CAAE,CAAA;SAEjB;gBAAO;YACN,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,CAAA;YACnC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAE,IAAI,CAAE,CAAA;SAC7B;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,QAAe;QAC9B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAE,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAE,CAAA;IACxD,CAAC;CAEF;AAxCD,6BAwCC"}

package/dist/tsc/classes/Listener.d.ts

@@ -0,0 +1,7 @@
+import { Redis } from "ioredis";
+import Broker from "./Broker";
+import BrokerClient from "./BrokerClient";
+export default class Listener extends BrokerClient {
+    constructor(broker: Broker, client: Redis, stream: string, callback: Function, group?: string);
+    streamCallback(message: DecypheredMessage): Promise<any>;
+}

package/dist/tsc/classes/Listener.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const BrokerClient_1 = tslib_1.__importDefault(require("./BrokerClient"));
+class Listener extends BrokerClient_1.default {
+    constructor(broker, client, stream, callback, group) {
+        super(broker, client, callback, null, stream, group);
+    }
+    streamCallback(message) {
+        return this.callback(message.id, message.parameters);
+    }
+}
+exports.default = Listener;
+//# sourceMappingURL=Listener.js.map

package/dist/tsc/classes/Listener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Listener.js","sourceRoot":"","sources":["../../../src/classes/Listener.ts"],"names":[],"mappings":";;;AAEA,0EAAyC;AAEzC,MAAqB,QAAS,SAAQ,sBAAY;IAChD,YAAa,MAAa,EAAE,MAAY,EAAE,MAAa,EAAE,QAAiB,EAAE,KAAe;QACzF,KAAK,CAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAE,CAAA;IACxD,CAAC;IAED,cAAc,CAAC,OAA0B;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAAE,CAAA;IACxD,CAAC;CACF;AARD,2BAQC"}

package/dist/tsc/main.d.ts

@@ -0,0 +1,2 @@
+import Broker from "./classes/Broker";
+export { Broker };

package/dist/tsc/main.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Broker = void 0;
+const tslib_1 = require("tslib");
+const Broker_1 = tslib_1.__importDefault(require("./classes/Broker"));
+exports.Broker = Broker_1.default;
+//# sourceMappingURL=main.js.map

package/dist/tsc/main.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;;AAAA,sEAAqC;AAE5B,iBAFF,gBAAM,CAEE"}

package/dist/tsc/services/utils.d.ts

@@ -0,0 +1,11 @@
+declare const isJSON: (str: any) => boolean;
+interface ObjectToOmitFrom {
+    [index: string]: any;
+}
+declare const omit: (objectToOmitFrom: ObjectToOmitFrom, keys: (keyof ObjectToOmitFrom)[]) => {};
+declare const mapJsonReplacer: (_key: any, value: Map<any, any> | any) => any;
+declare const mapJsonReviver: (_key: any, value: JsonStringifiedMap | any) => any;
+declare const stringifyMap: (map: Map<any, any>) => string;
+declare const parseMap: (json: string) => Map<any, any>;
+declare const capitalizeFirstLetter: (string: string) => string;
+export { isJSON, omit, mapJsonReviver, stringifyMap, parseMap, mapJsonReplacer, capitalizeFirstLetter };

package/dist/tsc/services/utils.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capitalizeFirstLetter = exports.mapJsonReplacer = exports.parseMap = exports.stringifyMap = exports.mapJsonReviver = exports.omit = exports.isJSON = void 0;
+const isJSON = (str) => {
+    if (typeof str == 'number')
+        return false;
+    try {
+        JSON.parse(str);
+    }
+    catch (error) {
+        return false;
+    }
+    return true;
+};
+exports.isJSON = isJSON;
+const omit = (objectToOmitFrom, keys) => Object.keys(objectToOmitFrom)
+    .filter(key => keys.indexOf(key) == -1)
+    .reduce((struct, key) => Object.assign(struct, { [key]: objectToOmitFrom[key] }), {});
+exports.omit = omit;
+const mapJsonReplacer = (_key, value) => {
+    if (value instanceof Map) {
+        return {
+            dataType: 'Map',
+            value: Array.from(value.entries()), // or with spread: value: [...value]
+        };
+    }
+    else {
+        return value;
+    }
+};
+exports.mapJsonReplacer = mapJsonReplacer;
+const mapJsonReviver = (_key, value) => {
+    if (typeof value === 'object' && value !== null) {
+        if (value.dataType === 'Map') {
+            return new Map(value.value);
+        }
+    }
+    return value;
+};
+exports.mapJsonReviver = mapJsonReviver;
+const stringifyMap = (map) => JSON.stringify(map, exports.mapJsonReplacer);
+exports.stringifyMap = stringifyMap;
+const parseMap = (json) => JSON.parse(json, exports.mapJsonReviver);
+exports.parseMap = parseMap;
+const capitalizeFirstLetter = (string) => string.charAt(0).toUpperCase() + string.slice(1);
+exports.capitalizeFirstLetter = capitalizeFirstLetter;
+//# sourceMappingURL=utils.js.map

package/dist/tsc/services/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/services/utils.ts"],"names":[],"mappings":";;;AAAA,MAAM,MAAM,GAAG,CAAE,GAAO,EAAG,EAAE;IAC3B,IAAI,OAAO,GAAG,IAAI,QAAQ;QAAG,OAAO,KAAK,CAAA;IACzC,IAAG;QACD,IAAI,CAAC,KAAK,CAAE,GAAG,CAAE,CAAA;KAClB;IAAA,OAAO,KAAK,EAAE;QACb,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAA;AAyCQ,wBAAM;AAlCf,MAAM,IAAI,GAAG,CAAE,gBAAiC,EAAE,IAA+B,EAAE,EAAE,CACrF,MAAM,CAAC,IAAI,CAAE,gBAAgB,CAAE;KAC9B,MAAM,CAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAE,GAAG,CAAE,IAAI,CAAC,CAAC,CAAE;KAC1C,MAAM,CAAE,CAAC,MAAa,EAAC,GAAG,EAAE,EAAE,CAC7B,MAAM,CAAC,MAAM,CAAE,MAAM,EAAE,EAAC,CAAC,GAAG,CAAC,EAAC,gBAAgB,CAAC,GAAG,CAAC,EAAC,CAAE,EACtD,EAAE,CACH,CAAA;AA4BgB,oBAAI;AAxBrB,MAAM,eAAe,GAAG,CAAE,IAAQ,EAAE,KAAwB,EAAG,EAAE;IAC/D,IAAG,KAAK,YAAY,GAAG,EAAE;QACvB,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,oCAAoC;SACnD,CAAA;KACxB;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAA;AAe8D,0CAAe;AAb9E,MAAM,cAAc,GAAG,CAAE,IAAQ,EAAE,KAA8B,EAAG,EAAE;IACpE,IAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;QAC9C,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,EAAE;YAC5B,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAA;AAMsB,wCAAc;AAJrC,MAAM,YAAY,GAAG,CAAE,GAAgB,EAAS,EAAE,CAAC,IAAI,CAAC,SAAS,CAAE,GAAG,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;AAIzD,oCAAY;AAHnD,MAAM,QAAQ,GAAG,CAAE,IAAW,EAAgB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;AAGrC,4BAAQ;AAF7D,MAAM,qBAAqB,GAAG,CAAC,MAAa,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAEjB,sDAAqB"}

package/{src → dist/tsc}/types.d.ts

@@ -46,4 +46,4 @@ interface DecypheredResponse{
 interface RollbarConfig{
   accessToken : string 
   environment : string
-}
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "woonplan-packages-redishelper",
-  "version": "2.0.2",
+  "version": "2.0.5",
   "description": "",
   "author": "Jasper Denk <jasper@e-trias.nl>",
   "repository": "https://github.com/e-line-websolutions/woonplan-micro-energyio",
   "license": "MIT",
   "keywords": [],
   "main": "./dist/tsc/main.js",
-  "types": "./dist/tsc/main.d.ts",
+  "types": "./dist/tsc/types.d.ts",
   "scripts": {
     "dev": "ts-node --esm src/main.ts",
     "lint": "eslint src/ --ext .js,.jsx,.ts,.tsx",

package/tsconfig.json

@@ -26,7 +26,7 @@
     "lib": [
       "ES6",
       "DOM"
-    ]
+    ],
   },
   "include": [
     "src/**/*.ts"

package/jest.config.js

@@ -1,18 +0,0 @@
-module.exports = {
-roots: ['<rootDir>/src'
-],
-testMatch: [
-    "**/__tests__/**/*.+(ts|tsx|js)",
-    "**/?(*.)+(spec|test).+(ts|tsx|js)"
-],
-transform: {
-    "^.+\\.(ts|tsx)$": "ts-jest"
-},
-testTimeout: 500,
-globals: {
-    'ts-jest': {
-    isolatedModules: true
-    }
-},
-preset: 'ts-jest/presets/js-with-ts'
-}

package/src/__tests__/Broker.test.ts

@@ -1,223 +0,0 @@
-
-
-import Broker from '../classes/Broker'
-import Listener from '../classes/Listener'
-import { DecypheredMessage, RedisConfig, RollbarConfig } from '../types'
-import { stringifyMap } from "../services/utils"
-import Redis from "ioredis-mock"
-
-jest.mock( 'ioredis', () => require("ioredis-mock") )
-// jest.mock( '../classes/Listener' )
-
-const cb = () => {}
-
-
-const rollbarConfig:RollbarConfig = {
-  environment : '',
-  accessToken : ''
-}
-const redisConfig:RedisConfig = {
-  REDISURL : ''
-}
-
-const service = "testservice",
-      consumer = "testconsumer"
-
-xdescribe("addListener", () => {
-  afterEach(()=>jest.clearAllMocks())
-  it("should create a Listener class", () => {
-    new Broker( 
-      redisConfig,
-      rollbarConfig,
-      service,
-      consumer
-    ).addListener( '', cb )
-
-    expect( Listener ).toHaveBeenCalled( )
-  })
-  it("should be chainable", () => {
-    new Broker( 
-      redisConfig,
-      rollbarConfig,
-      service,
-      consumer
-    ).addListener( '', cb ).addListener( '', cb ).addListener( '', cb )
-
-    expect( Listener ).toHaveBeenCalledTimes( 3 )
-  })
-})
-
-describe("sanitize",()=>{
-  const broker = new Broker( redisConfig, rollbarConfig,
-    service,
-    consumer )
-  it("should return a json map if a map is given" ,() => {
-    expect( broker.sanitizeValue( new Map() ) ).toStrictEqual( stringifyMap(new Map()))
-  })
-  it("should return a number if a number is given" ,() => {
-    expect( broker.sanitizeValue( 1 )).toStrictEqual( 1 ) 
-  })
-  it("should return a string if a string is given" ,() => {
-    expect( broker.sanitizeValue( 'foo' ) ).toStrictEqual( 'foo' )
-  })
-  it("should return a JSON array if an array is given" ,() => {
-    expect( broker.sanitizeValue( ['foo'] ) ).toStrictEqual( JSON.stringify( ['foo']))
-  })
-  it("should return a JSON object if an object is given" ,() => {
-    expect( broker.sanitizeValue( {'foo':'bar'} ) ).toStrictEqual( JSON.stringify( {'foo':'bar'} ))
-  })
-})
-
-describe("createRedisMessage", () => {
-  const broker = new Broker( redisConfig, rollbarConfig,
-    service,
-    consumer )
-  it("should create a redis message array from an object ", () => {
-    expect( broker.createRedisMessage({
-      foo : 'bar',
-      bar : ['baz'],
-      hello : new Map( [['world','foo']])
-    })).toStrictEqual(
-      ['foo','bar','bar',JSON.stringify( ['baz']),'hello', stringifyMap(new Map( [['world','foo']]))]
-    )
-  })
-})
-
-jest.setTimeout( 2500 )
-
-describe("getRequest", () => {
-  it("should add a subscription" , async () => {
-    const broker = new Broker( redisConfig, rollbarConfig,
-      service,
-      consumer )
-    
-    broker.getRequest( 'foo', 'bar', {})
-    const mockresult = new Redis()
-    mockresult.publish( broker.subscriptions[0], 'baz')
-    expect( broker.subscriptions.length > 0 ).toBe( true )
-    await broker 
-  })
-  it("should return a response" , async () => {
-    const broker = new Broker( redisConfig, rollbarConfig,
-      service,
-      consumer )
-    
-    const result = broker.getRequest( 'foo', 'bar', {})
-
-    const mockresult = new Redis()
-    mockresult.publish( broker.subscriptions[0], 'baz')
-    expect( await result ).toStrictEqual( 'baz' )
-  })
-  it("should return a timeout and null if no response is given within timeout" , async () => {
-    const broker = new Broker( redisConfig, rollbarConfig,
-      service,
-      consumer )
-    
-    const result = broker.getRequest( 'foo', 'bar', {})
-    expect( await result ).toStrictEqual( null )
-    
-  })
-})
-
-// Unable to test this untill ioredis-mock has a xreadgroup
-xdescribe("requester",()=>{
-  it("should send a request and be able to receive", async () => {
-    const receiver = new Broker( redisConfig, rollbarConfig, 'foo', consumer )
-    
-    const requestEndpoint = jest.fn(() => {
-      console.log( 'requestendpoint hit')
-      return 'baz'
-    })
-    receiver.setRequestEndpoint( requestEndpoint )
-
-    const requester = new Broker( redisConfig, rollbarConfig, 'bar', consumer )
-
-    const request = await requester.getRequest( 'foo', 'key', {} )
-
-    expect( request ).toStrictEqual( 'baz' )
-
-
-  })
-})
-
-xdescribe( "getRequest", () => {
-  afterEach(() => jest.clearAllMocks())
-  it("should subscribe to a channel", async ()=>{
-    const spy = jest.spyOn( Broker.prototype, 'subscribe' ).mockResolvedValueOnce( null )
-    const broker = new Broker( redisConfig, rollbarConfig, 'foo', consumer )
-    
-
-    jest.spyOn( Broker.prototype, 'requestMessageResponse' ).mockImplementation((resolve, timeout) => {
-      resolve()
-      clearTimeout( timeout )
-    })
-    broker.getRequest( 'foo', 'bar', {} )
-
-    expect( spy ).toBeCalled( )
-  })
-  it("should setup a message response", async ()=>{
-    jest.spyOn( Broker.prototype, 'subscribe' ).mockResolvedValueOnce( null )
-    
-
-    const spy = jest.spyOn( Broker.prototype, 'requestMessageResponse' ).mockImplementation((resolve, timeout) => {
-      console.log( 1 )
-      resolve()
-      clearTimeout( timeout )
-    })
-
-    const broker = new Broker( redisConfig, rollbarConfig, 'foo', consumer )
-    broker.getRequest( 'foo', 'bar', {} )
-    expect( spy ).toBeCalled( )
-  })
-  it("should setup a timeout", async ()=>{
-    jest.spyOn( Broker.prototype, 'subscribe' ).mockResolvedValueOnce( null )
-
-    jest.spyOn( Broker.prototype, 'requestMessageResponse' ).mockImplementation((resolve, timeout) => {
-      resolve()
-      clearTimeout( timeout )
-    })
-
-    const spy = jest.spyOn( Broker.prototype, 'setupTimeout' ).mockImplementation((_resolve, channel) => {
-      return setTimeout(() => {
-        
-      }, 200);
-    })
-
-    const broker = new Broker( redisConfig, rollbarConfig, 'foo', consumer )
-    broker.getRequest( 'foo', 'bar', {} )
-    expect( spy ).toBeCalled( )
-  })
-})
-
-
-
-const responses = [['foo',[['bar',['id','baz']],['bar',['id','baz1']],['bar',['id','baz2']]]]]
-
-describe("filterStream", () => {
-  it("should filter the stream and only give back the messages with the request parameters", async () => {
-    jest.spyOn( Broker.prototype, 'getStreamInfo' ).mockResolvedValue( [0,1,2,3,4,5,6,7,8,responses] )
-    const broker = new Broker( redisConfig, rollbarConfig, 'foo', consumer )
-
-    expect( await broker.filterStream( 'foo', 'id', 'baz') ).toStrictEqual([{
-      id : 'bar',
-      parameters : {
-        id : 'baz'
-      }
-
-    }])
-
-  })
-})
-
-describe("addListListener", () => {
-  
-  const broker = new Broker( redisConfig, rollbarConfig, 'foo', consumer )
-
-  const listcb = ( id:string ) => {
-    console.log( id )
-  }
-  const messagecb = ( message:DecypheredMessage ) => listcb( message.id ) 
-
-
-  broker.addListListener('measuredataschanged', messagecb )
-})

package/src/__tests__/Listener.test.ts

@@ -1,89 +0,0 @@
-import Broker from "../classes/Broker"
-import Listener from "../classes/Listener"
-import { RedisConfig, RollbarConfig } from "../types"
-
-const cb = jest.fn()
-
-
-const rollbarConfig:RollbarConfig = {
-  environment : '',
-  accessToken : ''
-}
-
-const redisConfig:RedisConfig = {
-  REDISURL : ''
-}
-
-const responses = [['foo',[['bar',['id','baz']]]]]
-
-jest.mock( 'ioredis', () => jest.fn().mockImplementation(() => {
-  return {
-    xread: jest.fn(( _a,_b,_c,_d,e) => {
-      if( e == 'bar' ) return null
-      return responses
-    }),
-    
-    xreadgroup: jest.fn(() => {
-      return null
-    })
-
-  }
-}) )
-
-describe("listenToStream", () => {
-  afterEach(() => jest.clearAllMocks())
-  it("should call xreadgroup if a groupname is given", async () => {
-    const broker = new Broker( 
-      redisConfig,
-      rollbarConfig
-    ).addListener( 'stream', cb, 'groupname' )
-    
-    await new Promise((r) => setTimeout(r, 100))
-    expect( broker.listeners.get( 'stream')?.client.xreadgroup ).toHaveBeenCalled()
-    expect( broker.listeners.get( 'stream')?.client.xread ).not.toHaveBeenCalled()
-  })
-  it("should call xread if a groupname is not given", async () => {
-    const broker = new Broker( 
-      redisConfig,
-      rollbarConfig
-    ).addListener( 'stream', cb )
-    
-    await new Promise((r) => setTimeout(r, 100))
-
-    expect( broker.listeners.get( 'stream')?.client.xreadgroup ).not.toHaveBeenCalled()
-    expect( broker.listeners.get( 'stream')?.client.xread ).toHaveBeenCalled()
-  })
-
-  it("should call the callback if a message comes in from the stream ", async ()=>{
-    
-    new Broker( 
-      redisConfig,
-      rollbarConfig
-    ).addListener( '', cb )
-    
-    await new Promise((r) => setTimeout(r, 100))
-
-    expect( cb ).toHaveBeenCalledWith( 'bar', {
-      id : 'baz'
-    })
-
-  })
-
-
-  it("should report an error", async () => {
-
-    const errormock = jest.fn( () => {
-      throw new Error('foo')
-    })
-
-    const spy = jest.spyOn( Broker.prototype, 'throwError')
-    new Broker( 
-      redisConfig,
-      rollbarConfig
-    ).addListener( 'stream', errormock )
-
-    await new Promise((r) => setTimeout(r, 100))
-
-    expect( spy ).toHaveBeenCalled( )
-  })
-})

package/src/classes/Broker.ts

@@ -1,224 +0,0 @@
-import { isArray, isObject } from "class-validator"
-import IORedis, { Redis } from "ioredis"
-import Rollbar from "rollbar"
-import { isMap } from "util/types"
-import { capitalizeFirstLetter, stringifyMap } from "../services/utils"
-import Listener from "./Listener"
-import ListListener from "./ListListener"
-import { v4 as uuidv4 } from 'uuid'
-
-export default class Broker{ 
-  redisConfig : RedisConfig
-  rollbar ?: Rollbar
-  consumername : string  = ''
-  listeners: Map<string,Listener> = new Map()
-  writer : Redis
-  reader : Redis
-  listprefix : string = 'listUpdated'
-  service: string 
-  subscriptions : string[] = []
-
-  requestendpoint ?: Function
-
-  constructor( redisConfig:RedisConfig, rollbarConfig:RollbarConfig, service:string, consumer : string  ){
-    this.redisConfig = redisConfig
-    this.rollbar = new Rollbar({
-      accessToken: rollbarConfig.accessToken,
-      environment: rollbarConfig.environment,
-    })
-    this.writer = new IORedis( redisConfig.REDISURL as string )
-    this.reader = new IORedis( redisConfig.REDISURL as string )
-    this.consumername = consumer
-    this.service = service
-  }
-
-  get requeststream(){
-    return this.getRequestStream( this.service )
-  }
-
-  getRequestStream( service:string ){
-    return `keyRequestedFrom${capitalizeFirstLetter(service)}Service`
-  }
-
-  setRequestEndpoint( callback:Function ){
-    return this.addListener( this.requeststream, this.getRequestCallback( callback ), this.service )
-  }
-
-  getRequestCallback( callback:Function ){
-    return async ( id:string, parameters:DecypheredParameters ) => {
-      const result = await callback( id, parameters )
-      if( !parameters.messageid ) return null
-      const channel = this.getRequestSubscriptionName(parameters.messageid)
-      return this.publish( channel, result )
-    }
-  }
-
-  publish( channel:string, result:string ){
-    return this.writer.publish( channel, result )
-  }
-
-  addListener( stream:string, callback:Function, group ?: string){
-    const client = new IORedis( this.redisConfig.REDISURL as string )
-    this.listeners.set( stream, new Listener( this, client, stream, callback, group ))
-    return this
-  }
-
-  addListListener( event:string, callback:Function ){
-    const client = new IORedis( this.redisConfig.REDISURL as string )
-    const channel = this.getListChannel( event )
-    this.listeners.set( channel, new ListListener( this, client, channel, callback ))
-
-    return this
-  }
-
-  throwError( error:Error ){
-    if(!this.rollbar) throw new Error('Rollbar not initialized')
-    this.rollbar.error( error )
-  }
-
-  sendMessage( stream:string, data:Struct){
-    return this.writer.xadd( stream, '*',  ...this.createRedisMessage( data ))
-  }
-
-  async getRequest( targetservice:string, key:string, data:Struct ){
-    // create a message id to subscribe to
-    const messageid  = uuidv4()
-
-    //subscribe to message response     
-    const channel = this.getRequestSubscriptionName(messageid)
-    await this.subscribe( channel )
-
-    // send the message to the correct service
-    this.sendMessage( this.getRequestStream(targetservice), {
-      request : key, 
-      messageid : messageid,
-      data : data 
-    })
-
-    let resolver 
-    // create a promise to be able to pass on to resolve later
-    const promise = new Promise((r) => {
-      resolver = r
-    })
-
-    if( !resolver ) return null 
-
-    //setup a timeout
-    const timeout = this.setupTimeout( resolver, channel )
-
-    //setup a response
-    this.requestMessageResponse( resolver, timeout )
-    
-    // return a promise that will resolve when the message returns or times out
-    return promise
-
-  }
-
-  requestMessageResponse( resolve:(value?: any) => void, timeout:NodeJS.Timeout  ){
-    this.reader.once( 'message', (channel,message) => {      
-      
-      if( message.length ) resolve( message );
-      else resolve( null )
-
-      this.unsubscribe( channel )
-      clearTimeout( timeout )
-
-    })
-  }
-
-  unsubscribe( channel:string ){
-    this.reader.unsubscribe( channel )
-    this.subscriptions = this.subscriptions.filter( s => s != channel )
-  }
-
-  setupTimeout( resolve:(value?: any) => void, channel:string, n:number = 2000 ){
-    return setTimeout( () => {
-      if( !this.subscriptions.includes( channel )) return
-
-      console.log( `sub timedout: ${channel}`)
-      resolve( null )
-      this.unsubscribe( channel )
-    }, n )
-  }
-
-  subscribe( channel:string ){
-    this.subscriptions.push( channel )
-    return this.reader.subscribe( channel )
-  }
-
-  getRequestSubscriptionName( messageid:string ){
-    return `messageresponse${messageid}`
-  }
-
-  async sendListEvent( event:string, listitems:any[], data:Struct = {} ){
-    const list = await this.addToList.call( this, listitems )
-    return this.sendMessage( 
-      this.getListChannel( event ) , {
-      ...data,
-      listname : list
-    } )
-  }
-
-  async addToList( listitems:any[], listname ?: string ){
-    const list = listname??uuidv4()
-    await this.writer.lpush( list , ...listitems.map( this.sanitizeValue) )
-    return list
-  }
-
-  getListChannel( event:string ){
-    return `${this.listprefix}${event}`
-  }
-
-  sanitizeValue( value:any ){
-    if( isMap( value )) return stringifyMap( value  )
-    if( isObject( value )) return JSON.stringify( value )
-    if( isArray( value )) return JSON.stringify( value )
-    return value
-  }
-
-  createRedisMessage( struct:Struct ){
-    return Object.keys( struct ).reduce( (arr:string[],key:keyof Struct) => [...arr,key,this.sanitizeValue( struct[key] )] , [] )
-  }
-
-  async getStreamMessages( stream:string ){
-    const streaminfo = await this.getStreamInfo.call( this, stream )
-    if( !streaminfo || !isArray( streaminfo ) || streaminfo.length < 10 ) return []
-    const streamresponses = streaminfo[9] as StreamResponse[]
-    return this.decypherResponse( ...streamresponses ).flatMap( r => r.messages )
-  }
-  
-  getStreamInfo( stream:string, count:number = 0 ){
-    return this.reader.xinfo('STREAM', stream ,'FULL', 'COUNT', count ) as Promise< null | any[]>
-  }
-
-  async filterStream( stream:string, key : string, value:any ){
-    const messages = await this.getStreamMessages.call( this, stream )
-    return messages.filter( message => message.parameters?.[key] != null && message.parameters[key] == value )
-  }
-
-  decypherResponse( ...responses:StreamResponse[] ):DecypheredResponse[]{    
-    return responses.reduce( (resp:DecypheredResponse[], response:StreamResponse) => 
-      [
-        ...resp,
-        {
-          stream : response[0],
-          messages : response[1].map( (message) => ({
-            id : message[0],
-            parameters : this.decypherParameters( message[1] )
-          }) as DecypheredMessage )
-        } as DecypheredResponse
-      ]
-    , [] as DecypheredResponse[] )  
-  }
-
-  
-  decypherParameters( parameters:string[] ):DecypheredParameters{
-    return parameters.reduce( ( params, v:string, n:number ) => (  n == 0 || ( n % 2 == 0)) && parameters.length >= n+1  ? ({
-      ...params,
-      [v] : parameters[n+1]
-    }) : params , {} as DecypheredParameters)
-  }
-
-}
-
-

package/src/classes/BrokerClient.ts

@@ -1,63 +0,0 @@
-import { Redis } from "ioredis"
-import Broker from "./Broker"
-
-export default abstract class BrokerClient{ 
-  broker : Broker
-  client : Redis  
-  group : string | null = null
-  stream : string | null = null
-  list : string | null = null
-  callback:Function
-
-  constructor( broker:Broker, client:Redis, callback:Function, list:string | null, stream:string | null = null, group: string | null = null   ){
-    this.broker = broker
-    this.client = client
-    this.list = list
-    this.stream = stream
-    this.group = group
-    this.callback = callback
-
-    this.listenToStream.call( this )
-  }
-
-  throwError( error:any ){
-    return this.broker.throwError( error )
-  }
-
-  decypherResponse( ...responses:StreamResponse[] ):DecypheredResponse[]{
-    return this.broker.decypherResponse( ...responses )
-  }
-  
-  async getGroupResponse():Promise< StreamResponse[] | null >{
-    if( !this.group || !this.stream ) return null
-    return await this.client.xreadgroup( 'GROUP', this.group, this.broker.consumername, 'COUNT', 1, 'BLOCK', 0, 'STREAMS', this.stream, '>'  ) as StreamResponse[]
-  }
-
-  async getResponse( lastid:string ):Promise< StreamResponse[] | null >{
-    if( !this.stream ) return null
-    return await this.client.xread("BLOCK", 0, "STREAMS", this.stream, lastid )
-  }
-
-  
-  async listenToStream( lastid:string = '$'):Promise<Function | null>{
-    const responses = await this.getResponse.call( this, lastid ) 
-    if( !responses ) return null
-
-    const streamResponses = this.decypherResponse( ...responses )
-    const messages = streamResponses.flatMap( r => r.messages )
-    await Promise.all( messages.map( async (message) => {
-      try{
-        await this.streamCallback( message )
-
-      }catch( e:any ){
-        this.broker.throwError( e )
-      }finally{
-        
-      }
-    }) )
-    
-    return this.listenToStream.call( this, messages[messages.length-1]?.id??'$' )
-  }
-
-  abstract streamCallback( message:DecypheredMessage ):Promise<any | null>
-}

package/src/classes/ListListener.ts

@@ -1,19 +0,0 @@
-import { Redis } from "ioredis"
-import Broker from "./Broker"
-import BrokerClient from "./BrokerClient"
-import ListRunner from "./ListRunner"
-
-export default class Listener extends BrokerClient{
-  constructor( broker:Broker, client:Redis, list:string, callback:Function ){
-    super( broker, client, callback, list )
-  }  
-
-  async streamCallback( message:DecypheredMessage ){
-    const listrunnercallback = await this.callback( message.id, message.parameters )
-        
-    if( message.parameters.listname )
-      return new ListRunner( this.client, message.parameters.listname, listrunnercallback)
-
-    return null
-  }
-}

package/src/classes/ListRunner.ts

@@ -1,43 +0,0 @@
-import { Redis } from "ioredis"
-
-export default class ListRunner{
-  listname:string 
-  itemsDone:number = 0
-  itemsPerCall:number
-  callback:Function
-  client : Redis
-  
-  
-  constructor( client:Redis, listname:string, callback:Function, itemsPerCall : number = 1 ){
-    this.client = client
-    this.callback = callback
-    this.listname = listname
-    this.itemsPerCall = itemsPerCall
-    
-    this.run.call( this )
-  }  
-
-
-  async run():Promise<Function|void>{
-    const items = await this.nextitems.call( this, this.listname )
-    if( !items ){
-      console.log( `finished with ${this.itemsDone} jobs`)
-      return
-    }  
-
-    try{
-      await this.callback( items )
-    }catch( e:any ){
-      console.log( e )
-
-    }finally{
-      this.itemsDone += this.itemsPerCall
-      return this.run.call( this )
-    }
-  }
-
-  async nextitems( listname:string ):Promise<string[] | null>{
-    return this.client.lpop( listname, this.itemsPerCall )
-  }
-
-} 

package/src/classes/Listener.ts

@@ -1,13 +0,0 @@
-import { Redis } from "ioredis"
-import Broker from "./Broker"
-import BrokerClient from "./BrokerClient"
-
-export default class Listener extends BrokerClient{
-  constructor( broker:Broker, client:Redis, stream:string, callback:Function, group ?: string ){
-    super( broker, client, callback, null, stream, group )
-  }  
-
-  streamCallback(message: DecypheredMessage): Promise<any> {
-    return this.callback( message.id, message.parameters )
-  }
-}

package/src/main.ts

@@ -1,3 +0,0 @@
-import Broker from "./classes/Broker"
-
-export { Broker }

package/src/services/utils.ts

@@ -1,51 +0,0 @@
-
-const isJSON = ( str:any ) => {
-  if( typeof str == 'number' ) return false
-  try{
-    JSON.parse( str )
-  }catch( error ){
-    return false;
-  }
-  return true;
-} 
-
-interface ObjectToOmitFrom{
-  [index: string]: any;
-}
-
-
-const omit = ( objectToOmitFrom:ObjectToOmitFrom, keys:(keyof ObjectToOmitFrom)[]) => 
-Object.keys( objectToOmitFrom )
-.filter( key => keys.indexOf( key ) == -1 )
-.reduce( (struct:object,key) => 
-  Object.assign( struct, {[key]:objectToOmitFrom[key]} ) , 
-  {} 
-)
-
-
-
-const mapJsonReplacer = ( _key:any, value:Map<any,any> | any ) => {
-  if(value instanceof Map) {
-    return {
-      dataType: 'Map',
-      value: Array.from(value.entries()), // or with spread: value: [...value]
-    } as JsonStringifiedMap
-  } else {
-    return value;
-  }
-}
-
-const mapJsonReviver = ( _key:any, value:JsonStringifiedMap | any ) => {
-  if(typeof value === 'object' && value !== null) {
-    if (value.dataType === 'Map') {
-      return new Map(value.value);
-    }
-  }
-  return value;
-}
-
-const stringifyMap = ( map:Map<any,any> ):string=> JSON.stringify( map, exports.mapJsonReplacer)
-const parseMap = ( json:string ):Map<any,any> => JSON.parse( json, exports.mapJsonReviver)
-const capitalizeFirstLetter = (string:string) => string.charAt(0).toUpperCase() + string.slice(1)
-
-export { isJSON, omit, mapJsonReviver, stringifyMap, parseMap, mapJsonReplacer, capitalizeFirstLetter }