@minca/core 0.3.1 → 0.4.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 (212) hide show
  1. package/README.md +2 -2
  2. package/dist/{session → hosting}/hosting.d.ts +1 -1
  3. package/dist/{session → hosting}/hosting.d.ts.map +1 -1
  4. package/dist/{session → hosting}/hosting.js.map +1 -1
  5. package/dist/index.d.ts +20 -28
  6. package/dist/index.d.ts.map +1 -1
  7. package/dist/index.js +16 -19
  8. package/dist/index.js.map +1 -1
  9. package/dist/network/mesh.d.ts.map +1 -1
  10. package/dist/network/mesh.js +13 -3
  11. package/dist/network/mesh.js.map +1 -1
  12. package/dist/network/network-manager.d.ts +5 -0
  13. package/dist/network/network-manager.d.ts.map +1 -1
  14. package/dist/network/network-manager.js +3 -0
  15. package/dist/network/network-manager.js.map +1 -1
  16. package/dist/network/peer-auth.d.ts +17 -5
  17. package/dist/network/peer-auth.d.ts.map +1 -1
  18. package/dist/network/peer-auth.js +19 -9
  19. package/dist/network/peer-auth.js.map +1 -1
  20. package/dist/network/rtc-transport.d.ts.map +1 -1
  21. package/dist/network/rtc-transport.js +1 -0
  22. package/dist/network/rtc-transport.js.map +1 -1
  23. package/dist/network/transport.d.ts +12 -0
  24. package/dist/network/transport.d.ts.map +1 -1
  25. package/dist/network/ws-transport.d.ts +1 -1
  26. package/dist/network/ws-transport.d.ts.map +1 -1
  27. package/dist/network/ws-transport.js +14 -4
  28. package/dist/network/ws-transport.js.map +1 -1
  29. package/dist/node/index.d.ts +1 -5
  30. package/dist/node/index.d.ts.map +1 -1
  31. package/dist/node/index.js +0 -3
  32. package/dist/node/index.js.map +1 -1
  33. package/dist/node/node-hosting.js +1 -1
  34. package/dist/node/node-records.js +1 -1
  35. package/dist/node/node-records.js.map +1 -1
  36. package/dist/node/node.d.ts.map +1 -1
  37. package/dist/node/node.js +18 -0
  38. package/dist/node/node.js.map +1 -1
  39. package/dist/node/space-mirrors.d.ts +1 -1
  40. package/dist/node/space-mirrors.d.ts.map +1 -1
  41. package/dist/node/space-mirrors.js +17 -5
  42. package/dist/node/space-mirrors.js.map +1 -1
  43. package/dist/node/space-peers.d.ts +2 -0
  44. package/dist/node/space-peers.d.ts.map +1 -1
  45. package/dist/node/space-peers.js +41 -8
  46. package/dist/node/space-peers.js.map +1 -1
  47. package/dist/node/space-runtime.d.ts +4 -2
  48. package/dist/node/space-runtime.d.ts.map +1 -1
  49. package/dist/node/space-runtime.js +3 -2
  50. package/dist/node/space-runtime.js.map +1 -1
  51. package/dist/node/space-standing.d.ts.map +1 -1
  52. package/dist/node/space-standing.js +12 -38
  53. package/dist/node/space-standing.js.map +1 -1
  54. package/dist/node/space-warrants.js +1 -1
  55. package/dist/node/space-warrants.js.map +1 -1
  56. package/dist/node/space-writing.d.ts.map +1 -1
  57. package/dist/node/space-writing.js +12 -32
  58. package/dist/node/space-writing.js.map +1 -1
  59. package/dist/node/stores.d.ts +2 -58
  60. package/dist/node/stores.d.ts.map +1 -1
  61. package/dist/node/stores.js +1 -74
  62. package/dist/node/stores.js.map +1 -1
  63. package/dist/node/types.d.ts +3 -3
  64. package/dist/node/types.d.ts.map +1 -1
  65. package/dist/node/writer-keys.d.ts +15 -14
  66. package/dist/node/writer-keys.d.ts.map +1 -1
  67. package/dist/node/writer-keys.js +3 -113
  68. package/dist/node/writer-keys.js.map +1 -1
  69. package/dist/records/key.d.ts +16 -19
  70. package/dist/records/key.d.ts.map +1 -1
  71. package/dist/records/key.js +53 -45
  72. package/dist/records/key.js.map +1 -1
  73. package/dist/records/rules.d.ts +1 -1
  74. package/dist/records/rules.d.ts.map +1 -1
  75. package/dist/records/rules.js +6 -4
  76. package/dist/records/rules.js.map +1 -1
  77. package/dist/storage/body-cache.d.ts +6 -3
  78. package/dist/storage/body-cache.d.ts.map +1 -1
  79. package/dist/storage/body-cache.js +37 -14
  80. package/dist/storage/body-cache.js.map +1 -1
  81. package/dist/storage/mirror.d.ts.map +1 -1
  82. package/dist/storage/mirror.js +35 -16
  83. package/dist/storage/mirror.js.map +1 -1
  84. package/dist/storage/segment.d.ts +6 -2
  85. package/dist/storage/segment.d.ts.map +1 -1
  86. package/dist/storage/segment.js +8 -4
  87. package/dist/storage/segment.js.map +1 -1
  88. package/dist/storage/shared-store.d.ts +32 -0
  89. package/dist/storage/shared-store.d.ts.map +1 -0
  90. package/dist/storage/{folder-reconcile.js → shared-store.js} +15 -15
  91. package/dist/storage/shared-store.js.map +1 -0
  92. package/dist/storage/storage-provider.d.ts +0 -9
  93. package/dist/storage/storage-provider.d.ts.map +1 -1
  94. package/dist/storage/storage-provider.js +8 -8
  95. package/dist/storage/storage-provider.js.map +1 -1
  96. package/dist/sync/sync-engine.d.ts +7 -0
  97. package/dist/sync/sync-engine.d.ts.map +1 -1
  98. package/dist/sync/sync-engine.js +179 -47
  99. package/dist/sync/sync-engine.js.map +1 -1
  100. package/dist/sync/sync-messages.d.ts +1 -1
  101. package/dist/sync/sync-messages.js +1 -1
  102. package/dist/types.d.ts +19 -0
  103. package/dist/types.d.ts.map +1 -1
  104. package/dist/types.js +4 -0
  105. package/dist/types.js.map +1 -1
  106. package/dist/utils/index.d.ts +5 -5
  107. package/dist/utils/index.d.ts.map +1 -1
  108. package/dist/utils/index.js +5 -5
  109. package/dist/utils/index.js.map +1 -1
  110. package/docs/README.md +3 -2
  111. package/docs/building-an-app.md +2 -2
  112. package/docs/node.md +24 -20
  113. package/docs/query-format.md +6 -5
  114. package/docs/records-and-queries.md +12 -13
  115. package/docs/storage.md +41 -15
  116. package/package.json +10 -19
  117. package/dist/identity/account-store.d.ts +0 -83
  118. package/dist/identity/account-store.d.ts.map +0 -1
  119. package/dist/identity/account-store.js +0 -234
  120. package/dist/identity/account-store.js.map +0 -1
  121. package/dist/identity/device-key.d.ts +0 -26
  122. package/dist/identity/device-key.d.ts.map +0 -1
  123. package/dist/identity/device-key.js +0 -48
  124. package/dist/identity/device-key.js.map +0 -1
  125. package/dist/identity/idb.d.ts +0 -19
  126. package/dist/identity/idb.d.ts.map +0 -1
  127. package/dist/identity/idb.js +0 -56
  128. package/dist/identity/idb.js.map +0 -1
  129. package/dist/node/worker.d.ts +0 -91
  130. package/dist/node/worker.d.ts.map +0 -1
  131. package/dist/node/worker.js +0 -344
  132. package/dist/node/worker.js.map +0 -1
  133. package/dist/node-worker.d.ts +0 -2
  134. package/dist/node-worker.d.ts.map +0 -1
  135. package/dist/node-worker.js +0 -16
  136. package/dist/node-worker.js.map +0 -1
  137. package/dist/session/account-hint.d.ts +0 -13
  138. package/dist/session/account-hint.d.ts.map +0 -1
  139. package/dist/session/account-hint.js +0 -54
  140. package/dist/session/account-hint.js.map +0 -1
  141. package/dist/session/channel-room.d.ts +0 -26
  142. package/dist/session/channel-room.d.ts.map +0 -1
  143. package/dist/session/channel-room.js +0 -56
  144. package/dist/session/channel-room.js.map +0 -1
  145. package/dist/session/connect-code.d.ts +0 -127
  146. package/dist/session/connect-code.d.ts.map +0 -1
  147. package/dist/session/connect-code.js +0 -408
  148. package/dist/session/connect-code.js.map +0 -1
  149. package/dist/session/connect.d.ts +0 -393
  150. package/dist/session/connect.d.ts.map +0 -1
  151. package/dist/session/connect.js +0 -587
  152. package/dist/session/connect.js.map +0 -1
  153. package/dist/session/connection.d.ts +0 -141
  154. package/dist/session/connection.d.ts.map +0 -1
  155. package/dist/session/connection.js +0 -344
  156. package/dist/session/connection.js.map +0 -1
  157. package/dist/session/index.d.ts +0 -24
  158. package/dist/session/index.d.ts.map +0 -1
  159. package/dist/session/index.js +0 -18
  160. package/dist/session/index.js.map +0 -1
  161. package/dist/session/pairing.d.ts +0 -97
  162. package/dist/session/pairing.d.ts.map +0 -1
  163. package/dist/session/pairing.js +0 -251
  164. package/dist/session/pairing.js.map +0 -1
  165. package/dist/session/places.d.ts +0 -71
  166. package/dist/session/places.d.ts.map +0 -1
  167. package/dist/session/places.js +0 -130
  168. package/dist/session/places.js.map +0 -1
  169. package/dist/session/popup.d.ts +0 -13
  170. package/dist/session/popup.d.ts.map +0 -1
  171. package/dist/session/popup.js +0 -23
  172. package/dist/session/popup.js.map +0 -1
  173. package/dist/session/stay-signed-in.d.ts +0 -48
  174. package/dist/session/stay-signed-in.d.ts.map +0 -1
  175. package/dist/session/stay-signed-in.js +0 -141
  176. package/dist/session/stay-signed-in.js.map +0 -1
  177. package/dist/storage/blob/directory.d.ts +0 -14
  178. package/dist/storage/blob/directory.d.ts.map +0 -1
  179. package/dist/storage/blob/directory.js +0 -87
  180. package/dist/storage/blob/directory.js.map +0 -1
  181. package/dist/storage/blob/memory.d.ts +0 -6
  182. package/dist/storage/blob/memory.d.ts.map +0 -1
  183. package/dist/storage/blob/memory.js +0 -20
  184. package/dist/storage/blob/memory.js.map +0 -1
  185. package/dist/storage/blob/s3.d.ts +0 -16
  186. package/dist/storage/blob/s3.d.ts.map +0 -1
  187. package/dist/storage/blob/s3.js +0 -91
  188. package/dist/storage/blob/s3.js.map +0 -1
  189. package/dist/storage/directory-access.d.ts +0 -36
  190. package/dist/storage/directory-access.d.ts.map +0 -1
  191. package/dist/storage/directory-access.js +0 -89
  192. package/dist/storage/directory-access.js.map +0 -1
  193. package/dist/storage/folder-adapter.d.ts +0 -100
  194. package/dist/storage/folder-adapter.d.ts.map +0 -1
  195. package/dist/storage/folder-adapter.js +0 -232
  196. package/dist/storage/folder-adapter.js.map +0 -1
  197. package/dist/storage/folder-reconcile.d.ts +0 -33
  198. package/dist/storage/folder-reconcile.d.ts.map +0 -1
  199. package/dist/storage/folder-reconcile.js.map +0 -1
  200. package/dist/storage/index.d.ts +0 -6
  201. package/dist/storage/index.d.ts.map +0 -1
  202. package/dist/storage/index.js +0 -5
  203. package/dist/storage/index.js.map +0 -1
  204. package/dist/storage/indexeddb-adapter.d.ts +0 -8
  205. package/dist/storage/indexeddb-adapter.d.ts.map +0 -1
  206. package/dist/storage/indexeddb-adapter.js +0 -128
  207. package/dist/storage/indexeddb-adapter.js.map +0 -1
  208. package/dist/storage/sqlite-adapter.d.ts +0 -57
  209. package/dist/storage/sqlite-adapter.d.ts.map +0 -1
  210. package/dist/storage/sqlite-adapter.js +0 -213
  211. package/dist/storage/sqlite-adapter.js.map +0 -1
  212. /package/dist/{session → hosting}/hosting.js +0 -0
@@ -2,30 +2,27 @@
2
2
  export declare const RECORD_KEY_PATTERN: RegExp;
3
3
  /** Whether a key has a line key's form, whoever's line and whichever collection's it is */
4
4
  export declare const hasLineKeyForm: (key: string) => boolean;
5
- /**
6
- * Whether a key has the form of a `onePer` key (spec 02 §7.3), and which:
7
- * `owned` for `<owner>.one:<hex>`, `shared` for `one:<hex>`. Such a key is
8
- * only for a first version in a collection whose `onePer` gives it.
9
- */
10
- export declare function onePerForm(key: string): 'owned' | 'shared' | null;
11
5
  /** Which kind a key is, or null when it is neither (and so no first version outside `sys.*` may use it) */
12
6
  export declare function keyKind(key: string): 'owned' | 'shared' | null;
13
7
  /**
14
- * The owner part of every key an account owns: the first 16 bytes of
15
- * SHA-256 over a label and its root DID, in base32. Root DIDs are not lower
16
- * case, so a key names a hash of one.
8
+ * The owner part of every key an account owns in a collection. Root DIDs are
9
+ * not lower case, so a key names a hash of one; they hold no `|`, so the
10
+ * input reads one way.
17
11
  */
18
- export declare function ownerTag(root: string): Promise<string>;
19
- /** The key `name` has in `root`'s namespace: `<owner>.<name>` */
20
- export declare function ownedKey(root: string, name: string): Promise<string>;
21
- /** A fresh key of `root`'s: 128 random bits as its name. Random rather than time-based, so it says nothing about when. */
22
- export declare function newRecordKey(root: string): Promise<string>;
23
- /** Whether `key` is an owned key of `root`'s */
24
- export declare function ownsKey(key: string, root: string): Promise<boolean>;
12
+ export declare function ownerTag(root: string, collection: string): Promise<string>;
13
+ /** The key `name` has in `root`'s namespace in a collection: `<owner>.<name>` */
14
+ export declare function ownedKey(root: string, collection: string, name: string): Promise<string>;
15
+ /** A shared key of a collection's, for a `onePer` HMAC in hex: `one:<tag>.<hex>` */
16
+ export declare function sharedKey(collection: string, hex: string): Promise<string>;
17
+ /** A fresh key of `root`'s in a collection: 128 random bits as its name. Random rather than time-based, so it says nothing about when. */
18
+ export declare function newRecordKey(root: string, collection: string): Promise<string>;
19
+ /** Whether `key` is an owned key of `root`'s in `collection` */
20
+ export declare function ownsKey(key: string, root: string, collection: string): Promise<boolean>;
21
+ /** Whether `key` is a shared key of `collection`'s */
22
+ export declare function isSharedKeyOf(key: string, collection: string): Promise<boolean>;
25
23
  /**
26
- * The key of an account's line in a collection (`spec/drafts/constitution-grants-contracts.md`
27
- * §3): an owned key, so only that account can write a version in it. The
28
- * collection is hashed, so a line has a key whatever the collection's name.
24
+ * The key of an account's line in a collection (`spec/09-contracts.md`): an
25
+ * owned key, so only that account can write a version in it.
29
26
  */
30
27
  export declare function lineKey(root: string, collection: string): Promise<string>;
31
28
  //# sourceMappingURL=key.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../src/records/key.ts"],"names":[],"mappings":"AAoBA,0FAA0F;AAC1F,eAAO,MAAM,kBAAkB,QAA0B,CAAC;AAY1D,2FAA2F;AAC3F,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,OAAqC,CAAC;AAKnF;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,IAAI,CAEjE;AAED,2GAA2G;AAC3G,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,IAAI,CAE9D;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG5D;AAED,iEAAiE;AACjE,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK1E;AAED,0HAA0H;AAC1H,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEhE;AAED,gDAAgD;AAChD,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAEzE;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG/E"}
1
+ {"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../src/records/key.ts"],"names":[],"mappings":"AAsBA,0FAA0F;AAC1F,eAAO,MAAM,kBAAkB,QAA0B,CAAC;AAc1D,2FAA2F;AAC3F,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,OAAqC,CAAC;AAEnF,2GAA2G;AAC3G,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,IAAI,CAE9D;AAOD;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE1E;AAOD,iFAAiF;AACjF,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAK9F;AAED,oFAAoF;AACpF,wBAAsB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEhF;AAED,0IAA0I;AAC1I,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE9E;AAED,gEAAgE;AAChE,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAE7F;AAED,sDAAsD;AACtD,wBAAsB,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAKrF;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEzE"}
@@ -2,15 +2,17 @@
2
2
  * Record keys: their shape, and whose they are (spec 02 §4.1).
3
3
  *
4
4
  * Outside `sys.*`, a record's first version must be at a key of one of two
5
- * kinds, so that whose a record is can be read from its key and no member can
6
- * take over another's:
5
+ * kinds, so that whose a record is, and which collection it is in, can be
6
+ * read from its key, and no member can take over another's:
7
7
  *
8
- * - **owned**, `<owner>.<name>`: `<owner>` is a hash of the creator's account,
9
- * so only that account can write a first version there. A fresh key is an
10
- * owned key with a random name; a key an app chooses (`profile`, a line) is
11
- * an owned key with that name.
12
- * - **shared**, `one:<hex>`: a `onePer` key that does not name its author
13
- * (one decision per proposal), anyone's to write first.
8
+ * - **owned**, `<owner>.<name>`: `<owner>` is a hash of the creator's account
9
+ * and the collection, so only that account can write a first version there,
10
+ * and only in that collection. A fresh key is an owned key with a random
11
+ * name; a key an app chooses (`profile`, a line) is an owned key with that
12
+ * name.
13
+ * - **shared**, `one:<tag>.<hex>`: a `onePer` key that does not name its
14
+ * author (one decision per proposal), anyone's to write first. `<tag>` is a
15
+ * hash of the collection.
14
16
  *
15
17
  * On its own so that `version` and `links` can both check a key's shape
16
18
  * without importing each other.
@@ -19,61 +21,67 @@ import { base32Encode, sha256 } from '../utils/hash.js';
19
21
  import { utf8Encode } from '../utils/encoding.js';
20
22
  /** What any record key looks like: `profile`, `collection:app.todo.item`, an owned key */
21
23
  export const RECORD_KEY_PATTERN = /^[a-z0-9:._-]{1,128}$/;
22
- /** Characters of the owner part of an owned key: 16 bytes of hash, base32 */
23
- const OWNER_LENGTH = 26;
24
+ /** Characters of the owner part of an owned key, and of a shared key's tag: 16 bytes of hash, base32 */
25
+ const TAG_LENGTH = 26;
24
26
  /** An owned key: the owner part, a dot, and a name of 1–101 key characters */
25
27
  const OWNED_KEY_PATTERN = /^[a-z2-7]{26}\.[a-z0-9:._-]{1,101}$/;
26
- /** A shared `onePer` key: `one:` and 20 bytes of HMAC, in hex */
27
- const SHARED_KEY_PATTERN = /^one:[0-9a-f]{40}$/;
28
- /** A line's key: `<owner>.line:` and 16 bytes of hash, base32 ({@link lineKey}) */
29
- const LINE_KEY_PATTERN = /^[a-z2-7]{26}\.line:[a-z2-7]{26}$/;
28
+ /** A shared `onePer` key: `one:`, the collection's tag, a dot, and 20 bytes of HMAC in hex */
29
+ const SHARED_KEY_PATTERN = /^one:[a-z2-7]{26}\.[0-9a-f]{40}$/;
30
+ /** Where a shared key's tag starts, after `one:` */
31
+ const SHARED_TAG_START = 4;
32
+ /** A line's key: `<owner>.line` ({@link lineKey}) */
33
+ const LINE_KEY_PATTERN = /^[a-z2-7]{26}\.line$/;
30
34
  /** Whether a key has a line key's form, whoever's line and whichever collection's it is */
31
35
  export const hasLineKeyForm = (key) => LINE_KEY_PATTERN.test(key);
32
- /** An owned key whose name has a `onePer` key's form: `<owner>.one:` and 20 bytes in hex */
33
- const OWNED_ONE_PER_PATTERN = /^[a-z2-7]{26}\.one:[0-9a-f]{40}$/;
34
- /**
35
- * Whether a key has the form of a `onePer` key (spec 02 §7.3), and which:
36
- * `owned` for `<owner>.one:<hex>`, `shared` for `one:<hex>`. Such a key is
37
- * only for a first version in a collection whose `onePer` gives it.
38
- */
39
- export function onePerForm(key) {
40
- return SHARED_KEY_PATTERN.test(key) ? 'shared' : OWNED_ONE_PER_PATTERN.test(key) ? 'owned' : null;
41
- }
42
36
  /** Which kind a key is, or null when it is neither (and so no first version outside `sys.*` may use it) */
43
37
  export function keyKind(key) {
44
38
  return OWNED_KEY_PATTERN.test(key) ? 'owned' : SHARED_KEY_PATTERN.test(key) ? 'shared' : null;
45
39
  }
40
+ /** The first 16 bytes of SHA-256 over `input`, in base32 */
41
+ async function tagOf(input) {
42
+ return base32Encode((await sha256(utf8Encode(input))).subarray(0, 16));
43
+ }
46
44
  /**
47
- * The owner part of every key an account owns: the first 16 bytes of
48
- * SHA-256 over a label and its root DID, in base32. Root DIDs are not lower
49
- * case, so a key names a hash of one.
45
+ * The owner part of every key an account owns in a collection. Root DIDs are
46
+ * not lower case, so a key names a hash of one; they hold no `|`, so the
47
+ * input reads one way.
50
48
  */
51
- export async function ownerTag(root) {
52
- const digest = await sha256(utf8Encode(`minca/record-owner/v1|${root}`));
53
- return base32Encode(digest.subarray(0, 16));
49
+ export function ownerTag(root, collection) {
50
+ return tagOf(`minca/record-owner/v2|${root}|${collection}`);
54
51
  }
55
- /** The key `name` has in `root`'s namespace: `<owner>.<name>` */
56
- export async function ownedKey(root, name) {
57
- const key = `${await ownerTag(root)}.${name}`;
52
+ /** The tag that names a collection in its shared keys */
53
+ function sharedKeyTag(collection) {
54
+ return tagOf(`minca/shared-key/v1|${collection}`);
55
+ }
56
+ /** The key `name` has in `root`'s namespace in a collection: `<owner>.<name>` */
57
+ export async function ownedKey(root, collection, name) {
58
+ const key = `${await ownerTag(root, collection)}.${name}`;
58
59
  if (!OWNED_KEY_PATTERN.test(key))
59
60
  throw new Error('A record key name is 1–101 characters of a–z, 0–9 and : . _ -');
60
61
  return key;
61
62
  }
62
- /** A fresh key of `root`'s: 128 random bits as its name. Random rather than time-based, so it says nothing about when. */
63
- export async function newRecordKey(root) {
64
- return ownedKey(root, base32Encode(globalThis.crypto.getRandomValues(new Uint8Array(16))));
63
+ /** A shared key of a collection's, for a `onePer` HMAC in hex: `one:<tag>.<hex>` */
64
+ export async function sharedKey(collection, hex) {
65
+ return `one:${await sharedKeyTag(collection)}.${hex}`;
66
+ }
67
+ /** A fresh key of `root`'s in a collection: 128 random bits as its name. Random rather than time-based, so it says nothing about when. */
68
+ export function newRecordKey(root, collection) {
69
+ return ownedKey(root, collection, base32Encode(globalThis.crypto.getRandomValues(new Uint8Array(16))));
70
+ }
71
+ /** Whether `key` is an owned key of `root`'s in `collection` */
72
+ export async function ownsKey(key, root, collection) {
73
+ return keyKind(key) === 'owned' && key.slice(0, TAG_LENGTH) === (await ownerTag(root, collection));
65
74
  }
66
- /** Whether `key` is an owned key of `root`'s */
67
- export async function ownsKey(key, root) {
68
- return keyKind(key) === 'owned' && key.slice(0, OWNER_LENGTH) === (await ownerTag(root));
75
+ /** Whether `key` is a shared key of `collection`'s */
76
+ export async function isSharedKeyOf(key, collection) {
77
+ return (keyKind(key) === 'shared' &&
78
+ key.slice(SHARED_TAG_START, SHARED_TAG_START + TAG_LENGTH) === (await sharedKeyTag(collection)));
69
79
  }
70
80
  /**
71
- * The key of an account's line in a collection (`spec/drafts/constitution-grants-contracts.md`
72
- * §3): an owned key, so only that account can write a version in it. The
73
- * collection is hashed, so a line has a key whatever the collection's name.
81
+ * The key of an account's line in a collection (`spec/09-contracts.md`): an
82
+ * owned key, so only that account can write a version in it.
74
83
  */
75
- export async function lineKey(root, collection) {
76
- const digest = await sha256(utf8Encode(collection));
77
- return ownedKey(root, `line:${base32Encode(digest.subarray(0, 16))}`);
84
+ export function lineKey(root, collection) {
85
+ return ownedKey(root, collection, 'line');
78
86
  }
79
87
  //# sourceMappingURL=key.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"key.js","sourceRoot":"","sources":["../../src/records/key.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"key.js","sourceRoot":"","sources":["../../src/records/key.ts"],"names":[],"mappings":"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"}
@@ -32,7 +32,7 @@ export declare function onePerSecret(material: {
32
32
  * The key a record must have under `onePer`, or null when something it names
33
33
  * is missing (no such link, no such field). With `@author` among the parts,
34
34
  * an owned key of the author's (`records/key.ts`), so no one else can write
35
- * its first version; without, a shared `one:` key.
35
+ * its first version; without, a shared key of the collection's.
36
36
  */
37
37
  export declare function onePerKey(secret: CryptoKey, collection: string, onePer: ReadonlyArray<string>, record: {
38
38
  root: string;
@@ -1 +1 @@
1
- {"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/records/rules.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACxC,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACvC;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC;CACvB;AAWD,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,SAAU,GAAG,MAAM,GAAG,IAAI,CActE;AAKD;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzE,OAAO,CAAC,SAAS,CAAC,CAGpB;AAKD;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,EAC7B,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAClE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMxB;AAgBD,yFAAyF;AACzF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,SAAS,EACxC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,GACZ,MAAM,GAAG,IAAI,CAEf"}
1
+ {"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/records/rules.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACxC,6DAA6D;IAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACvC;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC;CACvB;AAWD,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,SAAU,GAAG,MAAM,GAAG,IAAI,CActE;AAKD;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACzE,OAAO,CAAC,SAAS,CAAC,CAGpB;AAKD;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,EAC7B,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAClE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQxB;AAgBD,yFAAyF;AACzF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,SAAS,EACxC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,OAAO,GACZ,MAAM,GAAG,IAAI,CAEf"}
@@ -12,7 +12,7 @@
12
12
  * before and versions it cites. It is the definition's `contract`, apart from
13
13
  * these, because readers judge it and peers don't (`records/contracts.ts`).
14
14
  */
15
- import { ownedKey } from './key.js';
15
+ import { ownedKey, sharedKey } from './key.js';
16
16
  import { canonicalize } from '../schema/version.js';
17
17
  import { bytesToHex, utf8Encode } from '../utils/encoding.js';
18
18
  import { isRecord, readField } from '../utils/guards.js';
@@ -64,15 +64,17 @@ const publicSeed = (spaceId) => utf8Encode(`minca/public-one-per/v1|${spaceId}`)
64
64
  * The key a record must have under `onePer`, or null when something it names
65
65
  * is missing (no such link, no such field). With `@author` among the parts,
66
66
  * an owned key of the author's (`records/key.ts`), so no one else can write
67
- * its first version; without, a shared `one:` key.
67
+ * its first version; without, a shared key of the collection's.
68
68
  */
69
69
  export async function onePerKey(secret, collection, onePer, record) {
70
70
  const parts = onePer.map((part) => onePerPart(part, record));
71
71
  if (parts.includes(null))
72
72
  return null;
73
73
  const mac = await hmacPrefix(secret, [collection, ...parts].join('\n'), 20);
74
- const name = `one:${bytesToHex(mac)}`;
75
- return onePer.includes('@author') ? ownedKey(record.root, name) : name;
74
+ const hex = bytesToHex(mac);
75
+ return onePer.includes('@author')
76
+ ? ownedKey(record.root, collection, `one:${hex}`)
77
+ : sharedKey(collection, hex);
76
78
  }
77
79
  /** One part of a `onePer` key's input: `<part>=<value>`, or null when the record has no value for it */
78
80
  function onePerPart(part, record) {
@@ -1 +1 @@
1
- {"version":3,"file":"rules.js","sourceRoot":"","sources":["../../src/records/rules.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rules.js","sourceRoot":"","sources":["../../src/records/rules.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,8 @@
2
2
  * @module body-cache
3
3
  * Version bodies kept in memory, the one used longest ago let go first. One
4
4
  * cache can serve many stores, so a node's memory is bounded by what it reads
5
- * often, not by how many spaces it holds.
5
+ * often, not by how many spaces it holds. It is bounded by bytes, not by
6
+ * count: a store of large bodies takes no more memory than one of small ones.
6
7
  */
7
8
  import type { Version } from '../types.js';
8
9
  export interface BodyCache {
@@ -19,8 +20,10 @@ export interface BodyCachePart {
19
20
  clear(): void;
20
21
  }
21
22
  /**
22
- * A cache of at most `limit` bodies, shared by every part made from it.
23
- * @param limit How many bodies all parts together keep
23
+ * A cache of at most `limit` bytes of bodies, shared by every part made from
24
+ * it. A body larger than a quarter of it is not kept: it would push out many
25
+ * others to save one read.
26
+ * @param limit How many bytes all parts together keep
24
27
  */
25
28
  export declare function createBodyCache(limit: number): BodyCache;
26
29
  //# sourceMappingURL=body-cache.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"body-cache.d.ts","sourceRoot":"","sources":["../../src/storage/body-cache.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,WAAW,SAAS;IACxB,qFAAqF;IACrF,IAAI,IAAI,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACrC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,yCAAyC;IACzC,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,wCAAwC;IACxC,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAgCxD"}
1
+ {"version":3,"file":"body-cache.d.ts","sourceRoot":"","sources":["../../src/storage/body-cache.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,WAAW,SAAS;IACxB,qFAAqF;IACrF,IAAI,IAAI,aAAa,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC;IACrC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,yCAAyC;IACzC,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,wCAAwC;IACxC,KAAK,IAAI,IAAI,CAAC;CACf;AAYD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CA4CxD"}
@@ -1,11 +1,30 @@
1
+ /** About what a version takes in memory: its body's text, and its envelope */
2
+ function weigh(version) {
3
+ const { body } = version;
4
+ if (body === undefined || body === null)
5
+ return ENVELOPE_BYTES;
6
+ return ENVELOPE_BYTES + 2 * (typeof body === 'string' ? body.length : JSON.stringify(body).length);
7
+ }
8
+ /** An envelope's fields, ids and signature, held as strings */
9
+ const ENVELOPE_BYTES = 1024;
1
10
  /**
2
- * A cache of at most `limit` bodies, shared by every part made from it.
3
- * @param limit How many bodies all parts together keep
11
+ * A cache of at most `limit` bytes of bodies, shared by every part made from
12
+ * it. A body larger than a quarter of it is not kept: it would push out many
13
+ * others to save one read.
14
+ * @param limit How many bytes all parts together keep
4
15
  */
5
16
  export function createBodyCache(limit) {
6
- /** By part, then id */
17
+ /** By part, then id, with what each weighs */
7
18
  const held = new Map();
19
+ let total = 0;
8
20
  let parts = 0;
21
+ const drop = (key) => {
22
+ const entry = held.get(key);
23
+ if (!entry)
24
+ return;
25
+ held.delete(key);
26
+ total -= entry.bytes;
27
+ };
9
28
  return Object.freeze({
10
29
  part() {
11
30
  const prefix = `${parts++}:`;
@@ -13,26 +32,30 @@ export function createBodyCache(limit) {
13
32
  return Object.freeze({
14
33
  get(id) {
15
34
  const key = keyOf(id);
16
- const version = held.get(key);
17
- if (version) {
35
+ const entry = held.get(key);
36
+ if (entry) {
18
37
  held.delete(key);
19
- held.set(key, version);
38
+ held.set(key, entry);
20
39
  }
21
- return version;
40
+ return entry?.version;
22
41
  },
23
42
  has: (id) => held.has(keyOf(id)),
24
43
  set(version) {
25
44
  const key = keyOf(version.id);
26
- held.delete(key);
27
- held.set(key, version);
28
- if (held.size > limit)
29
- held.delete(held.keys().next().value);
45
+ drop(key);
46
+ const bytes = weigh(version);
47
+ if (bytes > limit / 4)
48
+ return;
49
+ held.set(key, { version, bytes });
50
+ total += bytes;
51
+ while (total > limit)
52
+ drop(held.keys().next().value);
30
53
  },
31
- delete: (id) => void held.delete(keyOf(id)),
54
+ delete: (id) => drop(keyOf(id)),
32
55
  clear() {
33
- for (const key of held.keys())
56
+ for (const key of [...held.keys()])
34
57
  if (key.startsWith(prefix))
35
- held.delete(key);
58
+ drop(key);
36
59
  },
37
60
  });
38
61
  },
@@ -1 +1 @@
1
- {"version":3,"file":"body-cache.js","sourceRoot":"","sources":["../../src/storage/body-cache.ts"],"names":[],"mappings":"AAuBA;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,uBAAuB;IACvB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAmB,CAAC;IACxC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI;YACF,MAAM,MAAM,GAAG,GAAG,KAAK,EAAE,GAAG,CAAC;YAC7B,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC;YAC1C,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,GAAG,CAAC,EAAU;oBACZ,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;oBACtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC9B,IAAI,OAAO,EAAE,CAAC;wBACZ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACjB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACzB,CAAC;oBACD,OAAO,OAAO,CAAC;gBACjB,CAAC;gBACD,GAAG,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACxC,GAAG,CAAC,OAAgB;oBAClB,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACjB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACvB,IAAI,IAAI,CAAC,IAAI,GAAG,KAAK;wBAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAC,CAAC;gBAChE,CAAC;gBACD,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACnD,KAAK;oBACH,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE;wBAAE,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;4BAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC9E,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"body-cache.js","sourceRoot":"","sources":["../../src/storage/body-cache.ts"],"names":[],"mappings":"AAwBA,8EAA8E;AAC9E,SAAS,KAAK,CAAC,OAAgB;IAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,cAAc,CAAC;IAC/D,OAAO,cAAc,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;AACrG,CAAC;AAED,+DAA+D;AAC/D,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,8CAA8C;IAC9C,MAAM,IAAI,GAAG,IAAI,GAAG,EAA+C,CAAC;IACpE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;IACvB,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI;YACF,MAAM,MAAM,GAAG,GAAG,KAAK,EAAE,GAAG,CAAC;YAC7B,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC;YAC1C,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,GAAG,CAAC,EAAU;oBACZ,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;oBACtB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC5B,IAAI,KAAK,EAAE,CAAC;wBACV,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACjB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;oBACvB,CAAC;oBACD,OAAO,KAAK,EAAE,OAAO,CAAC;gBACxB,CAAC;gBACD,GAAG,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACxC,GAAG,CAAC,OAAgB;oBAClB,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;oBAC9B,IAAI,CAAC,GAAG,CAAC,CAAC;oBACV,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC7B,IAAI,KAAK,GAAG,KAAK,GAAG,CAAC;wBAAE,OAAO;oBAC9B,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;oBAClC,KAAK,IAAI,KAAK,CAAC;oBACf,OAAO,KAAK,GAAG,KAAK;wBAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAC,CAAC;gBACxD,CAAC;gBACD,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvC,KAAK;oBACH,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;wBAAE,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;4BAAE,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5E,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/storage/mirror.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAa7D,0DAA0D;AAC1D,MAAM,MAAM,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAEnD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,uGAAuG;IACvG,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IACtD;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,iEAAiE;IACjE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,wDAAwD;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,MAAM;IACrB,+FAA+F;IAC/F,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,6EAA6E;IAC7E,IAAI,IAAI,OAAO,CAAC;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,6CAA6C;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,yCAAyC;IACzC,OAAO,IAAI,IAAI,CAAC;IAChB,iDAAiD;IACjD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,mCAAmC;IACnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAgBD,2FAA2F;AAC3F,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGnF;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA+KxE"}
1
+ {"version":3,"file":"mirror.d.ts","sourceRoot":"","sources":["../../src/storage/mirror.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAa7D,0DAA0D;AAC1D,MAAM,MAAM,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,SAAS,CAAC;AAEnD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,uGAAuG;IACvG,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IACtD;;;;OAIG;IACH,QAAQ,CAAC,KAAK,EAAE,cAAc,CAAC;IAC/B,iEAAiE;IACjE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,wDAAwD;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,MAAM;IACrB,+FAA+F;IAC/F,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,6EAA6E;IAC7E,IAAI,IAAI,OAAO,CAAC;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,6CAA6C;IAC7C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,yCAAyC;IACzC,OAAO,IAAI,IAAI,CAAC;IAChB,iDAAiD;IACjD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,mCAAmC;IACnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAiBD,2FAA2F;AAC3F,wBAAsB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAGnF;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA+LxE"}
@@ -36,6 +36,7 @@ import { unref } from '../utils/guards.js';
36
36
  const keys = {
37
37
  writer: 'mirror:writer',
38
38
  counter: 'mirror:counter',
39
+ left: 'mirror:left',
39
40
  read: (segment) => `mirror:read:${segment}`,
40
41
  known: (id = '') => `mirror:known:${id}`,
41
42
  };
@@ -57,8 +58,11 @@ export async function createMirror(config) {
57
58
  const writer = await readOrCreate(state, keys.writer, newWriterId);
58
59
  const mine = `${space}/${writer}/`;
59
60
  let counter = Number((await readText(state, keys.counter)) ?? 0);
60
- /** How many segments the last compaction left, so the next waits for twice that */
61
- let left = 0;
61
+ /**
62
+ * How many segments the last compaction left, so the next waits for twice
63
+ * that. Kept, or a restart would rewrite a large space whole on its first flush.
64
+ */
65
+ let left = Number((await readText(state, keys.left)) ?? 0);
62
66
  /** The versions the store is known to hold; read once, since every flush asks about all of them */
63
67
  const known = await loadKnown();
64
68
  let timer = null;
@@ -75,6 +79,9 @@ export async function createMirror(config) {
75
79
  return ids;
76
80
  for (const id of ids)
77
81
  await state.delete(keys.known(id));
82
+ // Nothing of this writer's is there either: the next compaction waits for none.
83
+ left = 0;
84
+ await state.delete(keys.left);
78
85
  return new Set();
79
86
  }
80
87
  async function markKnown(id) {
@@ -92,20 +99,27 @@ export async function createMirror(config) {
92
99
  await state.put(keys.counter, utf8Encode(String(counter)));
93
100
  await state.put(keys.read(name), MARK);
94
101
  }
95
- /** Writes versions in segments of about `flushBytes`; how many segments that took */
102
+ /** Writes versions in segments of about `flushBytes`, as they come; how many segments that took */
96
103
  async function writeSegments(versions, written = async () => { }) {
97
104
  let count = 0;
98
- for (const batch of segmentBatches(versions, flushBytes)) {
105
+ for await (const batch of segmentBatches(versions, flushBytes)) {
99
106
  await writeSegment(batch);
100
107
  await written(batch);
101
108
  count += 1;
102
109
  }
103
110
  return count;
104
111
  }
112
+ /** The versions this store holds of these ids, read one at a time */
113
+ async function* held(ids) {
114
+ for (const id of ids) {
115
+ const version = await storage.getVersion(id);
116
+ if (version)
117
+ yield version;
118
+ }
119
+ }
105
120
  async function flushNow() {
106
121
  const unknown = (await storage.versionIds()).filter((id) => !known.has(id));
107
- const waiting = (await Promise.all(unknown.map((id) => storage.getVersion(id)))).filter((version) => version !== null);
108
- await writeSegments(waiting, async (batch) => {
122
+ await writeSegments(held(unknown), async (batch) => {
109
123
  for (const version of batch)
110
124
  await markKnown(version.id);
111
125
  });
@@ -118,19 +132,24 @@ export async function createMirror(config) {
118
132
  if (old.length < 2)
119
133
  return;
120
134
  // What this store holds now: a version superseded since is a stub, and one it never held
121
- // was put there by someone else and goes.
122
- const keep = new Map();
123
- for (const key of old) {
124
- for (const version of (await fetchSegment(key)) ?? []) {
125
- if (keep.has(version.id))
126
- continue;
127
- const held = await storage.getVersion(version.id);
128
- if (held)
129
- keep.set(version.id, held);
135
+ // was put there by someone else and goes. Read a segment at a time, so memory holds one
136
+ // segment and the one being written, however large the space.
137
+ const seen = new Set();
138
+ async function* keep() {
139
+ for (const key of old) {
140
+ for (const version of (await fetchSegment(key)) ?? []) {
141
+ if (seen.has(version.id))
142
+ continue;
143
+ seen.add(version.id);
144
+ const now = await storage.getVersion(version.id);
145
+ if (now)
146
+ yield now;
147
+ }
130
148
  }
131
149
  }
132
150
  // New first, then delete: a reader in between sees each version twice, which is harmless.
133
- left = await writeSegments(keep.values());
151
+ left = await writeSegments(keep());
152
+ await state.put(keys.left, utf8Encode(String(left)));
134
153
  for (const key of old)
135
154
  await store.delete(key);
136
155
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/storage/mirror.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mirror.js","sourceRoot":"","sources":["../../src/storage/mirror.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,10 @@ export declare function segmentName(counter: number, bytes: Uint8Array): Promise
19
19
  * One still being written, or half delivered by a sync service, does not.
20
20
  */
21
21
  export declare const isWholeSegment: (key: string, bytes: Uint8Array) => Promise<boolean>;
22
- /** Splits versions into segments' worth: each closed once it reaches `bytes` */
23
- export declare function segmentBatches(versions: Iterable<Version>, bytes: number): Generator<Version[]>;
22
+ /**
23
+ * Splits versions into segments' worth: each closed once it reaches `bytes`.
24
+ * Takes them as they come, so a caller reading them from a store holds one
25
+ * segment's worth at a time.
26
+ */
27
+ export declare function segmentBatches(versions: Iterable<Version> | AsyncIterable<Version>, bytes: number): AsyncGenerator<Version[]>;
24
28
  //# sourceMappingURL=segment.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../src/storage/segment.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAK3C,eAAO,MAAM,cAAc,SAAS,CAAC;AAIrC,4CAA4C;AAC5C,wBAAgB,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,UAAU,CAExE;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,EAAE,CAQ1D;AAKD,qEAAqE;AACrE,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAErF;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAe,MAAM,SAAS,UAAU,qBACT,CAAC;AAK3D,gFAAgF;AAChF,wBAAiB,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAYhG"}
1
+ {"version":3,"file":"segment.d.ts","sourceRoot":"","sources":["../../src/storage/segment.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAK3C,eAAO,MAAM,cAAc,SAAS,CAAC;AAIrC,4CAA4C;AAC5C,wBAAgB,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,UAAU,CAExE;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,EAAE,CAQ1D;AAKD,qEAAqE;AACrE,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAErF;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAe,MAAM,SAAS,UAAU,qBACT,CAAC;AAK3D;;;;GAIG;AACH,wBAAuB,cAAc,CACnC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EACpD,KAAK,EAAE,MAAM,GACZ,cAAc,CAAC,OAAO,EAAE,CAAC,CAY3B"}
@@ -3,7 +3,7 @@ import { bytesToHex, utf8Decode, utf8Encode } from '../utils/encoding.js';
3
3
  import { isObject, isStoredVersion } from '../utils/guards.js';
4
4
  export const SEGMENT_SUFFIX = '.seg';
5
5
  /** The segment format; a reader skips segments of any other */
6
- const SEGMENT_VERSION = 8;
6
+ const SEGMENT_VERSION = 9;
7
7
  /** Packs versions into a segment's bytes */
8
8
  export function packSegment(versions) {
9
9
  return utf8Encode(JSON.stringify({ v: SEGMENT_VERSION, versions }));
@@ -33,11 +33,15 @@ export async function segmentName(counter, bytes) {
33
33
  export const isWholeSegment = async (key, bytes) => key.endsWith(`-${await hashOf(bytes)}${SEGMENT_SUFFIX}`);
34
34
  /** Roughly how many bytes a version takes in a segment */
35
35
  const versionSize = (version) => utf8Encode(JSON.stringify(version)).length;
36
- /** Splits versions into segments' worth: each closed once it reaches `bytes` */
37
- export function* segmentBatches(versions, bytes) {
36
+ /**
37
+ * Splits versions into segments' worth: each closed once it reaches `bytes`.
38
+ * Takes them as they come, so a caller reading them from a store holds one
39
+ * segment's worth at a time.
40
+ */
41
+ export async function* segmentBatches(versions, bytes) {
38
42
  let batch = [];
39
43
  let size = 0;
40
- for (const version of versions) {
44
+ for await (const version of versions) {
41
45
  batch.push(version);
42
46
  size += versionSize(version);
43
47
  if (size < bytes)