tool-db 2.2.0 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (237) hide show
  1. package/README.md +12 -139
  2. package/bundle.js +1 -1
  3. package/dist/adapters/toolDbIndexedb.d.ts +10 -0
  4. package/dist/adapters/toolDbIndexedb.js +128 -0
  5. package/dist/adapters/toolDbIndexedb.js.map +1 -0
  6. package/dist/adapters/toolDbLeveldb.d.ts +9 -0
  7. package/dist/adapters/toolDbLeveldb.js +112 -0
  8. package/dist/adapters/toolDbLeveldb.js.map +1 -0
  9. package/dist/adapters/toolDbWeb3User.d.ts +20 -0
  10. package/dist/adapters/toolDbWeb3User.js +75 -0
  11. package/dist/adapters/toolDbWeb3User.js.map +1 -0
  12. package/dist/adapters/toolDbWebrtc.d.ts +59 -0
  13. package/dist/adapters/toolDbWebrtc.js +492 -0
  14. package/dist/adapters/toolDbWebrtc.js.map +1 -0
  15. package/dist/adapters/toolDbWebsocket.d.ts +19 -0
  16. package/dist/adapters/toolDbWebsocket.js +181 -0
  17. package/dist/adapters/toolDbWebsocket.js.map +1 -0
  18. package/dist/adapters-base/networkAdapter.d.ts +57 -0
  19. package/dist/adapters-base/networkAdapter.js +184 -0
  20. package/dist/adapters-base/networkAdapter.js.map +1 -0
  21. package/dist/adapters-base/storageAdapter.d.ts +9 -0
  22. package/dist/adapters-base/storageAdapter.js +26 -0
  23. package/dist/adapters-base/storageAdapter.js.map +1 -0
  24. package/dist/adapters-base/userAdapter.d.ts +14 -0
  25. package/dist/adapters-base/userAdapter.js +35 -0
  26. package/dist/adapters-base/userAdapter.js.map +1 -0
  27. package/dist/index.d.ts +8 -4
  28. package/dist/index.js +15 -7
  29. package/dist/index.js.map +1 -1
  30. package/dist/logger.d.ts +2 -0
  31. package/dist/logger.js +32 -0
  32. package/dist/logger.js.map +1 -0
  33. package/dist/messageHandlers/handleCrdtGet.js +19 -22
  34. package/dist/messageHandlers/handleCrdtGet.js.map +1 -1
  35. package/dist/messageHandlers/handleCrdtPut.js +23 -14
  36. package/dist/messageHandlers/handleCrdtPut.js.map +1 -1
  37. package/dist/messageHandlers/handleGet.js +19 -21
  38. package/dist/messageHandlers/handleGet.js.map +1 -1
  39. package/dist/messageHandlers/handleJoin.js +2 -2
  40. package/dist/messageHandlers/handleJoin.js.map +1 -1
  41. package/dist/messageHandlers/handlePing.js +1 -0
  42. package/dist/messageHandlers/handlePing.js.map +1 -1
  43. package/dist/messageHandlers/handlePong.js +1 -23
  44. package/dist/messageHandlers/handlePong.js.map +1 -1
  45. package/dist/messageHandlers/handlePut.js +29 -25
  46. package/dist/messageHandlers/handlePut.js.map +1 -1
  47. package/dist/messageHandlers/handleQuery.js +7 -2
  48. package/dist/messageHandlers/handleQuery.js.map +1 -1
  49. package/dist/messageHandlers/handleServers.js +1 -1
  50. package/dist/messageHandlers/handleServers.js.map +1 -1
  51. package/dist/messageHandlers/handleSubscribe.js +30 -29
  52. package/dist/messageHandlers/handleSubscribe.js.map +1 -1
  53. package/dist/sendJoin.d.ts +2 -0
  54. package/dist/sendJoin.js +31 -0
  55. package/dist/sendJoin.js.map +1 -0
  56. package/dist/toolDbClientOnMessage.js +5 -8
  57. package/dist/toolDbClientOnMessage.js.map +1 -1
  58. package/dist/toolDbCrdtGet.js +29 -32
  59. package/dist/toolDbCrdtGet.js.map +1 -1
  60. package/dist/toolDbCrdtPut.js +25 -26
  61. package/dist/toolDbCrdtPut.js.map +1 -1
  62. package/dist/toolDbGet.js +29 -30
  63. package/dist/toolDbGet.js.map +1 -1
  64. package/dist/toolDbKeysSignIn.d.ts +1 -1
  65. package/dist/toolDbKeysSignIn.js +8 -4
  66. package/dist/toolDbKeysSignIn.js.map +1 -1
  67. package/dist/toolDbNetworkAdapter.js +5 -9
  68. package/dist/toolDbNetworkAdapter.js.map +1 -1
  69. package/dist/toolDbPut.js +33 -30
  70. package/dist/toolDbPut.js.map +1 -1
  71. package/dist/toolDbQueryKeys.js +8 -7
  72. package/dist/toolDbQueryKeys.js.map +1 -1
  73. package/dist/toolDbSignIn.js +6 -3
  74. package/dist/toolDbSignIn.js.map +1 -1
  75. package/dist/toolDbSignUp.js +37 -33
  76. package/dist/toolDbSignUp.js.map +1 -1
  77. package/dist/toolDbSubscribe.d.ts +2 -1
  78. package/dist/toolDbSubscribe.js +20 -16
  79. package/dist/toolDbSubscribe.js.map +1 -1
  80. package/dist/toolDbVerificationWrapper.js +15 -10
  81. package/dist/toolDbVerificationWrapper.js.map +1 -1
  82. package/dist/toolDbWebrtc.d.ts +0 -6
  83. package/dist/toolDbWebrtc.js +16 -15
  84. package/dist/toolDbWebrtc.js.map +1 -1
  85. package/dist/toolDbWebsocket.js +9 -15
  86. package/dist/toolDbWebsocket.js.map +1 -1
  87. package/dist/tooldb.d.ts +9 -3
  88. package/dist/tooldb.js +12 -9
  89. package/dist/tooldb.js.map +1 -1
  90. package/dist/types/message.d.ts +1 -1
  91. package/dist/types/tooldb.d.ts +7 -27
  92. package/dist/types/tooldb.js +0 -33
  93. package/dist/types/tooldb.js.map +1 -1
  94. package/dist/utils/getPeerSignature.d.ts +2 -2
  95. package/dist/utils/indexedb.js +4 -4
  96. package/dist/utils/indexedb.js.map +1 -1
  97. package/dist/utils/leveldb.js +4 -4
  98. package/dist/utils/leveldb.js.map +1 -1
  99. package/dist/utils/verifyMessage.js +37 -33
  100. package/dist/utils/verifyMessage.js.map +1 -1
  101. package/dist/utils/verifyPeer.js +1 -1
  102. package/dist/utils/verifyPeer.js.map +1 -1
  103. package/package.json +1 -1
  104. package/test-alice/000145.ldb +0 -0
  105. package/test-alice/000147.ldb +0 -0
  106. package/test-alice/000150.ldb +0 -0
  107. package/test-alice/000153.ldb +0 -0
  108. package/test-alice/000154.log +0 -0
  109. package/test-alice/CURRENT +1 -1
  110. package/test-alice/LOG +5 -5
  111. package/test-alice/LOG.old +5 -5
  112. package/test-alice/MANIFEST-000152 +0 -0
  113. package/test-alice-speed/000022.ldb +0 -0
  114. package/test-alice-speed/000024.ldb +0 -0
  115. package/test-alice-speed/000027.ldb +0 -0
  116. package/test-alice-speed/000030.ldb +0 -0
  117. package/test-alice-speed/000031.log +0 -0
  118. package/test-alice-speed/CURRENT +1 -1
  119. package/test-alice-speed/LOG +5 -13
  120. package/test-alice-speed/LOG.old +5 -5
  121. package/test-alice-speed/MANIFEST-000029 +0 -0
  122. package/{test-verify-a/000250.log → test-base-client/000099.log} +0 -0
  123. package/test-base-client/CURRENT +1 -0
  124. package/test-base-client/LOCK +0 -0
  125. package/test-base-client/LOG +3 -0
  126. package/test-base-client/LOG.old +3 -0
  127. package/test-base-client/MANIFEST-000098 +0 -0
  128. package/test-base-server/000101.log +0 -0
  129. package/test-base-server/CURRENT +1 -0
  130. package/test-base-server/LOCK +0 -0
  131. package/test-base-server/LOG +3 -0
  132. package/test-base-server/LOG.old +3 -0
  133. package/test-base-server/MANIFEST-000100 +0 -0
  134. package/test-bob/000160.ldb +0 -0
  135. package/test-bob/000162.ldb +0 -0
  136. package/test-bob/000163.log +0 -0
  137. package/test-bob/CURRENT +1 -1
  138. package/test-bob/LOG +5 -5
  139. package/test-bob/LOG.old +14 -14
  140. package/test-bob/MANIFEST-000161 +0 -0
  141. package/test-chris/000017.ldb +0 -0
  142. package/test-chris/000020.ldb +0 -0
  143. package/test-chris/000023.ldb +0 -0
  144. package/test-chris/000026.ldb +0 -0
  145. package/test-chris/000029.ldb +0 -0
  146. package/test-chris/000086.ldb +0 -0
  147. package/test-chris/000089.ldb +0 -0
  148. package/test-chris/000092.ldb +0 -0
  149. package/test-chris/000095.ldb +0 -0
  150. package/test-chris/000098.ldb +0 -0
  151. package/test-chris/000103.ldb +0 -0
  152. package/test-chris/000106.ldb +0 -0
  153. package/test-chris/000109.ldb +0 -0
  154. package/test-chris/000112.ldb +0 -0
  155. package/test-chris/000115.ldb +0 -0
  156. package/test-chris/000118.ldb +0 -0
  157. package/test-chris/000121.ldb +0 -0
  158. package/test-chris/000124.ldb +0 -0
  159. package/test-chris/000127.ldb +0 -0
  160. package/test-chris/000130.ldb +0 -0
  161. package/test-chris/000133.ldb +0 -0
  162. package/test-chris/000136.ldb +0 -0
  163. package/test-chris/000139.ldb +0 -0
  164. package/test-chris/000142.ldb +0 -0
  165. package/test-chris/000145.ldb +0 -0
  166. package/test-chris/000148.ldb +0 -0
  167. package/test-chris/000151.ldb +0 -0
  168. package/test-chris/000152.log +0 -0
  169. package/test-chris/CURRENT +1 -0
  170. package/test-chris/LOCK +0 -0
  171. package/test-chris/LOG +6 -0
  172. package/test-chris/LOG.old +6 -0
  173. package/test-chris/MANIFEST-000150 +0 -0
  174. package/test-node-a/000175.ldb +0 -0
  175. package/test-node-a/000177.ldb +0 -0
  176. package/test-node-a/000178.log +0 -0
  177. package/test-node-a/CURRENT +1 -1
  178. package/test-node-a/LOG +5 -5
  179. package/test-node-a/LOG.old +14 -5
  180. package/test-node-a/MANIFEST-000176 +0 -0
  181. package/test-node-b/000175.ldb +0 -0
  182. package/test-node-b/000177.ldb +0 -0
  183. package/test-node-b/000178.log +0 -0
  184. package/test-node-b/CURRENT +1 -1
  185. package/test-node-b/LOG +5 -5
  186. package/test-node-b/LOG.old +14 -5
  187. package/test-node-b/MANIFEST-000176 +0 -0
  188. package/test-store/000007.ldb +0 -0
  189. package/test-store/000010.ldb +0 -0
  190. package/test-store/000013.ldb +0 -0
  191. package/test-store/000016.ldb +0 -0
  192. package/test-store/000019.ldb +0 -0
  193. package/test-store/000022.ldb +0 -0
  194. package/test-store/000025.ldb +0 -0
  195. package/test-store/000028.ldb +0 -0
  196. package/test-store/000031.ldb +0 -0
  197. package/test-store/000034.ldb +0 -0
  198. package/test-store/000037.ldb +0 -0
  199. package/test-store/000038.log +0 -0
  200. package/test-store/CURRENT +1 -0
  201. package/test-store/LOCK +0 -0
  202. package/test-store/LOG +6 -0
  203. package/test-store/LOG.old +6 -0
  204. package/test-store/MANIFEST-000036 +0 -0
  205. package/test-verify-a/000049.log +0 -0
  206. package/test-verify-a/CURRENT +1 -1
  207. package/test-verify-a/LOG +3 -3
  208. package/test-verify-a/LOG.old +3 -3
  209. package/test-verify-a/MANIFEST-000048 +0 -0
  210. package/toolDbLibP2p.ts +12 -11
  211. package/test-alice/000663.ldb +0 -0
  212. package/test-alice/000665.ldb +0 -0
  213. package/test-alice/000668.ldb +0 -0
  214. package/test-alice/000669.log +0 -0
  215. package/test-alice/MANIFEST-000667 +0 -0
  216. package/test-alice-speed/000035.log +0 -0
  217. package/test-alice-speed/000036.ldb +0 -0
  218. package/test-alice-speed/MANIFEST-000033 +0 -0
  219. package/test-bob/000665.ldb +0 -0
  220. package/test-bob/000667.ldb +0 -0
  221. package/test-bob/000668.log +0 -0
  222. package/test-bob/MANIFEST-000666 +0 -0
  223. package/test-node-a/000663.ldb +0 -0
  224. package/test-node-a/000665.ldb +0 -0
  225. package/test-node-a/000668.ldb +0 -0
  226. package/test-node-a/000669.log +0 -0
  227. package/test-node-a/MANIFEST-000667 +0 -0
  228. package/test-node-b/000663.ldb +0 -0
  229. package/test-node-b/000665.ldb +0 -0
  230. package/test-node-b/000668.ldb +0 -0
  231. package/test-node-b/000669.log +0 -0
  232. package/test-node-b/MANIFEST-000667 +0 -0
  233. package/test-verify-a/000026.ldb +0 -0
  234. package/test-verify-a/000029.ldb +0 -0
  235. package/test-verify-a/000031.ldb +0 -0
  236. package/test-verify-a/000033.ldb +0 -0
  237. package/test-verify-a/MANIFEST-000249 +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":";;AAGA,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,gBAAgB;QAChB,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,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;QACtB,OAAO,CAAC,IAAI,CAAC,iBAAe,OAAO,CAAC,IAAI,cAAS,YAAc,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,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,IACE,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB;QACA,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,OAAO,EAAE,OAAO,OAAO,CAAC,CAAC;QAC7D,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;AA7ED,wCA6EC"}
1
+ {"version":3,"file":"toolDbClientOnMessage.js","sourceRoot":"","sources":["../src/toolDbClientOnMessage.ts"],"names":[],"mappings":";;AAGA,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,iBAAe,OAAO,CAAC,IAAI,cAAS,YAAc,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"}
@@ -20,52 +20,49 @@ function toolDbCrdtGet(key, crdt, userNamespaced, timeoutMs) {
20
20
  var finalKey = userNamespaced
21
21
  ? ":" + _this.userAccount.getAddress() + "." + key
22
22
  : key;
23
- if (_this.options.debug) {
24
- console.log("CRDT GET > " + finalKey);
25
- }
23
+ _this.logger("CRDT GET", finalKey);
26
24
  var msgId = (0, _1.textRandom)(10);
27
25
  var cancelTimeout = setTimeout(function () {
28
- _this.store.get(finalKey, function (err, data) {
29
- if (data) {
30
- try {
31
- var message = JSON.parse(data);
32
- crdt.mergeChanges(message.v);
33
- _this.emit("data", message);
34
- resolve(message);
35
- }
36
- catch (e) {
37
- resolve(null);
38
- }
26
+ _this.store
27
+ .get(finalKey)
28
+ .then(function (data) {
29
+ try {
30
+ var message = JSON.parse(data);
31
+ crdt.mergeChanges(message.v);
32
+ _this.emit("data", message);
33
+ resolve(message);
39
34
  }
40
- else {
35
+ catch (e) {
41
36
  resolve(null);
42
37
  }
43
- });
38
+ })
39
+ .catch(function (e) { return reject(null); });
44
40
  }, timeoutMs);
45
41
  _this.addIdListener(msgId, function (msg) {
46
- if (_this.options.debug) {
47
- console.log("GET RECV > " + finalKey, msg);
48
- }
42
+ _this.logger("GET RECV", finalKey);
49
43
  clearTimeout(cancelTimeout);
50
44
  if (msg.type === "crdtPut") {
51
45
  crdt.mergeChanges(msg.data.v);
52
46
  resolve(msg);
53
47
  }
54
48
  });
55
- _this.store.get(finalKey, function (err, data) {
56
- if (data) {
57
- try {
58
- var msg = JSON.parse(data);
59
- clearTimeout(cancelTimeout);
60
- _this.removeIdListener(msgId);
61
- crdt.mergeChanges(msg.v);
62
- _this.emit("data", msg);
63
- resolve(msg);
64
- }
65
- catch (e) {
66
- // do nothing
67
- }
49
+ _this.store
50
+ .get(finalKey)
51
+ .then(function (data) {
52
+ try {
53
+ var msg = JSON.parse(data);
54
+ clearTimeout(cancelTimeout);
55
+ _this.removeIdListener(msgId);
56
+ crdt.mergeChanges(msg.v);
57
+ _this.emit("data", msg);
58
+ resolve(msg);
59
+ }
60
+ catch (e) {
61
+ // do nothing
68
62
  }
63
+ })
64
+ .catch(function () {
65
+ // do nothing
69
66
  });
70
67
  // Do get
71
68
  _this.network.sendToAll({
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbCrdtGet.js","sourceRoot":"","sources":["../src/toolDbCrdtGet.ts"],"names":[],"mappings":"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"}
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,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,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"}
@@ -33,33 +33,32 @@ function toolDbCrdtPut(key, crdt, userNamespaced) {
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.userAccount.signData(hash);
37
- if (signature && _this.userAccount.getAddress()) {
38
- // Compose the message
39
- var data = {
40
- k: userNamespaced
41
- ? ":" + _this.userAccount.getAddress() + "." + key
42
- : key,
43
- a: _this.userAccount.getAddress() || "",
44
- n: nonce,
45
- t: timestamp,
46
- h: hash,
47
- s: signature,
48
- v: crdtChanges,
49
- c: crdt.type,
50
- };
51
- if (_this.options.debug) {
52
- console.log("PUT CRDT > " + key, data);
36
+ _this.userAccount.signData(hash).then(function (signature) {
37
+ if (signature && _this.userAccount.getAddress()) {
38
+ // Compose the message
39
+ var data = {
40
+ k: userNamespaced
41
+ ? ":" + _this.userAccount.getAddress() + "." + key
42
+ : key,
43
+ a: _this.userAccount.getAddress() || "",
44
+ n: nonce,
45
+ t: timestamp,
46
+ h: hash,
47
+ s: signature,
48
+ v: crdtChanges,
49
+ c: crdt.type,
50
+ };
51
+ _this.logger("PUT CRDT", key, data);
52
+ var finalMessage = {
53
+ type: "crdtPut",
54
+ id: (0, _1.textRandom)(10),
55
+ to: [],
56
+ data: data,
57
+ };
58
+ _this.network.sendToAll(finalMessage);
59
+ resolve(finalMessage);
53
60
  }
54
- var finalMessage = {
55
- type: "crdtPut",
56
- id: (0, _1.textRandom)(10),
57
- to: [],
58
- data: data,
59
- };
60
- _this.network.sendToAll(finalMessage);
61
- resolve(finalMessage);
62
- }
61
+ });
63
62
  })
64
63
  .catch(reject);
65
64
  });
@@ -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,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"}
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,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,+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,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,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;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.js CHANGED
@@ -20,50 +20,49 @@ function toolDbGet(key, userNamespaced, timeoutMs) {
20
20
  var finalKey = userNamespaced
21
21
  ? ":" + _this.userAccount.getAddress() + "." + key
22
22
  : key;
23
- if (_this.options.debug) {
24
- console.log("GET > " + finalKey);
25
- }
23
+ _this.logger("GET", finalKey);
26
24
  var msgId = (0, _1.textRandom)(10);
27
25
  var cancelTimeout = setTimeout(function () {
28
- _this.store.get(finalKey, function (err, data) {
29
- if (data) {
30
- try {
31
- var message = JSON.parse(data);
32
- _this.emit("data", message);
33
- resolve(message.v);
34
- }
35
- catch (e) {
36
- resolve(null);
37
- }
26
+ _this.store
27
+ .get(finalKey)
28
+ .then(function (data) {
29
+ try {
30
+ var message = JSON.parse(data);
31
+ _this.emit("data", message);
32
+ resolve(message.v);
38
33
  }
39
- else {
34
+ catch (e) {
40
35
  resolve(null);
41
36
  }
37
+ })
38
+ .catch(function (e) {
39
+ resolve(null);
42
40
  });
43
41
  }, timeoutMs);
44
42
  _this.addIdListener(msgId, function (msg) {
45
- if (_this.options.debug) {
46
- console.log("GET RECV > " + finalKey, msg);
47
- }
43
+ _this.logger("GET RECV", finalKey);
48
44
  clearTimeout(cancelTimeout);
49
45
  if (msg.type === "put") {
50
46
  resolve(msg.data.v);
51
47
  }
52
48
  });
53
- _this.store.get(finalKey, function (err, data) {
54
- if (data) {
55
- try {
56
- var parsed = JSON.parse(data);
57
- var val = parsed.v;
58
- clearTimeout(cancelTimeout);
59
- _this.removeIdListener(msgId);
60
- _this.emit("data", parsed);
61
- resolve(val);
62
- }
63
- catch (e) {
64
- // do nothing
65
- }
49
+ _this.store
50
+ .get(finalKey)
51
+ .then(function (data) {
52
+ try {
53
+ var parsed = JSON.parse(data);
54
+ var val = parsed.v;
55
+ clearTimeout(cancelTimeout);
56
+ _this.removeIdListener(msgId);
57
+ _this.emit("data", parsed);
58
+ resolve(val);
59
+ }
60
+ catch (e) {
61
+ // do nothing
66
62
  }
63
+ })
64
+ .catch(function (e) {
65
+ // do nothing
67
66
  });
68
67
  // Do get
69
68
  _this.network.sendToAll({
@@ -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,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
+ {"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,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
1
  import ToolDb from "./tooldb";
2
- export default function toolDbKeysSignIn(this: ToolDb, privateKey: string, username?: string): unknown;
2
+ export default function toolDbKeysSignIn(this: ToolDb, privateKey: string, username?: string): Promise<unknown>;
@@ -2,11 +2,15 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  var _1 = require(".");
4
4
  function toolDbKeysSignIn(privateKey, username) {
5
+ var _this = this;
5
6
  if (!this.userAccount)
6
- return;
7
- var newAccount = this.userAccount.getAccountFromPrivate(privateKey);
8
- this.userAccount.setUser(newAccount, username || (0, _1.randomAnimal)());
9
- return newAccount;
7
+ return Promise.resolve(undefined);
8
+ return this.userAccount
9
+ .getAccountFromPrivate(privateKey)
10
+ .then(function (newAccount) {
11
+ _this.userAccount.setUser(newAccount, username || (0, _1.randomAnimal)());
12
+ return newAccount;
13
+ });
10
14
  }
11
15
  exports.default = toolDbKeysSignIn;
12
16
  //# sourceMappingURL=toolDbKeysSignIn.js.map
@@ -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,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
+ {"version":3,"file":"toolDbKeysSignIn.js","sourceRoot":"","sources":["../src/toolDbKeysSignIn.ts"],"names":[],"mappings":";;AAAA,sBAAiC;AAGjC,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"}
@@ -99,9 +99,7 @@ var ToolDbNetworkAdapter = /** @class */ (function () {
99
99
  * @param setClientId Callback to set the client id on the parent class
100
100
  */
101
101
  ToolDbNetworkAdapter.prototype.onClientMessage = function (message, clientId, setClientId) {
102
- if (this.tooldb.options.debug) {
103
- console.log(message, clientId);
104
- }
102
+ // this.tooldb.logger("onClientMessage", clientId);
105
103
  if (clientId && !this.tooldb.processedOutHashes[clientId]) {
106
104
  this.tooldb.processedOutHashes[clientId] = [];
107
105
  }
@@ -122,8 +120,8 @@ var ToolDbNetworkAdapter = /** @class */ (function () {
122
120
  }
123
121
  }
124
122
  catch (e) {
125
- console.log("Got message ERR > ", message);
126
- console.log(e);
123
+ this.tooldb.logger("Got message ERR", message);
124
+ this.tooldb.logger(e);
127
125
  }
128
126
  };
129
127
  /**
@@ -148,9 +146,7 @@ var ToolDbNetworkAdapter = /** @class */ (function () {
148
146
  .filter(function (clientId) { return _this.isConnected(clientId); });
149
147
  filteredConns.forEach(function (clientId) {
150
148
  if ((crossServerOnly && _this.isServer(clientId)) || !crossServerOnly) {
151
- if (_this.tooldb.options.debug) {
152
- console.log(_this.tooldb.options.storageName, to, "Sent out to: ", clientId);
153
- }
149
+ _this.tooldb.logger(to, "Sent out to:", clientId);
154
150
  if (msg.type === "put" || msg.type === "crdtPut") {
155
151
  if (!_this.tooldb.processedOutHashes[clientId].includes(msg.data.h)) {
156
152
  _this.executeSendToClient(clientId, finalMessage);
@@ -162,7 +158,7 @@ var ToolDbNetworkAdapter = /** @class */ (function () {
162
158
  }
163
159
  }
164
160
  // } else {
165
- // console.log("Fitlered out;", clientId);
161
+ // this.tooldb.logger("Fitlered out;", clientId);
166
162
  // }
167
163
  });
168
164
  };
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbNetworkAdapter.js","sourceRoot":"","sources":["../src/toolDbNetworkAdapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"toolDbNetworkAdapter.js","sourceRoot":"","sources":["../src/toolDbNetworkAdapter.ts"],"names":[],"mappings":"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"}
package/dist/toolDbPut.js CHANGED
@@ -31,37 +31,40 @@ function toolDbPut(key, value, userNamespaced) {
31
31
  (0, proofOfWork_1.default)(dataString, _this.options.pow)
32
32
  .then(function (_a) {
33
33
  var hash = _a.hash, nonce = _a.nonce;
34
- var signature = _this.userAccount.signData(hash);
35
- if (signature && _this.userAccount.getAddress()) {
36
- var finalKey = userNamespaced
37
- ? ":" + _this.userAccount.getAddress() + "." + key
38
- : key;
39
- // Compose the message
40
- var data = {
41
- k: finalKey,
42
- a: _this.userAccount.getAddress() || "",
43
- n: nonce,
44
- t: timestamp,
45
- h: hash,
46
- s: signature,
47
- v: value,
48
- c: null,
49
- };
50
- _this.store.put(finalKey, JSON.stringify(data), function (err, data) {
51
- //
52
- });
53
- if (_this.options.debug) {
54
- console.log("PUT > " + key, data);
34
+ _this.userAccount.signData(hash).then(function (signature) {
35
+ if (signature && _this.userAccount.getAddress()) {
36
+ var finalKey = userNamespaced
37
+ ? ":" + _this.userAccount.getAddress() + "." + key
38
+ : key;
39
+ // Compose the message
40
+ var data = {
41
+ k: finalKey,
42
+ a: _this.userAccount.getAddress() || "",
43
+ n: nonce,
44
+ t: timestamp,
45
+ h: hash,
46
+ s: signature,
47
+ v: value,
48
+ c: null,
49
+ };
50
+ _this.logger("PUT", key, data);
51
+ var finalMessage_1 = {
52
+ type: "put",
53
+ id: (0, _1.textRandom)(10),
54
+ to: [],
55
+ data: data,
56
+ };
57
+ _this.network.sendToAll(finalMessage_1);
58
+ _this.store
59
+ .put(finalKey, JSON.stringify(data))
60
+ .catch(function (e) {
61
+ // do nothing
62
+ })
63
+ .finally(function () {
64
+ resolve(finalMessage_1);
65
+ });
55
66
  }
56
- var finalMessage = {
57
- type: "put",
58
- id: (0, _1.textRandom)(10),
59
- to: [],
60
- data: data,
61
- };
62
- _this.network.sendToAll(finalMessage);
63
- resolve(finalMessage);
64
- }
67
+ });
65
68
  })
66
69
  .catch(reject);
67
70
  });
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbPut.js","sourceRoot":"","sources":["../src/toolDbPut.ts"],"names":[],"mappings":";;;;;AAAA,sBAA6D;AAG7D,oEAA8C;AAE9C;;;;;;GAMG;AACH,SAAwB,SAAS,CAE/B,GAAW,EACX,KAAQ,EACR,cAAsB;IAJxB,iBAgEC;IA5DC,+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,IAAI,CAAC,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;YACvD,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;YAC5D,OAAO;SACR;QAED,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,IAAM,UAAU,GAAG,KAAG,IAAI,CAAC,SAAS,CAClC,KAAK,CACN,GAAG,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;QAEhD,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,IAAM,QAAQ,GAAG,cAAc;oBAC7B,CAAC,CAAC,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;oBAC5C,CAAC,CAAC,GAAG,CAAC;gBACR,sBAAsB;gBACtB,IAAM,IAAI,GAAqB;oBAC7B,CAAC,EAAE,QAAQ;oBACX,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,KAAK;oBACR,CAAC,EAAE,IAAI;iBACR,CAAC;gBAEF,KAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,UAAC,GAAG,EAAE,IAAI;oBACvD,EAAE;gBACJ,CAAC,CAAC,CAAC;gBAEH,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;iBACnC;gBAED,IAAM,YAAY,GAAe;oBAC/B,IAAI,EAAE,KAAK;oBACX,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;gBAErC,OAAO,CAAC,YAAY,CAAC,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAhED,4BAgEC"}
1
+ {"version":3,"file":"toolDbPut.js","sourceRoot":"","sources":["../src/toolDbPut.ts"],"names":[],"mappings":";;;;;AAAA,sBAA6D;AAG7D,oEAA8C;AAE9C;;;;;;GAMG;AACH,SAAwB,SAAS,CAE/B,GAAW,EACX,KAAQ,EACR,cAAsB;IAJxB,iBAmEC;IA/DC,+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,IAAI,CAAC,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE;YACvD,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;YAC5D,OAAO;SACR;QAED,IAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACvC,IAAM,UAAU,GAAG,KAAG,IAAI,CAAC,SAAS,CAClC,KAAK,CACN,GAAG,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,SAAW,CAAC;QAEhD,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,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,IAAM,QAAQ,GAAG,cAAc;wBAC7B,CAAC,CAAC,MAAI,KAAI,CAAC,WAAW,CAAC,UAAU,EAAE,SAAI,GAAK;wBAC5C,CAAC,CAAC,GAAG,CAAC;oBAER,sBAAsB;oBACtB,IAAM,IAAI,GAAqB;wBAC7B,CAAC,EAAE,QAAQ;wBACX,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,KAAK;wBACR,CAAC,EAAE,IAAI;qBACR,CAAC;oBAEF,KAAI,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;oBAE9B,IAAM,cAAY,GAAe;wBAC/B,IAAI,EAAE,KAAK;wBACX,EAAE,EAAE,IAAA,aAAU,EAAC,EAAE,CAAC;wBAClB,EAAE,EAAE,EAAE;wBACN,IAAI,MAAA;qBACL,CAAC;oBAEF,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC,cAAY,CAAC,CAAC;oBACrC,KAAI,CAAC,KAAK;yBACP,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;yBACnC,KAAK,CAAC,UAAC,CAAC;wBACP,aAAa;oBACf,CAAC,CAAC;yBACD,OAAO,CAAC;wBACP,OAAO,CAAC,cAAY,CAAC,CAAC;oBACxB,CAAC,CAAC,CAAC;iBACN;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAnED,4BAmEC"}
@@ -31,23 +31,24 @@ function toolDbQueryKeys(key, userNamespaced, timeoutMs) {
31
31
  return;
32
32
  }
33
33
  var finalKey = userNamespaced ? ":" + user.getAddress() + "." + key : key;
34
- if (_this.options.debug) {
35
- console.log("QUERY > " + finalKey);
36
- }
34
+ _this.logger("QUERY", finalKey);
37
35
  var msgId = (0, _1.textRandom)(10);
38
36
  var foundKeys = [];
39
37
  var timeout;
40
- _this.store.query(finalKey).then(function (localKeys) {
38
+ _this.store
39
+ .query(finalKey)
40
+ .then(function (localKeys) {
41
41
  foundKeys = __spreadArray(__spreadArray([], foundKeys, true), localKeys, true);
42
42
  timeout = setTimeout(finishListening, timeoutMs);
43
+ })
44
+ .catch(function (e) {
45
+ // do nothing
43
46
  });
44
47
  var finishListening = function () {
45
48
  resolve(lodash_1.default.uniq(foundKeys));
46
49
  };
47
50
  _this.addIdListener(msgId, function (msg) {
48
- if (_this.options.debug) {
49
- console.log("QUERY RECV > " + finalKey, msg);
50
- }
51
+ _this.logger("QUERY RECV", finalKey);
51
52
  if (msg.type === "queryAck") {
52
53
  foundKeys = __spreadArray(__spreadArray([], foundKeys, true), msg.keys, true);
53
54
  if (timeout) {
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbQueryKeys.js","sourceRoot":"","sources":["../src/toolDbQueryKeys.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAuB;AACvB,sBAA+B;AAG/B;;;;;GAKG;AACH,SAAwB,eAAe,CAErC,GAAW,EACX,cAAsB,EACtB,SAAgB;IAJlB,iBAqDC;IAlDC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,IAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;IAE9B,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,IAAI,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,IAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,CAAC;SACpC;QAED,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,OAAmC,CAAC;QAExC,KAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAC,SAAS;YACxC,SAAS,mCAAO,SAAS,SAAK,SAAS,OAAC,CAAC;YACzC,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,IAAM,eAAe,GAAG;YACtB,OAAO,CAAC,gBAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,IAAI,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC;aAC/C;YACD,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC3B,SAAS,mCAAO,SAAS,SAAK,GAAG,CAAC,IAAI,OAAC,CAAC;gBAExC,IAAI,OAAO,EAAE;oBACX,YAAY,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;aAClD;QACH,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AArDD,kCAqDC"}
1
+ {"version":3,"file":"toolDbQueryKeys.js","sourceRoot":"","sources":["../src/toolDbQueryKeys.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAuB;AACvB,sBAA+B;AAG/B;;;;;GAKG;AACH,SAAwB,eAAe,CAErC,GAAW,EACX,cAAsB,EACtB,SAAgB;IAJlB,iBAuDC;IApDC,+BAAA,EAAA,sBAAsB;IACtB,0BAAA,EAAA,gBAAgB;IAEhB,IAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;IAE9B,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,IAAI,cAAc,IAAI,IAAI,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,IAAI,CAAC,UAAU,EAAE,SAAI,GAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,KAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE/B,IAAM,KAAK,GAAG,IAAA,aAAU,EAAC,EAAE,CAAC,CAAC;QAC7B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,OAAmC,CAAC;QAExC,KAAI,CAAC,KAAK;aACP,KAAK,CAAC,QAAQ,CAAC;aACf,IAAI,CAAC,UAAC,SAAS;YACd,SAAS,mCAAO,SAAS,SAAK,SAAS,OAAC,CAAC;YACzC,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC,CAAC;aACD,KAAK,CAAC,UAAC,CAAC;YACP,aAAa;QACf,CAAC,CAAC,CAAC;QAEL,IAAM,eAAe,GAAG;YACtB,OAAO,CAAC,gBAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,KAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAC,GAAG;YAC5B,KAAI,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAEpC,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC3B,SAAS,mCAAO,SAAS,SAAK,GAAG,CAAC,IAAI,OAAC,CAAC;gBAExC,IAAI,OAAO,EAAE;oBACX,YAAY,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,OAAO,GAAG,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;aAClD;QACH,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,KAAI,CAAC,OAAO,CAAC,SAAS,CAAC;YACrB,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,EAAE;YACN,GAAG,EAAE,QAAQ;YACb,EAAE,EAAE,KAAK;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,kCAuDC"}
@@ -14,9 +14,12 @@ function toolDbSignIn(user, password) {
14
14
  return;
15
15
  }
16
16
  try {
17
- var newAccount = _this.userAccount.decryptAccount(_user, (0, sha256_1.default)(password));
18
- _this.userAccount.setUser(newAccount, user || "Anonymous " + (0, randomAnimal_1.default)());
19
- resolve(newAccount);
17
+ _this.userAccount
18
+ .decryptAccount(_user, (0, sha256_1.default)(password))
19
+ .then(function (newAccount) {
20
+ _this.userAccount.setUser(newAccount, user || "Anonymous " + (0, randomAnimal_1.default)());
21
+ resolve(_user);
22
+ });
20
23
  }
21
24
  catch (e) {
22
25
  reject(e);
@@ -1 +1 @@
1
- {"version":3,"file":"toolDbSignIn.js","sourceRoot":"","sources":["../src/toolDbSignIn.ts"],"names":[],"mappings":";;;;;AAEA,0DAAoC;AACpC,sEAAgD;AAEhD,SAAwB,YAAY,CAElC,IAAY,EACZ,QAAgB;IAHlB,iBA4BC;IAvBC,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,KAAI,CAAC,OAAO,CAAU,OAAK,IAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;YACzD,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBAC9B,OAAO;aACR;YAED,IAAI;gBACF,IAAM,UAAU,GAAG,KAAI,CAAC,WAAW,CAAC,cAAc,CAChD,KAAK,EACL,IAAA,gBAAM,EAAC,QAAQ,CAAC,CACjB,CAAC;gBACF,KAAI,CAAC,WAAW,CAAC,OAAO,CACtB,UAAU,EACV,IAAI,IAAI,eAAa,IAAA,sBAAY,GAAI,CACtC,CAAC;gBAEF,OAAO,CAAC,UAAU,CAAC,CAAC;aACrB;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,+BA4BC"}
1
+ {"version":3,"file":"toolDbSignIn.js","sourceRoot":"","sources":["../src/toolDbSignIn.ts"],"names":[],"mappings":";;;;;AAEA,0DAAoC;AACpC,sEAAgD;AAEhD,SAAwB,YAAY,CAElC,IAAY,EACZ,QAAgB;IAHlB,iBA4BC;IAvBC,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,KAAI,CAAC,OAAO,CAAU,OAAK,IAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,UAAC,KAAK;YACzD,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBAC9B,OAAO;aACR;YAED,IAAI;gBACF,KAAI,CAAC,WAAW;qBACb,cAAc,CAAC,KAAK,EAAE,IAAA,gBAAM,EAAC,QAAQ,CAAC,CAAC;qBACvC,IAAI,CAAC,UAAC,UAAU;oBACf,KAAI,CAAC,WAAW,CAAC,OAAO,CACtB,UAAU,EACV,IAAI,IAAI,eAAa,IAAA,sBAAY,GAAI,CACtC,CAAC;oBAEF,OAAO,CAAC,KAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,+BA4BC"}
@@ -48,39 +48,43 @@ function toolDbSignUp(user, password) {
48
48
  .then(function (data) {
49
49
  if (data === null) {
50
50
  var account_1 = new _this.options.userAdapter(_this);
51
- var userData_1 = account_1.encryptAccount((0, _1.sha256)(password));
52
- var timestamp_1 = new Date().getTime();
53
- var userDataString = "" + JSON.stringify(userData_1) + account_1.getAddress() + timestamp_1;
54
- (0, _1.proofOfWork)(userDataString, 0)
55
- .then(function (_a) {
56
- var hash = _a.hash, nonce = _a.nonce;
57
- var signature = account_1.signData(hash);
58
- var signupMessage = {
59
- k: userRoot,
60
- a: account_1.getAddress() || "",
61
- n: nonce,
62
- t: timestamp_1,
63
- h: hash,
64
- s: signature,
65
- v: userData_1,
66
- c: null,
67
- };
68
- _this.store.put(userRoot, JSON.stringify(signupMessage), function (err, data) {
69
- //
70
- });
71
- if (_this.options.debug) {
72
- console.log("SIGNUP PUT > " + userRoot, signupMessage);
73
- }
74
- var finalMsg = {
75
- type: "put",
76
- id: (0, _1.textRandom)(10),
77
- to: [],
78
- data: signupMessage,
79
- };
80
- _this.network.sendToAll(finalMsg);
81
- resolve(finalMsg);
82
- })
83
- .catch(reject);
51
+ account_1.encryptAccount((0, _1.sha256)(password)).then(function (userData) {
52
+ var timestamp = new Date().getTime();
53
+ var userDataString = "" + JSON.stringify(userData) + account_1.getAddress() + timestamp;
54
+ (0, _1.proofOfWork)(userDataString, 0)
55
+ .then(function (_a) {
56
+ var hash = _a.hash, nonce = _a.nonce;
57
+ account_1.signData(hash).then(function (signature) {
58
+ var signupMessage = {
59
+ k: userRoot,
60
+ a: account_1.getAddress() || "",
61
+ n: nonce,
62
+ t: timestamp,
63
+ h: hash,
64
+ s: signature,
65
+ v: userData,
66
+ c: null,
67
+ };
68
+ _this.logger("SIGNUP PUT", userRoot, signupMessage);
69
+ var finalMsg = {
70
+ type: "put",
71
+ id: (0, _1.textRandom)(10),
72
+ to: [],
73
+ data: signupMessage,
74
+ };
75
+ _this.network.sendToAll(finalMsg);
76
+ _this.store
77
+ .put(userRoot, JSON.stringify(signupMessage))
78
+ .catch(function (e) {
79
+ // do nothing
80
+ })
81
+ .finally(function () {
82
+ resolve(finalMsg);
83
+ });
84
+ });
85
+ })
86
+ .catch(reject);
87
+ });
84
88
  }
85
89
  else {
86
90
  reject(new Error("User already exists!"));