tool-db 1.2.1 → 1.3.1

package/dist/messageHandlers/handlePut.js

@@ -0,0 +1,61 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var __1 = require("..");
+var toolDbVerificationWrapper_1 = __importDefault(require("../toolDbVerificationWrapper"));
+function handlePut(message, remotePeerId) {
+    var _this = this;
+    toolDbVerificationWrapper_1.default.call(this, message).then(function (value) {
+        // console.log("Verification wrapper result: ", value, message.k);
+        if (value === __1.VerifyResult.Verified) {
+            // relay to other servers !!!
+            _this.network.sendToAll(message, true);
+            _this.store.get(message.k, function (err, oldData) {
+                if (oldData) {
+                    var parsedOldData = __assign({ type: "put" }, JSON.parse(oldData));
+                    if (parsedOldData.t < message.t) {
+                        var key = message.k;
+                        _this.triggerKeyListener(key, message);
+                        _this.store.put(message.k, JSON.stringify(message), function (err, data) {
+                            //
+                        });
+                    }
+                    else {
+                        var key = message.k;
+                        _this.triggerKeyListener(key, parsedOldData);
+                    }
+                    // } else if (this.options.debug) {
+                    //   console.log(
+                    //     `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
+                    //   );
+                    // }
+                }
+                else {
+                    var key = message.k;
+                    _this.triggerKeyListener(key, message);
+                    _this.store.put(message.k, JSON.stringify(message), function (err, data) {
+                        //
+                    });
+                }
+            });
+        }
+        else {
+            console.warn("unverified message: ", value, message);
+        }
+    });
+}
+exports.default = handlePut;
+//# sourceMappingURL=handlePut.js.map

package/dist/messageHandlers/handlePut.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handlePut.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePut.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wBAAsD;AACtD,2FAAqE;AAErE,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,iBA4CC;IAvCC,mCAAyB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;QACvD,kEAAkE;QAClE,IAAI,KAAK,KAAK,gBAAY,CAAC,QAAQ,EAAE;YACnC,6BAA6B;YAC7B,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAEtC,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,UAAC,GAAG,EAAE,OAAgB;gBAC9C,IAAI,OAAO,EAAE;oBACX,IAAM,aAAa,cACjB,IAAI,EAAE,KAAK,IACR,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CACvB,CAAC;oBACF,IAAI,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE;wBAC/B,IAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;wBACtB,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;wBACtC,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;4BAC3D,EAAE;wBACJ,CAAC,CAAC,CAAC;qBACJ;yBAAM;wBACL,IAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;wBACtB,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;qBAC7C;oBACD,mCAAmC;oBACnC,iBAAiB;oBACjB,4FAA4F;oBAC5F,OAAO;oBACP,IAAI;iBACL;qBAAM;oBACL,IAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;oBACtB,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACtC,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;wBAC3D,EAAE;oBACJ,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACtD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA5CD,4BA4CC"}

package/dist/messageHandlers/handleQuery.d.ts

@@ -0,0 +1,2 @@
+import { QueryMessage, ToolDb } from "..";
+export default function handleQuery(this: ToolDb, message: QueryMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleQuery.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function handleQuery(message, remotePeerId) {
+    var _this = this;
+    this.store.query(message.key).then(function (keys) {
+        _this.network.sendToClientId(remotePeerId, {
+            type: "queryAck",
+            id: message.id,
+            to: [],
+            keys: keys,
+        });
+    });
+    if (this.options.server) {
+        this.network.sendToAll(message, true, true);
+    }
+}
+exports.default = handleQuery;
+//# sourceMappingURL=handleQuery.js.map

package/dist/messageHandlers/handleQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleQuery.js","sourceRoot":"","sources":["../../src/messageHandlers/handleQuery.ts"],"names":[],"mappings":";;AAEA,SAAwB,WAAW,CAEjC,OAAqB,EACrB,YAAoB;IAHtB,iBAiBC;IAZC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,IAAI;QACtC,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;YACxC,IAAI,EAAE,UAAU;YAChB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,EAAE,EAAE,EAAE;YACN,IAAI,MAAA;SACc,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KAC7C;AACH,CAAC;AAjBD,8BAiBC"}

package/dist/messageHandlers/handleServers copy.d.ts

@@ -0,0 +1,2 @@
+import { ServersMessage, ToolDb } from "..";
+export default function handleServers(this: ToolDb, message: ServersMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleServers copy.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var verifyPeer_1 = __importDefault(require("../utils/verifyPeer"));
+function handleServers(message, remotePeerId) {
+    var _this = this;
+    message.servers.forEach(function (peer) {
+        (0, verifyPeer_1.default)(peer).then(function (verified) {
+            // Add this peer to our list of peers
+            if (verified) {
+                var filteredPeers = _this.peers.findIndex(function (p) { return p.pubkey === peer.pubkey; });
+                if (filteredPeers === -1) {
+                    // Add this peer to the list
+                    _this.peers.push(peer);
+                }
+            }
+        });
+    });
+}
+exports.default = handleServers;
+//# sourceMappingURL=handleServers%20copy.js.map

package/dist/messageHandlers/handleServers copy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleServers copy.js","sourceRoot":"","sources":["../../src/messageHandlers/handleServers copy.ts"],"names":[],"mappings":";;;;;AACA,mEAA6C;AAE7C,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBAmBC;IAdC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,IAAI;QAC3B,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;YAC7B,qCAAqC;YACrC,IAAI,QAAQ,EAAE;gBACZ,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,SAAS,CACxC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAxB,CAAwB,CAChC,CAAC;gBACF,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE;oBACxB,4BAA4B;oBAC5B,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACvB;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,gCAmBC"}

package/dist/messageHandlers/handleServers.d.ts

@@ -0,0 +1,2 @@
+import { ServersMessage, ToolDb } from "..";
+export default function handleServers(this: ToolDb, message: ServersMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleServers.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var verifyPeer_1 = __importDefault(require("../utils/verifyPeer"));
+function handleServers(message, remotePeerId) {
+    var _this = this;
+    message.servers.forEach(function (peer) {
+        (0, verifyPeer_1.default)(peer).then(function (verified) {
+            // Add this peer to our list of peers
+            if (verified) {
+                var filteredPeers = _this.peers.findIndex(function (p) { return p.pubkey === peer.pubkey; });
+                if (filteredPeers === -1) {
+                    // Add this peer to the list
+                    _this.peers.push(peer);
+                }
+            }
+        });
+    });
+}
+exports.default = handleServers;
+//# sourceMappingURL=handleServers.js.map

package/dist/messageHandlers/handleServers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleServers.js","sourceRoot":"","sources":["../../src/messageHandlers/handleServers.ts"],"names":[],"mappings":";;;;;AACA,mEAA6C;AAE7C,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBAmBC;IAdC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,IAAI;QAC3B,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;YAC7B,qCAAqC;YACrC,IAAI,QAAQ,EAAE;gBACZ,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,SAAS,CACxC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAxB,CAAwB,CAChC,CAAC;gBACF,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE;oBACxB,4BAA4B;oBAC5B,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACvB;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,gCAmBC"}

package/dist/messageHandlers/handleSubscribe.d.ts

@@ -0,0 +1,2 @@
+import { SubscribeMessage, ToolDb } from "..";
+export default function handleSubscribe(this: ToolDb, message: SubscribeMessage, remotePeerId: string): void;

package/dist/messageHandlers/handleSubscribe.js

@@ -0,0 +1,62 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var automerge_1 = __importDefault(require("automerge"));
+var __1 = require("..");
+function handleSubscribe(message, remotePeerId) {
+    var _this = this;
+    if (remotePeerId) {
+        var subId = remotePeerId + "-" + message.key;
+        if (!this.subscriptions.includes(subId)) {
+            this.subscriptions.push(subId);
+            this.addKeyListener(message.key, function (msg) {
+                if ((msg.type === "put" || msg.type === "crdt") && remotePeerId) {
+                    // We do not reply to the socket directly
+                    // instead we use the client id, in case the socket reconnects
+                    _this.network.sendToClientId(remotePeerId, msg);
+                }
+            });
+        }
+    }
+    // basically the exact same as GET, below
+    this.store.get(message.key, function (err, data) {
+        if (data) {
+            try {
+                var oldData = __assign(__assign({}, JSON.parse(data)), { id: message.id });
+                _this.network.sendToClientId(remotePeerId, oldData);
+            }
+            catch (e) {
+                // do nothing
+            }
+        }
+    });
+    this.loadCrdtDocument(message.key, false).then(function (doc) {
+        // console.log("Load crdt from subscribe", message.key, doc);
+        if (doc) {
+            var savedDoc = automerge_1.default.save(doc);
+            var msg = {
+                type: "crdt",
+                key: message.key,
+                to: [],
+                id: (0, __1.textRandom)(10),
+                doc: (0, __1.uint8ToBase64)(savedDoc),
+            };
+            _this.network.sendToClientId(remotePeerId, msg);
+        }
+    });
+}
+exports.default = handleSubscribe;
+//# sourceMappingURL=handleSubscribe.js.map

package/dist/messageHandlers/handleSubscribe.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleSubscribe.js","sourceRoot":"","sources":["../../src/messageHandlers/handleSubscribe.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAkC;AAClC,wBAMY;AAEZ,SAAwB,eAAe,CAErC,OAAyB,EACzB,YAAoB;IAHtB,iBA8CC;IAzCC,IAAI,YAAY,EAAE;QAChB,IAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACvC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE/B,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG;gBACnC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;oBAC/D,yCAAyC;oBACzC,8DAA8D;oBAC9D,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;iBAChD;YACH,CAAC,CAAC,CAAC;SACJ;KACF;IAED,yCAAyC;IACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG,EAAE,IAAI;QACpC,IAAI,IAAI,EAAE;YACR,IAAI;gBACF,IAAM,OAAO,yBAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAE,EAAE,EAAE,OAAO,CAAC,EAAE,GAAE,CAAC;gBACxD,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;aACpD;YAAC,OAAO,CAAC,EAAE;gBACV,aAAa;aACd;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,UAAC,GAAG;QACjD,6DAA6D;QAC7D,IAAI,GAAG,EAAE;YACP,IAAM,QAAQ,GAAG,mBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrC,IAAM,GAAG,GAAgB;gBACvB,IAAI,EAAE,MAAM;gBACZ,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,IAAA,cAAU,EAAC,EAAE,CAAC;gBAClB,GAAG,EAAE,IAAA,iBAAa,EAAC,QAAQ,CAAC;aAC7B,CAAC;YACF,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;SAChD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA9CD,kCA8CC"}

package/dist/metrics/metricsConfig.d.ts

@@ -0,0 +1,6 @@
+export declare const activeListenersCounter: import("@opentelemetry/api-metrics").UpDownCounter;
+export declare const idListenersCounter: import("@opentelemetry/api-metrics").UpDownCounter;
+export declare const messagesCounter: import("@opentelemetry/api-metrics").Counter;
+export declare const messagesGetCounter: import("@opentelemetry/api-metrics").Counter;
+export declare const messagesPutCounter: import("@opentelemetry/api-metrics").Counter;
+export declare const clientsCounter: import("@opentelemetry/api-metrics").Histogram;

package/dist/metrics/metricsConfig.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clientsCounter = exports.messagesPutCounter = exports.messagesGetCounter = exports.messagesCounter = exports.idListenersCounter = exports.activeListenersCounter = void 0;
+var exporter_prometheus_1 = require("@opentelemetry/exporter-prometheus");
+var sdk_metrics_base_1 = require("@opentelemetry/sdk-metrics-base");
+var prometheusPort = exporter_prometheus_1.PrometheusExporter.DEFAULT_OPTIONS.port;
+var prometheusEndpoint = exporter_prometheus_1.PrometheusExporter.DEFAULT_OPTIONS.endpoint;
+var exporter = new exporter_prometheus_1.PrometheusExporter({
+    port: 9464,
+}, function () {
+    console.log("prometheus scrape endpoint: http://localhost:" + prometheusPort + prometheusEndpoint);
+});
+var meter = new sdk_metrics_base_1.MeterProvider({
+    exporter: exporter,
+    interval: 1000,
+}).getMeter("tooldb");
+exports.activeListenersCounter = meter.createUpDownCounter("tooldb_active_listeners", {
+    description: "Current active listeners count",
+});
+exports.idListenersCounter = meter.createUpDownCounter("tooldb_id_listeners", {
+    description: "Current ID listeners count",
+});
+exports.messagesCounter = meter.createCounter("tooldb_messages", {
+    description: "Messages counter",
+});
+exports.messagesGetCounter = meter.createCounter("tooldb_get", {
+    description: "Messages GET counter",
+});
+exports.messagesPutCounter = meter.createCounter("tooldb_put", {
+    description: "Messages PUT counter",
+});
+exports.clientsCounter = meter.createHistogram("tooldb_connected_peers", {
+    description: "Current connected clients",
+});
+//# sourceMappingURL=metricsConfig.js.map

package/dist/metrics/metricsConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metricsConfig.js","sourceRoot":"","sources":["../../src/metrics/metricsConfig.ts"],"names":[],"mappings":";;;AAAA,0EAAwE;AACxE,oEAAgE;AAEhE,IAAM,cAAc,GAAG,wCAAkB,CAAC,eAAe,CAAC,IAAI,CAAC;AAC/D,IAAM,kBAAkB,GAAG,wCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC;AAEvE,IAAM,QAAQ,GAAG,IAAI,wCAAkB,CACrC;IACE,IAAI,EAAE,IAAI;CACX,EACD;IACE,OAAO,CAAC,GAAG,CACT,kDAAgD,cAAc,GAAG,kBAAoB,CACtF,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,IAAM,KAAK,GAAG,IAAI,gCAAa,CAAC;IAC9B,QAAQ,UAAA;IACR,QAAQ,EAAE,IAAI;CACf,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAET,QAAA,sBAAsB,GAAG,KAAK,CAAC,mBAAmB,CAC7D,yBAAyB,EACzB;IACE,WAAW,EAAE,gCAAgC;CAC9C,CACF,CAAC;AAEW,QAAA,kBAAkB,GAAG,KAAK,CAAC,mBAAmB,CACzD,qBAAqB,EACrB;IACE,WAAW,EAAE,4BAA4B;CAC1C,CACF,CAAC;AAEW,QAAA,eAAe,GAAG,KAAK,CAAC,aAAa,CAAC,iBAAiB,EAAE;IACpE,WAAW,EAAE,kBAAkB;CAChC,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE;IAClE,WAAW,EAAE,sBAAsB;CACpC,CAAC,CAAC;AAEU,QAAA,kBAAkB,GAAG,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE;IAClE,WAAW,EAAE,sBAAsB;CACpC,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,KAAK,CAAC,eAAe,CAAC,wBAAwB,EAAE;IAC5E,WAAW,EAAE,2BAA2B;CACzC,CAAC,CAAC"}

package/dist/toolDbClientOnMessage.d.ts

@@ -1,3 +1,3 @@
+import { ToolDbMessage } from ".";
 import ToolDb from "./tooldb";
-import { ToolDbWebSocket } from "./wss";
-export default function toolDbClientOnMessage(this: ToolDb, data: string, socket: ToolDbWebSocket): void;
+export default function toolDbClientOnMessage(this: ToolDb, message: ToolDbMessage, remotePeerId: string): void;

package/dist/toolDbClientOnMessage.js

@@ -1,266 +1,67 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var _1 = require(".");
-var toolDbVerificationWrapper_1 = __importDefault(require("./toolDbVerificationWrapper"));
-var automerge_1 = __importDefault(require("automerge"));
-var base64ToBinaryChange_1 = __importDefault(require("./utils/base64ToBinaryChange"));
-function toolDbClientOnMessage(data, socket) {
-    var _this = this;
-    var originalData = data;
-    if (typeof data === "string") {
-        try {
-            var message_1 = JSON.parse(data);
-            console.warn("Got message > ", message_1.type, message_1.k || "", message_1);
-            // Check if we are listening for this ID
-            if (message_1.id) {
-                var msgId = message_1.id;
-                if (this._idListeners[msgId]) {
-                    this._idListeners[msgId](message_1);
-                    this.removeIdListener(msgId);
-                }
-            }
-            if (message_1.type === "ping") {
-                socket.toolDbId = message_1.clientId;
-                this.websockets._clientSockets[message_1.clientId] = socket;
-                socket.isServer = message_1.isServer;
-                this.websockets.sendToClientId(socket.toolDbId || "", {
-                    type: "pong",
-                    isServer: this.options.server,
-                    clientId: this.options.id,
-                    to: [],
-                    id: (0, _1.textRandom)(10),
-                });
-            }
-            if (message_1.type === "pong") {
-                socket.toolDbId = message_1.clientId;
-                socket.isServer = message_1.isServer;
-                this.websockets._clientSockets[message_1.clientId] = socket;
-                this.onConnect();
-            }
-            if (message_1.type === "subscribe") {
-                if (socket.toolDbId) {
-                    var subId = socket.toolDbId + "-" + message_1.key;
-                    if (!this.subscriptions.includes(subId)) {
-                        this.subscriptions.push(subId);
-                        this.addKeyListener(message_1.key, function (msg) {
-                            if ((msg.type === "put" || msg.type === "crdt") &&
-                                socket.toolDbId) {
-                                // We do not reply to the socket directly
-                                // instead we use the client id, in case the socket reconnects
-                                _this.websockets.sendToClientId(socket.toolDbId, msg);
-                            }
-                        });
-                    }
-                }
-                // basically the exact same as GET, below
-                this.store.get(message_1.key, function (err, data) {
-                    if (data) {
-                        try {
-                            var oldData = __assign(__assign({}, JSON.parse(data)), { id: message_1.id });
-                            _this.websockets.sendToClientId(socket.toolDbId || "", oldData);
-                        }
-                        catch (e) {
-                            // do nothing
-                        }
-                    }
-                });
-                this.loadCrdtDocument(message_1.key, false).then(function (doc) {
-                    // console.log("Load crdt from subscribe", message.key, doc);
-                    if (doc) {
-                        var savedDoc = automerge_1.default.save(doc);
-                        // console.log("saved", savedDoc);
-                        var msg = {
-                            type: "crdt",
-                            key: message_1.key,
-                            to: [],
-                            id: (0, _1.textRandom)(10),
-                            doc: (0, _1.uint8ToBase64)(savedDoc),
-                        };
-                        _this.websockets.sendToClientId(socket.toolDbId || "", msg);
-                    }
-                });
-            }
-            if (message_1.type === "get") {
-                this.store.get(message_1.key, function (err, data) {
-                    if (data) {
-                        try {
-                            // Use the id of the get so the other client knows we are replying
-                            var oldData = __assign(__assign({ type: "put" }, JSON.parse(data)), { id: message_1.id });
-                            _this.websockets.sendToClientId(socket.toolDbId || "", oldData);
-                        }
-                        catch (e) {
-                            // socket.send(data);
-                            // do nothing
-                        }
-                    }
-                    else {
-                        if (_this.options.debug) {
-                            console.log("Local key not found, relay", originalData);
-                        }
-                        _this.websockets.send(message_1);
-                    }
-                });
-            }
-            if (message_1.type === "put") {
-                toolDbVerificationWrapper_1.default.call(this, message_1).then(function (value) {
-                    // console.log("Verification wrapper result: ", value, message.k);
-                    if (value === _1.VerifyResult.Verified) {
-                        // relay to other servers !!!
-                        _this.websockets.send(message_1);
-                        _this.store.get(message_1.k, function (err, oldData) {
-                            if (oldData) {
-                                var parsedOldData = __assign({ type: "put" }, JSON.parse(oldData));
-                                if (parsedOldData.t < message_1.t) {
-                                    var key = message_1.k;
-                                    _this.triggerKeyListener(key, message_1);
-                                    _this.store.put(message_1.k, JSON.stringify(message_1), function (err, data) {
-                                        //
-                                    });
-                                }
-                                else {
-                                    var key = message_1.k;
-                                    _this.triggerKeyListener(key, parsedOldData);
-                                }
-                                // } else if (this.options.debug) {
-                                //   console.log(
-                                //     `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
-                                //   );
-                                // }
-                            }
-                            else {
-                                var key = message_1.k;
-                                _this.triggerKeyListener(key, message_1);
-                                _this.store.put(message_1.k, JSON.stringify(message_1), function (err, data) {
-                                    //
-                                });
-                            }
-                        });
-                    }
-                    else {
-                        console.warn("unverified message: ", value, message_1);
-                    }
-                });
-            }
-            if (message_1.type === "crdtPut") {
-                // key = aggregated, final value
-                // key.crdt = automerge doc with changes
-                // const writeStart = new Date().getTime();
-                toolDbVerificationWrapper_1.default.call(this, message_1).then(function (value) {
-                    // console.log("CRDT Verification wrapper result: ", value);
-                    if (value === _1.VerifyResult.Verified) {
-                        var key_1 = message_1.k;
-                        var data_1 = [];
-                        try {
-                            data_1 = JSON.parse(message_1.v);
-                        }
-                        catch (e) {
-                            //
-                        }
-                        var changes_1 = data_1.map(base64ToBinaryChange_1.default);
-                        _this.loadCrdtDocument(key_1).then(function (currentDoc) {
-                            // if (currentDoc) {
-                            //   console.log(
-                            //     "loaded",
-                            //     key,
-                            //     currentDoc,
-                            //     Automerge.getHistory(currentDoc)
-                            //   );
-                            // }
-                            var newDoc = automerge_1.default.init();
-                            try {
-                                newDoc = automerge_1.default.applyChanges(currentDoc || automerge_1.default.init(), changes_1)[0];
-                            }
-                            catch (e) {
-                                try {
-                                    newDoc = automerge_1.default.applyChanges(automerge_1.default.init(), changes_1)[0];
-                                }
-                                catch (ee) {
-                                    if (_this.options.debug) {
-                                        console.log(ee);
-                                    }
-                                }
-                            }
-                            // if (newDoc) {
-                            //   console.log(
-                            //     "new document changes:",
-                            //     Automerge.getHistory(newDoc)
-                            //   );
-                            // }
-                            // persist
-                            _this.documents[key_1] = newDoc;
-                            var savedDoc = automerge_1.default.save(newDoc);
-                            _this.store.put(key_1 + ".crdt", savedDoc, function (err, data) {
-                                // const writeEnd = new Date().getTime();
-                                // console.log("CRDT write: ", (writeEnd - writeStart) / 1000);
-                            });
-                            var crdtMessage = {
-                                type: "crdt",
-                                key: key_1,
-                                id: message_1.id,
-                                to: [],
-                                doc: (0, _1.uint8ToBase64)(savedDoc),
-                            };
-                            _this.triggerKeyListener(key_1, crdtMessage);
-                            // relay to other servers
-                            // !!!
-                            _this.websockets.send(crdtMessage);
-                        });
-                    }
-                    else {
-                        console.log("unverified message", value, message_1);
-                    }
-                });
-            }
-            if (message_1.type === "crdtGet") {
-                this.loadCrdtDocument(message_1.key).then(function (currentDoc) {
-                    var saved = automerge_1.default.save(currentDoc || automerge_1.default.init());
-                    _this.websockets.sendToClientId(socket.toolDbId || "", {
-                        type: "crdt",
-                        id: message_1.id,
-                        key: message_1.key,
-                        to: [],
-                        doc: (0, _1.uint8ToBase64)(saved),
-                    });
-                });
-            }
-            if (message_1.type === "query") {
-                this.store.query(message_1.key).then(function (keys) {
-                    _this.websockets.sendToClientId(socket.toolDbId || "", {
-                        type: "queryAck",
-                        id: message_1.id,
-                        to: [],
-                        keys: keys,
-                    });
-                });
-            }
-            if (message_1.type === "crdt") {
-                var key = message_1.key;
-                this.triggerKeyListener(key, message_1);
-                var savedDoc = (0, _1.base64ToBinaryDocument)(message_1.doc);
-                this.store.put(key + ".crdt", savedDoc, function (err, data) {
-                    //
-                });
-            }
-        }
-        catch (e) {
-            console.log("Got message ERR > ", data);
-            console.log(e);
+function toolDbClientOnMessage(message, remotePeerId) {
+    if (!this.processedIds[message.type]) {
+        this.processedIds[message.type] = [];
+    }
+    if (this.processedIds[message.type].includes(message.id)) {
+        // console.warn(
+        //   `Already processed this message > ${message.type} from ${remotePeerId}`
+        // );
+        return;
+    }
+    this.emit("message", message, remotePeerId);
+    this.processedIds[message.type].push(message.id);
+    // console.warn(
+    //   `Got message > ${remotePeerId}`,
+    //   message.type,
+    //   (message as any).k || ""
+    //   // message
+    // );
+    // console.warn(`Got message ${message.type} from ${remotePeerId}`);
+    // Check if we are listening for this ID
+    if (message.id) {
+        var msgId = message.id;
+        if (this._idListeners[msgId]) {
+            this._idListeners[msgId](message);
+            this.removeIdListener(msgId);
         }
     }
+    if (message === undefined || message.type === undefined) {
+        console.warn("Message is invalid!", message, typeof message);
+        return;
+    }
+    switch (message.type) {
+        case "ping":
+            this.handlePing(message, remotePeerId);
+            break;
+        case "pong":
+            this.handlePong(message, remotePeerId);
+            break;
+        case "subscribe":
+            this.handleSubscribe(message, remotePeerId);
+            break;
+        case "get":
+            this.handleGet(message, remotePeerId);
+            break;
+        case "put":
+            this.handlePut(message, remotePeerId);
+            break;
+        case "crdtPut":
+            this.handleCrdtPut(message, remotePeerId);
+            break;
+        case "crdtGet":
+            this.handleCrdtGet(message, remotePeerId);
+            break;
+        case "query":
+            this.handleQuery(message, remotePeerId);
+            break;
+        case "crdt":
+            this.handleCrdt(message, remotePeerId);
+            break;
+        default:
+            break;
+    }
 }
 exports.default = toolDbClientOnMessage;
 //# sourceMappingURL=toolDbClientOnMessage.js.map