tool-db 2.1.2 → 2.2.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.
Files changed (134) hide show
  1. package/bundle.js +1 -1
  2. package/dist/crdt/listCrdt.d.ts +2 -2
  3. package/dist/index.d.ts +14 -6
  4. package/dist/index.js +22 -12
  5. package/dist/index.js.map +1 -1
  6. package/dist/messageHandlers/handleCrdtPut.js +3 -3
  7. package/dist/messageHandlers/handleCrdtPut.js.map +1 -1
  8. package/dist/messageHandlers/handleJoin.js +24 -20
  9. package/dist/messageHandlers/handleJoin.js.map +1 -1
  10. package/dist/messageHandlers/handlePing.js +1 -1
  11. package/dist/messageHandlers/handlePing.js.map +1 -1
  12. package/dist/messageHandlers/handlePong.js +5 -5
  13. package/dist/messageHandlers/handlePong.js.map +1 -1
  14. package/dist/messageHandlers/handleServers.js +9 -8
  15. package/dist/messageHandlers/handleServers.js.map +1 -1
  16. package/dist/toolDbAnonSignIn.js +1 -6
  17. package/dist/toolDbAnonSignIn.js.map +1 -1
  18. package/dist/toolDbCrdtGet.js +4 -2
  19. package/dist/toolDbCrdtGet.js.map +1 -1
  20. package/dist/toolDbCrdtPut.js +9 -7
  21. package/dist/toolDbCrdtPut.js.map +1 -1
  22. package/dist/toolDbGet.js +4 -2
  23. package/dist/toolDbGet.js.map +1 -1
  24. package/dist/toolDbKeysSignIn.d.ts +1 -1
  25. package/dist/toolDbKeysSignIn.js +4 -2
  26. package/dist/toolDbKeysSignIn.js.map +1 -1
  27. package/dist/toolDbNetwork.d.ts +4 -16
  28. package/dist/toolDbNetwork.js +74 -179
  29. package/dist/toolDbNetwork.js.map +1 -1
  30. package/dist/toolDbNetworkAdapter.d.ts +57 -0
  31. package/dist/toolDbNetworkAdapter.js +192 -0
  32. package/dist/toolDbNetworkAdapter.js.map +1 -0
  33. package/dist/toolDbPut.js +7 -7
  34. package/dist/toolDbPut.js.map +1 -1
  35. package/dist/toolDbQueryKeys.js +3 -2
  36. package/dist/toolDbQueryKeys.js.map +1 -1
  37. package/dist/toolDbSignIn.d.ts +1 -2
  38. package/dist/toolDbSignIn.js +2 -2
  39. package/dist/toolDbSignIn.js.map +1 -1
  40. package/dist/toolDbSignUp.js +6 -6
  41. package/dist/toolDbSignUp.js.map +1 -1
  42. package/dist/toolDbSubscribe.js +4 -2
  43. package/dist/toolDbSubscribe.js.map +1 -1
  44. package/dist/toolDbWeb3User.d.ts +20 -0
  45. package/dist/toolDbWeb3User.js +75 -0
  46. package/dist/toolDbWeb3User.js.map +1 -0
  47. package/dist/toolDbWebrtc.d.ts +2 -12
  48. package/dist/toolDbWebrtc.js +69 -104
  49. package/dist/toolDbWebrtc.js.map +1 -1
  50. package/dist/toolDbWebsocket.d.ts +19 -0
  51. package/dist/toolDbWebsocket.js +193 -0
  52. package/dist/toolDbWebsocket.js.map +1 -0
  53. package/dist/tooldb.d.ts +6 -15
  54. package/dist/tooldb.js +24 -54
  55. package/dist/tooldb.js.map +1 -1
  56. package/dist/types/tooldb.d.ts +16 -10
  57. package/dist/types/tooldb.js +27 -13
  58. package/dist/types/tooldb.js.map +1 -1
  59. package/dist/utils/getPeerSignature.d.ts +2 -2
  60. package/dist/utils/getPeerSignature.js +1 -1
  61. package/dist/utils/getPeerSignature.js.map +1 -1
  62. package/dist/utils/randomAnimal.js +36 -1
  63. package/dist/utils/randomAnimal.js.map +1 -1
  64. package/dist/utils/verifyMessage.js +4 -3
  65. package/dist/utils/verifyMessage.js.map +1 -1
  66. package/dist/utils/verifyPeer.d.ts +1 -1
  67. package/dist/utils/verifyPeer.js +7 -3
  68. package/dist/utils/verifyPeer.js.map +1 -1
  69. package/package.json +1 -1
  70. package/test-alice/000663.ldb +0 -0
  71. package/test-alice/000665.ldb +0 -0
  72. package/test-alice/000668.ldb +0 -0
  73. package/test-alice/000669.log +0 -0
  74. package/test-alice/CURRENT +1 -1
  75. package/test-alice/LOG +5 -5
  76. package/test-alice/LOG.old +5 -5
  77. package/test-alice/MANIFEST-000667 +0 -0
  78. package/test-alice-speed/000035.log +0 -0
  79. package/test-alice-speed/000036.ldb +0 -0
  80. package/test-alice-speed/CURRENT +1 -1
  81. package/test-alice-speed/LOG +13 -14
  82. package/test-alice-speed/LOG.old +5 -5
  83. package/test-alice-speed/MANIFEST-000033 +0 -0
  84. package/test-bob/000665.ldb +0 -0
  85. package/test-bob/000667.ldb +0 -0
  86. package/test-bob/000668.log +0 -0
  87. package/test-bob/CURRENT +1 -1
  88. package/test-bob/LOG +5 -5
  89. package/test-bob/LOG.old +14 -5
  90. package/test-bob/MANIFEST-000666 +0 -0
  91. package/test-node-a/000663.ldb +0 -0
  92. package/test-node-a/000665.ldb +0 -0
  93. package/test-node-a/000668.ldb +0 -0
  94. package/test-node-a/000669.log +0 -0
  95. package/test-node-a/CURRENT +1 -1
  96. package/test-node-a/LOG +5 -5
  97. package/test-node-a/LOG.old +5 -5
  98. package/test-node-a/MANIFEST-000667 +0 -0
  99. package/test-node-b/000663.ldb +0 -0
  100. package/test-node-b/000665.ldb +0 -0
  101. package/test-node-b/000668.ldb +0 -0
  102. package/test-node-b/000669.log +0 -0
  103. package/test-node-b/CURRENT +1 -1
  104. package/test-node-b/LOG +5 -5
  105. package/test-node-b/LOG.old +5 -5
  106. package/test-node-b/MANIFEST-000667 +0 -0
  107. package/test-verify-a/{000212.log → 000250.log} +0 -0
  108. package/test-verify-a/CURRENT +1 -1
  109. package/test-verify-a/LOG +3 -3
  110. package/test-verify-a/LOG.old +3 -3
  111. package/test-verify-a/{MANIFEST-000211 → MANIFEST-000249} +0 -0
  112. package/test-alice/000425.ldb +0 -0
  113. package/test-alice/000427.ldb +0 -0
  114. package/test-alice/000430.ldb +0 -0
  115. package/test-alice/000431.log +0 -0
  116. package/test-alice/MANIFEST-000429 +0 -0
  117. package/test-alice-speed/000236.log +0 -0
  118. package/test-alice-speed/000237.ldb +0 -0
  119. package/test-alice-speed/MANIFEST-000234 +0 -0
  120. package/test-bob/000425.ldb +0 -0
  121. package/test-bob/000427.ldb +0 -0
  122. package/test-bob/000430.ldb +0 -0
  123. package/test-bob/000431.log +0 -0
  124. package/test-bob/MANIFEST-000429 +0 -0
  125. package/test-node-a/000425.ldb +0 -0
  126. package/test-node-a/000427.ldb +0 -0
  127. package/test-node-a/000430.ldb +0 -0
  128. package/test-node-a/000431.log +0 -0
  129. package/test-node-a/MANIFEST-000429 +0 -0
  130. package/test-node-b/000425.ldb +0 -0
  131. package/test-node-b/000427.ldb +0 -0
  132. package/test-node-b/000430.ldb +0 -0
  133. package/test-node-b/000431.log +0 -0
  134. package/test-node-b/MANIFEST-000429 +0 -0
@@ -10,11 +10,11 @@ export interface InsListChange<T> extends ChangeListBase<T> {
10
10
  p: string | undefined;
11
11
  n: string | undefined;
12
12
  }
13
- export interface DelMapChange<T> extends ChangeListBase<T> {
13
+ export interface DelListChange<T> extends ChangeListBase<T> {
14
14
  t: "DEL";
15
15
  v: string;
16
16
  }
17
- export declare type ListChanges<T> = InsListChange<T> | DelMapChange<T>;
17
+ export declare type ListChanges<T> = InsListChange<T> | DelListChange<T>;
18
18
  interface ListTempCursor<T> {
19
19
  value: T;
20
20
  index: string;
package/dist/index.d.ts CHANGED
@@ -18,17 +18,25 @@ export { default as arrayBufferToHex } from "./utils/encoding/arrayBufferToHex";
18
18
  export { default as hexToArrayBuffer } from "./utils/encoding/hexToArrayBuffer";
19
19
  export { default as hexToString } from "./utils/encoding/hexToString";
20
20
  export { default as hexToUint8 } from "./utils/encoding/hexToUint8";
21
+ export { default as generateKeyFromPassword } from "./utils/crypto/generateKeyFromPassword";
21
22
  export { default as decryptWithPass } from "./utils/crypto/decryptWithPass";
22
23
  export { default as encryptWithPass } from "./utils/crypto/encryptWithPass";
23
- export { default as generateKeyFromPassword } from "./utils/crypto/generateKeyFromPassword";
24
- export { default as toolDbNetwork } from "./toolDbNetwork";
25
- export { default as toolDbWebrtc } from "./toolDbWebrtc";
24
+ export { default as ToolDbNetworkAdapter } from "./toolDbNetworkAdapter";
25
+ export { default as ToolDbWebsocket } from "./toolDbWebsocket";
26
+ export { default as ToolDbWebrtc } from "./toolDbWebrtc";
27
+ export * from "./types/tooldb";
28
+ export * from "./types/message";
29
+ export * from "./crdt/baseCrdt";
30
+ export * from "./crdt/counterCrdt";
31
+ export * from "./crdt/listCrdt";
32
+ export * from "./crdt/mapCrdt";
33
+ export { default as ToolDbWeb3User } from "./toolDbWeb3User";
34
+ export { default as handleSubscribe } from "./messageHandlers/handleSubscribe";
26
35
  export { default as handleCrdtGet } from "./messageHandlers/handleCrdtGet";
27
36
  export { default as handleCrdtPut } from "./messageHandlers/handleCrdtPut";
28
- export { default as handleGet } from "./messageHandlers/handleGet";
37
+ export { default as handleQuery } from "./messageHandlers/handleQuery";
29
38
  export { default as handlePing } from "./messageHandlers/handlePing";
30
39
  export { default as handlePong } from "./messageHandlers/handlePong";
40
+ export { default as handleGet } from "./messageHandlers/handleGet";
31
41
  export { default as handlePut } from "./messageHandlers/handlePut";
32
- export { default as handleQuery } from "./messageHandlers/handleQuery";
33
- export { default as handleSubscribe } from "./messageHandlers/handleSubscribe";
34
42
  export { default as ToolDb } from "./tooldb";
package/dist/index.js CHANGED
@@ -15,7 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
15
15
  return (mod && mod.__esModule) ? mod : { "default": mod };
16
16
  };
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.ToolDb = exports.handleSubscribe = exports.handleQuery = exports.handlePut = exports.handlePong = exports.handlePing = exports.handleGet = exports.handleCrdtPut = exports.handleCrdtGet = exports.toolDbWebrtc = exports.toolDbNetwork = exports.generateKeyFromPassword = exports.encryptWithPass = exports.decryptWithPass = exports.hexToUint8 = exports.hexToString = exports.hexToArrayBuffer = exports.arrayBufferToHex = exports.arrayBufferToString = exports.verifyPeer = exports.verifyMessage = exports.stringToArrayBuffer = exports.textRandom = exports.randomAnimal = exports.generateIv = exports.sha256 = exports.sha1 = exports.proofOfWork = exports.MapCrdt = exports.ListCrdt = exports.CounterCrdt = exports.BaseCrdt = void 0;
18
+ exports.ToolDb = exports.handlePut = exports.handleGet = exports.handlePong = exports.handlePing = exports.handleQuery = exports.handleCrdtPut = exports.handleCrdtGet = exports.handleSubscribe = exports.ToolDbWeb3User = exports.ToolDbWebrtc = exports.ToolDbWebsocket = exports.ToolDbNetworkAdapter = exports.encryptWithPass = exports.decryptWithPass = exports.generateKeyFromPassword = exports.hexToUint8 = exports.hexToString = exports.hexToArrayBuffer = exports.arrayBufferToHex = exports.arrayBufferToString = exports.verifyPeer = exports.verifyMessage = exports.stringToArrayBuffer = exports.textRandom = exports.randomAnimal = exports.generateIv = exports.sha256 = exports.sha1 = exports.proofOfWork = exports.MapCrdt = exports.ListCrdt = exports.CounterCrdt = exports.BaseCrdt = void 0;
19
19
  __exportStar(require("./types/tooldb"), exports);
20
20
  __exportStar(require("./types/message"), exports);
21
21
  global.Buffer = global.Buffer || require("buffer").Buffer;
@@ -58,32 +58,42 @@ var hexToString_1 = require("./utils/encoding/hexToString");
58
58
  Object.defineProperty(exports, "hexToString", { enumerable: true, get: function () { return __importDefault(hexToString_1).default; } });
59
59
  var hexToUint8_1 = require("./utils/encoding/hexToUint8");
60
60
  Object.defineProperty(exports, "hexToUint8", { enumerable: true, get: function () { return __importDefault(hexToUint8_1).default; } });
61
+ var generateKeyFromPassword_1 = require("./utils/crypto/generateKeyFromPassword");
62
+ Object.defineProperty(exports, "generateKeyFromPassword", { enumerable: true, get: function () { return __importDefault(generateKeyFromPassword_1).default; } });
61
63
  var decryptWithPass_1 = require("./utils/crypto/decryptWithPass");
62
64
  Object.defineProperty(exports, "decryptWithPass", { enumerable: true, get: function () { return __importDefault(decryptWithPass_1).default; } });
63
65
  var encryptWithPass_1 = require("./utils/crypto/encryptWithPass");
64
66
  Object.defineProperty(exports, "encryptWithPass", { enumerable: true, get: function () { return __importDefault(encryptWithPass_1).default; } });
65
- var generateKeyFromPassword_1 = require("./utils/crypto/generateKeyFromPassword");
66
- Object.defineProperty(exports, "generateKeyFromPassword", { enumerable: true, get: function () { return __importDefault(generateKeyFromPassword_1).default; } });
67
- var toolDbNetwork_1 = require("./toolDbNetwork");
68
- Object.defineProperty(exports, "toolDbNetwork", { enumerable: true, get: function () { return __importDefault(toolDbNetwork_1).default; } });
67
+ var toolDbNetworkAdapter_1 = require("./toolDbNetworkAdapter");
68
+ Object.defineProperty(exports, "ToolDbNetworkAdapter", { enumerable: true, get: function () { return __importDefault(toolDbNetworkAdapter_1).default; } });
69
+ var toolDbWebsocket_1 = require("./toolDbWebsocket");
70
+ Object.defineProperty(exports, "ToolDbWebsocket", { enumerable: true, get: function () { return __importDefault(toolDbWebsocket_1).default; } });
69
71
  var toolDbWebrtc_1 = require("./toolDbWebrtc");
70
- Object.defineProperty(exports, "toolDbWebrtc", { enumerable: true, get: function () { return __importDefault(toolDbWebrtc_1).default; } });
72
+ Object.defineProperty(exports, "ToolDbWebrtc", { enumerable: true, get: function () { return __importDefault(toolDbWebrtc_1).default; } });
73
+ __exportStar(require("./types/tooldb"), exports);
74
+ __exportStar(require("./types/message"), exports);
75
+ __exportStar(require("./crdt/baseCrdt"), exports);
76
+ __exportStar(require("./crdt/counterCrdt"), exports);
77
+ __exportStar(require("./crdt/listCrdt"), exports);
78
+ __exportStar(require("./crdt/mapCrdt"), exports);
79
+ var toolDbWeb3User_1 = require("./toolDbWeb3User");
80
+ Object.defineProperty(exports, "ToolDbWeb3User", { enumerable: true, get: function () { return __importDefault(toolDbWeb3User_1).default; } });
81
+ var handleSubscribe_1 = require("./messageHandlers/handleSubscribe");
82
+ Object.defineProperty(exports, "handleSubscribe", { enumerable: true, get: function () { return __importDefault(handleSubscribe_1).default; } });
71
83
  var handleCrdtGet_1 = require("./messageHandlers/handleCrdtGet");
72
84
  Object.defineProperty(exports, "handleCrdtGet", { enumerable: true, get: function () { return __importDefault(handleCrdtGet_1).default; } });
73
85
  var handleCrdtPut_1 = require("./messageHandlers/handleCrdtPut");
74
86
  Object.defineProperty(exports, "handleCrdtPut", { enumerable: true, get: function () { return __importDefault(handleCrdtPut_1).default; } });
75
- var handleGet_1 = require("./messageHandlers/handleGet");
76
- Object.defineProperty(exports, "handleGet", { enumerable: true, get: function () { return __importDefault(handleGet_1).default; } });
87
+ var handleQuery_1 = require("./messageHandlers/handleQuery");
88
+ Object.defineProperty(exports, "handleQuery", { enumerable: true, get: function () { return __importDefault(handleQuery_1).default; } });
77
89
  var handlePing_1 = require("./messageHandlers/handlePing");
78
90
  Object.defineProperty(exports, "handlePing", { enumerable: true, get: function () { return __importDefault(handlePing_1).default; } });
79
91
  var handlePong_1 = require("./messageHandlers/handlePong");
80
92
  Object.defineProperty(exports, "handlePong", { enumerable: true, get: function () { return __importDefault(handlePong_1).default; } });
93
+ var handleGet_1 = require("./messageHandlers/handleGet");
94
+ Object.defineProperty(exports, "handleGet", { enumerable: true, get: function () { return __importDefault(handleGet_1).default; } });
81
95
  var handlePut_1 = require("./messageHandlers/handlePut");
82
96
  Object.defineProperty(exports, "handlePut", { enumerable: true, get: function () { return __importDefault(handlePut_1).default; } });
83
- var handleQuery_1 = require("./messageHandlers/handleQuery");
84
- Object.defineProperty(exports, "handleQuery", { enumerable: true, get: function () { return __importDefault(handleQuery_1).default; } });
85
- var handleSubscribe_1 = require("./messageHandlers/handleSubscribe");
86
- Object.defineProperty(exports, "handleSubscribe", { enumerable: true, get: function () { return __importDefault(handleSubscribe_1).default; } });
87
97
  var tooldb_1 = require("./tooldb");
88
98
  Object.defineProperty(exports, "ToolDb", { enumerable: true, get: function () { return __importDefault(tooldb_1).default; } });
89
99
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,mCAAmC;;;;;;;;;;;;;;;;AAEnC,iDAA+B;AAC/B,kDAAgC;AAEhC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;AAE1D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC;CAC7C;AAED,4CAAsD;AAA7C,qHAAA,OAAO,OAAY;AAC5B,kDAA4D;AAAnD,2HAAA,OAAO,OAAe;AAC/B,4CAAsD;AAA7C,qHAAA,OAAO,OAAY;AAC5B,0CAAoD;AAA3C,mHAAA,OAAO,OAAW;AAE3B,mDAA6D;AAApD,2HAAA,OAAO,OAAe;AAC/B,qCAA+C;AAAtC,6GAAA,OAAO,OAAQ;AACxB,yCAAmD;AAA1C,iHAAA,OAAO,OAAU;AAE1B,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAC9B,qDAA+D;AAAtD,6HAAA,OAAO,OAAgB;AAChC,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAC9B,4EAAsF;AAA7E,2IAAA,OAAO,OAAuB;AACvC,uDAAiE;AAAxD,+HAAA,OAAO,OAAiB;AACjC,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAE9B,4EAAsF;AAA7E,2IAAA,OAAO,OAAuB;AACvC,sEAAgF;AAAvE,qIAAA,OAAO,OAAoB;AACpC,sEAAgF;AAAvE,qIAAA,OAAO,OAAoB;AACpC,4DAAsE;AAA7D,2HAAA,OAAO,OAAe;AAC/B,0DAAoE;AAA3D,yHAAA,OAAO,OAAc;AAE9B,kEAA4E;AAAnE,mIAAA,OAAO,OAAmB;AACnC,kEAA4E;AAAnE,mIAAA,OAAO,OAAmB;AACnC,kFAA4F;AAAnF,mJAAA,OAAO,OAA2B;AAE3C,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,+CAAyD;AAAhD,6HAAA,OAAO,OAAgB;AAEhC,iEAA2E;AAAlE,+HAAA,OAAO,OAAiB;AACjC,iEAA2E;AAAlE,+HAAA,OAAO,OAAiB;AACjC,yDAAmE;AAA1D,uHAAA,OAAO,OAAa;AAC7B,2DAAqE;AAA5D,yHAAA,OAAO,OAAc;AAC9B,2DAAqE;AAA5D,yHAAA,OAAO,OAAc;AAC9B,yDAAmE;AAA1D,uHAAA,OAAO,OAAa;AAC7B,6DAAuE;AAA9D,2HAAA,OAAO,OAAe;AAC/B,qEAA+E;AAAtE,mIAAA,OAAO,OAAmB;AAEnC,mCAA6C;AAApC,iHAAA,OAAO,OAAU"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,mCAAmC;;;;;;;;;;;;;;;;AAEnC,iDAA+B;AAC/B,kDAAgC;AAEhC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;AAE1D,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC;CAC7C;AAED,4CAAsD;AAA7C,qHAAA,OAAO,OAAY;AAC5B,kDAA4D;AAAnD,2HAAA,OAAO,OAAe;AAC/B,4CAAsD;AAA7C,qHAAA,OAAO,OAAY;AAC5B,0CAAoD;AAA3C,mHAAA,OAAO,OAAW;AAE3B,mDAA6D;AAApD,2HAAA,OAAO,OAAe;AAC/B,qCAA+C;AAAtC,6GAAA,OAAO,OAAQ;AACxB,yCAAmD;AAA1C,iHAAA,OAAO,OAAU;AAE1B,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAC9B,qDAA+D;AAAtD,6HAAA,OAAO,OAAgB;AAChC,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAC9B,4EAAsF;AAA7E,2IAAA,OAAO,OAAuB;AACvC,uDAAiE;AAAxD,+HAAA,OAAO,OAAiB;AACjC,iDAA2D;AAAlD,yHAAA,OAAO,OAAc;AAE9B,4EAAsF;AAA7E,2IAAA,OAAO,OAAuB;AACvC,sEAAgF;AAAvE,qIAAA,OAAO,OAAoB;AACpC,sEAAgF;AAAvE,qIAAA,OAAO,OAAoB;AACpC,4DAAsE;AAA7D,2HAAA,OAAO,OAAe;AAC/B,0DAAoE;AAA3D,yHAAA,OAAO,OAAc;AAE9B,kFAA4F;AAAnF,mJAAA,OAAO,OAA2B;AAC3C,kEAA4E;AAAnE,mIAAA,OAAO,OAAmB;AACnC,kEAA4E;AAAnE,mIAAA,OAAO,OAAmB;AAEnC,+DAAyE;AAAhE,6IAAA,OAAO,OAAwB;AACxC,qDAA+D;AAAtD,mIAAA,OAAO,OAAmB;AACnC,+CAAyD;AAAhD,6HAAA,OAAO,OAAgB;AAEhC,iDAA+B;AAC/B,kDAAgC;AAChC,kDAAgC;AAChC,qDAAmC;AACnC,kDAAgC;AAChC,iDAA+B;AAE/B,mDAA6D;AAApD,iIAAA,OAAO,OAAkB;AAElC,qEAA+E;AAAtE,mIAAA,OAAO,OAAmB;AACnC,iEAA2E;AAAlE,+HAAA,OAAO,OAAiB;AACjC,iEAA2E;AAAlE,+HAAA,OAAO,OAAiB;AACjC,6DAAuE;AAA9D,2HAAA,OAAO,OAAe;AAC/B,2DAAqE;AAA5D,yHAAA,OAAO,OAAc;AAC9B,2DAAqE;AAA5D,yHAAA,OAAO,OAAc;AAC9B,yDAAmE;AAA1D,uHAAA,OAAO,OAAa;AAC7B,yDAAmE;AAA1D,uHAAA,OAAO,OAAa;AAE7B,mCAA6C;AAApC,iHAAA,OAAO,OAAU"}
@@ -38,13 +38,13 @@ function handleCrdtPut(message, remotePeerId) {
38
38
  // Add handles for all kinds of CRDT we add
39
39
  var oldDoc = void 0;
40
40
  if (parsedOldData.c === baseCrdt_1.CRDT_MAP) {
41
- oldDoc = new mapCrdt_1.default(_this.getAddress() || "", parsedOldData.v);
41
+ oldDoc = new mapCrdt_1.default(_this.userAccount.getAddress() || "", parsedOldData.v);
42
42
  }
43
43
  if (parsedOldData.c === baseCrdt_1.CRDT_LIST) {
44
- oldDoc = new listCrdt_1.default(_this.getAddress() || "", parsedOldData.v);
44
+ oldDoc = new listCrdt_1.default(_this.userAccount.getAddress() || "", parsedOldData.v);
45
45
  }
46
46
  if (parsedOldData.c === baseCrdt_1.CRDT_COUNTER) {
47
- oldDoc = new counterCrdt_1.default(_this.getAddress() || "", parsedOldData.v);
47
+ oldDoc = new counterCrdt_1.default(_this.userAccount.getAddress() || "", parsedOldData.v);
48
48
  }
49
49
  var changesMerged = [];
50
50
  if (oldDoc) {
@@ -1 +1 @@
1
- {"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"handleCrdtPut.js","sourceRoot":"","sources":["../../src/messageHandlers/handleCrdtPut.ts"],"names":[],"mappings":"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"}
@@ -5,28 +5,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  var verifyPeer_1 = __importDefault(require("../utils/verifyPeer"));
7
7
  function handleJoin(message, remotePeerId) {
8
- var verified = (0, verifyPeer_1.default)(this, message.peer);
9
- // Add this peer to our list of peers
10
- if (verified) {
11
- var filteredPeers = this.peers.filter(function (p) { return p.adress !== message.peer.adress; });
12
- if (filteredPeers.length === 0 && message.peer.host && message.peer.port) {
13
- // Add this peer to the list
14
- this.peers.push(message.peer);
15
- // Reply with our servers list
16
- this.network.sendToClientId(remotePeerId, {
17
- type: "servers",
18
- servers: this.peers.filter(function (p) { return p.topic === message.peer.topic; }),
19
- id: message.id,
20
- });
21
- // If we are a server ourselves we broadcast this message
22
- if (this.options.server) {
23
- this.network.sendToAll(message, true);
8
+ var _this = this;
9
+ (0, verifyPeer_1.default)(this, message.peer).then(function (verified) {
10
+ if (verified) {
11
+ // Add this peer to our list of peers
12
+ var filteredPeers = _this.peers.filter(function (p) { return p.adress !== message.peer.adress; });
13
+ if (filteredPeers.length === 0 &&
14
+ message.peer.host &&
15
+ message.peer.port) {
16
+ // Add this peer to the list
17
+ _this.peers.push(message.peer);
18
+ // Reply with our servers list
19
+ _this.network.sendToClientId(remotePeerId, {
20
+ type: "servers",
21
+ servers: _this.peers.filter(function (p) { return p.topic === message.peer.topic; }),
22
+ id: message.id,
23
+ });
24
+ // If we are a server ourselves we broadcast this message
25
+ if (_this.options.server) {
26
+ _this.network.sendToAll(message, true);
27
+ }
24
28
  }
25
29
  }
26
- }
27
- else {
28
- console.warn("Blocked a remote peer from joining; ", message);
29
- }
30
+ else {
31
+ console.warn("Blocked a remote peer from joining; ", message);
32
+ }
33
+ });
30
34
  }
31
35
  exports.default = handleJoin;
32
36
  //# sourceMappingURL=handleJoin.js.map
@@ -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;IAEpB,IAAM,QAAQ,GAAG,IAAA,oBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,qCAAqC;IACrC,IAAI,QAAQ,EAAE;QACZ,IAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CACrC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,EAAhC,CAAgC,CACxC,CAAC;QACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;YACxE,4BAA4B;YAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC9B,8BAA8B;YAC9B,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;gBACxC,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,EAA9B,CAA8B,CAAC;gBACjE,EAAE,EAAE,OAAO,CAAC,EAAE;aACG,CAAC,CAAC;YAErB,yDAAyD;YACzD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBACvB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;aACvC;SACF;KACF;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,OAAO,CAAC,CAAC;KAC/D;AACH,CAAC;AA7BD,6BA6BC"}
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,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"}
@@ -12,7 +12,7 @@ function handlePing(message, remotePeerId) {
12
12
  this.network.sendToClientId(remotePeerId, {
13
13
  type: "pong",
14
14
  isServer: this.options.server,
15
- clientId: this.options.peerAccount.address,
15
+ clientId: this.network.getClientAddress(),
16
16
  to: [],
17
17
  id: message.id,
18
18
  });
@@ -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,WAAW,CAAC,OAAO;QAC1C,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;AAxBD,6BAwBC"}
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;AAxBD,6BAwBC"}
@@ -10,17 +10,17 @@ function handlePong(message, remotePeerId) {
10
10
  this.isConnected = true;
11
11
  this.onConnect();
12
12
  }
13
- this.onPeerConnect(this.options.peerAccount.address);
14
- if (this.options.server && this.options.peerAccount.address) {
13
+ this.onPeerConnect(this.peerAccount.getAddress() || "");
14
+ if (this.options.server && this.peerAccount.getAddress()) {
15
15
  var timestamp = new Date().getTime();
16
- var signature = (0, getPeerSignature_1.default)(this.options.peerAccount, this.options.topic, timestamp, this.options.host, this.options.port);
16
+ var signature = (0, getPeerSignature_1.default)(this.peerAccount, this.options.topic, timestamp, this.options.host, this.options.port);
17
17
  var meAsPeer = {
18
18
  topic: this.options.topic,
19
19
  timestamp: timestamp,
20
20
  host: this.options.host,
21
21
  port: this.options.port,
22
- adress: this.options.peerAccount.address,
23
- sig: signature.signature,
22
+ adress: this.peerAccount.getAddress() || "",
23
+ sig: signature,
24
24
  };
25
25
  this.network.sendToClientId(remotePeerId, {
26
26
  type: "join",
@@ -1 +1 @@
1
- {"version":3,"file":"handlePong.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePong.ts"],"names":[],"mappings":";;;;;AAEA,+EAAyD;AAEzD,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;IACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE;QAC3D,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAM,SAAS,GAAG,IAAA,0BAAgB,EAChC,IAAI,CAAC,OAAO,CAAC,WAAW,EACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,SAAS,EACT,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAClB,CAAC;QAEF,IAAM,QAAQ,GAAS;YACrB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO;YACxC,GAAG,EAAE,SAAS,CAAC,SAAS;SACzB,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;YACxC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;SACJ,CAAC,CAAC;KACnB;AACH,CAAC;AAtCD,6BAsCC"}
1
+ {"version":3,"file":"handlePong.js","sourceRoot":"","sources":["../../src/messageHandlers/handlePong.ts"],"names":[],"mappings":";;;;;AAEA,+EAAyD;AAEzD,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;IACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAExD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;QACxD,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAM,SAAS,GAAG,IAAA,0BAAgB,EAChC,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,SAAS,EACT,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,CAAC,OAAO,CAAC,IAAI,CAClB,CAAC;QAEF,IAAM,QAAQ,GAAS;YACrB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE;YAC3C,GAAG,EAAE,SAAS;SACf,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE;YACxC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,EAAE;YACN,EAAE,EAAE,IAAA,oBAAU,EAAC,EAAE,CAAC;SACJ,CAAC,CAAC;KACnB;AACH,CAAC;AAtCD,6BAsCC"}
@@ -7,15 +7,16 @@ 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
- var verified = (0, verifyPeer_1.default)(_this, peer);
11
- // Add this peer to our list of peers
12
- if (verified) {
13
- var filteredPeers = _this.peers.findIndex(function (p) { return p.adress === peer.adress; });
14
- if (filteredPeers === -1) {
15
- // Add this peer to the list
16
- _this.peers.push(peer);
10
+ (0, verifyPeer_1.default)(_this, peer).then(function (verified) {
11
+ // Add this peer to our list of peers
12
+ if (verified) {
13
+ var filteredPeers = _this.peers.findIndex(function (p) { return p.adress === peer.adress; });
14
+ if (filteredPeers === -1) {
15
+ // Add this peer to the list
16
+ _this.peers.push(peer);
17
+ }
17
18
  }
18
- }
19
+ });
19
20
  });
20
21
  }
21
22
  exports.default = handleServers;
@@ -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,IAAM,QAAQ,GAAG,IAAA,oBAAU,EAAC,KAAI,EAAE,IAAI,CAAC,CAAC;QAExC,qCAAqC;QACrC,IAAI,QAAQ,EAAE;YACZ,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,SAAS,CACxC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,EAAxB,CAAwB,CAChC,CAAC;YACF,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE;gBACxB,4BAA4B;gBAC5B,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACvB;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAnBD,gCAmBC"}
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,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,12 +1,7 @@
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 randomAnimal_1 = __importDefault(require("./utils/randomAnimal"));
7
3
  function toolDbAnonSignIn() {
8
- var account = this.createAccount();
9
- this.setUser(account, "Anonymous " + (0, randomAnimal_1.default)());
4
+ this.userAccount.anonUser();
10
5
  }
11
6
  exports.default = toolDbAnonSignIn;
12
7
  //# sourceMappingURL=toolDbAnonSignIn.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbAnonSignIn.js","sourceRoot":"","sources":["../src/toolDbAnonSignIn.ts"],"names":[],"mappings":";;;;;AAEA,sEAAgD;AAEhD,SAAwB,gBAAgB;IACtC,IAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACrC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAa,IAAA,sBAAY,GAAI,CAAC,CAAC;AACvD,CAAC;AAHD,mCAGC"}
1
+ {"version":3,"file":"toolDbAnonSignIn.js","sourceRoot":"","sources":["../src/toolDbAnonSignIn.ts"],"names":[],"mappings":";;AAEA,SAAwB,gBAAgB;IACtC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;AAC9B,CAAC;AAFD,mCAEC"}
@@ -13,11 +13,13 @@ function toolDbCrdtGet(key, crdt, userNamespaced, timeoutMs) {
13
13
  if (userNamespaced === void 0) { userNamespaced = false; }
14
14
  if (timeoutMs === void 0) { timeoutMs = 1000; }
15
15
  return new Promise(function (resolve, reject) {
16
- if (userNamespaced && _this.getAddress() === undefined) {
16
+ if (userNamespaced && _this.userAccount.getAddress() === undefined) {
17
17
  reject(new Error("You are not authorized yet!"));
18
18
  return;
19
19
  }
20
- var finalKey = userNamespaced ? ":" + _this.getAddress() + "." + key : key;
20
+ var finalKey = userNamespaced
21
+ ? ":" + _this.userAccount.getAddress() + "." + key
22
+ : key;
21
23
  if (_this.options.debug) {
22
24
  console.log("CRDT GET > " + finalKey);
23
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbCrdtGet.js","sourceRoot":"","sources":["../src/toolDbCrdtGet.ts"],"names":[],"mappings":";;AAAA,sBAA+B;AAK/B;;;;;;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,UAAU,EAAE,KAAK,SAAS,EAAE;YACrD,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;SACR;QACD,IAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,MAAI,KAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC;SACvC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,IAAM,aAAa,GAAG,UAAU,CAAC;YAC/B,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;gBACjC,IAAI,IAAI,EAAE;oBACR,IAAI;wBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACjC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBAE7B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAC3B,OAAO,CAAC,OAAO,CAAC,CAAC;qBAClB;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,IAAI,CAAC,CAAC;qBACf;iBACF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC7C;YAED,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,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;YACjC,IAAI,IAAI,EAAE;gBACR,IAAI;oBACF,IAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC7B,YAAY,CAAC,aAAa,CAAC,CAAC;oBAC5B,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;oBAC7B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACzB,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;oBACvB,OAAO,CAAC,GAAG,CAAC,CAAC;iBACd;gBAAC,OAAO,CAAC,EAAE;oBACV,aAAa;iBACd;aACF;QACH,CAAC,CAAC,CAAC;QAEH,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"}
1
+ {"version":3,"file":"toolDbCrdtGet.js","sourceRoot":"","sources":["../src/toolDbCrdtGet.ts"],"names":[],"mappings":"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"}
@@ -21,28 +21,30 @@ function toolDbCrdtPut(key, crdt, userNamespaced) {
21
21
  reject(new Error("Key cannot include dots!; " + key));
22
22
  return;
23
23
  }
24
- if (!_this.getAddress()) {
24
+ if (!_this.userAccount.getAddress()) {
25
25
  reject(new Error("You need to log in before you can PUT."));
26
26
  return;
27
27
  }
28
28
  var timestamp = new Date().getTime();
29
29
  var crdtChanges = crdt.getChanges();
30
30
  var encodedData = JSON.stringify(crdtChanges);
31
- var dataString = "" + encodedData + _this.getAddress() + timestamp;
31
+ var dataString = "" + encodedData + _this.userAccount.getAddress() + timestamp;
32
32
  // WORK
33
33
  (0, proofOfWork_1.default)(dataString, _this.options.pow)
34
34
  .then(function (_a) {
35
35
  var hash = _a.hash, nonce = _a.nonce;
36
- var signature = _this.signData(hash);
37
- if (signature && _this.getAddress()) {
36
+ var signature = _this.userAccount.signData(hash);
37
+ if (signature && _this.userAccount.getAddress()) {
38
38
  // Compose the message
39
39
  var data = {
40
- k: userNamespaced ? ":" + _this.getAddress() + "." + key : key,
41
- a: _this.getAddress() || "",
40
+ k: userNamespaced
41
+ ? ":" + _this.userAccount.getAddress() + "." + key
42
+ : key,
43
+ a: _this.userAccount.getAddress() || "",
42
44
  n: nonce,
43
45
  t: timestamp,
44
46
  h: hash,
45
- s: signature.signature,
47
+ s: signature,
46
48
  v: crdtChanges,
47
49
  c: crdt.type,
48
50
  };
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbCrdtPut.js","sourceRoot":"","sources":["../src/toolDbCrdtPut.ts"],"names":[],"mappings":";;;;;AAAA,sBAAiE;AAGjE,oEAA8C;AAI9C;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,IAA2B,EAC3B,cAAsB;IAJxB,iBA2DC;IAvDC,+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,+BAA6B,GAAK,CAAC,CAAC,CAAC;YACtD,OAAO;SACR;QAED,IAAI,CAAC,KAAI,CAAC,UAAU,EAAE,EAAE;YACtB,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,KAAG,WAAW,GAAG,KAAI,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;QAEpE,OAAO;QACP,IAAA,qBAAW,EAAC,UAAU,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC;aACtC,IAAI,CAAC,UAAC,EAAe;gBAAb,IAAI,UAAA,EAAE,KAAK,WAAA;YAClB,IAAM,SAAS,GAAG,KAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,SAAS,IAAI,KAAI,CAAC,UAAU,EAAE,EAAE;gBAClC,sBAAsB;gBACtB,IAAM,IAAI,GAA0B;oBAClC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,MAAI,KAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG;oBACxD,CAAC,EAAE,KAAI,CAAC,UAAU,EAAE,IAAI,EAAE;oBAC1B,CAAC,EAAE,KAAK;oBACR,CAAC,EAAE,SAAS;oBACZ,CAAC,EAAE,IAAI;oBACP,CAAC,EAAE,SAAS,CAAC,SAAS;oBACtB,CAAC,EAAE,WAAW;oBACd,CAAC,EAAE,IAAI,CAAC,IAAI;iBACb,CAAC;gBAEF,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;iBACxC;gBAED,IAAM,YAAY,GAAwB;oBACxC,IAAI,EAAE,SAAS;oBACf,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;oBAClB,EAAE,EAAE,EAAE;oBACN,IAAI,MAAA;iBACL,CAAC;gBACF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBACrC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AA3DD,gCA2DC"}
1
+ {"version":3,"file":"toolDbCrdtPut.js","sourceRoot":"","sources":["../src/toolDbCrdtPut.ts"],"names":[],"mappings":";;;;;AAAA,sBAAiE;AAGjE,oEAA8C;AAI9C;;;;;;GAMG;AACH,SAAwB,aAAa,CAEnC,GAAW,EACX,IAA2B,EAC3B,cAAsB;IAJxB,iBA6DC;IAzDC,+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,+BAA6B,GAAK,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,KAAG,WAAW,GAAG,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;QAEhF,OAAO;QACP,IAAA,qBAAW,EAAC,UAAU,EAAE,KAAI,CAAC,OAAO,CAAC,GAAG,CAAC;aACtC,IAAI,CAAC,UAAC,EAAe;gBAAb,IAAI,UAAA,EAAE,KAAK,WAAA;YAClB,IAAM,SAAS,GAAG,KAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAClD,IAAI,SAAS,IAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;gBAC9C,sBAAsB;gBACtB,IAAM,IAAI,GAA0B;oBAClC,CAAC,EAAE,cAAc;wBACf,CAAC,CAAC,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;wBAC5C,CAAC,CAAC,GAAG;oBACP,CAAC,EAAE,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,EAAE;oBACtC,CAAC,EAAE,KAAK;oBACR,CAAC,EAAE,SAAS;oBACZ,CAAC,EAAE,IAAI;oBACP,CAAC,EAAE,SAAS;oBACZ,CAAC,EAAE,WAAW;oBACd,CAAC,EAAE,IAAI,CAAC,IAAI;iBACb,CAAC;gBAEF,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;iBACxC;gBAED,IAAM,YAAY,GAAwB;oBACxC,IAAI,EAAE,SAAS;oBACf,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;oBAClB,EAAE,EAAE,EAAE;oBACN,IAAI,MAAA;iBACL,CAAC;gBACF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBACrC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AA7DD,gCA6DC"}
package/dist/toolDbGet.js CHANGED
@@ -13,11 +13,13 @@ function toolDbGet(key, userNamespaced, timeoutMs) {
13
13
  if (userNamespaced === void 0) { userNamespaced = false; }
14
14
  if (timeoutMs === void 0) { timeoutMs = 1000; }
15
15
  return new Promise(function (resolve, reject) {
16
- if (userNamespaced && _this.getAddress() === undefined) {
16
+ if (userNamespaced && _this.userAccount.getAddress() === undefined) {
17
17
  reject(new Error("You are not authorized yet!"));
18
18
  return;
19
19
  }
20
- var finalKey = userNamespaced ? ":" + _this.getAddress() + "." + key : key;
20
+ var finalKey = userNamespaced
21
+ ? ":" + _this.userAccount.getAddress() + "." + key
22
+ : key;
21
23
  if (_this.options.debug) {
22
24
  console.log("GET > " + finalKey);
23
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbGet.js","sourceRoot":"","sources":["../src/toolDbGet.ts"],"names":[],"mappings":";;AAAA,sBAA+B;AAG/B;;;;;;GAMG;AACH,SAAwB,SAAS,CAE/B,GAAW,EACX,cAAsB,EACtB,SAAgB;IAJlB,iBAoEC;IAjEC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,KAAI,CAAC,UAAU,EAAE,KAAK,SAAS,EAAE;YACrD,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;YACjD,OAAO;SACR;QACD,IAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,MAAI,KAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;SAClC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,IAAM,aAAa,GAAG,UAAU,CAAC;YAC/B,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;gBACjC,IAAI,IAAI,EAAE;oBACR,IAAI;wBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACjC,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAC3B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;qBACpB;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,IAAI,CAAC,CAAC;qBACf;iBACF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC7C;YAED,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,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;YACjC,IAAI,IAAI,EAAE;gBACR,IAAI;oBACF,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAChC,IAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC;oBACrB,YAAY,CAAC,aAAa,CAAC,CAAC;oBAC5B,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;oBAC7B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,CAAC;iBACd;gBAAC,OAAO,CAAC,EAAE;oBACV,aAAa;iBACd;aACF;QACH,CAAC,CAAC,CAAC;QAEH,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;AApED,4BAoEC"}
1
+ {"version":3,"file":"toolDbGet.js","sourceRoot":"","sources":["../src/toolDbGet.ts"],"names":[],"mappings":";;AAAA,sBAA+B;AAG/B;;;;;;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,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;YAC5C,CAAC,CAAC,GAAG,CAAC;QACR,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC,CAAC;SAClC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAE7B,IAAM,aAAa,GAAG,UAAU,CAAC;YAC/B,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;gBACjC,IAAI,IAAI,EAAE;oBACR,IAAI;wBACF,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACjC,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBAC3B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;qBACpB;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,IAAI,CAAC,CAAC;qBACf;iBACF;qBAAM;oBACL,OAAO,CAAC,IAAI,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC7C;YAED,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,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAC,GAAG,EAAE,IAAI;YACjC,IAAI,IAAI,EAAE;gBACR,IAAI;oBACF,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAChC,IAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC;oBACrB,YAAY,CAAC,aAAa,CAAC,CAAC;oBAC5B,KAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;oBAC7B,KAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,CAAC;iBACd;gBAAC,OAAO,CAAC,EAAE;oBACV,aAAa;iBACd;aACF;QACH,CAAC,CAAC,CAAC;QAEH,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
1
  import ToolDb from "./tooldb";
2
- export default function toolDbKeysSignIn(this: ToolDb, privateKey: string, username?: string): import("web3-core").Account;
2
+ export default function toolDbKeysSignIn(this: ToolDb, privateKey: string, username?: string): unknown;
@@ -2,8 +2,10 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  var _1 = require(".");
4
4
  function toolDbKeysSignIn(privateKey, username) {
5
- var newAccount = this.getAccountFromPrivate(privateKey);
6
- this.setUser(newAccount, username || "Anonymous " + (0, _1.randomAnimal)());
5
+ if (!this.userAccount)
6
+ return;
7
+ var newAccount = this.userAccount.getAccountFromPrivate(privateKey);
8
+ this.userAccount.setUser(newAccount, username || (0, _1.randomAnimal)());
7
9
  return newAccount;
8
10
  }
9
11
  exports.default = toolDbKeysSignIn;
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbKeysSignIn.js","sourceRoot":"","sources":["../src/toolDbKeysSignIn.ts"],"names":[],"mappings":";;AAAA,sBAAiC;AAGjC,SAAwB,gBAAgB,CAEtC,UAAkB,EAClB,QAAiB;IAEjB,IAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAE1D,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,IAAI,eAAa,IAAA,eAAY,GAAI,CAAC,CAAC;IACpE,OAAO,UAAU,CAAC;AACpB,CAAC;AATD,mCASC"}
1
+ {"version":3,"file":"toolDbKeysSignIn.js","sourceRoot":"","sources":["../src/toolDbKeysSignIn.ts"],"names":[],"mappings":";;AAAA,sBAAiC;AAGjC,SAAwB,gBAAgB,CAEtC,UAAkB,EAClB,QAAiB;IAEjB,IAAI,CAAC,IAAI,CAAC,WAAW;QAAE,OAAO;IAE9B,IAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAEtE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,IAAI,IAAA,eAAY,GAAE,CAAC,CAAC;IACjE,OAAO,UAAU,CAAC;AACpB,CAAC;AAXD,mCAWC"}
@@ -1,32 +1,20 @@
1
1
  import WebSocket from "ws";
2
- import { ToolDbMessage } from ".";
3
2
  import ToolDb from "./tooldb";
4
- export declare type ToolDbWebSocket = WebSocket & {
5
- toolDbId?: string;
6
- isServer: boolean;
7
- origUrl: string;
8
- };
9
- export default class toolDbNetwork {
3
+ import ToolDbNetworkAdapter from "./toolDbNetworkAdapter";
4
+ export declare type ToolDbWebSocket = WebSocket;
5
+ export default class toolDbNetwork extends ToolDbNetworkAdapter {
10
6
  private wnd;
11
7
  private _wss;
12
- private options;
13
8
  private server;
14
- private _tooldb;
15
9
  private _connections;
16
10
  private _awaitingConnections;
17
11
  private removeFromAwaiting;
18
- _clientSockets: Record<string, ToolDbWebSocket>;
19
- get clientSockets(): Record<string, ToolDbWebSocket>;
20
12
  constructor(db: ToolDb);
21
13
  /**
22
- * Open a connection to a federated server
14
+ * Open a connection to a server
23
15
  * @param url URL of the server (including port)
24
16
  * @returns websocket
25
17
  */
26
18
  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;
30
19
  private reconnect;
31
- get tooldb(): ToolDb;
32
20
  }