@geekity/cms 0.51.0 → 0.52.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (346) hide show
  1. package/admin/components/badge.njk +1 -0
  2. package/admin/pages/account/forgot.njk +13 -7
  3. package/admin/pages/account/reset.njk +1 -1
  4. package/admin/pages/federation/followers.njk +8 -4
  5. package/admin/pages/federation/resend.njk +2 -2
  6. package/admin/pages/users/edit.njk +36 -4
  7. package/admin/pages/users/new.njk +19 -1
  8. package/admin/static/admin.css +27 -37
  9. package/dist/admin/admin-bar.d.ts.map +1 -1
  10. package/dist/admin/admin-bar.js +11 -10
  11. package/dist/admin/admin-bar.js.map +1 -1
  12. package/dist/admin/autosave.d.ts.map +1 -1
  13. package/dist/admin/autosave.js +1 -2
  14. package/dist/admin/autosave.js.map +1 -1
  15. package/dist/admin/confirm-password.d.ts +19 -1
  16. package/dist/admin/confirm-password.d.ts.map +1 -1
  17. package/dist/admin/confirm-password.js +40 -8
  18. package/dist/admin/confirm-password.js.map +1 -1
  19. package/dist/admin/connected-apps.d.ts.map +1 -1
  20. package/dist/admin/connected-apps.js +1 -0
  21. package/dist/admin/connected-apps.js.map +1 -1
  22. package/dist/admin/credentials.d.ts +0 -1
  23. package/dist/admin/credentials.d.ts.map +1 -1
  24. package/dist/admin/credentials.js +1 -2
  25. package/dist/admin/credentials.js.map +1 -1
  26. package/dist/admin/documents.d.ts +0 -7
  27. package/dist/admin/documents.d.ts.map +1 -1
  28. package/dist/admin/documents.js +1 -15
  29. package/dist/admin/documents.js.map +1 -1
  30. package/dist/admin/export.d.ts +2 -0
  31. package/dist/admin/export.d.ts.map +1 -1
  32. package/dist/admin/export.js +5 -4
  33. package/dist/admin/export.js.map +1 -1
  34. package/dist/admin/federation.d.ts +4 -4
  35. package/dist/admin/federation.d.ts.map +1 -1
  36. package/dist/admin/federation.js +31 -16
  37. package/dist/admin/federation.js.map +1 -1
  38. package/dist/admin/headers.d.ts.map +1 -1
  39. package/dist/admin/headers.js +4 -0
  40. package/dist/admin/headers.js.map +1 -1
  41. package/dist/admin/index.d.ts +7 -7
  42. package/dist/admin/index.d.ts.map +1 -1
  43. package/dist/admin/index.js +5 -5
  44. package/dist/admin/index.js.map +1 -1
  45. package/dist/admin/indieauth-consent.d.ts.map +1 -1
  46. package/dist/admin/indieauth-consent.js +4 -3
  47. package/dist/admin/indieauth-consent.js.map +1 -1
  48. package/dist/admin/legacy-migrations.d.ts.map +1 -1
  49. package/dist/admin/legacy-migrations.js +6 -2
  50. package/dist/admin/legacy-migrations.js.map +1 -1
  51. package/dist/admin/plugins.d.ts +2 -0
  52. package/dist/admin/plugins.d.ts.map +1 -1
  53. package/dist/admin/plugins.js +15 -11
  54. package/dist/admin/plugins.js.map +1 -1
  55. package/dist/admin/recovery.d.ts +7 -4
  56. package/dist/admin/recovery.d.ts.map +1 -1
  57. package/dist/admin/recovery.js +68 -43
  58. package/dist/admin/recovery.js.map +1 -1
  59. package/dist/admin/routes.d.ts.map +1 -1
  60. package/dist/admin/routes.js +99 -76
  61. package/dist/admin/routes.js.map +1 -1
  62. package/dist/admin/taxonomy.d.ts.map +1 -1
  63. package/dist/admin/taxonomy.js +28 -19
  64. package/dist/admin/taxonomy.js.map +1 -1
  65. package/dist/admin/uploads.d.ts +4 -13
  66. package/dist/admin/uploads.d.ts.map +1 -1
  67. package/dist/admin/uploads.js +9 -28
  68. package/dist/admin/uploads.js.map +1 -1
  69. package/dist/admin/users.d.ts +7 -0
  70. package/dist/admin/users.d.ts.map +1 -1
  71. package/dist/admin/users.js +166 -43
  72. package/dist/admin/users.js.map +1 -1
  73. package/dist/cli/commands.d.ts.map +1 -1
  74. package/dist/cli/commands.js +13 -2
  75. package/dist/cli/commands.js.map +1 -1
  76. package/dist/cli/help.d.ts.map +1 -1
  77. package/dist/cli/help.js +5 -4
  78. package/dist/cli/help.js.map +1 -1
  79. package/dist/cli/password.js +3 -3
  80. package/dist/cli/password.js.map +1 -1
  81. package/dist/cli/resend.d.ts.map +1 -1
  82. package/dist/cli/resend.js +26 -5
  83. package/dist/cli/resend.js.map +1 -1
  84. package/dist/cli/run-job.d.ts +1 -1
  85. package/dist/cli/run-job.d.ts.map +1 -1
  86. package/dist/cli/run-job.js +2 -2
  87. package/dist/cli/run-job.js.map +1 -1
  88. package/dist/cli/serve.d.ts.map +1 -1
  89. package/dist/cli/serve.js +17 -0
  90. package/dist/cli/serve.js.map +1 -1
  91. package/dist/cli/user.d.ts +1 -1
  92. package/dist/cli/user.d.ts.map +1 -1
  93. package/dist/cli/user.js +79 -12
  94. package/dist/cli/user.js.map +1 -1
  95. package/dist/cms/services.d.ts.map +1 -1
  96. package/dist/cms/services.js +36 -14
  97. package/dist/cms/services.js.map +1 -1
  98. package/dist/config.d.ts +16 -4
  99. package/dist/config.d.ts.map +1 -1
  100. package/dist/config.js +6 -1
  101. package/dist/config.js.map +1 -1
  102. package/dist/content/authors.d.ts +6 -0
  103. package/dist/content/authors.d.ts.map +1 -1
  104. package/dist/content/authors.js +9 -0
  105. package/dist/content/authors.js.map +1 -1
  106. package/dist/content/reconcile.d.ts.map +1 -1
  107. package/dist/content/reconcile.js +20 -14
  108. package/dist/content/reconcile.js.map +1 -1
  109. package/dist/content/save.d.ts +33 -0
  110. package/dist/content/save.d.ts.map +1 -1
  111. package/dist/content/save.js +84 -5
  112. package/dist/content/save.js.map +1 -1
  113. package/dist/content/schedule.d.ts.map +1 -1
  114. package/dist/content/schedule.js +30 -6
  115. package/dist/content/schedule.js.map +1 -1
  116. package/dist/content/sync.d.ts +7 -0
  117. package/dist/content/sync.d.ts.map +1 -1
  118. package/dist/content/sync.js +41 -9
  119. package/dist/content/sync.js.map +1 -1
  120. package/dist/content/trash.d.ts.map +1 -1
  121. package/dist/content/trash.js +24 -17
  122. package/dist/content/trash.js.map +1 -1
  123. package/dist/content/write.d.ts.map +1 -1
  124. package/dist/content/write.js +64 -41
  125. package/dist/content/write.js.map +1 -1
  126. package/dist/federation/actor.d.ts.map +1 -1
  127. package/dist/federation/actor.js +9 -5
  128. package/dist/federation/actor.js.map +1 -1
  129. package/dist/federation/article.d.ts +27 -13
  130. package/dist/federation/article.d.ts.map +1 -1
  131. package/dist/federation/article.js +44 -33
  132. package/dist/federation/article.js.map +1 -1
  133. package/dist/federation/backfill.d.ts.map +1 -1
  134. package/dist/federation/backfill.js +3 -3
  135. package/dist/federation/backfill.js.map +1 -1
  136. package/dist/federation/citations.d.ts +1 -1
  137. package/dist/federation/citations.d.ts.map +1 -1
  138. package/dist/federation/citations.js +74 -19
  139. package/dist/federation/citations.js.map +1 -1
  140. package/dist/federation/delivery-plan.d.ts +17 -2
  141. package/dist/federation/delivery-plan.d.ts.map +1 -1
  142. package/dist/federation/delivery-plan.js +66 -6
  143. package/dist/federation/delivery-plan.js.map +1 -1
  144. package/dist/federation/delivery.d.ts +22 -19
  145. package/dist/federation/delivery.d.ts.map +1 -1
  146. package/dist/federation/delivery.js +186 -120
  147. package/dist/federation/delivery.js.map +1 -1
  148. package/dist/federation/federation.d.ts.map +1 -1
  149. package/dist/federation/federation.js +1 -3
  150. package/dist/federation/federation.js.map +1 -1
  151. package/dist/federation/handles.d.ts.map +1 -1
  152. package/dist/federation/handles.js +22 -1
  153. package/dist/federation/handles.js.map +1 -1
  154. package/dist/federation/keys.d.ts +5 -0
  155. package/dist/federation/keys.d.ts.map +1 -1
  156. package/dist/federation/keys.js +32 -16
  157. package/dist/federation/keys.js.map +1 -1
  158. package/dist/federation/object-ids.d.ts.map +1 -1
  159. package/dist/federation/object-ids.js +32 -13
  160. package/dist/federation/object-ids.js.map +1 -1
  161. package/dist/federation/ordered-queue.d.ts +16 -0
  162. package/dist/federation/ordered-queue.d.ts.map +1 -0
  163. package/dist/federation/ordered-queue.js +77 -0
  164. package/dist/federation/ordered-queue.js.map +1 -0
  165. package/dist/federation/outbox-observer.d.ts +3 -1
  166. package/dist/federation/outbox-observer.d.ts.map +1 -1
  167. package/dist/federation/outbox-observer.js +18 -6
  168. package/dist/federation/outbox-observer.js.map +1 -1
  169. package/dist/federation/paths.d.ts +3 -4
  170. package/dist/federation/paths.d.ts.map +1 -1
  171. package/dist/federation/paths.js +3 -4
  172. package/dist/federation/paths.js.map +1 -1
  173. package/dist/federation/profiles.d.ts.map +1 -1
  174. package/dist/federation/profiles.js +5 -4
  175. package/dist/federation/profiles.js.map +1 -1
  176. package/dist/federation/queue.d.ts +9 -4
  177. package/dist/federation/queue.d.ts.map +1 -1
  178. package/dist/federation/queue.js +12 -6
  179. package/dist/federation/queue.js.map +1 -1
  180. package/dist/federation/records.d.ts.map +1 -1
  181. package/dist/federation/records.js +17 -1
  182. package/dist/federation/records.js.map +1 -1
  183. package/dist/federation/relays.d.ts +20 -11
  184. package/dist/federation/relays.d.ts.map +1 -1
  185. package/dist/federation/relays.js +108 -83
  186. package/dist/federation/relays.js.map +1 -1
  187. package/dist/federation/reply-targets.d.ts +5 -2
  188. package/dist/federation/reply-targets.d.ts.map +1 -1
  189. package/dist/federation/reply-targets.js +24 -14
  190. package/dist/federation/reply-targets.js.map +1 -1
  191. package/dist/federation/resend-job.d.ts +10 -4
  192. package/dist/federation/resend-job.d.ts.map +1 -1
  193. package/dist/federation/resend-job.js +27 -19
  194. package/dist/federation/resend-job.js.map +1 -1
  195. package/dist/federation/retry-job.d.ts +26 -8
  196. package/dist/federation/retry-job.d.ts.map +1 -1
  197. package/dist/federation/retry-job.js +114 -45
  198. package/dist/federation/retry-job.js.map +1 -1
  199. package/dist/federation/send-deadline.d.ts +13 -0
  200. package/dist/federation/send-deadline.d.ts.map +1 -0
  201. package/dist/federation/send-deadline.js +30 -0
  202. package/dist/federation/send-deadline.js.map +1 -0
  203. package/dist/files/atomic.d.ts +7 -1
  204. package/dist/files/atomic.d.ts.map +1 -1
  205. package/dist/files/atomic.js +75 -14
  206. package/dist/files/atomic.js.map +1 -1
  207. package/dist/files/data-files.d.ts +12 -0
  208. package/dist/files/data-files.d.ts.map +1 -1
  209. package/dist/files/data-files.js +24 -0
  210. package/dist/files/data-files.js.map +1 -1
  211. package/dist/files/lock-file.d.ts.map +1 -0
  212. package/dist/{jobs → files}/lock-file.js +1 -1
  213. package/dist/files/lock-file.js.map +1 -0
  214. package/dist/gemini/certificate.d.ts.map +1 -1
  215. package/dist/gemini/certificate.js +15 -12
  216. package/dist/gemini/certificate.js.map +1 -1
  217. package/dist/indieauth/grants.d.ts +1 -0
  218. package/dist/indieauth/grants.d.ts.map +1 -1
  219. package/dist/indieauth/grants.js.map +1 -1
  220. package/dist/indieauth/tokens.d.ts +4 -1
  221. package/dist/indieauth/tokens.d.ts.map +1 -1
  222. package/dist/indieauth/tokens.js +7 -3
  223. package/dist/indieauth/tokens.js.map +1 -1
  224. package/dist/jobs/file-records.js +1 -1
  225. package/dist/jobs/file-records.js.map +1 -1
  226. package/dist/jobs/processes.d.ts +0 -1
  227. package/dist/jobs/processes.d.ts.map +1 -1
  228. package/dist/jobs/processes.js +1 -9
  229. package/dist/jobs/processes.js.map +1 -1
  230. package/dist/jobs/queue.d.ts.map +1 -1
  231. package/dist/jobs/queue.js +5 -4
  232. package/dist/jobs/queue.js.map +1 -1
  233. package/dist/jobs/types.d.ts +8 -2
  234. package/dist/jobs/types.d.ts.map +1 -1
  235. package/dist/jobs/types.js.map +1 -1
  236. package/dist/mcp/authoring/shared.d.ts.map +1 -1
  237. package/dist/mcp/authoring/shared.js +2 -3
  238. package/dist/mcp/authoring/shared.js.map +1 -1
  239. package/dist/mcp/repair/resend.js +1 -1
  240. package/dist/mcp/repair/resend.js.map +1 -1
  241. package/dist/mcp/repair/retry.d.ts.map +1 -1
  242. package/dist/mcp/repair/retry.js +20 -8
  243. package/dist/mcp/repair/retry.js.map +1 -1
  244. package/dist/micropub/endpoint.d.ts.map +1 -1
  245. package/dist/micropub/endpoint.js +3 -6
  246. package/dist/micropub/endpoint.js.map +1 -1
  247. package/dist/notifications/mail-service.d.ts.map +1 -1
  248. package/dist/notifications/mail-service.js +16 -1
  249. package/dist/notifications/mail-service.js.map +1 -1
  250. package/dist/plugin.d.ts +3 -2
  251. package/dist/plugin.d.ts.map +1 -1
  252. package/dist/plugin.js.map +1 -1
  253. package/dist/plugins/site.d.ts.map +1 -1
  254. package/dist/plugins/site.js +1 -1
  255. package/dist/plugins/site.js.map +1 -1
  256. package/dist/privacy/retention.d.ts.map +1 -1
  257. package/dist/privacy/retention.js +9 -0
  258. package/dist/privacy/retention.js.map +1 -1
  259. package/dist/site/admin-paths.d.ts +7 -0
  260. package/dist/site/admin-paths.d.ts.map +1 -1
  261. package/dist/site/admin-paths.js +18 -0
  262. package/dist/site/admin-paths.js.map +1 -1
  263. package/dist/site/passwords.d.ts +9 -2
  264. package/dist/site/passwords.d.ts.map +1 -1
  265. package/dist/site/passwords.js +45 -14
  266. package/dist/site/passwords.js.map +1 -1
  267. package/dist/site/setting-values.d.ts +3 -2
  268. package/dist/site/setting-values.d.ts.map +1 -1
  269. package/dist/site/setting-values.js +7 -4
  270. package/dist/site/setting-values.js.map +1 -1
  271. package/dist/site/users.d.ts +85 -11
  272. package/dist/site/users.d.ts.map +1 -1
  273. package/dist/site/users.js +237 -37
  274. package/dist/site/users.js.map +1 -1
  275. package/dist/store/deliveries.d.ts +24 -5
  276. package/dist/store/deliveries.d.ts.map +1 -1
  277. package/dist/store/deliveries.js +86 -31
  278. package/dist/store/deliveries.js.map +1 -1
  279. package/dist/store/queue-database.d.ts +19 -2
  280. package/dist/store/queue-database.d.ts.map +1 -1
  281. package/dist/store/queue-database.js +69 -4
  282. package/dist/store/queue-database.js.map +1 -1
  283. package/dist/store/queue-order.d.ts +17 -0
  284. package/dist/store/queue-order.d.ts.map +1 -0
  285. package/dist/store/queue-order.js +33 -0
  286. package/dist/store/queue-order.js.map +1 -0
  287. package/dist/store/relays.d.ts +5 -3
  288. package/dist/store/relays.d.ts.map +1 -1
  289. package/dist/store/relays.js +1 -1
  290. package/dist/store/relays.js.map +1 -1
  291. package/dist/store/schema.d.ts.map +1 -1
  292. package/dist/store/schema.js +23 -0
  293. package/dist/store/schema.js.map +1 -1
  294. package/dist/store/sessions.d.ts +3 -0
  295. package/dist/store/sessions.d.ts.map +1 -1
  296. package/dist/store/sessions.js +27 -18
  297. package/dist/store/sessions.js.map +1 -1
  298. package/dist/store/tokens.d.ts +4 -2
  299. package/dist/store/tokens.d.ts.map +1 -1
  300. package/dist/store/tokens.js +16 -10
  301. package/dist/store/tokens.js.map +1 -1
  302. package/dist/util/errors.d.ts +6 -0
  303. package/dist/util/errors.d.ts.map +1 -1
  304. package/dist/util/errors.js +11 -0
  305. package/dist/util/errors.js.map +1 -1
  306. package/dist/util/html-tree.d.ts +4 -0
  307. package/dist/util/html-tree.d.ts.map +1 -1
  308. package/dist/util/html-tree.js +34 -0
  309. package/dist/util/html-tree.js.map +1 -1
  310. package/dist/util/process-alive.d.ts +3 -0
  311. package/dist/util/process-alive.d.ts.map +1 -0
  312. package/dist/util/process-alive.js +11 -0
  313. package/dist/util/process-alive.js.map +1 -0
  314. package/dist/web/compression.js +2 -3
  315. package/dist/web/compression.js.map +1 -1
  316. package/dist/web/indieauth-bearer.js +2 -2
  317. package/dist/web/indieauth-bearer.js.map +1 -1
  318. package/dist/web/indieauth-token.js +3 -3
  319. package/dist/web/indieauth-token.js.map +1 -1
  320. package/dist/web/session.d.ts +6 -1
  321. package/dist/web/session.d.ts.map +1 -1
  322. package/dist/web/session.js +21 -3
  323. package/dist/web/session.js.map +1 -1
  324. package/dist/web/signed-in.d.ts.map +1 -1
  325. package/dist/web/signed-in.js +6 -2
  326. package/dist/web/signed-in.js.map +1 -1
  327. package/dist/web/throttle.d.ts +26 -18
  328. package/dist/web/throttle.d.ts.map +1 -1
  329. package/dist/web/throttle.js +130 -24
  330. package/dist/web/throttle.js.map +1 -1
  331. package/dist/webmention/service.d.ts +2 -2
  332. package/dist/webmention/service.d.ts.map +1 -1
  333. package/dist/webmention/service.js +3 -16
  334. package/dist/webmention/service.js.map +1 -1
  335. package/package.json +11 -11
  336. package/templates/site/gitignore +4 -0
  337. package/themes/default/mail/email-changed.html.njk +17 -0
  338. package/themes/default/mail/email-changed.subject.njk +1 -0
  339. package/themes/default/mail/email-changed.txt.njk +14 -0
  340. package/themes/default/mail/password-changed.html.njk +1 -1
  341. package/themes/default/mail/password-changed.txt.njk +2 -1
  342. package/themes/default/partials/jsonld.njk +1 -1
  343. package/themes/default/static/style.css +8 -8
  344. package/dist/jobs/lock-file.d.ts.map +0 -1
  345. package/dist/jobs/lock-file.js.map +0 -1
  346. /package/dist/{jobs → files}/lock-file.d.ts +0 -0
@@ -1,29 +1,41 @@
1
- import type { CatalogReader, DocumentLookup } from '../content/store.ts';
1
+ import type { Document } from '../content/document.ts';
2
+ import type { CatalogReader, DocumentLookup, IndexClock } from '../content/store.ts';
2
3
  import type { ResolvedConfig } from '../config.ts';
3
4
  import type { JobDefinition } from '../jobs/types.ts';
4
5
  import type { AdminStore } from '../store/admin-store.ts';
5
6
  import type { DeliveryService } from './delivery.ts';
6
7
  import type { ResendActivity } from './resend-job.ts';
8
+ /** A post is named by its content path, because a slug can name several. */
7
9
  export type RetryFilter = {
8
- readonly slug: string;
10
+ readonly path: string;
9
11
  readonly inbox: string | null;
10
12
  } | {
11
- readonly slug: null;
13
+ readonly path: null;
12
14
  readonly inbox: string;
13
15
  };
16
+ /**
17
+ * What a recipient is owed. `post` is `announcement` when its newest `Create`
18
+ * failed, so it may never have stored the post, and `revision` when only a
19
+ * later activity about the post failed. `pin` is whether its newest `Add` or
20
+ * `Remove` failed.
21
+ */
22
+ export type Missed = {
23
+ readonly post: 'announcement' | 'revision' | null;
24
+ readonly pin: boolean;
25
+ };
14
26
  export type RetryRecipient = {
15
27
  readonly actorId: string;
16
28
  readonly inboxId: string;
17
29
  readonly error: string | null;
18
- readonly missedAnnouncement: boolean;
30
+ readonly missed: Missed;
19
31
  };
20
32
  export type Retry = {
21
- readonly slug: string;
33
+ readonly path: string;
22
34
  readonly recipients: RetryRecipient[];
23
35
  };
24
36
  export type RetryReport = {
25
37
  readonly posts: readonly {
26
- readonly slug: string;
38
+ readonly path: string;
27
39
  readonly recipients: number;
28
40
  readonly activity: ResendActivity | null;
29
41
  }[];
@@ -32,13 +44,19 @@ export declare const RETRY_DELIVERIES_JOB: import("../jobs/types.ts").JobName<Re
32
44
  /** A burst of deliveries to one server can trip its bot protection. */
33
45
  export declare const RETRY_PACE_MS = 2000;
34
46
  export interface RetryPlanServices {
35
- readonly store: DocumentLookup & CatalogReader;
47
+ readonly store: DocumentLookup & CatalogReader & IndexClock;
36
48
  readonly admin: Pick<AdminStore, 'searchDeliveries'>;
37
49
  readonly config: Pick<ResolvedConfig, 'contentDir' | 'baseUrl'>;
38
50
  }
39
51
  export interface RetryJobServices extends RetryPlanServices {
40
- readonly delivery: Pick<DeliveryService, 'resend'>;
52
+ readonly delivery: Pick<DeliveryService, 'resend' | 'resendPin'>;
41
53
  }
42
54
  export declare function failedRetries(services: RetryPlanServices, filter: RetryFilter): Retry[];
55
+ /**
56
+ * The announced post a delivery row's object id belongs to, under any id it
57
+ * has been federated as. Built on first use, so a caller that never asks pays
58
+ * nothing for the walk of every announced post.
59
+ */
60
+ export declare function federatedPostOf(services: RetryPlanServices): (objectId: string) => Document | undefined;
43
61
  export declare function retryDeliveriesJob(services: RetryJobServices, pace?: (signal: AbortSignal) => Promise<void>): JobDefinition<RetryFilter, RetryReport>;
44
62
  //# sourceMappingURL=retry-job.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"retry-job.d.ts","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAA4B,MAAM,yBAAyB,CAAC;AAIpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACxD;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC;AAErF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS;QACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;KAC1C,EAAE,CAAC;CACL,CAAC;AAIF,eAAO,MAAM,oBAAoB,8DAAwD,CAAC;AAE1F,uEAAuE;AACvE,eAAO,MAAM,aAAa,OAAO,CAAC;AAElC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;IACrD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;CACpD;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,CA4CvF;AAaD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CACE,GAC5C,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,CA4BzC"}
1
+ {"version":3,"file":"retry-job.d.ts","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAA4B,MAAM,yBAAyB,CAAC;AAGpF,OAAO,KAAK,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,4EAA4E;AAC5E,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACxD;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,UAAU,GAAG,IAAI,CAAC;IAClD,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC;AAErF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS;QACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;KAC1C,EAAE,CAAC;CACL,CAAC;AAQF,eAAO,MAAM,oBAAoB,8DAAwD,CAAC;AAE1F,uEAAuE;AACvE,eAAO,MAAM,aAAa,OAAO,CAAC;AAElC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,GAAG,UAAU,CAAC;IAC5D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;IACrD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC;CAClE;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,CAkDvF;AAqCD;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,iBAAiB,GAC1B,CAAC,QAAQ,EAAE,MAAM,KAAK,QAAQ,GAAG,SAAS,CAM5C;AAuBD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CACE,GAC5C,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,CAiCzC"}
@@ -1,61 +1,113 @@
1
1
  import { setTimeout as sleep } from 'node:timers/promises';
2
- import { postObjectId } from '../content/guids.js';
3
2
  import { jobName } from '../jobs/types.js';
4
3
  import { NO_LIMIT } from '../store/rows.js';
5
4
  import { isRecord } from '../util/guards.js';
6
- import { postBySlug } from './delivery.js';
7
- import { objectIdsOf, readObjectIds } from './object-ids.js';
5
+ import { ownObjectIds } from './article.js';
8
6
  import { resendActivity } from './resend-job.js';
9
7
  const RETRIED = new Set(['failed', 'unknown']);
8
+ const PIN_ACTIVITIES = new Set(['Add', 'Remove']);
9
+ const POST_ORDER = ['announcement', 'revision', null];
10
10
  export const RETRY_DELIVERIES_JOB = jobName('retry-deliveries');
11
11
  /** A burst of deliveries to one server can trip its bot protection. */
12
12
  export const RETRY_PACE_MS = 2000;
13
13
  export function failedRetries(services, filter) {
14
14
  const { admin, config } = services;
15
15
  let objectIds;
16
- if (filter.slug !== null) {
17
- const document = postBySlug(services.store, filter.slug);
18
- if (document === undefined)
16
+ let postOf = federatedPostOf(services);
17
+ if (filter.path !== null) {
18
+ const document = services.store.getByPath(filter.path);
19
+ if (document?.type !== 'post')
19
20
  return [];
20
- objectIds = [
21
- ...objectIdsOf(readObjectIds(config.contentDir), postObjectId(document, config.baseUrl)),
22
- ];
21
+ objectIds = [...ownObjectIds(services.store, document, config)];
22
+ postOf = () => document;
23
23
  }
24
24
  const all = { limit: NO_LIMIT };
25
25
  const candidates = admin.searchDeliveries({ objectIds, inboxId: filter.inbox ?? undefined }, all).items;
26
26
  const history = filter.inbox === null ? candidates : deliveriesToSameActors(admin, objectIds, candidates);
27
- const newest = new Map();
28
- const newestCreate = new Map();
27
+ const histories = new Map();
29
28
  for (const row of history) {
30
- const slug = filter.slug ?? row.slug;
31
- if (slug === null)
29
+ const path = postOf(row.objectId)?.path;
30
+ if (path === undefined)
32
31
  continue;
33
- const key = JSON.stringify([slug, row.actorId]);
34
- if (!newest.has(key))
35
- newest.set(key, { slug, row });
36
- if (row.activityType === 'Create' && !newestCreate.has(key))
37
- newestCreate.set(key, row);
32
+ const key = JSON.stringify([path, row.actorId]);
33
+ let held = histories.get(key);
34
+ if (held === undefined) {
35
+ held = { path };
36
+ histories.set(key, held);
37
+ }
38
+ if (row.activityType === 'Create')
39
+ held.create ??= row;
40
+ if (PIN_ACTIVITIES.has(row.activityType))
41
+ held.pin ??= row;
42
+ else
43
+ held.post ??= row;
38
44
  }
39
45
  const retries = new Map();
40
- for (const [key, { slug, row }] of newest) {
41
- if (!RETRIED.has(row.status))
46
+ for (const { path, ...rows } of histories.values()) {
47
+ const missed = missedFrom(rows);
48
+ const failure = newestFailure(rows, missed);
49
+ if (failure === undefined)
42
50
  continue;
43
- const create = newestCreate.get(key);
44
- if (filter.inbox !== null && row.inboxId !== filter.inbox)
51
+ if (filter.inbox !== null && failure.inboxId !== filter.inbox)
45
52
  continue;
46
53
  const recipient = {
47
- actorId: row.actorId,
48
- inboxId: row.inboxId,
49
- error: row.error,
50
- missedAnnouncement: create !== undefined && RETRIED.has(create.status),
54
+ actorId: failure.actorId,
55
+ inboxId: failure.inboxId,
56
+ error: failure.error,
57
+ missed,
51
58
  };
52
- const held = retries.get(slug);
59
+ const held = retries.get(path);
53
60
  if (held === undefined)
54
- retries.set(slug, [recipient]);
61
+ retries.set(path, [recipient]);
55
62
  else
56
63
  held.push(recipient);
57
64
  }
58
- return [...retries].map(([slug, recipients]) => ({ slug, recipients }));
65
+ return [...retries].map(([path, recipients]) => ({ path, recipients }));
66
+ }
67
+ function failed(row) {
68
+ return row !== undefined && RETRIED.has(row.status);
69
+ }
70
+ /**
71
+ * A failed `Create` is owed even after a later `Update` went through, because
72
+ * a peer drops an `Update` of a status it never stored; only a later `Delete`
73
+ * settles it.
74
+ */
75
+ function missedFrom({ create, post, pin }) {
76
+ const withdrawn = post?.activityType === 'Delete' && !failed(post);
77
+ return {
78
+ post: failed(create) && !withdrawn ? 'announcement' : failed(post) ? 'revision' : null,
79
+ pin: failed(pin),
80
+ };
81
+ }
82
+ function newestFailure({ create, post, pin }, missed) {
83
+ const owed = [
84
+ missed.post === 'announcement' ? create : undefined,
85
+ missed.post === null ? undefined : post,
86
+ missed.pin ? pin : undefined,
87
+ ].filter(failed);
88
+ return owed.toSorted((a, b) => b.attemptedAt.localeCompare(a.attemptedAt))[0];
89
+ }
90
+ /**
91
+ * The announced post a delivery row's object id belongs to, under any id it
92
+ * has been federated as. Built on first use, so a caller that never asks pays
93
+ * nothing for the walk of every announced post.
94
+ */
95
+ export function federatedPostOf(services) {
96
+ let posts;
97
+ return (objectId) => {
98
+ posts ??= postsByObjectId(services);
99
+ return posts.get(objectId);
100
+ };
101
+ }
102
+ function postsByObjectId({ store, config }) {
103
+ const posts = new Map();
104
+ for (const document of store.listFederated()) {
105
+ for (const id of ownObjectIds(store, document, config)) {
106
+ if (!posts.has(id))
107
+ posts.set(id, document);
108
+ }
109
+ }
110
+ return posts;
59
111
  }
60
112
  function deliveriesToSameActors(admin, objectIds, rows) {
61
113
  const actorIds = new Set(rows.map((row) => row.actorId));
@@ -72,17 +124,22 @@ export function retryDeliveriesJob(services, pace = (signal) => sleep(RETRY_PACE
72
124
  context.signal.throwIfAborted();
73
125
  if (done > 0)
74
126
  await pace(context.signal);
75
- for (const missedAnnouncement of [true, false]) {
76
- const group = retry.recipients.filter((recipient) => recipient.missedAnnouncement === missedAnnouncement);
77
- if (group.length === 0)
78
- continue;
127
+ for (const { missed, group } of byWhatTheyMissed(retry.recipients)) {
79
128
  const actors = new Set(group.map((recipient) => recipient.actorId));
80
- const report = await services.delivery.resend(retry.slug, { actors, missedAnnouncement });
81
- posts.push({
82
- slug: retry.slug,
83
- recipients: group.length,
84
- activity: report === undefined ? null : resendActivity(report),
85
- });
129
+ const reports = [];
130
+ if (missed.post !== null) {
131
+ const missedAnnouncement = missed.post === 'announcement';
132
+ reports.push(await services.delivery.resend(retry.path, { actors, missedAnnouncement }));
133
+ }
134
+ if (missed.pin)
135
+ reports.push(await services.delivery.resendPin(retry.path, actors));
136
+ for (const report of reports) {
137
+ posts.push({
138
+ path: retry.path,
139
+ recipients: group.length,
140
+ activity: report === undefined ? null : resendActivity(report),
141
+ });
142
+ }
86
143
  }
87
144
  await context.progress({ done: done + 1, total: retries.length });
88
145
  }
@@ -90,15 +147,27 @@ export function retryDeliveriesJob(services, pace = (signal) => sleep(RETRY_PACE
90
147
  },
91
148
  };
92
149
  }
150
+ function byWhatTheyMissed(recipients) {
151
+ const groups = new Map();
152
+ for (const recipient of recipients) {
153
+ const key = JSON.stringify(recipient.missed);
154
+ const held = groups.get(key);
155
+ if (held === undefined)
156
+ groups.set(key, { missed: recipient.missed, group: [recipient] });
157
+ else
158
+ held.group.push(recipient);
159
+ }
160
+ return [...groups.values()].toSorted((a, b) => POST_ORDER.indexOf(a.missed.post) - POST_ORDER.indexOf(b.missed.post));
161
+ }
93
162
  function parseRetryFilter(payload) {
94
163
  if (isRecord(payload)) {
95
- const { slug, inbox } = payload;
96
- if (typeof slug === 'string' && (inbox === null || typeof inbox === 'string')) {
97
- return { slug, inbox };
164
+ const { path, inbox } = payload;
165
+ if (typeof path === 'string' && (inbox === null || typeof inbox === 'string')) {
166
+ return { path, inbox };
98
167
  }
99
- if (slug === null && typeof inbox === 'string')
100
- return { slug, inbox };
168
+ if (path === null && typeof inbox === 'string')
169
+ return { path, inbox };
101
170
  }
102
- throw new Error('A retry names a post’s slug, an inbox, or both.');
171
+ throw new Error('A retry names a post’s path, an inbox, or both.');
103
172
  }
104
173
  //# sourceMappingURL=retry-job.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"retry-job.js","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"retry-job.js","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ import type { ResolvedConfig } from '../config.ts';
2
+ /**
3
+ * Wait for one delivery POST for as long as the config allows, and reject when
4
+ * the inbox has not answered by then.
5
+ *
6
+ * Fedify 2.4.5 takes no signal or deadline for a delivery, and its HTTP client
7
+ * waits five minutes for headers, so an inbox that accepts the connection and
8
+ * never answers would hold a resend and a shutdown that long per post. The
9
+ * request is left to finish or fail on its own, and what it ends in after the
10
+ * deadline is dropped.
11
+ */
12
+ export declare function sendWithinDeadline(config: Pick<ResolvedConfig, 'federation'>, inbox: string, sending: Promise<void>): Promise<void>;
13
+ //# sourceMappingURL=send-deadline.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"send-deadline.d.ts","sourceRoot":"","sources":["../../src/federation/send-deadline.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,EAC1C,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GACrB,OAAO,CAAC,IAAI,CAAC,CAgBf"}
@@ -0,0 +1,30 @@
1
+ import { DEFAULT_DELIVERY_TIMEOUT_MS } from '../config.js';
2
+ /**
3
+ * Wait for one delivery POST for as long as the config allows, and reject when
4
+ * the inbox has not answered by then.
5
+ *
6
+ * Fedify 2.4.5 takes no signal or deadline for a delivery, and its HTTP client
7
+ * waits five minutes for headers, so an inbox that accepts the connection and
8
+ * never answers would hold a resend and a shutdown that long per post. The
9
+ * request is left to finish or fail on its own, and what it ends in after the
10
+ * deadline is dropped.
11
+ */
12
+ export async function sendWithinDeadline(config, inbox, sending) {
13
+ const ms = config.federation.deliveryTimeoutMs ?? DEFAULT_DELIVERY_TIMEOUT_MS;
14
+ sending.catch(() => undefined);
15
+ let timer;
16
+ try {
17
+ await Promise.race([
18
+ sending,
19
+ new Promise((_resolve, reject) => {
20
+ timer = setTimeout(() => {
21
+ reject(new Error(`No answer from ${inbox} within ${String(ms / 1000)} s.`));
22
+ }, ms);
23
+ }),
24
+ ]);
25
+ }
26
+ finally {
27
+ clearTimeout(timer);
28
+ }
29
+ }
30
+ //# sourceMappingURL=send-deadline.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"send-deadline.js","sourceRoot":"","sources":["../../src/federation/send-deadline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAG3D;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAA0C,EAC1C,KAAa,EACb,OAAsB;IAEtB,MAAM,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,iBAAiB,IAAI,2BAA2B,CAAC;IAC9E,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC/B,IAAI,KAAiC,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,OAAO,CAAC,IAAI,CAAC;YACjB,OAAO;YACP,IAAI,OAAO,CAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;gBACtC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;oBACtB,MAAM,CAAC,IAAI,KAAK,CAAC,kBAAkB,KAAK,WAAW,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC9E,CAAC,EAAE,EAAE,CAAC,CAAC;YACT,CAAC,CAAC;SACH,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC"}
@@ -15,7 +15,8 @@
15
15
  * process, so two requests that both rewrite `site.json` cannot interleave.
16
16
  * {@link updateFileAtomically} puts the read inside that queue as well,
17
17
  * which is what stops the second writer reading the file before the first
18
- * has written it and then overwriting what it wrote.
18
+ * has written it and then overwriting what it wrote. It also holds a lock
19
+ * file beside the target for that step.
19
20
  *
20
21
  * The queue is per path, so writes to different files still run at once, and
21
22
  * a path is forgotten again as soon as its queue drains.
@@ -33,6 +34,11 @@ export interface WriteFileAtomicallyOptions {
33
34
  * file happened to have.
34
35
  */
35
36
  mode?: number | undefined;
37
+ /**
38
+ * Flush the file before the rename and its directory after, so a power cut
39
+ * cannot leave it empty or missing.
40
+ */
41
+ durable?: boolean | undefined;
36
42
  }
37
43
  /** What a write puts in a file: text, or bytes as they are. */
38
44
  export type FileContents = string | Uint8Array;
@@ -1 +1 @@
1
- {"version":3,"file":"atomic.d.ts","sourceRoot":"","sources":["../../src/files/atomic.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,qDAAqD;AACrD,MAAM,WAAW,0BAA0B;IACzC;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED,+DAA+D;AAC/D,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,UAAU,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,MAAM,GAAG,SAAS,KACxB,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAE1C;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,IAAI,EAAE,MAAM,EAGvB;CACF;AAKD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,IAAI,CAa5E;AAcD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,mBAAmB,EAC5B,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,IAAI,CAAC,CAUf;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAEpF;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,0BAA+B,GACvC,IAAI,CAgBN;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMtE;AAyCD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGlD"}
1
+ {"version":3,"file":"atomic.d.ts","sourceRoot":"","sources":["../../src/files/atomic.ts"],"names":[],"mappings":"AAiBA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,qDAAqD;AACrD,MAAM,WAAW,0BAA0B;IACzC;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED,+DAA+D;AAC/D,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,UAAU,CAAC;AAE/C;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,MAAM,GAAG,SAAS,KACxB,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAE1C;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,IAAI,EAAE,MAAM,EAGvB;CACF;AAKD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,IAAI,CAa5E;AAcD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,mBAAmB,EAC5B,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,IAAI,CAAC,CAaf;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAEpF;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,0BAA+B,GACvC,IAAI,CA2BN;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOtE;AA4DD;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGlD"}
@@ -1,6 +1,7 @@
1
- import { mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs';
2
- import { mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
1
+ import { closeSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, unlinkSync, writeFileSync, } from 'node:fs';
2
+ import { mkdir, open, readFile, rename, unlink, writeFile } from 'node:fs/promises';
3
3
  import path from 'node:path';
4
+ import { lockFileFor, withLockFile } from './lock-file.js';
4
5
  import { createSerialQueue } from '../util/queue.js';
5
6
  /**
6
7
  * A write refused because its directory is read-only for now: a worker that
@@ -68,14 +69,18 @@ export function writeFileAtomically(file, contents, options = {}) {
68
69
  */
69
70
  export function updateFileAtomically(file, produce, options = {}) {
70
71
  return withFileLock(file, async () => {
71
- let current;
72
- try {
73
- current = await readFile(file, 'utf8');
74
- }
75
- catch {
76
- current = undefined;
77
- }
78
- await write(file, await produce(current), options);
72
+ assertWritable(file);
73
+ await withLockFile(lockFileFor(file), async () => {
74
+ let current;
75
+ try {
76
+ current = await readFile(file, 'utf8');
77
+ }
78
+ catch (error) {
79
+ if (!isAbsent(error))
80
+ throw error;
81
+ }
82
+ await write(file, await produce(current), options);
83
+ });
79
84
  });
80
85
  }
81
86
  /**
@@ -113,8 +118,22 @@ export function writeFileAtomicallySync(file, contents, options = {}) {
113
118
  mkdirSync(path.dirname(file), { recursive: true });
114
119
  const temporary = temporaryName(file);
115
120
  try {
116
- writeFileSync(temporary, contents, options.mode === undefined ? {} : { mode: options.mode });
121
+ if (options.durable === true) {
122
+ const fd = openSync(temporary, 'w', options.mode);
123
+ try {
124
+ writeFileSync(fd, contents);
125
+ fsyncSync(fd);
126
+ }
127
+ finally {
128
+ closeSync(fd);
129
+ }
130
+ }
131
+ else {
132
+ writeFileSync(temporary, contents, options.mode === undefined ? {} : { mode: options.mode });
133
+ }
117
134
  renameSync(temporary, file);
135
+ if (options.durable === true)
136
+ syncDirectorySync(path.dirname(file));
118
137
  }
119
138
  catch (error) {
120
139
  try {
@@ -138,10 +157,15 @@ export function readFileIfPresentSync(file) {
138
157
  try {
139
158
  return readFileSync(file, 'utf8');
140
159
  }
141
- catch {
142
- return undefined;
160
+ catch (error) {
161
+ if (isAbsent(error))
162
+ return undefined;
163
+ throw error;
143
164
  }
144
165
  }
166
+ function isAbsent(error) {
167
+ return error?.code === 'ENOENT';
168
+ }
145
169
  /** Run a task once every task already queued for this path has finished. */
146
170
  function enqueue(file, task) {
147
171
  const key = path.resolve(file);
@@ -160,8 +184,22 @@ async function write(file, contents, options) {
160
184
  await mkdir(path.dirname(file), { recursive: true });
161
185
  const temporary = temporaryName(file);
162
186
  try {
163
- await writeFile(temporary, contents, options.mode === undefined ? {} : { mode: options.mode });
187
+ if (options.durable === true) {
188
+ const handle = await open(temporary, 'w', options.mode);
189
+ try {
190
+ await handle.writeFile(contents);
191
+ await handle.sync();
192
+ }
193
+ finally {
194
+ await handle.close();
195
+ }
196
+ }
197
+ else {
198
+ await writeFile(temporary, contents, options.mode === undefined ? {} : { mode: options.mode });
199
+ }
164
200
  await rename(temporary, file);
201
+ if (options.durable === true)
202
+ await syncDirectory(path.dirname(file));
165
203
  }
166
204
  catch (error) {
167
205
  try {
@@ -187,4 +225,27 @@ export function temporaryName(file) {
187
225
  sequence += 1;
188
226
  return `${file}.${process.pid.toString(36)}-${sequence.toString(36)}.tmp`;
189
227
  }
228
+ const DIRECTORIES_FLUSH = process.platform !== 'win32';
229
+ async function syncDirectory(directory) {
230
+ if (!DIRECTORIES_FLUSH)
231
+ return;
232
+ const handle = await open(directory, 'r');
233
+ try {
234
+ await handle.sync();
235
+ }
236
+ finally {
237
+ await handle.close();
238
+ }
239
+ }
240
+ function syncDirectorySync(directory) {
241
+ if (!DIRECTORIES_FLUSH)
242
+ return;
243
+ const fd = openSync(directory, 'r');
244
+ try {
245
+ fsyncSync(fd);
246
+ }
247
+ finally {
248
+ closeSync(fd);
249
+ }
250
+ }
190
251
  //# sourceMappingURL=atomic.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"atomic.js","sourceRoot":"","sources":["../../src/files/atomic.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"atomic.js","sourceRoot":"","sources":["../../src/files/atomic.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AA6DrD;;;;GAIG;AACH,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,IAAY;QACtB,KAAK,CAAC,GAAG,IAAI,6DAA6D,CAAC,CAAC;QAC5E,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAED,wFAAwF;AACxF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE1C;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,WAA8B;IAC9D,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACrE,KAAK,MAAM,GAAG,IAAI,IAAI;QAAE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,OAAO,GAAG,EAAE;QACV,IAAI,QAAQ;YAAE,OAAO;QACrB,QAAQ,GAAG,IAAI,CAAC;QAChB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;;gBAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACvC,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACxE,MAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,MAAM,MAAM,GAAG,IAAI,GAAG,EAAuB,CAAC;AAE9C;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,IAAY,EACZ,QAAsB,EACtB,OAAO,GAA+B,EAAE;IAExC,OAAO,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,oBAAoB,CAClC,IAAY,EACZ,OAA4B,EAC5B,OAAO,GAA+B,EAAE;IAExC,OAAO,YAAY,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;QACnC,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE;YAC/C,IAAI,OAA2B,CAAC;YAChC,IAAI,CAAC;gBACH,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACzC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;oBAAE,MAAM,KAAK,CAAC;YACpC,CAAC;YACD,MAAM,KAAK,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,YAAY,CAAI,IAAY,EAAE,IAA0B;IACtE,OAAO,OAAO,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CACrC,IAAY,EACZ,QAAsB,EACtB,OAAO,GAA+B,EAAE;IAExC,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEtC,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAClD,IAAI,CAAC;gBACH,aAAa,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAC5B,SAAS,CAAC,EAAE,CAAC,CAAC;YAChB,CAAC;oBAAS,CAAC;gBACT,SAAS,CAAC,EAAE,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/F,CAAC;QACD,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC5B,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI;YAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACtE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC;YACH,UAAU,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,6DAA6D;QAC/D,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACtC,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAQ,KAAmC,EAAE,IAAI,KAAK,QAAQ,CAAC;AACjE,CAAC;AAED,4EAA4E;AAC5E,SAAS,OAAO,CAAI,IAAY,EAAE,IAAsB;IACtD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,iBAAiB,EAAE,CAAC;IACrD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAEvB,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QAClC,2EAA2E;QAC3E,kEAAkE;QAClE,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK;YAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC;AAED,4EAA4E;AAC5E,KAAK,UAAU,KAAK,CAClB,IAAY,EACZ,QAAsB,EACtB,OAAmC;IAEnC,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEtC,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACxD,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACjC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;oBAAS,CAAC;gBACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,CACb,SAAS,EACT,QAAQ,EACR,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CACzD,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9B,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI;YAAE,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACxE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,6DAA6D;QAC/D,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,wDAAwD;AACxD,IAAI,QAAQ,GAAG,CAAC,CAAC;AAEjB;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,QAAQ,IAAI,CAAC,CAAC;IACd,OAAO,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC;AAC5E,CAAC;AAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AAEvD,KAAK,UAAU,aAAa,CAAC,SAAiB;IAC5C,IAAI,CAAC,iBAAiB;QAAE,OAAO;IAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAC1C,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,SAAiB;IAC1C,IAAI,CAAC,iBAAiB;QAAE,OAAO;IAC/B,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACpC,IAAI,CAAC;QACH,SAAS,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,SAAS,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;AACH,CAAC"}
@@ -42,6 +42,16 @@ export declare function dataFileFor(declarations: readonly DataFileDeclaration[]
42
42
  export declare function writtenPrivately(declaration: DataFileDeclaration): boolean;
43
43
  export declare function declareDataFile(declaration: DataFileDeclaration): DataFileDeclaration;
44
44
  export declare function dataPath(dataDir: string, file: DataFileDeclaration, ...parts: string[]): string;
45
+ /**
46
+ * The part of a file name one identifier or algorithm contributes.
47
+ *
48
+ * Lower case, because `RSASSA-PKCS1-v1_5` on a case-insensitive filesystem is
49
+ * the same file as `rsassa-pkcs1-v1_5` and only one of them should ever be
50
+ * written; and anything that is not a letter, a digit, a dash or an underscore
51
+ * becomes a dash, so nothing a name carries — a dot, a slash, a `..` — can
52
+ * reach out of its folder or split the file name into more parts than it has.
53
+ */
54
+ export declare function fileToken(value: string): string;
45
55
  /** The folder that holds what `folder` declares: `keys/` for `keys/*.jwk`, `images/` for `images/**`. */
46
56
  export declare function dataFolder(dataDir: string, folder: DataFileDeclaration, ...parts: string[]): string;
47
57
  export declare const TEMPORARY_FILES: DataFileDeclaration;
@@ -82,6 +92,8 @@ export declare const QUEUE_LOG: DataFileDeclaration;
82
92
  export declare const AUTOSAVE: DataFileDeclaration;
83
93
  export declare const CORE_DATA_FILES: readonly DataFileDeclaration[];
84
94
  export declare const WATCH_PROBE: DataFileDeclaration;
95
+ export declare const CONTENT_DATA_LOCK_FILES: DataFileDeclaration;
96
+ export declare const CONTENT_DATA_LOCK_TAKEOVER_FILES: DataFileDeclaration;
85
97
  export declare const CONTENT_SCRATCH_FILES: readonly DataFileDeclaration[];
86
98
  export interface ClassifiedFile {
87
99
  /** Under the folder walked, `/`-separated. */
@@ -1 +1 @@
1
- {"version":3,"file":"data-files.d.ts","sourceRoot":"","sources":["../../src/files/data-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"data-files.d.ts","sourceRoot":"","sources":["../../src/files/data-files.ts"],"names":[],"mappings":"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"}