@welshman/app 0.8.15 → 0.9.0-pre1

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 (561) hide show
  1. package/dist/app/src/app.d.ts +47 -0
  2. package/dist/app/src/app.d.ts.map +1 -0
  3. package/dist/app/src/app.js +56 -0
  4. package/dist/app/src/app.js.map +1 -0
  5. package/dist/app/src/createApp.d.ts +12 -0
  6. package/dist/app/src/createApp.d.ts.map +1 -0
  7. package/dist/app/src/createApp.js +12 -0
  8. package/dist/app/src/createApp.js.map +1 -0
  9. package/dist/app/src/index.d.ts +34 -27
  10. package/dist/app/src/index.d.ts.map +1 -1
  11. package/dist/app/src/index.js +34 -92
  12. package/dist/app/src/index.js.map +1 -1
  13. package/dist/app/src/plugins/base.d.ts +86 -0
  14. package/dist/app/src/plugins/base.d.ts.map +1 -0
  15. package/dist/app/src/plugins/base.js +124 -0
  16. package/dist/app/src/plugins/base.js.map +1 -0
  17. package/dist/app/src/plugins/blockedRelayLists.d.ts +19 -0
  18. package/dist/app/src/plugins/blockedRelayLists.d.ts.map +1 -0
  19. package/dist/app/src/plugins/blockedRelayLists.js +35 -0
  20. package/dist/app/src/plugins/blockedRelayLists.js.map +1 -0
  21. package/dist/app/src/plugins/blossom.d.ts +12 -0
  22. package/dist/app/src/plugins/blossom.d.ts.map +1 -0
  23. package/dist/app/src/plugins/blossom.js +21 -0
  24. package/dist/app/src/plugins/blossom.js.map +1 -0
  25. package/dist/app/src/plugins/feeds.d.ts +21 -0
  26. package/dist/app/src/plugins/feeds.d.ts.map +1 -0
  27. package/dist/app/src/plugins/feeds.js +58 -0
  28. package/dist/app/src/plugins/feeds.js.map +1 -0
  29. package/dist/app/src/plugins/follows.d.ts +15 -0
  30. package/dist/app/src/plugins/follows.d.ts.map +1 -0
  31. package/dist/app/src/plugins/follows.js +32 -0
  32. package/dist/app/src/plugins/follows.js.map +1 -0
  33. package/dist/app/src/plugins/handles.d.ts +20 -0
  34. package/dist/app/src/plugins/handles.d.ts.map +1 -0
  35. package/dist/app/src/plugins/handles.js +64 -0
  36. package/dist/app/src/plugins/handles.js.map +1 -0
  37. package/dist/app/src/plugins/logger.d.ts +26 -0
  38. package/dist/app/src/plugins/logger.d.ts.map +1 -0
  39. package/dist/app/src/plugins/logger.js +19 -0
  40. package/dist/app/src/plugins/logger.js.map +1 -0
  41. package/dist/app/src/plugins/messagingRelayLists.d.ts +19 -0
  42. package/dist/app/src/plugins/messagingRelayLists.d.ts.map +1 -0
  43. package/dist/app/src/plugins/messagingRelayLists.js +35 -0
  44. package/dist/app/src/plugins/messagingRelayLists.js.map +1 -0
  45. package/dist/app/src/plugins/mutes.d.ts +19 -0
  46. package/dist/app/src/plugins/mutes.d.ts.map +1 -0
  47. package/dist/app/src/plugins/mutes.js +39 -0
  48. package/dist/app/src/plugins/mutes.js.map +1 -0
  49. package/dist/app/src/plugins/network.d.ts +24 -0
  50. package/dist/app/src/plugins/network.d.ts.map +1 -0
  51. package/dist/app/src/plugins/network.js +41 -0
  52. package/dist/app/src/plugins/network.js.map +1 -0
  53. package/dist/app/src/plugins/pins.d.ts +15 -0
  54. package/dist/app/src/plugins/pins.d.ts.map +1 -0
  55. package/dist/app/src/plugins/pins.js +32 -0
  56. package/dist/app/src/plugins/pins.js.map +1 -0
  57. package/dist/app/src/plugins/plaintext.d.ts +11 -0
  58. package/dist/app/src/plugins/plaintext.d.ts.map +1 -0
  59. package/dist/app/src/plugins/plaintext.js +18 -0
  60. package/dist/app/src/plugins/plaintext.js.map +1 -0
  61. package/dist/app/src/plugins/profiles.d.ts +15 -0
  62. package/dist/app/src/plugins/profiles.d.ts.map +1 -0
  63. package/dist/app/src/plugins/profiles.js +39 -0
  64. package/dist/app/src/plugins/profiles.js.map +1 -0
  65. package/dist/app/src/plugins/relayLists.d.ts +23 -0
  66. package/dist/app/src/plugins/relayLists.d.ts.map +1 -0
  67. package/dist/app/src/plugins/relayLists.js +65 -0
  68. package/dist/app/src/plugins/relayLists.js.map +1 -0
  69. package/dist/app/src/plugins/relayManagement.d.ts +12 -0
  70. package/dist/app/src/plugins/relayManagement.d.ts.map +1 -0
  71. package/dist/app/src/plugins/relayManagement.js +19 -0
  72. package/dist/app/src/plugins/relayManagement.js.map +1 -0
  73. package/dist/app/src/plugins/relayStats.d.ts +39 -0
  74. package/dist/app/src/plugins/relayStats.d.ts.map +1 -0
  75. package/dist/app/src/plugins/relayStats.js +173 -0
  76. package/dist/app/src/plugins/relayStats.js.map +1 -0
  77. package/dist/app/src/plugins/relays.d.ts +15 -0
  78. package/dist/app/src/plugins/relays.d.ts.map +1 -0
  79. package/dist/app/src/plugins/relays.js +43 -0
  80. package/dist/app/src/plugins/relays.js.map +1 -0
  81. package/dist/app/src/plugins/rooms.d.ts +30 -0
  82. package/dist/app/src/plugins/rooms.d.ts.map +1 -0
  83. package/dist/app/src/plugins/rooms.js +36 -0
  84. package/dist/app/src/plugins/rooms.js.map +1 -0
  85. package/dist/app/src/plugins/router.d.ts +13 -0
  86. package/dist/app/src/plugins/router.d.ts.map +1 -0
  87. package/dist/app/src/plugins/router.js +26 -0
  88. package/dist/app/src/plugins/router.js.map +1 -0
  89. package/dist/app/src/plugins/search.d.ts +35 -0
  90. package/dist/app/src/plugins/search.d.ts.map +1 -0
  91. package/dist/app/src/plugins/search.js +88 -0
  92. package/dist/app/src/plugins/search.js.map +1 -0
  93. package/dist/app/src/plugins/searchRelayLists.d.ts +19 -0
  94. package/dist/app/src/plugins/searchRelayLists.d.ts.map +1 -0
  95. package/dist/app/src/plugins/searchRelayLists.js +35 -0
  96. package/dist/app/src/plugins/searchRelayLists.js.map +1 -0
  97. package/dist/app/src/plugins/slashCommands.d.ts +22 -0
  98. package/dist/app/src/plugins/slashCommands.d.ts.map +1 -0
  99. package/dist/app/src/plugins/slashCommands.js +70 -0
  100. package/dist/app/src/plugins/slashCommands.js.map +1 -0
  101. package/dist/app/src/plugins/stores.d.ts +22 -0
  102. package/dist/app/src/plugins/stores.d.ts.map +1 -0
  103. package/dist/app/src/plugins/stores.js +22 -0
  104. package/dist/app/src/plugins/stores.js.map +1 -0
  105. package/dist/app/src/plugins/sync.d.ts +20 -0
  106. package/dist/app/src/plugins/sync.d.ts.map +1 -0
  107. package/dist/app/src/plugins/sync.js +41 -0
  108. package/dist/app/src/plugins/sync.js.map +1 -0
  109. package/dist/app/src/plugins/tags.d.ts +20 -0
  110. package/dist/app/src/plugins/tags.d.ts.map +1 -0
  111. package/dist/app/src/plugins/tags.js +106 -0
  112. package/dist/app/src/plugins/tags.js.map +1 -0
  113. package/dist/app/src/plugins/thunk.d.ts +75 -0
  114. package/dist/app/src/plugins/thunk.d.ts.map +1 -0
  115. package/dist/app/src/{thunk.js → plugins/thunk.js} +158 -144
  116. package/dist/app/src/plugins/thunk.js.map +1 -0
  117. package/dist/app/src/plugins/topics.d.ts +17 -0
  118. package/dist/app/src/plugins/topics.d.ts.map +1 -0
  119. package/dist/app/src/plugins/topics.js +45 -0
  120. package/dist/app/src/plugins/topics.js.map +1 -0
  121. package/dist/app/src/plugins/wot.d.ts +28 -0
  122. package/dist/app/src/plugins/wot.d.ts.map +1 -0
  123. package/dist/app/src/plugins/wot.js +116 -0
  124. package/dist/app/src/plugins/wot.js.map +1 -0
  125. package/dist/app/src/plugins/wraps.d.ts +25 -0
  126. package/dist/app/src/plugins/wraps.d.ts.map +1 -0
  127. package/dist/app/src/plugins/wraps.js +59 -0
  128. package/dist/app/src/plugins/wraps.js.map +1 -0
  129. package/dist/app/src/plugins/zappers.d.ts +28 -0
  130. package/dist/app/src/plugins/zappers.d.ts.map +1 -0
  131. package/dist/app/src/plugins/zappers.js +106 -0
  132. package/dist/app/src/plugins/zappers.js.map +1 -0
  133. package/dist/app/src/policy.d.ts +51 -0
  134. package/dist/app/src/policy.d.ts.map +1 -0
  135. package/dist/app/src/policy.js +129 -0
  136. package/dist/app/src/policy.js.map +1 -0
  137. package/dist/app/src/session.d.ts +36 -103
  138. package/dist/app/src/session.d.ts.map +1 -1
  139. package/dist/app/src/session.js +42 -171
  140. package/dist/app/src/session.js.map +1 -1
  141. package/dist/app/src/user.d.ts +34 -33
  142. package/dist/app/src/user.d.ts.map +1 -1
  143. package/dist/app/src/user.js +51 -53
  144. package/dist/app/src/user.js.map +1 -1
  145. package/dist/domain/src/EventBuilder.d.ts +35 -0
  146. package/dist/domain/src/EventBuilder.d.ts.map +1 -0
  147. package/dist/domain/src/EventBuilder.js +111 -0
  148. package/dist/domain/src/EventBuilder.js.map +1 -0
  149. package/dist/domain/src/EventReader.d.ts +24 -0
  150. package/dist/domain/src/EventReader.d.ts.map +1 -0
  151. package/dist/domain/src/EventReader.js +57 -0
  152. package/dist/domain/src/EventReader.js.map +1 -0
  153. package/dist/domain/src/ListBuilder.d.ts +21 -0
  154. package/dist/domain/src/ListBuilder.d.ts.map +1 -0
  155. package/dist/domain/src/ListBuilder.js +73 -0
  156. package/dist/domain/src/ListBuilder.js.map +1 -0
  157. package/dist/domain/src/ListReader.d.ts +12 -0
  158. package/dist/domain/src/ListReader.d.ts.map +1 -0
  159. package/dist/domain/src/ListReader.js +31 -0
  160. package/dist/domain/src/ListReader.js.map +1 -0
  161. package/dist/domain/src/index.d.ts +54 -0
  162. package/dist/domain/src/index.d.ts.map +1 -0
  163. package/dist/domain/src/index.js +54 -0
  164. package/dist/domain/src/index.js.map +1 -0
  165. package/dist/domain/src/kinds/BlockedRelayList.d.ts +15 -0
  166. package/dist/domain/src/kinds/BlockedRelayList.d.ts.map +1 -0
  167. package/dist/domain/src/kinds/BlockedRelayList.js +30 -0
  168. package/dist/domain/src/kinds/BlockedRelayList.js.map +1 -0
  169. package/dist/domain/src/kinds/BlossomServerList.d.ts +15 -0
  170. package/dist/domain/src/kinds/BlossomServerList.d.ts.map +1 -0
  171. package/dist/domain/src/kinds/BlossomServerList.js +30 -0
  172. package/dist/domain/src/kinds/BlossomServerList.js.map +1 -0
  173. package/dist/domain/src/kinds/BookmarkList.d.ts +17 -0
  174. package/dist/domain/src/kinds/BookmarkList.d.ts.map +1 -0
  175. package/dist/domain/src/kinds/BookmarkList.js +36 -0
  176. package/dist/domain/src/kinds/BookmarkList.js.map +1 -0
  177. package/dist/domain/src/kinds/Classified.d.ts +27 -0
  178. package/dist/domain/src/kinds/Classified.d.ts.map +1 -0
  179. package/dist/domain/src/kinds/Classified.js +65 -0
  180. package/dist/domain/src/kinds/Classified.js.map +1 -0
  181. package/dist/domain/src/kinds/Comment.d.ts +29 -0
  182. package/dist/domain/src/kinds/Comment.d.ts.map +1 -0
  183. package/dist/domain/src/kinds/Comment.js +82 -0
  184. package/dist/domain/src/kinds/Comment.js.map +1 -0
  185. package/dist/domain/src/kinds/EmojiList.d.ts +16 -0
  186. package/dist/domain/src/kinds/EmojiList.d.ts.map +1 -0
  187. package/dist/domain/src/kinds/EmojiList.js +33 -0
  188. package/dist/domain/src/kinds/EmojiList.js.map +1 -0
  189. package/dist/domain/src/kinds/Feed.d.ts +17 -0
  190. package/dist/domain/src/kinds/Feed.d.ts.map +1 -0
  191. package/dist/domain/src/kinds/Feed.js +33 -0
  192. package/dist/domain/src/kinds/Feed.js.map +1 -0
  193. package/dist/domain/src/kinds/FeedList.d.ts +15 -0
  194. package/dist/domain/src/kinds/FeedList.d.ts.map +1 -0
  195. package/dist/domain/src/kinds/FeedList.js +30 -0
  196. package/dist/domain/src/kinds/FeedList.js.map +1 -0
  197. package/dist/domain/src/kinds/FollowList.d.ts +14 -0
  198. package/dist/domain/src/kinds/FollowList.d.ts.map +1 -0
  199. package/dist/domain/src/kinds/FollowList.js +27 -0
  200. package/dist/domain/src/kinds/FollowList.js.map +1 -0
  201. package/dist/domain/src/kinds/GroupList.d.ts +13 -0
  202. package/dist/domain/src/kinds/GroupList.d.ts.map +1 -0
  203. package/dist/domain/src/kinds/GroupList.js +24 -0
  204. package/dist/domain/src/kinds/GroupList.js.map +1 -0
  205. package/dist/domain/src/kinds/Handler.d.ts +41 -0
  206. package/dist/domain/src/kinds/Handler.d.ts.map +1 -0
  207. package/dist/domain/src/kinds/Handler.js +86 -0
  208. package/dist/domain/src/kinds/Handler.js.map +1 -0
  209. package/dist/domain/src/kinds/HandlerRecommendation.d.ts +15 -0
  210. package/dist/domain/src/kinds/HandlerRecommendation.d.ts.map +1 -0
  211. package/dist/domain/src/kinds/HandlerRecommendation.js +32 -0
  212. package/dist/domain/src/kinds/HandlerRecommendation.js.map +1 -0
  213. package/dist/domain/src/kinds/MessagingRelayList.d.ts +14 -0
  214. package/dist/domain/src/kinds/MessagingRelayList.d.ts.map +1 -0
  215. package/dist/domain/src/kinds/MessagingRelayList.js +27 -0
  216. package/dist/domain/src/kinds/MessagingRelayList.js.map +1 -0
  217. package/dist/domain/src/kinds/MuteList.d.ts +15 -0
  218. package/dist/domain/src/kinds/MuteList.d.ts.map +1 -0
  219. package/dist/domain/src/kinds/MuteList.js +30 -0
  220. package/dist/domain/src/kinds/MuteList.js.map +1 -0
  221. package/dist/domain/src/kinds/Pin.d.ts +37 -0
  222. package/dist/domain/src/kinds/Pin.d.ts.map +1 -0
  223. package/dist/domain/src/kinds/Pin.js +74 -0
  224. package/dist/domain/src/kinds/Pin.js.map +1 -0
  225. package/dist/domain/src/kinds/PinList.d.ts +15 -0
  226. package/dist/domain/src/kinds/PinList.d.ts.map +1 -0
  227. package/dist/domain/src/kinds/PinList.js +30 -0
  228. package/dist/domain/src/kinds/PinList.js.map +1 -0
  229. package/dist/domain/src/kinds/Pinboard.d.ts +21 -0
  230. package/dist/domain/src/kinds/Pinboard.d.ts.map +1 -0
  231. package/dist/domain/src/kinds/Pinboard.js +53 -0
  232. package/dist/domain/src/kinds/Pinboard.js.map +1 -0
  233. package/dist/domain/src/kinds/Poll.d.ts +37 -0
  234. package/dist/domain/src/kinds/Poll.d.ts.map +1 -0
  235. package/dist/domain/src/kinds/Poll.js +80 -0
  236. package/dist/domain/src/kinds/Poll.js.map +1 -0
  237. package/dist/domain/src/kinds/PollResponse.d.ts +15 -0
  238. package/dist/domain/src/kinds/PollResponse.d.ts.map +1 -0
  239. package/dist/domain/src/kinds/PollResponse.js +33 -0
  240. package/dist/domain/src/kinds/PollResponse.js.map +1 -0
  241. package/dist/domain/src/kinds/Profile.d.ts +36 -0
  242. package/dist/domain/src/kinds/Profile.d.ts.map +1 -0
  243. package/dist/domain/src/kinds/Profile.js +105 -0
  244. package/dist/domain/src/kinds/Profile.js.map +1 -0
  245. package/dist/domain/src/kinds/RelayAddMember.d.ts +12 -0
  246. package/dist/domain/src/kinds/RelayAddMember.d.ts.map +1 -0
  247. package/dist/domain/src/kinds/RelayAddMember.js +21 -0
  248. package/dist/domain/src/kinds/RelayAddMember.js.map +1 -0
  249. package/dist/domain/src/kinds/RelayInvite.d.ts +12 -0
  250. package/dist/domain/src/kinds/RelayInvite.d.ts.map +1 -0
  251. package/dist/domain/src/kinds/RelayInvite.js +21 -0
  252. package/dist/domain/src/kinds/RelayInvite.js.map +1 -0
  253. package/dist/domain/src/kinds/RelayJoin.d.ts +14 -0
  254. package/dist/domain/src/kinds/RelayJoin.d.ts.map +1 -0
  255. package/dist/domain/src/kinds/RelayJoin.js +27 -0
  256. package/dist/domain/src/kinds/RelayJoin.js.map +1 -0
  257. package/dist/domain/src/kinds/RelayLeave.d.ts +10 -0
  258. package/dist/domain/src/kinds/RelayLeave.d.ts.map +1 -0
  259. package/dist/domain/src/kinds/RelayLeave.js +14 -0
  260. package/dist/domain/src/kinds/RelayLeave.js.map +1 -0
  261. package/dist/domain/src/kinds/RelayList.d.ts +24 -0
  262. package/dist/domain/src/kinds/RelayList.d.ts.map +1 -0
  263. package/dist/domain/src/kinds/RelayList.js +89 -0
  264. package/dist/domain/src/kinds/RelayList.js.map +1 -0
  265. package/dist/domain/src/kinds/RelayMembers.d.ts +17 -0
  266. package/dist/domain/src/kinds/RelayMembers.d.ts.map +1 -0
  267. package/dist/domain/src/kinds/RelayMembers.js +38 -0
  268. package/dist/domain/src/kinds/RelayMembers.js.map +1 -0
  269. package/dist/domain/src/kinds/RelayRemoveMember.d.ts +12 -0
  270. package/dist/domain/src/kinds/RelayRemoveMember.d.ts.map +1 -0
  271. package/dist/domain/src/kinds/RelayRemoveMember.js +21 -0
  272. package/dist/domain/src/kinds/RelayRemoveMember.js.map +1 -0
  273. package/dist/domain/src/kinds/RelaySet.d.ts +20 -0
  274. package/dist/domain/src/kinds/RelaySet.d.ts.map +1 -0
  275. package/dist/domain/src/kinds/RelaySet.js +45 -0
  276. package/dist/domain/src/kinds/RelaySet.js.map +1 -0
  277. package/dist/domain/src/kinds/Report.d.ts +18 -0
  278. package/dist/domain/src/kinds/Report.d.ts.map +1 -0
  279. package/dist/domain/src/kinds/Report.js +59 -0
  280. package/dist/domain/src/kinds/Report.js.map +1 -0
  281. package/dist/domain/src/kinds/RoomAddMember.d.ts +12 -0
  282. package/dist/domain/src/kinds/RoomAddMember.d.ts.map +1 -0
  283. package/dist/domain/src/kinds/RoomAddMember.js +21 -0
  284. package/dist/domain/src/kinds/RoomAddMember.js.map +1 -0
  285. package/dist/domain/src/kinds/RoomAdmins.d.ts +14 -0
  286. package/dist/domain/src/kinds/RoomAdmins.d.ts.map +1 -0
  287. package/dist/domain/src/kinds/RoomAdmins.js +27 -0
  288. package/dist/domain/src/kinds/RoomAdmins.js.map +1 -0
  289. package/dist/domain/src/kinds/RoomCreate.d.ts +11 -0
  290. package/dist/domain/src/kinds/RoomCreate.d.ts.map +1 -0
  291. package/dist/domain/src/kinds/RoomCreate.js +20 -0
  292. package/dist/domain/src/kinds/RoomCreate.js.map +1 -0
  293. package/dist/domain/src/kinds/RoomCreatePermission.d.ts +15 -0
  294. package/dist/domain/src/kinds/RoomCreatePermission.d.ts.map +1 -0
  295. package/dist/domain/src/kinds/RoomCreatePermission.js +30 -0
  296. package/dist/domain/src/kinds/RoomCreatePermission.js.map +1 -0
  297. package/dist/domain/src/kinds/RoomDelete.d.ts +11 -0
  298. package/dist/domain/src/kinds/RoomDelete.d.ts.map +1 -0
  299. package/dist/domain/src/kinds/RoomDelete.js +20 -0
  300. package/dist/domain/src/kinds/RoomDelete.js.map +1 -0
  301. package/dist/domain/src/kinds/RoomEdit.d.ts +28 -0
  302. package/dist/domain/src/kinds/RoomEdit.d.ts.map +1 -0
  303. package/dist/domain/src/kinds/RoomEdit.js +80 -0
  304. package/dist/domain/src/kinds/RoomEdit.js.map +1 -0
  305. package/dist/domain/src/kinds/RoomJoin.d.ts +15 -0
  306. package/dist/domain/src/kinds/RoomJoin.d.ts.map +1 -0
  307. package/dist/domain/src/kinds/RoomJoin.js +33 -0
  308. package/dist/domain/src/kinds/RoomJoin.js.map +1 -0
  309. package/dist/domain/src/kinds/RoomLeave.d.ts +11 -0
  310. package/dist/domain/src/kinds/RoomLeave.d.ts.map +1 -0
  311. package/dist/domain/src/kinds/RoomLeave.js +20 -0
  312. package/dist/domain/src/kinds/RoomLeave.js.map +1 -0
  313. package/dist/domain/src/kinds/RoomList.d.ts +14 -0
  314. package/dist/domain/src/kinds/RoomList.d.ts.map +1 -0
  315. package/dist/domain/src/kinds/RoomList.js +27 -0
  316. package/dist/domain/src/kinds/RoomList.js.map +1 -0
  317. package/dist/domain/src/kinds/RoomMembers.d.ts +15 -0
  318. package/dist/domain/src/kinds/RoomMembers.d.ts.map +1 -0
  319. package/dist/domain/src/kinds/RoomMembers.js +30 -0
  320. package/dist/domain/src/kinds/RoomMembers.js.map +1 -0
  321. package/dist/domain/src/kinds/RoomMeta.d.ts +27 -0
  322. package/dist/domain/src/kinds/RoomMeta.d.ts.map +1 -0
  323. package/dist/domain/src/kinds/RoomMeta.js +72 -0
  324. package/dist/domain/src/kinds/RoomMeta.js.map +1 -0
  325. package/dist/domain/src/kinds/RoomRemoveMember.d.ts +14 -0
  326. package/dist/domain/src/kinds/RoomRemoveMember.d.ts.map +1 -0
  327. package/dist/domain/src/kinds/RoomRemoveMember.js +27 -0
  328. package/dist/domain/src/kinds/RoomRemoveMember.js.map +1 -0
  329. package/dist/domain/src/kinds/SearchRelayList.d.ts +15 -0
  330. package/dist/domain/src/kinds/SearchRelayList.d.ts.map +1 -0
  331. package/dist/domain/src/kinds/SearchRelayList.js +30 -0
  332. package/dist/domain/src/kinds/SearchRelayList.js.map +1 -0
  333. package/dist/domain/src/kinds/SlashCommand.d.ts +38 -0
  334. package/dist/domain/src/kinds/SlashCommand.d.ts.map +1 -0
  335. package/dist/domain/src/kinds/SlashCommand.js +91 -0
  336. package/dist/domain/src/kinds/SlashCommand.js.map +1 -0
  337. package/dist/domain/src/kinds/Thread.d.ts +12 -0
  338. package/dist/domain/src/kinds/Thread.d.ts.map +1 -0
  339. package/dist/domain/src/kinds/Thread.js +21 -0
  340. package/dist/domain/src/kinds/Thread.js.map +1 -0
  341. package/dist/domain/src/kinds/TimeEvent.d.ts +21 -0
  342. package/dist/domain/src/kinds/TimeEvent.d.ts.map +1 -0
  343. package/dist/domain/src/kinds/TimeEvent.js +58 -0
  344. package/dist/domain/src/kinds/TimeEvent.js.map +1 -0
  345. package/dist/domain/src/kinds/TopicList.d.ts +17 -0
  346. package/dist/domain/src/kinds/TopicList.d.ts.map +1 -0
  347. package/dist/domain/src/kinds/TopicList.js +36 -0
  348. package/dist/domain/src/kinds/TopicList.js.map +1 -0
  349. package/dist/domain/src/kinds/ZapGoal.d.ts +20 -0
  350. package/dist/domain/src/kinds/ZapGoal.d.ts.map +1 -0
  351. package/dist/domain/src/kinds/ZapGoal.js +52 -0
  352. package/dist/domain/src/kinds/ZapGoal.js.map +1 -0
  353. package/dist/domain/src/kinds/ZapReceipt.d.ts +28 -0
  354. package/dist/domain/src/kinds/ZapReceipt.d.ts.map +1 -0
  355. package/dist/domain/src/kinds/ZapReceipt.js +93 -0
  356. package/dist/domain/src/kinds/ZapReceipt.js.map +1 -0
  357. package/dist/domain/src/kinds/ZapRequest.d.ts +20 -0
  358. package/dist/domain/src/kinds/ZapRequest.d.ts.map +1 -0
  359. package/dist/domain/src/kinds/ZapRequest.js +47 -0
  360. package/dist/domain/src/kinds/ZapRequest.js.map +1 -0
  361. package/dist/feeds/src/compiler.d.ts +2 -0
  362. package/dist/feeds/src/compiler.d.ts.map +1 -1
  363. package/dist/feeds/src/compiler.js +3 -0
  364. package/dist/feeds/src/compiler.js.map +1 -1
  365. package/dist/feeds/src/controller.d.ts.map +1 -1
  366. package/dist/feeds/src/controller.js +2 -0
  367. package/dist/feeds/src/controller.js.map +1 -1
  368. package/dist/feeds/src/request.d.ts +5 -2
  369. package/dist/feeds/src/request.d.ts.map +1 -1
  370. package/dist/feeds/src/request.js +9 -9
  371. package/dist/feeds/src/request.js.map +1 -1
  372. package/dist/lib/src/Tools.d.ts +4 -0
  373. package/dist/lib/src/Tools.d.ts.map +1 -1
  374. package/dist/lib/src/Tools.js +4 -0
  375. package/dist/lib/src/Tools.js.map +1 -1
  376. package/dist/net/src/adapter.d.ts +2 -2
  377. package/dist/net/src/adapter.d.ts.map +1 -1
  378. package/dist/net/src/adapter.js +8 -4
  379. package/dist/net/src/adapter.js.map +1 -1
  380. package/dist/net/src/auth.d.ts +1 -1
  381. package/dist/net/src/auth.d.ts.map +1 -1
  382. package/dist/net/src/auth.js +10 -4
  383. package/dist/net/src/auth.js.map +1 -1
  384. package/dist/net/src/context.d.ts +4 -7
  385. package/dist/net/src/context.d.ts.map +1 -1
  386. package/dist/net/src/context.js +1 -9
  387. package/dist/net/src/context.js.map +1 -1
  388. package/dist/net/src/diff.d.ts +1 -0
  389. package/dist/net/src/diff.d.ts.map +1 -1
  390. package/dist/net/src/diff.js +19 -14
  391. package/dist/net/src/diff.js.map +1 -1
  392. package/dist/net/src/policy.js +1 -1
  393. package/dist/net/src/policy.js.map +1 -1
  394. package/dist/net/src/pool.d.ts +1 -8
  395. package/dist/net/src/pool.d.ts.map +1 -1
  396. package/dist/net/src/pool.js +4 -20
  397. package/dist/net/src/pool.js.map +1 -1
  398. package/dist/net/src/publish.d.ts.map +1 -1
  399. package/dist/net/src/publish.js +19 -12
  400. package/dist/net/src/publish.js.map +1 -1
  401. package/dist/net/src/repository.d.ts +1 -2
  402. package/dist/net/src/repository.d.ts.map +1 -1
  403. package/dist/net/src/repository.js +12 -10
  404. package/dist/net/src/repository.js.map +1 -1
  405. package/dist/net/src/request.d.ts +0 -2
  406. package/dist/net/src/request.d.ts.map +1 -1
  407. package/dist/net/src/request.js +21 -9
  408. package/dist/net/src/request.js.map +1 -1
  409. package/dist/net/src/socket.js +1 -1
  410. package/dist/net/src/socket.js.map +1 -1
  411. package/dist/net/src/tracker.js +3 -3
  412. package/dist/net/src/tracker.js.map +1 -1
  413. package/dist/net/src/wrapManager.d.ts +1 -0
  414. package/dist/net/src/wrapManager.d.ts.map +1 -1
  415. package/dist/net/src/wrapManager.js +5 -1
  416. package/dist/net/src/wrapManager.js.map +1 -1
  417. package/dist/router/src/index.d.ts +163 -0
  418. package/dist/router/src/index.d.ts.map +1 -0
  419. package/dist/router/src/index.js +214 -0
  420. package/dist/router/src/index.js.map +1 -0
  421. package/dist/signer/src/util.d.ts +1 -1
  422. package/dist/signer/src/util.d.ts.map +1 -1
  423. package/dist/signer/src/util.js +18 -6
  424. package/dist/signer/src/util.js.map +1 -1
  425. package/dist/tsconfig.build.tsbuildinfo +1 -1
  426. package/dist/util/src/Handles.d.ts +15 -0
  427. package/dist/util/src/Handles.d.ts.map +1 -0
  428. package/dist/util/src/Handles.js +25 -0
  429. package/dist/util/src/Handles.js.map +1 -0
  430. package/dist/util/src/Kinds.d.ts +4 -1
  431. package/dist/util/src/Kinds.d.ts.map +1 -1
  432. package/dist/util/src/Kinds.js +4 -1
  433. package/dist/util/src/Kinds.js.map +1 -1
  434. package/dist/util/src/Nip86.d.ts +8 -2
  435. package/dist/util/src/Nip86.d.ts.map +1 -1
  436. package/dist/util/src/Nip86.js +6 -0
  437. package/dist/util/src/Nip86.js.map +1 -1
  438. package/dist/util/src/Zaps.d.ts +31 -0
  439. package/dist/util/src/Zaps.d.ts.map +1 -1
  440. package/dist/util/src/Zaps.js +52 -3
  441. package/dist/util/src/Zaps.js.map +1 -1
  442. package/dist/util/src/index.d.ts +1 -5
  443. package/dist/util/src/index.d.ts.map +1 -1
  444. package/dist/util/src/index.js +1 -5
  445. package/dist/util/src/index.js.map +1 -1
  446. package/package.json +18 -16
  447. package/dist/app/src/blockedRelayLists.d.ts +0 -9
  448. package/dist/app/src/blockedRelayLists.d.ts.map +0 -1
  449. package/dist/app/src/blockedRelayLists.js +0 -18
  450. package/dist/app/src/blockedRelayLists.js.map +0 -1
  451. package/dist/app/src/blossom.d.ts +0 -8
  452. package/dist/app/src/blossom.d.ts.map +0 -1
  453. package/dist/app/src/blossom.js +0 -17
  454. package/dist/app/src/blossom.js.map +0 -1
  455. package/dist/app/src/commands.d.ts +0 -43
  456. package/dist/app/src/commands.d.ts.map +0 -1
  457. package/dist/app/src/commands.js +0 -216
  458. package/dist/app/src/commands.js.map +0 -1
  459. package/dist/app/src/context.d.ts +0 -5
  460. package/dist/app/src/context.d.ts.map +0 -1
  461. package/dist/app/src/context.js +0 -2
  462. package/dist/app/src/context.js.map +0 -1
  463. package/dist/app/src/core.d.ts +0 -4
  464. package/dist/app/src/core.d.ts.map +0 -1
  465. package/dist/app/src/core.js +0 -4
  466. package/dist/app/src/core.js.map +0 -1
  467. package/dist/app/src/feeds.d.ts +0 -9
  468. package/dist/app/src/feeds.d.ts.map +0 -1
  469. package/dist/app/src/feeds.js +0 -35
  470. package/dist/app/src/feeds.js.map +0 -1
  471. package/dist/app/src/follows.d.ts +0 -9
  472. package/dist/app/src/follows.d.ts.map +0 -1
  473. package/dist/app/src/follows.js +0 -18
  474. package/dist/app/src/follows.js.map +0 -1
  475. package/dist/app/src/handles.d.ts +0 -30
  476. package/dist/app/src/handles.d.ts.map +0 -1
  477. package/dist/app/src/handles.js +0 -91
  478. package/dist/app/src/handles.js.map +0 -1
  479. package/dist/app/src/messagingRelayLists.d.ts +0 -9
  480. package/dist/app/src/messagingRelayLists.d.ts.map +0 -1
  481. package/dist/app/src/messagingRelayLists.js +0 -18
  482. package/dist/app/src/messagingRelayLists.js.map +0 -1
  483. package/dist/app/src/mutes.d.ts +0 -10
  484. package/dist/app/src/mutes.d.ts.map +0 -1
  485. package/dist/app/src/mutes.js +0 -21
  486. package/dist/app/src/mutes.js.map +0 -1
  487. package/dist/app/src/pins.d.ts +0 -9
  488. package/dist/app/src/pins.d.ts.map +0 -1
  489. package/dist/app/src/pins.js +0 -18
  490. package/dist/app/src/pins.js.map +0 -1
  491. package/dist/app/src/plaintext.d.ts +0 -6
  492. package/dist/app/src/plaintext.d.ts.map +0 -1
  493. package/dist/app/src/plaintext.js +0 -32
  494. package/dist/app/src/plaintext.js.map +0 -1
  495. package/dist/app/src/profiles.d.ts +0 -11
  496. package/dist/app/src/profiles.d.ts.map +0 -1
  497. package/dist/app/src/profiles.js +0 -23
  498. package/dist/app/src/profiles.js.map +0 -1
  499. package/dist/app/src/relayLists.d.ts +0 -13
  500. package/dist/app/src/relayLists.d.ts.map +0 -1
  501. package/dist/app/src/relayLists.js +0 -52
  502. package/dist/app/src/relayLists.js.map +0 -1
  503. package/dist/app/src/relayStats.d.ts +0 -34
  504. package/dist/app/src/relayStats.d.ts.map +0 -1
  505. package/dist/app/src/relayStats.js +0 -194
  506. package/dist/app/src/relayStats.js.map +0 -1
  507. package/dist/app/src/relays.d.ts +0 -18
  508. package/dist/app/src/relays.d.ts.map +0 -1
  509. package/dist/app/src/relays.js +0 -46
  510. package/dist/app/src/relays.js.map +0 -1
  511. package/dist/app/src/search.d.ts +0 -23
  512. package/dist/app/src/search.d.ts.map +0 -1
  513. package/dist/app/src/search.js +0 -76
  514. package/dist/app/src/search.js.map +0 -1
  515. package/dist/app/src/searchRelayLists.d.ts +0 -9
  516. package/dist/app/src/searchRelayLists.d.ts.map +0 -1
  517. package/dist/app/src/searchRelayLists.js +0 -18
  518. package/dist/app/src/searchRelayLists.js.map +0 -1
  519. package/dist/app/src/sync.d.ts +0 -9
  520. package/dist/app/src/sync.d.ts.map +0 -1
  521. package/dist/app/src/sync.js +0 -32
  522. package/dist/app/src/sync.js.map +0 -1
  523. package/dist/app/src/tags.d.ts +0 -10
  524. package/dist/app/src/tags.d.ts.map +0 -1
  525. package/dist/app/src/tags.js +0 -96
  526. package/dist/app/src/tags.js.map +0 -1
  527. package/dist/app/src/thunk.d.ts +0 -61
  528. package/dist/app/src/thunk.d.ts.map +0 -1
  529. package/dist/app/src/thunk.js.map +0 -1
  530. package/dist/app/src/topics.d.ts +0 -7
  531. package/dist/app/src/topics.d.ts.map +0 -1
  532. package/dist/app/src/topics.js +0 -38
  533. package/dist/app/src/topics.js.map +0 -1
  534. package/dist/app/src/wot.d.ts +0 -17
  535. package/dist/app/src/wot.d.ts.map +0 -1
  536. package/dist/app/src/wot.js +0 -72
  537. package/dist/app/src/wot.js.map +0 -1
  538. package/dist/app/src/zappers.d.ts +0 -21
  539. package/dist/app/src/zappers.d.ts.map +0 -1
  540. package/dist/app/src/zappers.js +0 -98
  541. package/dist/app/src/zappers.js.map +0 -1
  542. package/dist/util/src/Encryptable.d.ts +0 -34
  543. package/dist/util/src/Encryptable.d.ts.map +0 -1
  544. package/dist/util/src/Encryptable.js +0 -52
  545. package/dist/util/src/Encryptable.js.map +0 -1
  546. package/dist/util/src/Handler.d.ts +0 -17
  547. package/dist/util/src/Handler.d.ts.map +0 -1
  548. package/dist/util/src/Handler.js +0 -33
  549. package/dist/util/src/Handler.js.map +0 -1
  550. package/dist/util/src/List.d.ts +0 -42
  551. package/dist/util/src/List.d.ts.map +0 -1
  552. package/dist/util/src/List.js +0 -86
  553. package/dist/util/src/List.js.map +0 -1
  554. package/dist/util/src/Profile.d.ts +0 -26
  555. package/dist/util/src/Profile.d.ts.map +0 -1
  556. package/dist/util/src/Profile.js +0 -50
  557. package/dist/util/src/Profile.js.map +0 -1
  558. package/dist/util/src/Room.d.ts +0 -63
  559. package/dist/util/src/Room.d.ts.map +0 -1
  560. package/dist/util/src/Room.js +0 -94
  561. package/dist/util/src/Room.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../net/src/adapter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../../net/src/adapter.ts"],"names":[],"mappings":"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"}
@@ -16,7 +16,7 @@ export type AuthResult = {
16
16
  reason?: string;
17
17
  };
18
18
  export declare enum AuthStateEvent {
19
- Status = "auth:event:status"
19
+ Status = "status"
20
20
  }
21
21
  export type AuthStateEvents = {
22
22
  [AuthStateEvent.Status]: (status: AuthStatus) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../net/src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,QAAQ,CAAA;AAEjC,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAGxD,OAAO,EAAC,MAAM,EAA4B,MAAM,aAAa,CAAA;AAC7D,OAAO,EAAC,YAAY,EAAC,MAAM,WAAW,CAAA;AAEtC,oBAAY,UAAU;IACpB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,gBAAgB,sBAAsB;IACtC,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,SAAS,cAAc;IACvB,EAAE,OAAO;CACV;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,oBAAY,cAAc;IACxB,MAAM,sBAAsB;CAC7B;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;AAEzD,qBAAa,SAAU,SAAQ,YAAY;IAO7B,QAAQ,CAAC,MAAM,EAAE,MAAM;IANnC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,MAAM,aAAkB;IACxB,cAAc,EAAE,YAAY,EAAE,CAAK;gBAEd,MAAM,EAAE,MAAM;IAgDnC,SAAS,CAAC,MAAM,EAAE,UAAU;IAKtB,MAAM,CAAC,IAAI,EAAE,IAAI;IAsBjB,WAAW,CAAC,IAAI,EAAE,IAAI;IAoBtB,SAAS,CAAC,IAAI,EAAE,IAAI;IAU1B,OAAO;CAIR"}
1
+ {"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../net/src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,QAAQ,CAAA;AAEjC,OAAO,EAAC,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAGxD,OAAO,EAAC,MAAM,EAA4B,MAAM,aAAa,CAAA;AAC7D,OAAO,EAAC,YAAY,EAAC,MAAM,WAAW,CAAA;AAEtC,oBAAY,UAAU;IACpB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,gBAAgB,sBAAsB;IACtC,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,SAAS,cAAc;IACvB,EAAE,OAAO;CACV;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,OAAO,CAAA;IACX,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,oBAAY,cAAc;IACxB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;AAEzD,qBAAa,SAAU,SAAQ,YAAY;IAO7B,QAAQ,CAAC,MAAM,EAAE,MAAM;IANnC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,MAAM,aAAkB;IACxB,cAAc,EAAE,YAAY,EAAE,CAAK;gBAEd,MAAM,EAAE,MAAM;IAgDnC,SAAS,CAAC,MAAM,EAAE,UAAU;IAKtB,MAAM,CAAC,IAAI,EAAE,IAAI;IA8BjB,WAAW,CAAC,IAAI,EAAE,IAAI;IAoBtB,SAAS,CAAC,IAAI,EAAE,IAAI;IAU1B,OAAO;CAIR"}
@@ -15,7 +15,7 @@ export var AuthStatus;
15
15
  })(AuthStatus || (AuthStatus = {}));
16
16
  export var AuthStateEvent;
17
17
  (function (AuthStateEvent) {
18
- AuthStateEvent["Status"] = "auth:event:status";
18
+ AuthStateEvent["Status"] = "status";
19
19
  })(AuthStateEvent || (AuthStateEvent = {}));
20
20
  export class AuthState extends EventEmitter {
21
21
  socket;
@@ -75,10 +75,16 @@ export class AuthState extends EventEmitter {
75
75
  if (this.status !== AuthStatus.Requested) {
76
76
  throw new Error(`Attempted to authenticate when auth is already ${this.status}`);
77
77
  }
78
+ const challenge = this.challenge;
78
79
  this.setStatus(AuthStatus.PendingSignature);
79
- const template = makeRelayAuth(this.socket.url, this.challenge);
80
+ const template = makeRelayAuth(this.socket.url, challenge);
80
81
  const event = await tryCatch(() => sign(template));
81
82
  if (event) {
83
+ // If a new challenge arrived while signing, our signature is stale, so
84
+ // abort rather than responding to an obsolete challenge
85
+ if (this.challenge !== challenge) {
86
+ return;
87
+ }
82
88
  this.request = event.id;
83
89
  this.socket.send(["AUTH", event]);
84
90
  }
@@ -90,14 +96,14 @@ export class AuthState extends EventEmitter {
90
96
  this.socket.attemptToOpen();
91
97
  if (![AuthStatus.Forbidden, AuthStatus.Ok].includes(this.status)) {
92
98
  await poll({
93
- signal: AbortSignal.timeout(800),
99
+ signal: AbortSignal.timeout(1000),
94
100
  condition: () => this.status === AuthStatus.Requested,
95
101
  });
96
102
  if (this.status === AuthStatus.Requested) {
97
103
  await this.doAuth(sign);
98
104
  }
99
105
  await poll({
100
- signal: AbortSignal.timeout(800),
106
+ signal: AbortSignal.timeout(3000),
101
107
  condition: () => this.status !== AuthStatus.PendingResponse,
102
108
  });
103
109
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../net/src/auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../net/src/auth.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,10 @@
1
- import { TrustedEvent } from "@welshman/util";
2
1
  import { AbstractAdapter } from "./adapter.js";
3
2
  import { Repository } from "./repository.js";
4
3
  import { Pool } from "./pool.js";
4
+ export type AdapterFactory = (url: string, context: NetContext) => AbstractAdapter;
5
5
  export type NetContext = {
6
- pool: Pool;
7
- repository: Repository;
8
- isEventValid: (event: TrustedEvent, url: string) => boolean;
9
- isEventDeleted: (event: TrustedEvent, url: string) => boolean;
10
- getAdapter?: (url: string, context: NetContext) => AbstractAdapter;
6
+ pool?: Pool;
7
+ repository?: Repository;
8
+ getAdapter?: AdapterFactory;
11
9
  };
12
- export declare const netContext: NetContext;
13
10
  //# sourceMappingURL=context.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../net/src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAC,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAE9B,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,IAAI,CAAA;IACV,UAAU,EAAE,UAAU,CAAA;IACtB,YAAY,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;IAC3D,cAAc,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAA;IAC7D,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,eAAe,CAAA;CACnE,CAAA;AAED,eAAO,MAAM,UAAU,EAAE,UAKxB,CAAA"}
1
+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../net/src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAE9B,MAAM,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,eAAe,CAAA;AAElF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,UAAU,CAAC,EAAE,cAAc,CAAA;CAC5B,CAAA"}
@@ -1,10 +1,2 @@
1
- import { verifyEvent } from "@welshman/util";
2
- import { Repository } from "./repository.js";
3
- import { Pool } from "./pool.js";
4
- export const netContext = {
5
- pool: Pool.get(),
6
- repository: Repository.get(),
7
- isEventValid: (event, url) => verifyEvent(event),
8
- isEventDeleted: (event, url) => netContext.repository.isDeleted(event),
9
- };
1
+ export {};
10
2
  //# sourceMappingURL=context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../net/src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAe,MAAM,gBAAgB,CAAA;AAExD,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAA;AAU9B,MAAM,CAAC,MAAM,UAAU,GAAe;IACpC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;IAChB,UAAU,EAAE,UAAU,CAAC,GAAG,EAAE;IAC5B,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC;IAChD,cAAc,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC;CACvE,CAAA"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../net/src/context.ts"],"names":[],"mappings":""}
@@ -29,6 +29,7 @@ export declare class Difference extends EventEmitter {
29
29
  _unsubscriber: () => void;
30
30
  _adapter: AbstractAdapter;
31
31
  _closed: boolean;
32
+ _reconcileQueue: Promise<void>;
32
33
  constructor(options: DifferenceOptions);
33
34
  close(): void;
34
35
  }
@@ -1 +1 @@
1
- {"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../../net/src/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAQhE,OAAO,EAAa,cAAc,EAAE,eAAe,EAAe,MAAM,cAAc,CAAA;AAKtF,oBAAY,eAAe;IACzB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE;QAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAC,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC3F,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7D,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,qBAAa,UAAW,SAAQ,YAAY;IAS9B,QAAQ,CAAC,OAAO,EAAE,iBAAiB;IAR/C,IAAI,cAAoB;IACxB,IAAI,cAAoB;IAExB,GAAG,SAAkC;IACrC,aAAa,EAAE,MAAM,IAAI,CAAA;IACzB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,UAAQ;gBAEM,OAAO,EAAE,iBAAiB;IAgE/C,KAAK;CAUN;AAID,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACjB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,IAAI,GAAU,iCAA+B,WAAW;;;;IA4CpE,CAAA;AAID,MAAM,MAAM,WAAW,GAAG,WAAW,CAAA;AAErC,eAAO,MAAM,IAAI,GAAU,yBAAuB,WAAW,4BA+C5D,CAAA;AAID,MAAM,MAAM,WAAW,GAAG,WAAW,CAAA;AAErC,eAAO,MAAM,IAAI,GAAU,iCAA+B,WAAW,kBAkBpE,CAAA"}
1
+ {"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../../net/src/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAA;AAEnC,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,gBAAgB,CAAA;AAQhE,OAAO,EAAa,cAAc,EAAE,eAAe,EAAe,MAAM,cAAc,CAAA;AAKtF,oBAAY,eAAe;IACzB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE;QAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAC,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC3F,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7D,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,qBAAa,UAAW,SAAQ,YAAY;IAU9B,QAAQ,CAAC,OAAO,EAAE,iBAAiB;IAT/C,IAAI,cAAoB;IACxB,IAAI,cAAoB;IAExB,GAAG,SAAkC;IACrC,aAAa,EAAE,MAAM,IAAI,CAAA;IACzB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,UAAQ;IACf,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,CAAoB;gBAE7B,OAAO,EAAE,iBAAiB;IAoE/C,KAAK;CAUN;AAID,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACjB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,IAAI,GAAU,iCAA+B,WAAW;;;;IA4CpE,CAAA;AAID,MAAM,MAAM,WAAW,GAAG,WAAW,CAAA;AAErC,eAAO,MAAM,IAAI,GAAU,yBAAuB,WAAW,4BA+C5D,CAAA;AAID,MAAM,MAAM,WAAW,GAAG,WAAW,CAAA;AAErC,eAAO,MAAM,IAAI,GAAU,iCAA+B,WAAW,kBAkBpE,CAAA"}
@@ -19,6 +19,7 @@ export class Difference extends EventEmitter {
19
19
  _unsubscriber;
20
20
  _adapter;
21
21
  _closed = false;
22
+ _reconcileQueue = Promise.resolve();
22
23
  constructor(options) {
23
24
  super();
24
25
  this.options = options;
@@ -38,20 +39,24 @@ export class Difference extends EventEmitter {
38
39
  if (isRelayNegMsg(message)) {
39
40
  const [_, negid, msg] = message;
40
41
  if (negid === this._id) {
41
- const [newMsg, have, need] = await neg.reconcile(msg);
42
- for (const id of have) {
43
- this.have.add(id);
44
- }
45
- for (const id of need) {
46
- this.need.add(id);
47
- }
48
- this.emit(DifferenceEvent.Message, { have, need }, url);
49
- if (newMsg) {
50
- this._adapter.send([RelayMessageType.NegMsg, this._id, newMsg]);
51
- }
52
- else {
53
- this.close();
54
- }
42
+ // Serialize reconcile calls through a promise queue so that concurrent
43
+ // messages don't corrupt negentropy's internal timestamp state.
44
+ await (this._reconcileQueue = this._reconcileQueue.then(async () => {
45
+ const [newMsg, have, need] = await neg.reconcile(msg);
46
+ for (const id of have) {
47
+ this.have.add(id);
48
+ }
49
+ for (const id of need) {
50
+ this.need.add(id);
51
+ }
52
+ this.emit(DifferenceEvent.Message, { have, need }, url);
53
+ if (newMsg) {
54
+ this._adapter.send([RelayMessageType.NegMsg, this._id, newMsg]);
55
+ }
56
+ else {
57
+ this.close();
58
+ }
59
+ }));
55
60
  }
56
61
  }
57
62
  if (isRelayNegErr(message)) {
@@ -1 +1 @@
1
- {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../net/src/diff.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../net/src/diff.ts"],"names":[],"mappings":"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"}
@@ -124,7 +124,7 @@ export const socketPolicyCloseInactive = (socket) => {
124
124
  let lastActivity = now();
125
125
  const unsubscribers = [
126
126
  on(socket, SocketEvent.Status, (newStatus) => {
127
- const isClosed = [SocketStatus.Closed, SocketStatus.Error].includes(socket.status);
127
+ const isClosed = [SocketStatus.Closed, SocketStatus.Error].includes(newStatus);
128
128
  // Keep track of the most recent open
129
129
  if (newStatus === SocketStatus.Open) {
130
130
  lastOpen = now();
@@ -1 +1 @@
1
- {"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../../net/src/policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,eAAe,CAAA;AAChF,OAAO,EAAC,UAAU,EAAoC,MAAM,gBAAgB,CAAA;AAC5E,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,aAAa,EACb,WAAW,EACX,eAAe,EACf,gBAAgB,EAEhB,SAAS,EACT,WAAW,EACX,aAAa,EACb,aAAa,GACd,MAAM,cAAc,CAAA;AACrB,OAAO,EAAS,YAAY,EAAE,WAAW,EAAe,MAAM,aAAa,CAAA;AAC3E,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,WAAW,CAAA;AAEpD;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAE,EAAE;IACjD,IAAI,YAAY,GAAG,CAAC,CAAA;IAEpB,MAAM,aAAa,GAAG;QACpB,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,OAAsB,EAAE,EAAE;YACtD,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC3B,CAAC,CAAC;QACF,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,OAAsB,EAAE,EAAE;YACzD,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC3B,CAAC,CAAC;KACH,CAAA;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAChC,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,IAAI,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;YAC9E,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;QAC9B,CAAC;IACH,CAAC,EAAE,MAAM,CAAC,CAAA;IAEV,OAAO,GAAG,EAAE;QACV,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC3B,aAAa,CAAC,QAAQ,CAAC,CAAA;IACzB,CAAC,CAAA;AACH,CAAC,CAAA;AAED;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAE,EAAE;IACvD,MAAM,EAAC,IAAI,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAC,GAAG,UAAU,CAAA;IACzD,MAAM,gBAAgB,GAAG,CAAC,EAAE,EAAE,eAAe,EAAE,SAAS,CAAC,CAAA;IAEzD,IAAI,MAAM,GAAoB,EAAE,CAAA;IAEhC,MAAM,aAAa,GAAG;QACpB,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,OAAsB,EAAE,EAAE;YACzD,4BAA4B;YAC5B,IAAI,YAAY,CAAC,OAAO,CAAC;gBAAE,OAAM;YAEjC,qCAAqC;YACrC,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU;gBAAE,OAAM;YAEpE,0DAA0D;YAC1D,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;gBAAE,OAAM;YAEzD,8DAA8D;YAC9D,2FAA2F;YAC3F,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC9C,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;YAC9C,CAAC;QACH,CAAC,CAAC;QACF,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,OAAqB,EAAE,EAAE;YAC1D,uFAAuF;YACvF,IACE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC;gBAClD,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,gBAAgB,CAAC,EACxC,CAAC;gBACD,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACnC,CAAC;YAED,oEAAoE;YACpE,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACnC,CAAC;YAED,yFAAyF;YACzF,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBAClF,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACnC,CAAC;QACH,CAAC,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC,MAAkB,EAAE,EAAE;YAC5D,kFAAkF;YAClF,+BAA+B;YAC/B,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;gBAClB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACtB,CAAC;YACH,CAAC;iBAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzD,MAAM,GAAG,EAAE,CAAA;YACb,CAAC;QACH,CAAC,CAAC;KACH,CAAA;IAED,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAAc,EAAE,EAAE;IAC1D,IAAI,SAAS,GAAG,CAAC,CAAA;IAEjB,MAAM,aAAa,GAAG;QACpB,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,SAAuB,EAAE,EAAE;YACzD,sCAAsC;YACtC,IAAI,SAAS,KAAK,YAAY,CAAC,KAAK,EAAE,CAAC;gBACrC,SAAS,GAAG,GAAG,EAAE,CAAA;YACnB,CAAC;QACH,CAAC,CAAC;QACF,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,OAAsB,EAAE,EAAE;YACzD,MAAM,QAAQ,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAElF,6FAA6F;YAC7F,IAAI,QAAQ,IAAI,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnC,MAAM,CAAC,IAAI,EAAE,CAAA;YACf,CAAC;QACH,CAAC,CAAC;KACH,CAAA;IAED,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAAc,EAAE,EAAE;IAC1D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAA;IAEhD,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAA;IACpB,IAAI,YAAY,GAAG,GAAG,EAAE,CAAA;IAExB,MAAM,aAAa,GAAG;QACpB,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,SAAuB,EAAE,EAAE;YACzD,MAAM,QAAQ,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAElF,qCAAqC;YACrC,IAAI,SAAS,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;gBACpC,QAAQ,GAAG,GAAG,EAAE,CAAA;YAClB,CAAC;YAED,sEAAsE;YACtE,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC7B,MAAM,KAAK,GAAG,GAAG,EAAE,CAAA;gBACnB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;gBAErD,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;oBACrB,MAAM,CAAC,aAAa,EAAE,CAAA;oBAEtB,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;wBACvC,0FAA0F;wBAC1F,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;4BACtC,MAAM,OAAO,GAAa,EAAE,CAAA;4BAE5B,KAAK,IAAI,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAa,EAAE,CAAC;gCAChD,IAAI,MAAM,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;oCACvB,MAAM,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;gCAClC,CAAC;gCAED,OAAO,CAAC,IAAI,CAAC,EAAC,GAAG,MAAM,EAAE,KAAK,EAAC,CAAC,CAAA;4BAClC,CAAC;4BAED,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;wBACnD,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBACtB,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC,CAAC;QACF,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,OAAsB,EAAE,EAAE;YACtD,YAAY,GAAG,GAAG,EAAE,CAAA;YAEpB,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;YACrC,CAAC;YAED,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrD,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;YAClC,CAAC;YAED,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxD,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC,CAAC;QACF,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,OAAqB,EAAE,EAAE;YACxD,YAAY,GAAG,GAAG,EAAE,CAAA;YAEpB,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjD,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC,CAAC;KACH,CAAA;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;QAChC,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,CAAC,IAAI,IAAI,YAAY,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACxF,MAAM,CAAC,KAAK,EAAE,CAAA;QAChB,CAAC;IACH,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,OAAO,GAAG,EAAE;QACV,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC3B,aAAa,CAAC,QAAQ,CAAC,CAAA;IACzB,CAAC,CAAA;AACH,CAAC,CAAA;AAOD;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAgC,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,CAAA;IAErD,MAAM,aAAa,GAAG;QACpB,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC,MAAkB,EAAE,EAAE;YAC5D,IAAI,MAAM,KAAK,UAAU,CAAC,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAClC,CAAC;QACH,CAAC,CAAC;KACH,CAAA;IAED,OAAO,GAAG,EAAE;QACV,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7B,CAAC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAmB;IACnD,gBAAgB;IAChB,sBAAsB;IACtB,yBAAyB;IACzB,yBAAyB;CAC1B,CAAA"}
1
+ {"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../../net/src/policy.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,10 @@
1
1
  import { Socket } from "./socket.js";
2
2
  export type PoolSubscription = (socket: Socket) => void;
3
- export type PoolOptions = {
4
- makeSocket?: (url: string) => Socket;
5
- };
6
- export declare let poolSingleton: Pool;
7
3
  export declare class Pool {
8
- readonly options: PoolOptions;
4
+ socketPolicies: import("./socket.js").SocketPolicy[];
9
5
  _data: Map<string, Socket>;
10
6
  _subs: PoolSubscription[];
11
- static get(): Pool;
12
- constructor(options?: PoolOptions);
13
7
  has(url: string): boolean;
14
- makeSocket(url: string): Socket;
15
8
  get(_url: string): Socket;
16
9
  subscribe(cb: PoolSubscription): () => void;
17
10
  remove(url: string): void;
@@ -1 +1 @@
1
- {"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../net/src/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAGlC,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;AAEvD,MAAM,MAAM,WAAW,GAAG;IACxB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;CACrC,CAAA;AAED,eAAO,IAAI,aAAa,EAAE,IAAI,CAAA;AAE9B,qBAAa,IAAI;IAYH,QAAQ,CAAC,OAAO,EAAE,WAAW;IAXzC,KAAK,sBAA4B;IACjC,KAAK,EAAE,gBAAgB,EAAE,CAAK;IAE9B,MAAM,CAAC,GAAG;gBAQW,OAAO,GAAE,WAAgB;IAE9C,GAAG,CAAC,GAAG,EAAE,MAAM;IAIf,UAAU,CAAC,GAAG,EAAE,MAAM;IAQtB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAmBzB,SAAS,CAAC,EAAE,EAAE,gBAAgB;IAQ9B,MAAM,CAAC,GAAG,EAAE,MAAM;IAUlB,KAAK;CAKN"}
1
+ {"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../../net/src/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAGlC,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;AAEvD,qBAAa,IAAI;IACf,cAAc,uCAA6B;IAC3C,KAAK,sBAA4B;IACjC,KAAK,EAAE,gBAAgB,EAAE,CAAK;IAE9B,GAAG,CAAC,GAAG,EAAE,MAAM;IAIf,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAmBzB,SAAS,CAAC,EAAE,EAAE,gBAAgB;IAQ9B,MAAM,CAAC,GAAG,EAAE,MAAM;IAUlB,KAAK;CAKN"}
@@ -2,36 +2,20 @@ import { remove } from "@welshman/lib";
2
2
  import { normalizeRelayUrl } from "@welshman/util";
3
3
  import { Socket } from "./socket.js";
4
4
  import { defaultSocketPolicies } from "./policy.js";
5
- export let poolSingleton;
6
5
  export class Pool {
7
- options;
6
+ socketPolicies = [...defaultSocketPolicies];
8
7
  _data = new Map();
9
8
  _subs = [];
10
- static get() {
11
- if (!poolSingleton) {
12
- poolSingleton = new Pool();
13
- }
14
- return poolSingleton;
15
- }
16
- constructor(options = {}) {
17
- this.options = options;
18
- }
19
9
  has(url) {
20
10
  return this._data.has(normalizeRelayUrl(url));
21
11
  }
22
- makeSocket(url) {
23
- if (this.options.makeSocket) {
24
- return this.options.makeSocket(url);
25
- }
26
- return new Socket(url, defaultSocketPolicies);
27
- }
28
12
  get(_url) {
29
13
  const url = normalizeRelayUrl(_url);
30
14
  const socket = this._data.get(url);
31
15
  if (socket) {
32
16
  return socket;
33
17
  }
34
- const newSocket = this.makeSocket(url);
18
+ const newSocket = new Socket(url, this.socketPolicies);
35
19
  this._data.set(url, newSocket);
36
20
  for (const cb of this._subs) {
37
21
  cb(newSocket);
@@ -45,10 +29,10 @@ export class Pool {
45
29
  };
46
30
  }
47
31
  remove(url) {
48
- const socket = this._data.get(url);
32
+ const socket = this._data.get(normalizeRelayUrl(url));
49
33
  if (socket) {
50
34
  socket.cleanup();
51
- this._data.delete(url);
35
+ this._data.delete(normalizeRelayUrl(url));
52
36
  }
53
37
  }
54
38
  clear() {
@@ -1 +1 @@
1
- {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../net/src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAA;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAA;AAQjD,MAAM,CAAC,IAAI,aAAmB,CAAA;AAE9B,MAAM,OAAO,IAAI;IAYM;IAXrB,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAA;IACjC,KAAK,GAAuB,EAAE,CAAA;IAE9B,MAAM,CAAC,GAAG;QACR,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,IAAI,IAAI,EAAE,CAAA;QAC5B,CAAC;QAED,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,YAAqB,UAAuB,EAAE;QAAzB,YAAO,GAAP,OAAO,CAAkB;IAAG,CAAC;IAElD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,UAAU,CAAC,GAAW;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACrC,CAAC;QAED,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAA;IAC/C,CAAC;IAED,GAAG,CAAC,IAAY;QACd,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAElC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAA;QACf,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QAEtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAE9B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,CAAA;QACf,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,SAAS,CAAC,EAAoB;QAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEnB,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACrC,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAElC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,OAAO,EAAE,CAAA;YAEhB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAED,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../../net/src/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAA;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAA;AAIjD,MAAM,OAAO,IAAI;IACf,cAAc,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAA;IAC3C,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAA;IACjC,KAAK,GAAuB,EAAE,CAAA;IAE9B,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,GAAG,CAAC,IAAY;QACd,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAA;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAElC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAA;QACf,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;QAEtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QAE9B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,CAAA;QACf,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,SAAS,CAAC,EAAoB;QAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAEnB,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QACrC,CAAC,CAAA;IACH,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;QAErD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,OAAO,EAAE,CAAA;YAEhB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;QAC3C,CAAC;IACH,CAAC;IAED,KAAK;QACH,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../net/src/publish.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAe,cAAc,EAAa,MAAM,cAAc,CAAA;AAErE,oBAAY,aAAa;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,iBAAiB,2BA+DjD,CAAA;AAEJ,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAEjE,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,KAAG,OAAO,CAAC,qBAAqB,CAoCpF,CAAA"}
1
+ {"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../net/src/publish.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAe,cAAc,EAAa,MAAM,cAAc,CAAA;AAErE,oBAAY,aAAa;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,aAAa,CAAA;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,iBAAiB,2BAuEjD,CAAA;AAEJ,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAEjE,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,WAAW,CAAA;IAClB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;IAC3C,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC7C,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,KAAG,OAAO,CAAC,qBAAqB,CAoCpF,CAAA"}
@@ -1,4 +1,4 @@
1
- import { fromPairs } from "@welshman/lib";
1
+ import { fromPairs, once } from "@welshman/lib";
2
2
  import { ClientMessageType, isRelayOk } from "./message.js";
3
3
  import { AdapterEvent, getAdapter } from "./adapter.js";
4
4
  export var PublishStatus;
@@ -18,11 +18,23 @@ export const publishOne = (options) => new Promise(resolve => {
18
18
  detail: "",
19
19
  };
20
20
  options.onPending?.(result);
21
- const cleanup = () => {
21
+ let timeoutId = null;
22
+ const abort = () => {
23
+ if (result.status === PublishStatus.Pending) {
24
+ result.status = PublishStatus.Aborted;
25
+ result.detail = "aborted";
26
+ options.onAborted?.(result);
27
+ }
28
+ cleanup();
29
+ };
30
+ const cleanup = once(() => {
31
+ options.signal?.removeEventListener("abort", abort);
22
32
  options.onComplete?.(result);
33
+ if (timeoutId)
34
+ clearTimeout(timeoutId);
23
35
  adapter.cleanup();
24
36
  resolve(result);
25
- };
37
+ });
26
38
  adapter.on(AdapterEvent.Receive, (message, url) => {
27
39
  if (isRelayOk(message)) {
28
40
  const [_, id, ok, detail] = message;
@@ -41,15 +53,10 @@ export const publishOne = (options) => new Promise(resolve => {
41
53
  cleanup();
42
54
  }
43
55
  });
44
- options.signal?.addEventListener("abort", () => {
45
- if (result.status === PublishStatus.Pending) {
46
- result.status = PublishStatus.Aborted;
47
- result.detail = "aborted";
48
- options.onAborted?.(result);
49
- }
50
- cleanup();
51
- });
52
- setTimeout(() => {
56
+ if (options.signal) {
57
+ options.signal.addEventListener("abort", abort);
58
+ }
59
+ timeoutId = setTimeout(() => {
53
60
  if (result.status === PublishStatus.Pending) {
54
61
  result.status = PublishStatus.Timeout;
55
62
  result.detail = "timed out";
@@ -1 +1 @@
1
- {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../net/src/publish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../net/src/publish.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  import { Emitter } from "@welshman/lib";
2
2
  import { Filter, TrustedEvent } from "@welshman/util";
3
3
  export declare const LOCAL_RELAY_URL = "local://welshman.relay/";
4
- export declare let repositorySingleton: Repository;
5
4
  export type RepositoryUpdate = {
6
5
  added: TrustedEvent[];
7
6
  removed: Set<string>;
@@ -19,9 +18,9 @@ export declare class Repository extends Emitter {
19
18
  pubkey: string;
20
19
  }[]>;
21
20
  expired: Map<string, number>;
22
- static get(): Repository;
23
21
  constructor();
24
22
  dump: () => TrustedEvent[];
23
+ clear: () => void;
25
24
  load: (events: TrustedEvent[]) => void;
26
25
  getEvent: (idOrAddress: string) => TrustedEvent | undefined;
27
26
  hasEvent: (event: TrustedEvent) => boolean | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../../net/src/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAWR,MAAM,eAAe,CAAA;AACtB,OAAO,EAML,MAAM,EACN,YAAY,EACb,MAAM,gBAAgB,CAAA;AAEvB,eAAO,MAAM,eAAe,4BAA4B,CAAA;AAIxD,eAAO,IAAI,mBAAmB,EAAE,UAAU,CAAA;AAE1C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,YAAY,EAAE,CAAA;IACrB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,SAAS,gBAAgB,EAAE,KAAG,gBAgBpE,CAAA;AAED,qBAAa,UAAW,SAAQ,OAAO;IACrC,UAAU,4BAAkC;IAC5C,eAAe,4BAAkC;IACjD,WAAW,8BAAoC;IAC/C,WAAW,8BAAoC;IAC/C,cAAc,8BAAoC;IAClD,YAAY,8BAAoC;IAChD,OAAO;oBAAgC,MAAM;gBAAU,MAAM;SAAM;IACnE,OAAO,sBAA4B;IAEnC,MAAM,CAAC,GAAG;;IAgBV,IAAI,uBAEH;IAED,IAAI,GAAI,QAAQ,YAAY,EAAE,UA+C7B;IAID,QAAQ,GAAI,aAAa,MAAM,8BAI9B;IAED,QAAQ,GAAI,OAAO,YAAY,yBAI9B;IAED,WAAW,GAAI,aAAa,MAAM,UAmBjC;IAED,KAAK,GACH,SAAS,MAAM,EAAE,EACjB;;;;KAAwE,oBAoCzE;IAED,OAAO,GAAI,OAAO,YAAY,EAAE;;KAA0B,KAAG,OAAO,CA4EnE;IAED,UAAU,GAAI,KAAK,MAAM,EAAE,OAAO,YAAY,aAQ7C;IAED,kBAAkB,GAAI,OAAO,YAAY,aAA8C;IAEvF,aAAa,GAAI,OAAO,YAAY,aAAqC;IAEzE,SAAS,GAAI,OAAO,YAAY,aAC+C;IAE/E,SAAS,GAAI,OAAO,YAAY,aAI/B;IAID,WAAW,GAAI,YAAY,OAAO,EAAE,QAAQ,YAAY,EAAE,oBACA;IAE1D,YAAY,GAAI,CAAC,EACf,GAAG,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EACzB,GAAG,CAAC,EACJ,MAAM,YAAY,EAClB,SAAS,YAAY,UAatB;IAED,UAAU,GAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,oBAYlC;IAED,eAAe,GAAI,QAAQ,MAAM;;;kBAOhC;IAED,mBAAmB,GAAI,QAAQ,MAAM;;;kBASpC;IAED,gBAAgB,GAAI,QAAQ,MAAM;;;kBAkBjC;IAED,iBAAiB,GAAI,QAAQ,MAAM;;;kBASlC;IAED,gBAAgB,GAAI,QAAQ,MAAM;;;kBAUjC;IAED,eAAe,GAAI,QAAQ,MAAM;;;kBAkBhC;CACF"}
1
+ {"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../../net/src/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAWR,MAAM,eAAe,CAAA;AACtB,OAAO,EAML,MAAM,EACN,YAAY,EACb,MAAM,gBAAgB,CAAA;AAEvB,eAAO,MAAM,eAAe,4BAA4B,CAAA;AAIxD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,YAAY,EAAE,CAAA;IACrB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,SAAS,gBAAgB,EAAE,KAAG,gBAgBpE,CAAA;AAED,qBAAa,UAAW,SAAQ,OAAO;IACrC,UAAU,4BAAkC;IAC5C,eAAe,4BAAkC;IACjD,WAAW,8BAAoC;IAC/C,WAAW,8BAAoC;IAC/C,cAAc,8BAAoC;IAClD,YAAY,8BAAoC;IAChD,OAAO;oBAAgC,MAAM;gBAAU,MAAM;SAAM;IACnE,OAAO,sBAA4B;;IAUnC,IAAI,uBAEH;IAED,KAAK,aAUJ;IAED,IAAI,GAAI,QAAQ,YAAY,EAAE,UAwC7B;IAID,QAAQ,GAAI,aAAa,MAAM,8BAI9B;IAED,QAAQ,GAAI,OAAO,YAAY,yBAI9B;IAED,WAAW,GAAI,aAAa,MAAM,UAmBjC;IAED,KAAK,GACH,SAAS,MAAM,EAAE,EACjB;;;;KAAwE,oBAoCzE;IAED,OAAO,GAAI,OAAO,YAAY,EAAE;;KAA0B,KAAG,OAAO,CA4EnE;IAED,UAAU,GAAI,KAAK,MAAM,EAAE,OAAO,YAAY,aAQ7C;IAED,kBAAkB,GAAI,OAAO,YAAY,aAA8C;IAEvF,aAAa,GAAI,OAAO,YAAY,aAAqC;IAEzE,SAAS,GAAI,OAAO,YAAY,aAC+C;IAE/E,SAAS,GAAI,OAAO,YAAY,aAI/B;IAID,WAAW,GAAI,YAAY,OAAO,EAAE,QAAQ,YAAY,EAAE,oBACA;IAE1D,YAAY,GAAI,CAAC,EACf,GAAG,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EACzB,GAAG,CAAC,EACJ,MAAM,YAAY,EAClB,SAAS,YAAY,UAiBtB;IAED,UAAU,GAAI,KAAK,QAAQ,CAAC,MAAM,CAAC,oBAYlC;IAED,eAAe,GAAI,QAAQ,MAAM;;;kBAOhC;IAED,mBAAmB,GAAI,QAAQ,MAAM;;;kBASpC;IAED,gBAAgB,GAAI,QAAQ,MAAM;;;kBAkBjC;IAED,iBAAiB,GAAI,QAAQ,MAAM;;;kBASlC;IAED,gBAAgB,GAAI,QAAQ,MAAM;;;kBAUjC;IAED,eAAe,GAAI,QAAQ,MAAM;;;kBAkBhC;CACF"}
@@ -2,7 +2,6 @@ import { DAY, Emitter, flatten, pick, pushToMapKey, pluck, sortBy, inc, uniq, om
2
2
  import { DELETE, EPOCH, matchFilter, isReplaceable, getAddress, } from "@welshman/util";
3
3
  export const LOCAL_RELAY_URL = "local://welshman.relay/";
4
4
  const getDay = (ts) => Math.floor(ts / DAY);
5
- export let repositorySingleton;
6
5
  export const mergeRepositoryUpdates = (updates) => {
7
6
  const added = [];
8
7
  const removed = new Set();
@@ -26,12 +25,6 @@ export class Repository extends Emitter {
26
25
  eventsByKind = new Map();
27
26
  deletes = new Map();
28
27
  expired = new Map();
29
- static get() {
30
- if (!repositorySingleton) {
31
- repositorySingleton = new Repository();
32
- }
33
- return repositorySingleton;
34
- }
35
28
  constructor() {
36
29
  super();
37
30
  this.setMaxListeners(1000);
@@ -40,8 +33,7 @@ export class Repository extends Emitter {
40
33
  dump = () => {
41
34
  return Array.from(this.eventsById.values());
42
35
  };
43
- load = (events) => {
44
- const stale = new Set(this.eventsById.keys());
36
+ clear = () => {
45
37
  this.eventsById.clear();
46
38
  this.eventsByAddress.clear();
47
39
  this.eventsByTag.clear();
@@ -50,6 +42,11 @@ export class Repository extends Emitter {
50
42
  this.eventsByKind.clear();
51
43
  this.deletes.clear();
52
44
  this.expired.clear();
45
+ this.emit("clear");
46
+ };
47
+ load = (events) => {
48
+ const stale = new Set(this.eventsById.keys());
49
+ this.clear();
53
50
  const added = [];
54
51
  for (const event of events) {
55
52
  if (this.publish(event, { shouldNotify: false })) {
@@ -219,7 +216,12 @@ export class Repository extends Emitter {
219
216
  if (add) {
220
217
  a.push(add);
221
218
  }
222
- m.set(k, a);
219
+ if (a.length > 0) {
220
+ m.set(k, a);
221
+ }
222
+ else {
223
+ m.delete(k);
224
+ }
223
225
  };
224
226
  _getEvents = (ids) => {
225
227
  const events = [];