tool-db 2.2.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -139
- package/bundle.js +1 -1
- package/dist/adapters/toolDbIndexedb.d.ts +10 -0
- package/dist/adapters/toolDbIndexedb.js +128 -0
- package/dist/adapters/toolDbIndexedb.js.map +1 -0
- package/dist/adapters/toolDbLeveldb.d.ts +9 -0
- package/dist/adapters/toolDbLeveldb.js +112 -0
- package/dist/adapters/toolDbLeveldb.js.map +1 -0
- package/dist/adapters/toolDbWeb3User.d.ts +20 -0
- package/dist/adapters/toolDbWeb3User.js +75 -0
- package/dist/adapters/toolDbWeb3User.js.map +1 -0
- package/dist/adapters/toolDbWebrtc.d.ts +59 -0
- package/dist/adapters/toolDbWebrtc.js +492 -0
- package/dist/adapters/toolDbWebrtc.js.map +1 -0
- package/dist/adapters/toolDbWebsocket.d.ts +19 -0
- package/dist/adapters/toolDbWebsocket.js +181 -0
- package/dist/adapters/toolDbWebsocket.js.map +1 -0
- package/dist/adapters-base/networkAdapter.d.ts +57 -0
- package/dist/adapters-base/networkAdapter.js +184 -0
- package/dist/adapters-base/networkAdapter.js.map +1 -0
- package/dist/adapters-base/storageAdapter.d.ts +9 -0
- package/dist/adapters-base/storageAdapter.js +26 -0
- package/dist/adapters-base/storageAdapter.js.map +1 -0
- package/dist/adapters-base/userAdapter.d.ts +14 -0
- package/dist/adapters-base/userAdapter.js +35 -0
- package/dist/adapters-base/userAdapter.js.map +1 -0
- package/dist/index.d.ts +8 -4
- package/dist/index.js +15 -7
- package/dist/index.js.map +1 -1
- package/dist/logger.d.ts +2 -0
- package/dist/logger.js +32 -0
- package/dist/logger.js.map +1 -0
- package/dist/messageHandlers/handleCrdtGet.js +19 -22
- package/dist/messageHandlers/handleCrdtGet.js.map +1 -1
- package/dist/messageHandlers/handleCrdtPut.js +23 -14
- package/dist/messageHandlers/handleCrdtPut.js.map +1 -1
- package/dist/messageHandlers/handleGet.js +19 -21
- package/dist/messageHandlers/handleGet.js.map +1 -1
- package/dist/messageHandlers/handleJoin.js +2 -2
- package/dist/messageHandlers/handleJoin.js.map +1 -1
- package/dist/messageHandlers/handlePing.js +1 -0
- package/dist/messageHandlers/handlePing.js.map +1 -1
- package/dist/messageHandlers/handlePong.js +1 -23
- package/dist/messageHandlers/handlePong.js.map +1 -1
- package/dist/messageHandlers/handlePut.js +29 -25
- package/dist/messageHandlers/handlePut.js.map +1 -1
- package/dist/messageHandlers/handleQuery.js +7 -2
- package/dist/messageHandlers/handleQuery.js.map +1 -1
- package/dist/messageHandlers/handleServers.js +1 -1
- package/dist/messageHandlers/handleServers.js.map +1 -1
- package/dist/messageHandlers/handleSubscribe.js +30 -29
- package/dist/messageHandlers/handleSubscribe.js.map +1 -1
- package/dist/sendJoin.d.ts +2 -0
- package/dist/sendJoin.js +31 -0
- package/dist/sendJoin.js.map +1 -0
- package/dist/toolDbClientOnMessage.js +5 -8
- package/dist/toolDbClientOnMessage.js.map +1 -1
- package/dist/toolDbCrdtGet.js +29 -32
- package/dist/toolDbCrdtGet.js.map +1 -1
- package/dist/toolDbCrdtPut.js +25 -26
- package/dist/toolDbCrdtPut.js.map +1 -1
- package/dist/toolDbGet.js +29 -30
- package/dist/toolDbGet.js.map +1 -1
- package/dist/toolDbKeysSignIn.d.ts +1 -1
- package/dist/toolDbKeysSignIn.js +8 -4
- package/dist/toolDbKeysSignIn.js.map +1 -1
- package/dist/toolDbNetworkAdapter.js +5 -9
- package/dist/toolDbNetworkAdapter.js.map +1 -1
- package/dist/toolDbPut.js +33 -30
- package/dist/toolDbPut.js.map +1 -1
- package/dist/toolDbQueryKeys.js +8 -7
- package/dist/toolDbQueryKeys.js.map +1 -1
- package/dist/toolDbSignIn.js +6 -3
- package/dist/toolDbSignIn.js.map +1 -1
- package/dist/toolDbSignUp.js +37 -33
- package/dist/toolDbSignUp.js.map +1 -1
- package/dist/toolDbSubscribe.d.ts +2 -1
- package/dist/toolDbSubscribe.js +20 -16
- package/dist/toolDbSubscribe.js.map +1 -1
- package/dist/toolDbVerificationWrapper.js +15 -10
- package/dist/toolDbVerificationWrapper.js.map +1 -1
- package/dist/toolDbWebrtc.d.ts +0 -6
- package/dist/toolDbWebrtc.js +16 -15
- package/dist/toolDbWebrtc.js.map +1 -1
- package/dist/toolDbWebsocket.js +9 -15
- package/dist/toolDbWebsocket.js.map +1 -1
- package/dist/tooldb.d.ts +9 -3
- package/dist/tooldb.js +12 -9
- package/dist/tooldb.js.map +1 -1
- package/dist/types/message.d.ts +1 -1
- package/dist/types/tooldb.d.ts +7 -27
- package/dist/types/tooldb.js +0 -33
- package/dist/types/tooldb.js.map +1 -1
- package/dist/utils/getPeerSignature.d.ts +2 -2
- package/dist/utils/indexedb.js +4 -4
- package/dist/utils/indexedb.js.map +1 -1
- package/dist/utils/leveldb.js +4 -4
- package/dist/utils/leveldb.js.map +1 -1
- package/dist/utils/verifyMessage.js +37 -33
- package/dist/utils/verifyMessage.js.map +1 -1
- package/dist/utils/verifyPeer.js +1 -1
- package/dist/utils/verifyPeer.js.map +1 -1
- package/package.json +1 -1
- package/test-alice/000145.ldb +0 -0
- package/test-alice/000147.ldb +0 -0
- package/test-alice/000150.ldb +0 -0
- package/test-alice/000153.ldb +0 -0
- package/test-alice/000154.log +0 -0
- package/test-alice/CURRENT +1 -1
- package/test-alice/LOG +5 -5
- package/test-alice/LOG.old +5 -5
- package/test-alice/MANIFEST-000152 +0 -0
- package/test-alice-speed/000022.ldb +0 -0
- package/test-alice-speed/000024.ldb +0 -0
- package/test-alice-speed/000027.ldb +0 -0
- package/test-alice-speed/000030.ldb +0 -0
- package/test-alice-speed/000031.log +0 -0
- package/test-alice-speed/CURRENT +1 -1
- package/test-alice-speed/LOG +5 -13
- package/test-alice-speed/LOG.old +5 -5
- package/test-alice-speed/MANIFEST-000029 +0 -0
- package/{test-verify-a/000250.log → test-base-client/000099.log} +0 -0
- package/test-base-client/CURRENT +1 -0
- package/test-base-client/LOCK +0 -0
- package/test-base-client/LOG +3 -0
- package/test-base-client/LOG.old +3 -0
- package/test-base-client/MANIFEST-000098 +0 -0
- package/test-base-server/000101.log +0 -0
- package/test-base-server/CURRENT +1 -0
- package/test-base-server/LOCK +0 -0
- package/test-base-server/LOG +3 -0
- package/test-base-server/LOG.old +3 -0
- package/test-base-server/MANIFEST-000100 +0 -0
- package/test-bob/000160.ldb +0 -0
- package/test-bob/000162.ldb +0 -0
- package/test-bob/000163.log +0 -0
- package/test-bob/CURRENT +1 -1
- package/test-bob/LOG +5 -5
- package/test-bob/LOG.old +14 -14
- package/test-bob/MANIFEST-000161 +0 -0
- package/test-chris/000017.ldb +0 -0
- package/test-chris/000020.ldb +0 -0
- package/test-chris/000023.ldb +0 -0
- package/test-chris/000026.ldb +0 -0
- package/test-chris/000029.ldb +0 -0
- package/test-chris/000086.ldb +0 -0
- package/test-chris/000089.ldb +0 -0
- package/test-chris/000092.ldb +0 -0
- package/test-chris/000095.ldb +0 -0
- package/test-chris/000098.ldb +0 -0
- package/test-chris/000103.ldb +0 -0
- package/test-chris/000106.ldb +0 -0
- package/test-chris/000109.ldb +0 -0
- package/test-chris/000112.ldb +0 -0
- package/test-chris/000115.ldb +0 -0
- package/test-chris/000118.ldb +0 -0
- package/test-chris/000121.ldb +0 -0
- package/test-chris/000124.ldb +0 -0
- package/test-chris/000127.ldb +0 -0
- package/test-chris/000130.ldb +0 -0
- package/test-chris/000133.ldb +0 -0
- package/test-chris/000136.ldb +0 -0
- package/test-chris/000139.ldb +0 -0
- package/test-chris/000142.ldb +0 -0
- package/test-chris/000145.ldb +0 -0
- package/test-chris/000148.ldb +0 -0
- package/test-chris/000151.ldb +0 -0
- package/test-chris/000152.log +0 -0
- package/test-chris/CURRENT +1 -0
- package/test-chris/LOCK +0 -0
- package/test-chris/LOG +6 -0
- package/test-chris/LOG.old +6 -0
- package/test-chris/MANIFEST-000150 +0 -0
- package/test-node-a/000175.ldb +0 -0
- package/test-node-a/000177.ldb +0 -0
- package/test-node-a/000178.log +0 -0
- package/test-node-a/CURRENT +1 -1
- package/test-node-a/LOG +5 -5
- package/test-node-a/LOG.old +14 -5
- package/test-node-a/MANIFEST-000176 +0 -0
- package/test-node-b/000175.ldb +0 -0
- package/test-node-b/000177.ldb +0 -0
- package/test-node-b/000178.log +0 -0
- package/test-node-b/CURRENT +1 -1
- package/test-node-b/LOG +5 -5
- package/test-node-b/LOG.old +14 -5
- package/test-node-b/MANIFEST-000176 +0 -0
- package/test-store/000007.ldb +0 -0
- package/test-store/000010.ldb +0 -0
- package/test-store/000013.ldb +0 -0
- package/test-store/000016.ldb +0 -0
- package/test-store/000019.ldb +0 -0
- package/test-store/000022.ldb +0 -0
- package/test-store/000025.ldb +0 -0
- package/test-store/000028.ldb +0 -0
- package/test-store/000031.ldb +0 -0
- package/test-store/000034.ldb +0 -0
- package/test-store/000037.ldb +0 -0
- package/test-store/000038.log +0 -0
- package/test-store/CURRENT +1 -0
- package/test-store/LOCK +0 -0
- package/test-store/LOG +6 -0
- package/test-store/LOG.old +6 -0
- package/test-store/MANIFEST-000036 +0 -0
- package/test-verify-a/000049.log +0 -0
- package/test-verify-a/CURRENT +1 -1
- package/test-verify-a/LOG +3 -3
- package/test-verify-a/LOG.old +3 -3
- package/test-verify-a/MANIFEST-000048 +0 -0
- package/toolDbLibP2p.ts +12 -11
- package/test-alice/000663.ldb +0 -0
- package/test-alice/000665.ldb +0 -0
- package/test-alice/000668.ldb +0 -0
- package/test-alice/000669.log +0 -0
- package/test-alice/MANIFEST-000667 +0 -0
- package/test-alice-speed/000035.log +0 -0
- package/test-alice-speed/000036.ldb +0 -0
- package/test-alice-speed/MANIFEST-000033 +0 -0
- package/test-bob/000665.ldb +0 -0
- package/test-bob/000667.ldb +0 -0
- package/test-bob/000668.log +0 -0
- package/test-bob/MANIFEST-000666 +0 -0
- package/test-node-a/000663.ldb +0 -0
- package/test-node-a/000665.ldb +0 -0
- package/test-node-a/000668.ldb +0 -0
- package/test-node-a/000669.log +0 -0
- package/test-node-a/MANIFEST-000667 +0 -0
- package/test-node-b/000663.ldb +0 -0
- package/test-node-b/000665.ldb +0 -0
- package/test-node-b/000668.ldb +0 -0
- package/test-node-b/000669.log +0 -0
- package/test-node-b/MANIFEST-000667 +0 -0
- package/test-verify-a/000026.ldb +0 -0
- package/test-verify-a/000029.ldb +0 -0
- package/test-verify-a/000031.ldb +0 -0
- package/test-verify-a/000033.ldb +0 -0
- package/test-verify-a/MANIFEST-000249 +0 -0
package/dist/logger.js
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
3
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
4
|
+
if (ar || !(i in from)) {
|
|
5
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
6
|
+
ar[i] = from[i];
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
var sha1_1 = __importDefault(require("./utils/sha1"));
|
|
16
|
+
function logger(arg0, arg1, arg2, arg3, arg4, arg5) {
|
|
17
|
+
if (this.options.debug) {
|
|
18
|
+
var isNode = typeof window === "undefined";
|
|
19
|
+
var title = isNode
|
|
20
|
+
? this.options.storageName
|
|
21
|
+
: "%c" + this.options.storageName;
|
|
22
|
+
var style = isNode
|
|
23
|
+
? ""
|
|
24
|
+
: "background: #" +
|
|
25
|
+
(0, sha1_1.default)(this.options.storageName).slice(-6) +
|
|
26
|
+
"; padding: 2px; color: black";
|
|
27
|
+
console.log.apply(console, __spreadArray([title,
|
|
28
|
+
style], [arg0, arg1, arg2, arg3, arg4, arg4, arg5].slice(0, arguments.length), false));
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.default = logger;
|
|
32
|
+
//# sourceMappingURL=logger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,sDAAgC;AAEhC,SAAwB,MAAM,CAE5B,IAAS,EACT,IAAU,EACV,IAAU,EACV,IAAU,EACV,IAAU,EACV,IAAU;IAEV,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;QACtB,IAAM,MAAM,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;QAC7C,IAAM,KAAK,GAAG,MAAM;YAClB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW;YAC1B,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;QAEpC,IAAM,KAAK,GAAG,MAAM;YAClB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,eAAe;gBACf,IAAA,cAAI,EAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACxC,8BAA8B,CAAC;QAEnC,OAAO,CAAC,GAAG,OAAX,OAAO,iBACL,KAAK;YACL,KAAK,GACF,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,UACxE;KACH;AACH,CAAC;AA3BD,yBA2BC"}
|
|
@@ -2,30 +2,27 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
function handleCrdtGet(message, remotePeerId) {
|
|
4
4
|
var _this = this;
|
|
5
|
-
this.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
catch (e) {
|
|
19
|
-
// socket.send(data);
|
|
20
|
-
// do nothing
|
|
21
|
-
}
|
|
5
|
+
this.store
|
|
6
|
+
.get(message.key)
|
|
7
|
+
.then(function (data) {
|
|
8
|
+
try {
|
|
9
|
+
// Use the id of the get so the other client knows we are replying
|
|
10
|
+
var oldData = {
|
|
11
|
+
type: "crdtPut",
|
|
12
|
+
data: JSON.parse(data),
|
|
13
|
+
to: [],
|
|
14
|
+
id: message.id,
|
|
15
|
+
};
|
|
16
|
+
_this.network.sendToClientId(remotePeerId, oldData);
|
|
22
17
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
27
|
-
_this.network.sendToAll(message, false, true);
|
|
18
|
+
catch (e) {
|
|
19
|
+
// socket.send(data);
|
|
20
|
+
// do nothing
|
|
28
21
|
}
|
|
22
|
+
})
|
|
23
|
+
.catch(function (e) {
|
|
24
|
+
_this.logger("Local key not found, relay", JSON.stringify(message));
|
|
25
|
+
_this.network.sendToAll(message, false);
|
|
29
26
|
});
|
|
30
27
|
}
|
|
31
28
|
exports.default = handleCrdtGet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;AAGA,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,
|
|
1
|
+
{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;AAGA,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBA0BC;IArBC,IAAI,CAAC,KAAK;SACP,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,IAAI,CAAC,UAAC,IAAI;QACT,IAAI;YACF,kEAAkE;YAClE,IAAM,OAAO,GAAG;gBACd,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACtB,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,OAAO,CAAC,EAAE;aACG,CAAC;YACpB,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACV,qBAAqB;YACrB,aAAa;SACd;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,KAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC;AA1BD,gCA0BC"}
|
|
@@ -23,15 +23,17 @@ var counterCrdt_1 = __importDefault(require("../crdt/counterCrdt"));
|
|
|
23
23
|
function handleCrdtPut(message, remotePeerId) {
|
|
24
24
|
var _this = this;
|
|
25
25
|
toolDbVerificationWrapper_1.default.call(this, message.data).then(function (value) {
|
|
26
|
-
//
|
|
26
|
+
// this.logger("Verification wrapper result: ", value, message.k);
|
|
27
27
|
if (value === message_1.VerifyResult.Verified) {
|
|
28
28
|
_this.emit("crdtput", message);
|
|
29
29
|
_this.emit("data", message.data);
|
|
30
30
|
_this.emit("verified", message);
|
|
31
31
|
// relay to other servers !!!
|
|
32
32
|
_this.network.sendToAll(message, true);
|
|
33
|
-
_this.store
|
|
34
|
-
|
|
33
|
+
_this.store
|
|
34
|
+
.get(message.data.k)
|
|
35
|
+
.then(function (oldData) {
|
|
36
|
+
try {
|
|
35
37
|
var parsedOldData = JSON.parse(oldData);
|
|
36
38
|
var newMessage = message;
|
|
37
39
|
// Merge old document with new data incoming and save it
|
|
@@ -56,31 +58,38 @@ function handleCrdtPut(message, remotePeerId) {
|
|
|
56
58
|
if (parsedOldData.t < message.data.t) {
|
|
57
59
|
var key = newMessage.data.k;
|
|
58
60
|
_this.triggerKeyListener(key, newMessage.data);
|
|
59
|
-
_this.store
|
|
60
|
-
|
|
61
|
+
_this.store
|
|
62
|
+
.put(newMessage.data.k, JSON.stringify(newMessage.data))
|
|
63
|
+
.catch(function (e) {
|
|
64
|
+
// do nothing
|
|
61
65
|
});
|
|
62
66
|
}
|
|
63
67
|
else {
|
|
64
68
|
var key = message.data.k;
|
|
65
69
|
_this.triggerKeyListener(key, parsedOldData);
|
|
66
70
|
}
|
|
67
|
-
// } else
|
|
68
|
-
//
|
|
71
|
+
// } else {
|
|
72
|
+
// this.logger(
|
|
69
73
|
// `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
|
|
70
74
|
// );
|
|
71
75
|
// }
|
|
72
76
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
_this.triggerKeyListener(key, message.data);
|
|
76
|
-
_this.store.put(message.data.k, JSON.stringify(message.data), function (err, data) {
|
|
77
|
-
//
|
|
78
|
-
});
|
|
77
|
+
catch (e) {
|
|
78
|
+
_this.logger("Couldnt parse crdt data", oldData, e);
|
|
79
79
|
}
|
|
80
|
+
})
|
|
81
|
+
.catch(function (e) {
|
|
82
|
+
var key = message.data.k;
|
|
83
|
+
_this.triggerKeyListener(key, message.data);
|
|
84
|
+
_this.store
|
|
85
|
+
.put(message.data.k, JSON.stringify(message.data))
|
|
86
|
+
.catch(function (e) {
|
|
87
|
+
// do nothing
|
|
88
|
+
});
|
|
80
89
|
});
|
|
81
90
|
}
|
|
82
91
|
else {
|
|
83
|
-
|
|
92
|
+
_this.logger("unverified message: ", value, message);
|
|
84
93
|
}
|
|
85
94
|
});
|
|
86
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4CAI0B;AAC1B,2FAAqE;AACrE,4DAAsD;AACtD,6CAAqE;AACrE,8DAAyD;AACzD,oEAAkE;AAElE,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,
|
|
1
|
+
{"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,29 +2,27 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
function handleGet(message, remotePeerId) {
|
|
4
4
|
var _this = this;
|
|
5
|
-
this.store
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
catch (e) {
|
|
18
|
-
// socket.send(data);
|
|
19
|
-
// do nothing
|
|
20
|
-
}
|
|
5
|
+
this.store
|
|
6
|
+
.get(message.key)
|
|
7
|
+
.then(function (data) {
|
|
8
|
+
try {
|
|
9
|
+
// Use the id of the get so the other client knows we are replying
|
|
10
|
+
var oldData = {
|
|
11
|
+
type: "put",
|
|
12
|
+
data: JSON.parse(data),
|
|
13
|
+
to: [],
|
|
14
|
+
id: message.id,
|
|
15
|
+
};
|
|
16
|
+
_this.network.sendToClientId(remotePeerId, oldData);
|
|
21
17
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
_this.network.sendToAll(message, false, true);
|
|
18
|
+
catch (e) {
|
|
19
|
+
// socket.send(data);
|
|
20
|
+
// do nothing
|
|
27
21
|
}
|
|
22
|
+
})
|
|
23
|
+
.catch(function (e) {
|
|
24
|
+
_this.logger("Local key not found, relay", JSON.stringify(message));
|
|
25
|
+
_this.network.sendToAll(message, false);
|
|
28
26
|
});
|
|
29
27
|
}
|
|
30
28
|
exports.default = handleGet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleGet.ts"],"names":[],"mappings":";;AAGA,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,
|
|
1
|
+
{"version":3,"file":"handleGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleGet.ts"],"names":[],"mappings":";;AAGA,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,iBA0BC;IArBC,IAAI,CAAC,KAAK;SACP,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,IAAI,CAAC,UAAC,IAAI;QACT,IAAI;YACF,kEAAkE;YAClE,IAAM,OAAO,GAAG;gBACd,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACtB,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,OAAO,CAAC,EAAE;aACD,CAAC;YAChB,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACV,qBAAqB;YACrB,aAAa;SACd;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,KAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC;AA1BD,4BA0BC"}
|
|
@@ -9,7 +9,7 @@ function handleJoin(message, remotePeerId) {
|
|
|
9
9
|
(0, verifyPeer_1.default)(this, message.peer).then(function (verified) {
|
|
10
10
|
if (verified) {
|
|
11
11
|
// Add this peer to our list of peers
|
|
12
|
-
var filteredPeers = _this.peers.filter(function (p) { return p.
|
|
12
|
+
var filteredPeers = _this.peers.filter(function (p) { return p.address !== message.peer.address; });
|
|
13
13
|
if (filteredPeers.length === 0 &&
|
|
14
14
|
message.peer.host &&
|
|
15
15
|
message.peer.port) {
|
|
@@ -28,7 +28,7 @@ function handleJoin(message, remotePeerId) {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
|
|
31
|
+
_this.logger("Blocked a remote peer from joining; ", message);
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleJoin.js","sourceRoot":"","sources":["../../src/messageHandlers/handleJoin.ts"],"names":[],"mappings":";;;;;AAEA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBAkCC;IA7BC,IAAA,oBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;QAC3C,IAAI,QAAQ,EAAE;YACZ,qCAAqC;YACrC,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,MAAM,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"handleJoin.js","sourceRoot":"","sources":["../../src/messageHandlers/handleJoin.ts"],"names":[],"mappings":";;;;;AAEA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBAkCC;IA7BC,IAAA,oBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;QAC3C,IAAI,QAAQ,EAAE;YACZ,qCAAqC;YACrC,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,MAAM,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,EAAlC,CAAkC,CAC1C,CAAC;YACF,IACE,aAAa,CAAC,MAAM,KAAK,CAAC;gBAC1B,OAAO,CAAC,IAAI,CAAC,IAAI;gBACjB,OAAO,CAAC,IAAI,CAAC,IAAI,EACjB;gBACA,4BAA4B;gBAC5B,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC9B,8BAA8B;gBAC9B,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;oBACxC,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,KAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,EAA9B,CAA8B,CAAC;oBACjE,EAAE,EAAE,OAAO,CAAC,EAAE;iBACG,CAAC,CAAC;gBAErB,yDAAyD;gBACzD,IAAI,KAAI,CAAC,OAAO,CAAC,MAAM,EAAE;oBACvB,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;iBACvC;aACF;SACF;aAAM;YACL,KAAI,CAAC,MAAM,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAlCD,6BAkCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlePing.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePing.ts"],"names":[],"mappings":";;;;;AAEA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;QACxC,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;QAC7B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;QACzC,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,OAAO,CAAC,EAAE;KACA,CAAC,CAAC;IAElB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;QACxC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI,CAAC,KAAK;QACnB,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;KACD,CAAC,CAAC;AACvB,CAAC;
|
|
1
|
+
{"version":3,"file":"handlePing.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePing.ts"],"names":[],"mappings":";;;;;AAEA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;QACxC,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;QAC7B,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;QACzC,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,OAAO,CAAC,EAAE;KACA,CAAC,CAAC;IAElB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAE5B,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;QACxC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI,CAAC,KAAK;QACnB,EAAE,EAAE,EAAE;QACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;KACD,CAAC,CAAC;AACvB,CAAC;AA1BD,6BA0BC"}
|
|
@@ -1,34 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
var getPeerSignature_1 = __importDefault(require("../utils/getPeerSignature"));
|
|
7
|
-
var textRandom_1 = __importDefault(require("../utils/textRandom"));
|
|
8
3
|
function handlePong(message, remotePeerId) {
|
|
9
4
|
if (!this.isConnected) {
|
|
10
5
|
this.isConnected = true;
|
|
11
6
|
this.onConnect();
|
|
12
7
|
}
|
|
13
8
|
this.onPeerConnect(this.peerAccount.getAddress() || "");
|
|
14
|
-
|
|
15
|
-
var timestamp = new Date().getTime();
|
|
16
|
-
var signature = (0, getPeerSignature_1.default)(this.peerAccount, this.options.topic, timestamp, this.options.host, this.options.port);
|
|
17
|
-
var meAsPeer = {
|
|
18
|
-
topic: this.options.topic,
|
|
19
|
-
timestamp: timestamp,
|
|
20
|
-
host: this.options.host,
|
|
21
|
-
port: this.options.port,
|
|
22
|
-
adress: this.peerAccount.getAddress() || "",
|
|
23
|
-
sig: signature,
|
|
24
|
-
};
|
|
25
|
-
this.network.sendToClientId(remotePeerId, {
|
|
26
|
-
type: "join",
|
|
27
|
-
peer: meAsPeer,
|
|
28
|
-
to: [],
|
|
29
|
-
id: (0, textRandom_1.default)(10),
|
|
30
|
-
});
|
|
31
|
-
}
|
|
9
|
+
this.sendJoin(remotePeerId);
|
|
32
10
|
}
|
|
33
11
|
exports.default = handlePong;
|
|
34
12
|
//# sourceMappingURL=handlePong.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlePong.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePong.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"handlePong.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePong.ts"],"names":[],"mappings":";;AAIA,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC9B,CAAC;AAZD,6BAYC"}
|
|
@@ -8,44 +8,48 @@ var message_1 = require("../types/message");
|
|
|
8
8
|
function handlePut(message, remotePeerId) {
|
|
9
9
|
var _this = this;
|
|
10
10
|
toolDbVerificationWrapper_1.default.call(this, message.data).then(function (value) {
|
|
11
|
-
//
|
|
11
|
+
// this.logger("Verification wrapper result: ", value, message.k);
|
|
12
12
|
if (value === message_1.VerifyResult.Verified) {
|
|
13
13
|
_this.emit("put", message);
|
|
14
14
|
_this.emit("data", message.data);
|
|
15
15
|
_this.emit("verified", message);
|
|
16
16
|
// relay to other servers !!!
|
|
17
17
|
_this.network.sendToAll(message, true);
|
|
18
|
-
_this.store
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
_this.triggerKeyListener(key, message.data);
|
|
24
|
-
_this.store.put(message.data.k, JSON.stringify(message.data), function (err, data) {
|
|
25
|
-
//
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
var key = message.data.k;
|
|
30
|
-
_this.triggerKeyListener(key, parsedOldData);
|
|
31
|
-
}
|
|
32
|
-
// } else if (this.options.debug) {
|
|
33
|
-
// console.log(
|
|
34
|
-
// `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
|
|
35
|
-
// );
|
|
36
|
-
// }
|
|
37
|
-
}
|
|
38
|
-
else {
|
|
18
|
+
_this.store
|
|
19
|
+
.get(message.data.k)
|
|
20
|
+
.then(function (oldData) {
|
|
21
|
+
var parsedOldData = JSON.parse(oldData);
|
|
22
|
+
if (parsedOldData.t < message.data.t) {
|
|
39
23
|
var key = message.data.k;
|
|
40
24
|
_this.triggerKeyListener(key, message.data);
|
|
41
|
-
_this.store
|
|
42
|
-
|
|
25
|
+
_this.store
|
|
26
|
+
.put(message.data.k, JSON.stringify(message.data))
|
|
27
|
+
.catch(function (e) {
|
|
28
|
+
// do nothing
|
|
43
29
|
});
|
|
44
30
|
}
|
|
31
|
+
else {
|
|
32
|
+
var key = message.data.k;
|
|
33
|
+
_this.triggerKeyListener(key, parsedOldData);
|
|
34
|
+
}
|
|
35
|
+
// } else {
|
|
36
|
+
// this.logger(
|
|
37
|
+
// `${message.k} has old data, but its newer. old ${parsedOldData.t} < new ${message.t}`
|
|
38
|
+
// );
|
|
39
|
+
// }
|
|
40
|
+
})
|
|
41
|
+
.catch(function (e) {
|
|
42
|
+
var key = message.data.k;
|
|
43
|
+
_this.triggerKeyListener(key, message.data);
|
|
44
|
+
_this.store
|
|
45
|
+
.put(message.data.k, JSON.stringify(message.data))
|
|
46
|
+
.catch(function (e) {
|
|
47
|
+
//
|
|
48
|
+
});
|
|
45
49
|
});
|
|
46
50
|
}
|
|
47
51
|
else {
|
|
48
|
-
|
|
52
|
+
_this.logger("unverified message: ", value, message);
|
|
49
53
|
}
|
|
50
54
|
});
|
|
51
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlePut.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePut.ts"],"names":[],"mappings":";;;;;AACA,2FAAqE;AACrE,4CAA4D;AAE5D,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,
|
|
1
|
+
{"version":3,"file":"handlePut.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePut.ts"],"names":[],"mappings":";;;;;AACA,2FAAqE;AACrE,4CAA4D;AAE5D,SAAwB,SAAS,CAE/B,OAAmB,EACnB,YAAoB;IAHtB,iBAiDC;IA5CC,mCAAyB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;QAC5D,kEAAkE;QAClE,IAAI,KAAK,KAAK,sBAAY,CAAC,QAAQ,EAAE;YACnC,KAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAChC,KAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC/B,6BAA6B;YAC7B,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAEtC,KAAI,CAAC,KAAK;iBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;iBACnB,IAAI,CAAC,UAAC,OAAO;gBACZ,IAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1C,IAAI,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;oBACpC,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;oBAC3C,KAAI,CAAC,KAAK;yBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;yBACjD,KAAK,CAAC,UAAC,CAAC;wBACP,aAAa;oBACf,CAAC,CAAC,CAAC;iBACN;qBAAM;oBACL,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;oBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;iBAC7C;gBACD,WAAW;gBACX,iBAAiB;gBACjB,4FAA4F;gBAC5F,OAAO;gBACP,IAAI;YACN,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,CAAC;gBACP,IAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3B,KAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC3C,KAAI,CAAC,KAAK;qBACP,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjD,KAAK,CAAC,UAAC,CAAC;oBACP,EAAE;gBACJ,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;aAAM;YACL,KAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACrD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAjDD,4BAiDC"}
|
|
@@ -2,16 +2,21 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
function handleQuery(message, remotePeerId) {
|
|
4
4
|
var _this = this;
|
|
5
|
-
this.store
|
|
5
|
+
this.store
|
|
6
|
+
.query(message.key)
|
|
7
|
+
.then(function (keys) {
|
|
6
8
|
_this.network.sendToClientId(remotePeerId, {
|
|
7
9
|
type: "queryAck",
|
|
8
10
|
id: message.id,
|
|
9
11
|
to: [],
|
|
10
12
|
keys: keys,
|
|
11
13
|
});
|
|
14
|
+
})
|
|
15
|
+
.catch(function (e) {
|
|
16
|
+
// do nothing
|
|
12
17
|
});
|
|
13
18
|
if (this.options.server) {
|
|
14
|
-
this.network.sendToAll(message, true
|
|
19
|
+
this.network.sendToAll(message, true);
|
|
15
20
|
}
|
|
16
21
|
}
|
|
17
22
|
exports.default = handleQuery;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleQuery.js","sourceRoot":"","sources":["../../src/messageHandlers/handleQuery.ts"],"names":[],"mappings":";;AAGA,SAAwB,WAAW,CAEjC,OAAqB,EACrB,YAAoB;IAHtB,
|
|
1
|
+
{"version":3,"file":"handleQuery.js","sourceRoot":"","sources":["../../src/messageHandlers/handleQuery.ts"],"names":[],"mappings":";;AAGA,SAAwB,WAAW,CAEjC,OAAqB,EACrB,YAAoB;IAHtB,iBAsBC;IAjBC,IAAI,CAAC,KAAK;SACP,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;SAClB,IAAI,CAAC,UAAC,IAAI;QACT,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;SACD,KAAK,CAAC,UAAC,CAAC;QACP,aAAa;IACf,CAAC,CAAC,CAAC;IAEL,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;KACvC;AACH,CAAC;AAtBD,8BAsBC"}
|
|
@@ -10,7 +10,7 @@ function handleServers(message, remotePeerId) {
|
|
|
10
10
|
(0, verifyPeer_1.default)(_this, peer).then(function (verified) {
|
|
11
11
|
// Add this peer to our list of peers
|
|
12
12
|
if (verified) {
|
|
13
|
-
var filteredPeers = _this.peers.findIndex(function (p) { return p.
|
|
13
|
+
var filteredPeers = _this.peers.findIndex(function (p) { return p.address === peer.address; });
|
|
14
14
|
if (filteredPeers === -1) {
|
|
15
15
|
// Add this peer to the list
|
|
16
16
|
_this.peers.push(peer);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleServers.js","sourceRoot":"","sources":["../../src/messageHandlers/handleServers.ts"],"names":[],"mappings":";;;;;AACA,mEAA6C;AAG7C,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBAmBC;IAdC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,IAAI;QAC3B,IAAA,oBAAU,EAAC,KAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;YACnC,qCAAqC;YACrC,IAAI,QAAQ,EAAE;gBACZ,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,SAAS,CACxC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"handleServers.js","sourceRoot":"","sources":["../../src/messageHandlers/handleServers.ts"],"names":[],"mappings":";;;;;AACA,mEAA6C;AAG7C,SAAwB,aAAa,CAEnC,OAAuB,EACvB,YAAoB;IAHtB,iBAmBC;IAdC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,IAAI;QAC3B,IAAA,oBAAU,EAAC,KAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;YACnC,qCAAqC;YACrC,IAAI,QAAQ,EAAE;gBACZ,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,SAAS,CACxC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAA1B,CAA0B,CAClC,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"}
|
|
@@ -2,41 +2,42 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
function handleSubscribe(message, remotePeerId) {
|
|
4
4
|
var _this = this;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
data: msg,
|
|
15
|
-
id: message.id,
|
|
16
|
-
type: "put",
|
|
17
|
-
to: [],
|
|
18
|
-
};
|
|
19
|
-
_this.network.sendToClientId(remotePeerId, newMsg);
|
|
20
|
-
}
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
// basically the exact same as GET, below
|
|
25
|
-
this.store.get(message.key, function (err, data) {
|
|
26
|
-
if (data) {
|
|
27
|
-
try {
|
|
28
|
-
var oldData = {
|
|
29
|
-
data: JSON.parse(data),
|
|
5
|
+
var subId = remotePeerId + "-" + message.key;
|
|
6
|
+
if (!this.subscriptions.includes(subId)) {
|
|
7
|
+
this.subscriptions.push(subId);
|
|
8
|
+
this.addKeyListener(message.key, function (msg) {
|
|
9
|
+
if (remotePeerId) {
|
|
10
|
+
// We do not reply to the socket directly
|
|
11
|
+
// instead we use the client id, in case the socket reconnects
|
|
12
|
+
var newMsg = {
|
|
13
|
+
data: msg,
|
|
30
14
|
id: message.id,
|
|
31
15
|
type: "put",
|
|
32
16
|
to: [],
|
|
33
17
|
};
|
|
34
|
-
_this.network.sendToClientId(remotePeerId,
|
|
35
|
-
}
|
|
36
|
-
catch (e) {
|
|
37
|
-
// do nothing
|
|
18
|
+
_this.network.sendToClientId(remotePeerId, newMsg);
|
|
38
19
|
}
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
// basically the exact same as GET, below
|
|
23
|
+
this.store
|
|
24
|
+
.get(message.key)
|
|
25
|
+
.then(function (data) {
|
|
26
|
+
try {
|
|
27
|
+
var oldData = {
|
|
28
|
+
data: JSON.parse(data),
|
|
29
|
+
id: message.id,
|
|
30
|
+
type: "put",
|
|
31
|
+
to: [],
|
|
32
|
+
};
|
|
33
|
+
_this.network.sendToClientId(remotePeerId, oldData);
|
|
34
|
+
}
|
|
35
|
+
catch (e) {
|
|
36
|
+
// do nothing
|
|
39
37
|
}
|
|
38
|
+
})
|
|
39
|
+
.catch(function (e) {
|
|
40
|
+
// do nothing
|
|
40
41
|
});
|
|
41
42
|
}
|
|
42
43
|
exports.default = handleSubscribe;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleSubscribe.js","sourceRoot":"","sources":["../../src/messageHandlers/handleSubscribe.ts"],"names":[],"mappings":";;AAGA,SAAwB,eAAe,CAErC,OAAyB,EACzB,YAAoB;IAHtB,
|
|
1
|
+
{"version":3,"file":"handleSubscribe.js","sourceRoot":"","sources":["../../src/messageHandlers/handleSubscribe.ts"],"names":[],"mappings":";;AAGA,SAAwB,eAAe,CAErC,OAAyB,EACzB,YAAoB;IAHtB,iBA2CC;IAtCC,IAAM,KAAK,GAAG,YAAY,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAC/C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACvC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE/B,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,UAAC,GAAG;YACnC,IAAI,YAAY,EAAE;gBAChB,yCAAyC;gBACzC,8DAA8D;gBAC9D,IAAM,MAAM,GAAe;oBACzB,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,KAAK;oBACX,EAAE,EAAE,EAAE;iBACP,CAAC;gBACF,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;aACnD;QACH,CAAC,CAAC,CAAC;KACJ;IAED,yCAAyC;IACzC,IAAI,CAAC,KAAK;SACP,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,IAAI,CAAC,UAAC,IAAI;QACT,IAAI;YACF,IAAM,OAAO,GAAe;gBAC1B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACtB,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,KAAK;gBACX,EAAE,EAAE,EAAE;aACP,CAAC;YACF,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACV,aAAa;SACd;IACH,CAAC,CAAC;SACD,KAAK,CAAC,UAAC,CAAC;QACP,aAAa;IACf,CAAC,CAAC,CAAC;AACP,CAAC;AA3CD,kCA2CC"}
|
package/dist/sendJoin.js
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
var getPeerSignature_1 = __importDefault(require("./utils/getPeerSignature"));
|
|
7
|
+
var textRandom_1 = __importDefault(require("./utils/textRandom"));
|
|
8
|
+
function sendJoin(remotePeerId) {
|
|
9
|
+
var _this = this;
|
|
10
|
+
if (this.options.server && this.peerAccount.getAddress()) {
|
|
11
|
+
var timestamp_1 = new Date().getTime();
|
|
12
|
+
(0, getPeerSignature_1.default)(this.peerAccount, this.options.topic, timestamp_1, this.options.host, this.options.port).then(function (signature) {
|
|
13
|
+
var meAsPeer = {
|
|
14
|
+
topic: _this.options.topic,
|
|
15
|
+
timestamp: timestamp_1,
|
|
16
|
+
host: _this.options.host,
|
|
17
|
+
port: _this.options.port,
|
|
18
|
+
address: _this.peerAccount.getAddress() || "",
|
|
19
|
+
sig: signature,
|
|
20
|
+
};
|
|
21
|
+
_this.network.sendToClientId(remotePeerId, {
|
|
22
|
+
type: "join",
|
|
23
|
+
peer: meAsPeer,
|
|
24
|
+
to: [],
|
|
25
|
+
id: (0, textRandom_1.default)(10),
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
exports.default = sendJoin;
|
|
31
|
+
//# sourceMappingURL=sendJoin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sendJoin.js","sourceRoot":"","sources":["../src/sendJoin.ts"],"names":[],"mappings":";;;;;AAGA,8EAAwD;AACxD,kEAA4C;AAE5C,SAAwB,QAAQ,CAAe,YAAoB;IAAnE,iBA4BC;IA3BC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;QACxD,IAAM,WAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAA,0BAAgB,EACd,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,WAAS,EACT,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAClB,CAAC,IAAI,CAAC,UAAC,SAAS;YACf,IAAM,QAAQ,GAAS;gBACrB,KAAK,EAAE,KAAI,CAAC,OAAO,CAAC,KAAK;gBACzB,SAAS,EAAE,WAAS;gBACpB,IAAI,EAAE,KAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,IAAI,EAAE,KAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,OAAO,EAAE,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE;gBAC5C,GAAG,EAAE,SAAS;aACf,CAAC;YAEF,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;gBACxC,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ;gBACd,EAAE,EAAE,EAAE;gBACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;aACJ,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AA5BD,2BA4BC"}
|
|
@@ -5,17 +5,15 @@ function toolDbClientOnMessage(message, remotePeerId) {
|
|
|
5
5
|
this.processedIds[message.type] = [];
|
|
6
6
|
}
|
|
7
7
|
if (this.processedIds[message.type].includes(message.id)) {
|
|
8
|
-
//
|
|
8
|
+
// this.logger(
|
|
9
9
|
// `Already processed this message > ${message.type} from ${remotePeerId}`
|
|
10
10
|
// );
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
13
|
this.emit("message", message, remotePeerId);
|
|
14
14
|
this.processedIds[message.type].push(message.id);
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
console.warn(message);
|
|
18
|
-
}
|
|
15
|
+
this.logger("Got message " + message.type + " from " + remotePeerId);
|
|
16
|
+
this.logger(message);
|
|
19
17
|
// Check if we are listening for this ID
|
|
20
18
|
if (message.id) {
|
|
21
19
|
var msgId = message.id;
|
|
@@ -24,9 +22,8 @@ function toolDbClientOnMessage(message, remotePeerId) {
|
|
|
24
22
|
this.removeIdListener(msgId);
|
|
25
23
|
}
|
|
26
24
|
}
|
|
27
|
-
if (
|
|
28
|
-
this.
|
|
29
|
-
console.warn("Message is invalid!", message, typeof message);
|
|
25
|
+
if (message === undefined || message.type === undefined) {
|
|
26
|
+
this.logger("Message is invalid!", message, typeof message);
|
|
30
27
|
return;
|
|
31
28
|
}
|
|
32
29
|
switch (message.type) {
|