tool-db 2.3.0 → 2.3.1
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/_____peer/000005.ldb +0 -0
- package/{test-alice-speed/LOCK → _____peer/000008.log} +0 -0
- package/_____peer/CURRENT +1 -0
- package/{test-base-client/000099.log → _____peer/LOCK} +0 -0
- package/{test-base-server/000101.log → _____peer/LOG} +0 -0
- package/{test-verify-a/000049.log → _____peer/LOG.old} +0 -0
- package/_____peer/MANIFEST-000007 +0 -0
- package/_____peer_test-alice/000003.log +0 -0
- package/_____peer_test-alice/CURRENT +1 -0
- package/_____peer_test-alice/LOCK +0 -0
- package/_____peer_test-alice/LOG +1 -0
- package/_____peer_test-alice/MANIFEST-000002 +0 -0
- package/_____peer_test-base-client/000005.ldb +0 -0
- package/_____peer_test-base-client/000006.log +0 -0
- package/_____peer_test-base-client/CURRENT +1 -0
- package/_____peer_test-base-client/LOCK +0 -0
- package/_____peer_test-base-client/LOG +5 -0
- package/_____peer_test-base-client/LOG.old +1 -0
- package/_____peer_test-base-client/MANIFEST-000004 +0 -0
- package/_____peer_test-base-server/000005.ldb +0 -0
- package/_____peer_test-base-server/000006.log +0 -0
- package/_____peer_test-base-server/CURRENT +1 -0
- package/_____peer_test-base-server/LOCK +0 -0
- package/_____peer_test-base-server/LOG +5 -0
- package/_____peer_test-base-server/LOG.old +1 -0
- package/_____peer_test-base-server/MANIFEST-000004 +0 -0
- package/_____peer_test-bob/000003.log +0 -0
- package/_____peer_test-bob/CURRENT +1 -0
- package/_____peer_test-bob/LOCK +0 -0
- package/_____peer_test-bob/LOG +1 -0
- package/_____peer_test-bob/MANIFEST-000002 +0 -0
- package/_____peer_test-chris/000003.log +0 -0
- package/_____peer_test-chris/CURRENT +1 -0
- package/_____peer_test-chris/LOCK +0 -0
- package/_____peer_test-chris/LOG +1 -0
- package/_____peer_test-chris/MANIFEST-000002 +0 -0
- package/_____peer_test-node-a/000003.log +0 -0
- package/_____peer_test-node-a/CURRENT +1 -0
- package/_____peer_test-node-a/LOCK +0 -0
- package/_____peer_test-node-a/LOG +1 -0
- package/_____peer_test-node-a/MANIFEST-000002 +0 -0
- package/_____peer_test-node-b/000003.log +0 -0
- package/_____peer_test-node-b/CURRENT +1 -0
- package/_____peer_test-node-b/LOCK +0 -0
- package/_____peer_test-node-b/LOG +1 -0
- package/_____peer_test-node-b/MANIFEST-000002 +0 -0
- package/_____peer_test-store/000003.log +0 -0
- package/_____peer_test-store/CURRENT +1 -0
- package/_____peer_test-store/LOCK +0 -0
- package/_____peer_test-store/LOG +1 -0
- package/_____peer_test-store/MANIFEST-000002 +0 -0
- package/_____peer_test-verify-a/000003.log +0 -0
- package/_____peer_test-verify-a/CURRENT +1 -0
- package/_____peer_test-verify-a/LOCK +0 -0
- package/_____peer_test-verify-a/LOG +1 -0
- package/_____peer_test-verify-a/MANIFEST-000002 +0 -0
- package/bundle.js +1 -1
- package/dist/adapters/toolDbIndexedb.d.ts +2 -3
- package/dist/adapters/toolDbIndexedb.js +21 -18
- package/dist/adapters/toolDbIndexedb.js.map +1 -1
- package/dist/adapters/toolDbLeveldb.d.ts +2 -3
- package/dist/adapters/toolDbLeveldb.js +7 -10
- package/dist/adapters/toolDbLeveldb.js.map +1 -1
- package/dist/adapters/toolDbWeb3User.d.ts +2 -4
- package/dist/adapters/toolDbWeb3User.js +4 -5
- package/dist/adapters/toolDbWeb3User.js.map +1 -1
- package/dist/adapters/toolDbWebrtc.d.ts +1 -2
- package/dist/adapters/toolDbWebrtc.js +7 -12
- package/dist/adapters/toolDbWebrtc.js.map +1 -1
- package/dist/adapters/toolDbWebsocket.d.ts +2 -3
- package/dist/adapters/toolDbWebsocket.js +9 -14
- package/dist/adapters/toolDbWebsocket.js.map +1 -1
- package/dist/adapters-base/networkAdapter.d.ts +3 -2
- package/dist/adapters-base/networkAdapter.js +36 -6
- package/dist/adapters-base/networkAdapter.js.map +1 -1
- package/dist/adapters-base/storageAdapter.d.ts +4 -2
- package/dist/adapters-base/storageAdapter.js +11 -1
- package/dist/adapters-base/storageAdapter.js.map +1 -1
- package/dist/adapters-base/userAdapter.d.ts +3 -2
- package/dist/adapters-base/userAdapter.js +8 -1
- package/dist/adapters-base/userAdapter.js.map +1 -1
- package/dist/crdt/baseCrdt.d.ts +1 -1
- package/dist/crdt/baseCrdt.js +2 -2
- package/dist/crdt/baseCrdt.js.map +1 -1
- package/dist/crdt/counterCrdt.d.ts +2 -2
- package/dist/crdt/counterCrdt.js +5 -23
- package/dist/crdt/counterCrdt.js.map +1 -1
- package/dist/crdt/listCrdt.d.ts +2 -2
- package/dist/crdt/listCrdt.js +8 -26
- package/dist/crdt/listCrdt.js.map +1 -1
- package/dist/crdt/mapCrdt.d.ts +2 -2
- package/dist/crdt/mapCrdt.js +5 -23
- package/dist/crdt/mapCrdt.js.map +1 -1
- package/dist/index.d.ts +5 -12
- package/dist/index.js +16 -30
- package/dist/index.js.map +1 -1
- package/dist/loadCrdtDocument.js +9 -4
- package/dist/loadCrdtDocument.js.map +1 -1
- package/dist/logger.d.ts +1 -1
- package/dist/logger.js +2 -5
- package/dist/logger.js.map +1 -1
- package/dist/messageHandlers/handleCrdt.d.ts +1 -2
- package/dist/messageHandlers/handleCrdt.js +5 -1
- package/dist/messageHandlers/handleCrdt.js.map +1 -1
- package/dist/messageHandlers/handleCrdtGet.d.ts +1 -2
- package/dist/messageHandlers/handleCrdtGet.js.map +1 -1
- package/dist/messageHandlers/handleCrdtPut.d.ts +1 -2
- package/dist/messageHandlers/handleCrdtPut.js +8 -12
- package/dist/messageHandlers/handleCrdtPut.js.map +1 -1
- package/dist/messageHandlers/handleGet.d.ts +1 -2
- package/dist/messageHandlers/handleGet.js.map +1 -1
- package/dist/messageHandlers/handleJoin.d.ts +1 -2
- package/dist/messageHandlers/handleJoin.js +4 -4
- package/dist/messageHandlers/handleJoin.js.map +1 -1
- package/dist/messageHandlers/handlePing.d.ts +1 -2
- package/dist/messageHandlers/handlePing.js +25 -17
- package/dist/messageHandlers/handlePing.js.map +1 -1
- package/dist/messageHandlers/handlePong.d.ts +1 -2
- package/dist/messageHandlers/handlePong.js +15 -1
- package/dist/messageHandlers/handlePong.js.map +1 -1
- package/dist/messageHandlers/handlePut.d.ts +1 -2
- package/dist/messageHandlers/handlePut.js +2 -2
- package/dist/messageHandlers/handlePut.js.map +1 -1
- package/dist/messageHandlers/handleQuery.d.ts +1 -2
- package/dist/messageHandlers/handleQuery.js.map +1 -1
- package/dist/messageHandlers/handleServers.d.ts +1 -2
- package/dist/messageHandlers/handleServers.js +2 -2
- package/dist/messageHandlers/handleServers.js.map +1 -1
- package/dist/messageHandlers/handleSubscribe.d.ts +1 -2
- package/dist/messageHandlers/handleSubscribe.js.map +1 -1
- package/dist/server.js +2 -5
- package/dist/server.js.map +1 -1
- package/dist/toolDbAnonSignIn.d.ts +1 -1
- package/dist/toolDbClientOnMessage.d.ts +1 -2
- package/dist/toolDbClientOnMessage.js +1 -1
- package/dist/toolDbClientOnMessage.js.map +1 -1
- package/dist/toolDbCrdtGet.d.ts +1 -3
- package/dist/toolDbCrdtGet.js +1 -1
- package/dist/toolDbCrdtGet.js.map +1 -1
- package/dist/toolDbCrdtPut.d.ts +1 -3
- package/dist/toolDbCrdtPut.js +4 -8
- package/dist/toolDbCrdtPut.js.map +1 -1
- package/dist/toolDbGet.d.ts +1 -1
- package/dist/toolDbGet.js +1 -1
- package/dist/toolDbGet.js.map +1 -1
- package/dist/toolDbKeysSignIn.d.ts +1 -1
- package/dist/toolDbKeysSignIn.js.map +1 -1
- package/dist/toolDbNetwork.d.ts +16 -4
- package/dist/toolDbNetwork.js +177 -74
- package/dist/toolDbNetwork.js.map +1 -1
- package/dist/toolDbPut.d.ts +1 -2
- package/dist/toolDbPut.js +4 -8
- package/dist/toolDbPut.js.map +1 -1
- package/dist/toolDbQueryKeys.d.ts +1 -1
- package/dist/toolDbQueryKeys.js +2 -6
- package/dist/toolDbQueryKeys.js.map +1 -1
- package/dist/toolDbSignIn.d.ts +1 -1
- package/dist/toolDbSignIn.js +4 -8
- package/dist/toolDbSignIn.js.map +1 -1
- package/dist/toolDbSignUp.d.ts +1 -2
- package/dist/toolDbSignUp.js +2 -2
- package/dist/toolDbSignUp.js.map +1 -1
- package/dist/toolDbSubscribe.d.ts +1 -1
- package/dist/toolDbSubscribe.js +1 -1
- package/dist/toolDbSubscribe.js.map +1 -1
- package/dist/toolDbWebrtc.d.ts +18 -2
- package/dist/toolDbWebrtc.js +92 -110
- package/dist/toolDbWebrtc.js.map +1 -1
- package/dist/tooldb.d.ts +4 -9
- package/dist/tooldb.js +35 -14
- package/dist/tooldb.js.map +1 -1
- package/dist/types/message.d.ts +5 -11
- package/dist/types/tooldb.d.ts +2 -5
- package/dist/utils/crypto/decodeKeyString.d.ts +1 -1
- package/dist/utils/crypto/decodeKeyString.js +4 -3
- package/dist/utils/crypto/decodeKeyString.js.map +1 -1
- package/dist/utils/crypto/decryptData.js +3 -3
- package/dist/utils/crypto/decryptData.js.map +1 -1
- package/dist/utils/crypto/decryptWithPass.d.ts +1 -1
- package/dist/utils/crypto/decryptWithPass.js +3 -2
- package/dist/utils/crypto/decryptWithPass.js.map +1 -1
- package/dist/utils/crypto/encodeKeyString.js +4 -3
- package/dist/utils/crypto/encodeKeyString.js.map +1 -1
- package/dist/utils/crypto/encryptData.d.ts +1 -1
- package/dist/utils/crypto/encryptData.js +6 -1
- package/dist/utils/crypto/encryptData.js.map +1 -1
- package/dist/utils/crypto/encryptWithPass.d.ts +1 -1
- package/dist/utils/crypto/encryptWithPass.js +5 -1
- package/dist/utils/crypto/encryptWithPass.js.map +1 -1
- package/dist/utils/crypto/generateKeyFromPassword.js +1 -1
- package/dist/utils/crypto/generateKeyFromPassword.js.map +1 -1
- package/dist/utils/crypto/loadKeysComb.js +10 -10
- package/dist/utils/crypto/loadKeysComb.js.map +1 -1
- package/dist/utils/crypto/recoverPubKey.d.ts +1 -1
- package/dist/utils/crypto/recoverPubKey.js +6 -12
- package/dist/utils/crypto/recoverPubKey.js.map +1 -1
- package/dist/utils/crypto/saveSignKeys.d.ts +1 -1
- package/dist/utils/crypto/saveSignKeys.js +2 -2
- package/dist/utils/crypto/verifyData.js +1 -1
- package/dist/utils/crypto/verifyData.js.map +1 -1
- package/dist/utils/encoding/hexToUint8.js +2 -5
- package/dist/utils/encoding/hexToUint8.js.map +1 -1
- package/dist/utils/getPeerSignature.d.ts +1 -1
- package/dist/utils/getPeerSignature.js +2 -5
- package/dist/utils/getPeerSignature.js.map +1 -1
- package/dist/utils/indexedb.js +4 -4
- package/dist/utils/indexedb.js.map +1 -1
- package/dist/utils/leveldb.js +2 -4
- package/dist/utils/leveldb.js.map +1 -1
- package/dist/utils/proofOfWork.js +3 -6
- package/dist/utils/proofOfWork.js.map +1 -1
- package/dist/utils/randomAnimal.js +1 -1
- package/dist/utils/randomAnimal.js.map +1 -1
- package/dist/utils/signData.js +1 -1
- package/dist/utils/signData.js.map +1 -1
- package/dist/utils/uniq.d.ts +1 -0
- package/dist/utils/uniq.js +7 -0
- package/dist/utils/uniq.js.map +1 -0
- package/dist/utils/verifyMessage.d.ts +1 -2
- package/dist/utils/verifyMessage.js +9 -13
- package/dist/utils/verifyMessage.js.map +1 -1
- package/dist/utils/verifyPeer.d.ts +1 -2
- package/dist/utils/verifyPeer.js +2 -5
- package/dist/utils/verifyPeer.js.map +1 -1
- package/package.json +17 -21
- package/test-alice/000216.ldb +0 -0
- package/test-alice/000218.ldb +0 -0
- package/test-alice/000221.ldb +0 -0
- package/test-alice/000224.ldb +0 -0
- package/test-alice/000225.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-000223 +0 -0
- package/test-base-client/000019.log +0 -0
- package/test-base-client/CURRENT +1 -1
- package/test-base-client/LOG +3 -3
- package/test-base-client/LOG.old +3 -3
- package/test-base-client/MANIFEST-000018 +0 -0
- package/test-base-server/000019.log +0 -0
- package/test-base-server/CURRENT +1 -1
- package/test-base-server/LOG +3 -3
- package/test-base-server/LOG.old +3 -3
- package/test-base-server/MANIFEST-000018 +0 -0
- package/test-bob/000231.ldb +0 -0
- package/test-bob/000233.ldb +0 -0
- package/test-bob/000234.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-000232 +0 -0
- package/test-chris/000005.ldb +0 -0
- package/test-chris/000008.ldb +0 -0
- package/test-chris/000009.log +0 -0
- package/test-chris/CURRENT +1 -1
- package/test-chris/LOG +5 -6
- package/test-chris/LOG.old +5 -6
- package/test-chris/MANIFEST-000007 +0 -0
- package/test-node-a/000246.ldb +0 -0
- package/test-node-a/000248.ldb +0 -0
- package/test-node-a/000249.log +0 -0
- package/test-node-a/CURRENT +1 -1
- package/test-node-a/LOG +5 -5
- package/test-node-a/LOG.old +14 -14
- package/test-node-a/MANIFEST-000247 +0 -0
- package/test-node-b/000246.ldb +0 -0
- package/test-node-b/000248.ldb +0 -0
- package/test-node-b/000249.log +0 -0
- package/test-node-b/CURRENT +1 -1
- package/test-node-b/LOG +5 -5
- package/test-node-b/LOG.old +14 -14
- package/test-node-b/MANIFEST-000247 +0 -0
- package/test-store/000005.ldb +0 -0
- package/test-store/000008.ldb +0 -0
- package/test-store/000011.ldb +0 -0
- package/test-store/000014.ldb +0 -0
- package/test-store/000017.ldb +0 -0
- package/test-store/000018.log +0 -0
- package/test-store/CURRENT +1 -1
- package/test-store/LOG +6 -6
- package/test-store/LOG.old +6 -6
- package/test-store/MANIFEST-000016 +0 -0
- package/test-verify-a/000059.ldb +0 -0
- package/test-verify-a/000066.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-000065 +0 -0
- package/tsconfig.json +2 -2
- 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/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 +0 -1
- package/test-alice-speed/LOG +0 -5
- package/test-alice-speed/LOG.old +0 -5
- package/test-alice-speed/MANIFEST-000029 +0 -0
- package/test-base-client/MANIFEST-000098 +0 -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/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/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/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/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/MANIFEST-000036 +0 -0
- package/test-verify-a/MANIFEST-000048 +0 -0
- package/toolDbLibP2p.ts +0 -207
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"handleCrdtGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtGet.ts"],"names":[],"mappings":";;AAEA,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"}
|
|
@@ -14,17 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
var
|
|
17
|
+
var __1 = require("..");
|
|
18
18
|
var toolDbVerificationWrapper_1 = __importDefault(require("../toolDbVerificationWrapper"));
|
|
19
|
-
var mapCrdt_1 = __importDefault(require("../crdt/mapCrdt"));
|
|
20
|
-
var baseCrdt_1 = require("../crdt/baseCrdt");
|
|
21
|
-
var listCrdt_1 = __importDefault(require("../crdt/listCrdt"));
|
|
22
|
-
var counterCrdt_1 = __importDefault(require("../crdt/counterCrdt"));
|
|
23
19
|
function handleCrdtPut(message, remotePeerId) {
|
|
24
20
|
var _this = this;
|
|
25
21
|
toolDbVerificationWrapper_1.default.call(this, message.data).then(function (value) {
|
|
26
22
|
// this.logger("Verification wrapper result: ", value, message.k);
|
|
27
|
-
if (value ===
|
|
23
|
+
if (value === __1.VerifyResult.Verified) {
|
|
28
24
|
_this.emit("crdtput", message);
|
|
29
25
|
_this.emit("data", message.data);
|
|
30
26
|
_this.emit("verified", message);
|
|
@@ -39,14 +35,14 @@ function handleCrdtPut(message, remotePeerId) {
|
|
|
39
35
|
// Merge old document with new data incoming and save it
|
|
40
36
|
// Add handles for all kinds of CRDT we add
|
|
41
37
|
var oldDoc = void 0;
|
|
42
|
-
if (parsedOldData.c ===
|
|
43
|
-
oldDoc = new
|
|
38
|
+
if (parsedOldData.c === __1.CRDT_MAP) {
|
|
39
|
+
oldDoc = new __1.MapCrdt(_this.userAccount.getAddress() || "", parsedOldData.v);
|
|
44
40
|
}
|
|
45
|
-
if (parsedOldData.c ===
|
|
46
|
-
oldDoc = new
|
|
41
|
+
if (parsedOldData.c === __1.CRDT_LIST) {
|
|
42
|
+
oldDoc = new __1.ListCrdt(_this.userAccount.getAddress() || "", parsedOldData.v);
|
|
47
43
|
}
|
|
48
|
-
if (parsedOldData.c ===
|
|
49
|
-
oldDoc = new
|
|
44
|
+
if (parsedOldData.c === __1.CRDT_COUNTER) {
|
|
45
|
+
oldDoc = new __1.CounterCrdt(_this.userAccount.getAddress() || "", parsedOldData.v);
|
|
50
46
|
}
|
|
51
47
|
var changesMerged = [];
|
|
52
48
|
if (oldDoc) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleGet.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"handleGet.js","sourceRoot":"","sources":["../../src/messageHandlers/handleGet.ts"],"names":[],"mappings":";;AAEA,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"}
|
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
var verifyPeer_1 = __importDefault(require("../utils/verifyPeer"));
|
|
7
7
|
function handleJoin(message, remotePeerId) {
|
|
8
8
|
var _this = this;
|
|
9
|
-
(0, verifyPeer_1.default)(
|
|
9
|
+
(0, verifyPeer_1.default)(message.peer).then(function (verified) {
|
|
10
|
+
// Add this peer to our list of peers
|
|
10
11
|
if (verified) {
|
|
11
|
-
|
|
12
|
-
var filteredPeers = _this.peers.filter(function (p) { return p.address !== message.peer.address; });
|
|
12
|
+
var filteredPeers = _this.peers.filter(function (p) { return p.pubkey !== message.peer.pubkey; });
|
|
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
|
+
console.warn("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":";;;;;
|
|
1
|
+
{"version":3,"file":"handleJoin.js","sourceRoot":"","sources":["../../src/messageHandlers/handleJoin.ts"],"names":[],"mappings":";;;;;AACA,mEAA6C;AAE7C,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBAkCC;IA7BC,IAAA,oBAAU,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;QACrC,qCAAqC;QACrC,IAAI,QAAQ,EAAE;YACZ,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,MAAM,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,EAAhC,CAAgC,CACxC,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,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;SAC/D;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAlCD,6BAkCC"}
|
|
@@ -1,27 +1,35 @@
|
|
|
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
|
|
3
|
+
var __1 = require("..");
|
|
7
4
|
function handlePing(message, remotePeerId) {
|
|
5
|
+
var _this = this;
|
|
8
6
|
if (!this.isConnected) {
|
|
9
7
|
this.isConnected = true;
|
|
10
8
|
this.onConnect();
|
|
11
9
|
}
|
|
12
|
-
this.
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
10
|
+
(0, __1.verifyPeer)(this, message.peer).then(function (verified) {
|
|
11
|
+
// Verify integrity and topic
|
|
12
|
+
if (verified && message.peer.topic === _this.options.topic) {
|
|
13
|
+
// Add this peer to our list of peers
|
|
14
|
+
var filteredPeers = _this.serverPeers.filter(function (p) { return p.address === message.peer.address; });
|
|
15
|
+
if (filteredPeers.length === 0 && message.isServer) {
|
|
16
|
+
// Add this peer to the list
|
|
17
|
+
_this.serverPeers.push(message.peer);
|
|
18
|
+
}
|
|
19
|
+
_this.network.sendToClientId(remotePeerId, {
|
|
20
|
+
type: "pong",
|
|
21
|
+
isServer: _this.options.server,
|
|
22
|
+
clientId: _this.network.getClientAddress(),
|
|
23
|
+
to: [],
|
|
24
|
+
servers: _this.serverPeers,
|
|
25
|
+
id: message.id,
|
|
26
|
+
});
|
|
27
|
+
_this.onPeerConnect(_this.peerAccount.getAddress() || "");
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
_this.logger("Blocked a remote peer from joining; ", message);
|
|
31
|
+
// Drop connection here!
|
|
32
|
+
}
|
|
25
33
|
});
|
|
26
34
|
}
|
|
27
35
|
exports.default = handlePing;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlePing.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePing.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"handlePing.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePing.ts"],"names":[],"mappings":";;AAAA,wBAAkE;AAElE,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBAqCC;IAhCC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,IAAA,cAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;QAC3C,6BAA6B;QAC7B,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,KAAK,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACzD,qCAAqC;YACrC,IAAM,aAAa,GAAG,KAAI,CAAC,WAAW,CAAC,MAAM,CAC3C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,OAAO,EAAlC,CAAkC,CAC1C,CAAC;YACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE;gBAClD,4BAA4B;gBAC5B,KAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aACrC;YAED,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;gBACxC,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,KAAI,CAAC,OAAO,CAAC,MAAM;gBAC7B,QAAQ,EAAE,KAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;gBACzC,EAAE,EAAE,EAAE;gBACN,OAAO,EAAE,KAAI,CAAC,WAAW;gBACzB,EAAE,EAAE,OAAO,CAAC,EAAE;aACA,CAAC,CAAC;YAElB,KAAI,CAAC,aAAa,CAAC,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;SACzD;aAAM;YACL,KAAI,CAAC,MAAM,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;YAC7D,wBAAwB;SACzB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AArCD,6BAqCC"}
|
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var __1 = require("..");
|
|
3
4
|
function handlePong(message, remotePeerId) {
|
|
5
|
+
var _this = this;
|
|
4
6
|
if (!this.isConnected) {
|
|
5
7
|
this.isConnected = true;
|
|
6
8
|
this.onConnect();
|
|
7
9
|
}
|
|
10
|
+
message.servers.forEach(function (peer) {
|
|
11
|
+
(0, __1.verifyPeer)(_this, peer).then(function (verified) {
|
|
12
|
+
// Verify integrity and topic
|
|
13
|
+
if (verified && peer.topic === _this.options.topic) {
|
|
14
|
+
// Add this peer to our list of peers
|
|
15
|
+
var filteredPeers = _this.serverPeers.filter(function (p) { return p.address === peer.address; });
|
|
16
|
+
if (filteredPeers.length === 0 && peer.host && peer.port) {
|
|
17
|
+
// Add this peer to the list
|
|
18
|
+
_this.serverPeers.push(peer);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
});
|
|
8
23
|
this.onPeerConnect(this.peerAccount.getAddress() || "");
|
|
9
|
-
this.sendJoin(remotePeerId);
|
|
10
24
|
}
|
|
11
25
|
exports.default = handlePong;
|
|
12
26
|
//# 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":";;AAAA,wBAAqD;AAErD,SAAwB,UAAU,CAEhC,OAAoB,EACpB,YAAoB;IAHtB,iBA2BC;IAtBC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,SAAS,EAAE,CAAC;KAClB;IAED,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,UAAC,IAAI;QAC3B,IAAA,cAAU,EAAC,KAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,QAAQ;YACnC,6BAA6B;YAC7B,IAAI,QAAQ,IAAI,IAAI,CAAC,KAAK,KAAK,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACjD,qCAAqC;gBACrC,IAAM,aAAa,GAAG,KAAI,CAAC,WAAW,CAAC,MAAM,CAC3C,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAA1B,CAA0B,CAClC,CAAC;gBACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;oBACxD,4BAA4B;oBAC5B,KAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC7B;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AAC1D,CAAC;AA3BD,6BA2BC"}
|
|
@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
var __1 = require("..");
|
|
6
7
|
var toolDbVerificationWrapper_1 = __importDefault(require("../toolDbVerificationWrapper"));
|
|
7
|
-
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
|
-
if (value ===
|
|
12
|
+
if (value === __1.VerifyResult.Verified) {
|
|
13
13
|
_this.emit("put", message);
|
|
14
14
|
_this.emit("data", message.data);
|
|
15
15
|
_this.emit("verified", message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlePut.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePut.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"handlePut.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePut.ts"],"names":[],"mappings":";;;;;AAAA,wBAAsD;AAEtD,2FAAqE;AAErE,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,gBAAY,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleQuery.js","sourceRoot":"","sources":["../../src/messageHandlers/handleQuery.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"handleQuery.js","sourceRoot":"","sources":["../../src/messageHandlers/handleQuery.ts"],"names":[],"mappings":";;AAEA,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"}
|
|
@@ -7,10 +7,10 @@ var verifyPeer_1 = __importDefault(require("../utils/verifyPeer"));
|
|
|
7
7
|
function handleServers(message, remotePeerId) {
|
|
8
8
|
var _this = this;
|
|
9
9
|
message.servers.forEach(function (peer) {
|
|
10
|
-
(0, verifyPeer_1.default)(
|
|
10
|
+
(0, verifyPeer_1.default)(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.pubkey === peer.pubkey; });
|
|
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;
|
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleSubscribe.js","sourceRoot":"","sources":["../../src/messageHandlers/handleSubscribe.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"handleSubscribe.js","sourceRoot":"","sources":["../../src/messageHandlers/handleSubscribe.ts"],"names":[],"mappings":";;AAEA,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/server.js
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
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
|
|
3
|
+
var _1 = require(".");
|
|
7
4
|
console.log("Starting server..");
|
|
8
|
-
var server = new
|
|
5
|
+
var server = new _1.ToolDb({
|
|
9
6
|
port: 8080,
|
|
10
7
|
server: true,
|
|
11
8
|
});
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;AAAA,sBAA2B;AAE3B,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACjC,IAAM,MAAM,GAAG,IAAI,SAAM,CAAC;IACxB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;CACb,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import ToolDb from "
|
|
1
|
+
import { ToolDb } from ".";
|
|
2
2
|
export default function toolDbAnonSignIn(this: ToolDb): void;
|
|
@@ -12,7 +12,7 @@ function toolDbClientOnMessage(message, remotePeerId) {
|
|
|
12
12
|
}
|
|
13
13
|
this.emit("message", message, remotePeerId);
|
|
14
14
|
this.processedIds[message.type].push(message.id);
|
|
15
|
-
this.logger("Got message "
|
|
15
|
+
this.logger("Got message ".concat(message.type, " from ").concat(remotePeerId));
|
|
16
16
|
this.logger(message);
|
|
17
17
|
// Check if we are listening for this ID
|
|
18
18
|
if (message.id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":";;AAEA,SAAwB,qBAAqB,CAE3C,OAAsB,EACtB,YAAoB;IAEpB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;KACtC;IACD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACxD,eAAe;QACf,4EAA4E;QAC5E,KAAK;QACL,OAAO;KACR;IAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;IAE5C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEjD,IAAI,CAAC,MAAM,CAAC,sBAAe,OAAO,CAAC,IAAI,mBAAS,YAAY,CAAE,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAErB,wCAAwC;IACxC,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAM,KAAK,GAAG,OAAO,CAAC,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;YAClC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;SAC9B;KACF;IAED,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;QACvD,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,OAAO,EAAE,OAAO,OAAO,CAAC,CAAC;QAC5D,OAAO;KACR;IAED,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,MAAM;YACT,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,MAAM;QAER,KAAK,MAAM;YACT,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACvC,MAAM;QAER,KAAK,WAAW;YACd,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC5C,MAAM;QAER,KAAK,KAAK;YACR,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACtC,MAAM;QAER,KAAK,KAAK;YACR,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACtC,MAAM;QAER,KAAK,SAAS;YACZ,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,SAAS;YACZ,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,OAAO;YACV,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACxC,MAAM;QAER;YACE,MAAM;KACT;AACH,CAAC;AAxED,wCAwEC"}
|
package/dist/toolDbCrdtGet.d.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import BaseCrdt from "
|
|
2
|
-
import ToolDb from "./tooldb";
|
|
3
|
-
import { CrdtPutMessage } from "./types/message";
|
|
1
|
+
import { BaseCrdt, ToolDb, CrdtPutMessage } from ".";
|
|
4
2
|
/**
|
|
5
3
|
* Triggers a GET request to other peers. If the data is available locally it will return that instead.
|
|
6
4
|
* @param key key of the data
|
package/dist/toolDbCrdtGet.js
CHANGED
|
@@ -18,7 +18,7 @@ function toolDbCrdtGet(key, crdt, userNamespaced, timeoutMs) {
|
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
20
|
var finalKey = userNamespaced
|
|
21
|
-
? ":"
|
|
21
|
+
? ":".concat(_this.userAccount.getAddress(), ".").concat(key)
|
|
22
22
|
: key;
|
|
23
23
|
_this.logger("CRDT GET", finalKey);
|
|
24
24
|
var msgId = (0, _1.textRandom)(10);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolDbCrdtGet.js","sourceRoot":"","sources":["../src/toolDbCrdtGet.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"toolDbCrdtGet.js","sourceRoot":"","sources":["../src/toolDbCrdtGet.ts"],"names":[],"mappings":";;AAAA,sBAAiE;AAEjE;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,IAA2B,EAC3B,cAAsB,EACtB,SAAgB;IALlB,iBAwEC;IApEC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,SAAS,EAAE;YACjE,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;SACR;QACD,IAAM,QAAQ,GAAG,cAAc;YAC7B,CAAC,CAAC,WAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,cAAI,GAAG,CAAE;YAC5C,CAAC,CAAC,GAAG,CAAC;QACR,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAElC,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,IAAM,aAAa,GAAG,UAAU,CAAC;YAC/B,KAAI,CAAC,KAAK;iBACP,GAAG,CAAC,QAAQ,CAAC;iBACb,IAAI,CAAC,UAAC,IAAI;gBACT,IAAI;oBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAE7B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBAC3B,OAAO,CAAC,OAAO,CAAC,CAAC;iBAClB;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,CAAC,IAAK,OAAA,MAAM,CAAC,IAAI,CAAC,EAAZ,CAAY,CAAC,CAAC;QAChC,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAElC,YAAY,CAAC,aAAa,CAAC,CAAC;YAC5B,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC1B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;QAEH,KAAI,CAAC,KAAK;aACP,GAAG,CAAC,QAAQ,CAAC;aACb,IAAI,CAAC,UAAC,IAAI;YACT,IAAI;gBACF,IAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC7B,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC5B,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAC7B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACzB,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACvB,OAAO,CAAC,GAAG,CAAC,CAAC;aACd;YAAC,OAAO,CAAC,EAAE;gBACV,aAAa;aACd;QACH,CAAC,CAAC;aACD,KAAK,CAAC;YACL,aAAa;QACf,CAAC,CAAC,CAAC;QAEL,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,SAAS;YACf,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAxED,gCAwEC"}
|
package/dist/toolDbCrdtPut.d.ts
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import { CrdtPutMessage } from ".";
|
|
2
|
-
import ToolDb from "./tooldb";
|
|
3
|
-
import BaseCrdt from "./crdt/baseCrdt";
|
|
1
|
+
import { ToolDb, CrdtPutMessage, BaseCrdt } from ".";
|
|
4
2
|
/**
|
|
5
3
|
* Triggers a PUT request to other peers.
|
|
6
4
|
* @param key key where we want to put the data at.
|
package/dist/toolDbCrdtPut.js
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
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
3
|
var _1 = require(".");
|
|
7
|
-
var proofOfWork_1 = __importDefault(require("./utils/proofOfWork"));
|
|
8
4
|
/**
|
|
9
5
|
* Triggers a PUT request to other peers.
|
|
10
6
|
* @param key key where we want to put the data at.
|
|
@@ -18,7 +14,7 @@ function toolDbCrdtPut(key, crdt, userNamespaced) {
|
|
|
18
14
|
return new Promise(function (resolve, reject) {
|
|
19
15
|
if (key.includes(".")) {
|
|
20
16
|
// Dots are used as a delimitator character between bublic keys and the key of the user's data
|
|
21
|
-
reject(new Error("Key cannot include dots!; "
|
|
17
|
+
reject(new Error("Key cannot include dots!; ".concat(key)));
|
|
22
18
|
return;
|
|
23
19
|
}
|
|
24
20
|
if (!_this.userAccount.getAddress()) {
|
|
@@ -28,9 +24,9 @@ function toolDbCrdtPut(key, crdt, userNamespaced) {
|
|
|
28
24
|
var timestamp = new Date().getTime();
|
|
29
25
|
var crdtChanges = crdt.getChanges();
|
|
30
26
|
var encodedData = JSON.stringify(crdtChanges);
|
|
31
|
-
var dataString = ""
|
|
27
|
+
var dataString = "".concat(encodedData).concat(_this.userAccount.getAddress()).concat(timestamp);
|
|
32
28
|
// WORK
|
|
33
|
-
(0,
|
|
29
|
+
(0, _1.proofOfWork)(dataString, _this.options.pow)
|
|
34
30
|
.then(function (_a) {
|
|
35
31
|
var hash = _a.hash, nonce = _a.nonce;
|
|
36
32
|
_this.userAccount.signData(hash).then(function (signature) {
|
|
@@ -38,7 +34,7 @@ function toolDbCrdtPut(key, crdt, userNamespaced) {
|
|
|
38
34
|
// Compose the message
|
|
39
35
|
var data = {
|
|
40
36
|
k: userNamespaced
|
|
41
|
-
? ":"
|
|
37
|
+
? ":".concat(_this.userAccount.getAddress(), ".").concat(key)
|
|
42
38
|
: key,
|
|
43
39
|
a: _this.userAccount.getAddress() || "",
|
|
44
40
|
n: nonce,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolDbCrdtPut.js","sourceRoot":"","sources":["../src/toolDbCrdtPut.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toolDbCrdtPut.js","sourceRoot":"","sources":["../src/toolDbCrdtPut.ts"],"names":[],"mappings":";;AAAA,sBAOW;AAEX;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,IAA2B,EAC3B,cAAsB;IAJxB,iBA4DC;IAxDC,+BAAA,EAAA,sBAAsB;IAEtB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACrB,8FAA8F;YAC9F,MAAM,CAAC,IAAI,KAAK,CAAC,oCAA6B,GAAG,CAAE,CAAC,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI,CAAC,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;YAClC,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;YAC5D,OAAO;SACR;QAED,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAEtC,IAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAEhD,IAAM,UAAU,GAAG,UAAG,WAAW,SAAG,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAG,SAAS,CAAE,CAAC;QAEhF,OAAO;QACP,IAAA,cAAW,EAAC,UAAU,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC;aACtC,IAAI,CAAC,UAAC,EAAe;gBAAb,IAAI,UAAA,EAAE,KAAK,WAAA;YAClB,KAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,SAAS;gBAC7C,IAAI,SAAS,IAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;oBAC9C,sBAAsB;oBACtB,IAAM,IAAI,GAA0B;wBAClC,CAAC,EAAE,cAAc;4BACf,CAAC,CAAC,WAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,cAAI,GAAG,CAAE;4BAC5C,CAAC,CAAC,GAAG;wBACP,CAAC,EAAE,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE;wBACtC,CAAC,EAAE,KAAK;wBACR,CAAC,EAAE,SAAS;wBACZ,CAAC,EAAE,IAAI;wBACP,CAAC,EAAE,SAAS;wBACZ,CAAC,EAAE,WAAW;wBACd,CAAC,EAAE,IAAI,CAAC,IAAI;qBACb,CAAC;oBAEF,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;oBAEnC,IAAM,YAAY,GAAwB;wBACxC,IAAI,EAAE,SAAS;wBACf,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;wBAClB,EAAE,EAAE,EAAE;wBACN,IAAI,MAAA;qBACL,CAAC;oBACF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;oBACrC,OAAO,CAAC,YAAY,CAAC,CAAC;iBACvB;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AA5DD,gCA4DC"}
|
package/dist/toolDbGet.d.ts
CHANGED
package/dist/toolDbGet.js
CHANGED
|
@@ -18,7 +18,7 @@ function toolDbGet(key, userNamespaced, timeoutMs) {
|
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
20
|
var finalKey = userNamespaced
|
|
21
|
-
? ":"
|
|
21
|
+
? ":".concat(_this.userAccount.getAddress(), ".").concat(key)
|
|
22
22
|
: key;
|
|
23
23
|
_this.logger("GET", finalKey);
|
|
24
24
|
var msgId = (0, _1.textRandom)(10);
|
package/dist/toolDbGet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolDbGet.js","sourceRoot":"","sources":["../src/toolDbGet.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"toolDbGet.js","sourceRoot":"","sources":["../src/toolDbGet.ts"],"names":[],"mappings":";;AAAA,sBAAuC;AAEvC;;;;;;GAMG;AACH,SAAwB,SAAS,CAE/B,GAAW,EACX,cAAsB,EACtB,SAAgB;IAJlB,iBAsEC;IAnEC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,SAAS,EAAE;YACjE,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;SACR;QACD,IAAM,QAAQ,GAAG,cAAc;YAC7B,CAAC,CAAC,WAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,cAAI,GAAG,CAAE;YAC5C,CAAC,CAAC,GAAG,CAAC;QACR,KAAI,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAE7B,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,IAAM,aAAa,GAAG,UAAU,CAAC;YAC/B,KAAI,CAAC,KAAK;iBACP,GAAG,CAAC,QAAQ,CAAC;iBACb,IAAI,CAAC,UAAC,IAAI;gBACT,IAAI;oBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACjC,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBAC3B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;iBACpB;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,KAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAElC,YAAY,CAAC,aAAa,CAAC,CAAC;YAC5B,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACrB;QACH,CAAC,CAAC,CAAC;QAEH,KAAI,CAAC,KAAK;aACP,GAAG,CAAC,QAAQ,CAAC;aACb,IAAI,CAAC,UAAC,IAAI;YACT,IAAI;gBACF,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC;gBACrB,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC5B,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAC7B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,CAAC;aACd;YAAC,OAAO,CAAC,EAAE;gBACV,aAAa;aACd;QACH,CAAC,CAAC;aACD,KAAK,CAAC,UAAC,CAAC;YACP,aAAa;QACf,CAAC,CAAC,CAAC;QAEL,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAtED,4BAsEC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import ToolDb from "
|
|
1
|
+
import { ToolDb } from ".";
|
|
2
2
|
export default function toolDbKeysSignIn(this: ToolDb, privateKey: string, username?: string): Promise<unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolDbKeysSignIn.js","sourceRoot":"","sources":["../src/toolDbKeysSignIn.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"toolDbKeysSignIn.js","sourceRoot":"","sources":["../src/toolDbKeysSignIn.ts"],"names":[],"mappings":";;AAAA,sBAAyC;AAEzC,SAAwB,gBAAgB,CAEtC,UAAkB,EAClB,QAAiB;IAHnB,iBAaC;IARC,IAAI,CAAC,IAAI,CAAC,WAAW;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEzD,OAAO,IAAI,CAAC,WAAW;SACpB,qBAAqB,CAAC,UAAU,CAAC;SACjC,IAAI,CAAC,UAAC,UAAU;QACf,KAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,IAAI,IAAA,eAAY,GAAE,CAAC,CAAC;QACjE,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;AACP,CAAC;AAbD,mCAaC"}
|
package/dist/toolDbNetwork.d.ts
CHANGED
|
@@ -1,20 +1,32 @@
|
|
|
1
1
|
import WebSocket from "ws";
|
|
2
|
+
import { ToolDbMessage } from ".";
|
|
2
3
|
import ToolDb from "./tooldb";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
export declare type ToolDbWebSocket = WebSocket & {
|
|
5
|
+
toolDbId?: string;
|
|
6
|
+
isServer: boolean;
|
|
7
|
+
origUrl: string;
|
|
8
|
+
};
|
|
9
|
+
export default class toolDbNetwork {
|
|
6
10
|
private wnd;
|
|
7
11
|
private _wss;
|
|
12
|
+
private options;
|
|
8
13
|
private server;
|
|
14
|
+
private _tooldb;
|
|
9
15
|
private _connections;
|
|
10
16
|
private _awaitingConnections;
|
|
11
17
|
private removeFromAwaiting;
|
|
18
|
+
_clientSockets: Record<string, ToolDbWebSocket>;
|
|
19
|
+
get clientSockets(): Record<string, ToolDbWebSocket>;
|
|
12
20
|
constructor(db: ToolDb);
|
|
13
21
|
/**
|
|
14
|
-
* Open a connection to a server
|
|
22
|
+
* Open a connection to a federated server
|
|
15
23
|
* @param url URL of the server (including port)
|
|
16
24
|
* @returns websocket
|
|
17
25
|
*/
|
|
18
26
|
connectTo: (host: string, port: number, connectionId?: string | undefined) => ToolDbWebSocket | undefined;
|
|
27
|
+
close(clientId: string): void;
|
|
28
|
+
sendToAll(msg: ToolDbMessage, crossServerOnly?: boolean, isRelay?: boolean): void;
|
|
29
|
+
sendToClientId(clientId: string, msg: ToolDbMessage): void;
|
|
19
30
|
private reconnect;
|
|
31
|
+
get tooldb(): ToolDb;
|
|
20
32
|
}
|