@c9up/archive 0.1.13 → 0.1.15

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 (41) hide show
  1. package/dist/ArchiveProvider.d.ts +1 -0
  2. package/dist/ArchiveProvider.d.ts.map +1 -1
  3. package/dist/ArchiveProvider.js +53 -17
  4. package/dist/ArchiveProvider.js.map +1 -1
  5. package/dist/DriveManager.js +2 -2
  6. package/dist/DriveManager.js.map +1 -1
  7. package/dist/GcsDriver.js +5 -5
  8. package/dist/GcsDriver.js.map +1 -1
  9. package/dist/S3Driver.js +6 -6
  10. package/dist/S3Driver.js.map +1 -1
  11. package/dist/StaticMiddleware.d.ts.map +1 -1
  12. package/dist/StaticMiddleware.js +31 -11
  13. package/dist/StaticMiddleware.js.map +1 -1
  14. package/dist/StorageManager.d.ts +16 -8
  15. package/dist/StorageManager.d.ts.map +1 -1
  16. package/dist/StorageManager.js +176 -115
  17. package/dist/StorageManager.js.map +1 -1
  18. package/dist/etag.d.ts +32 -0
  19. package/dist/etag.d.ts.map +1 -0
  20. package/dist/etag.js +41 -0
  21. package/dist/etag.js.map +1 -0
  22. package/dist/expiry.d.ts +2 -2
  23. package/dist/expiry.js +6 -6
  24. package/dist/expiry.js.map +1 -1
  25. package/dist/services/main.d.ts +11 -0
  26. package/dist/services/main.d.ts.map +1 -1
  27. package/dist/services/main.js +21 -0
  28. package/dist/services/main.js.map +1 -1
  29. package/dist/testing/FakeStorage.js +7 -7
  30. package/dist/testing/FakeStorage.js.map +1 -1
  31. package/package.json +1 -1
  32. package/src/ArchiveProvider.ts +64 -24
  33. package/src/DriveManager.ts +2 -2
  34. package/src/GcsDriver.ts +5 -5
  35. package/src/S3Driver.ts +6 -6
  36. package/src/StaticMiddleware.ts +32 -11
  37. package/src/StorageManager.ts +182 -118
  38. package/src/etag.ts +44 -0
  39. package/src/expiry.ts +6 -6
  40. package/src/services/main.ts +21 -0
  41. package/src/testing/FakeStorage.ts +7 -7
package/dist/etag.d.ts ADDED
@@ -0,0 +1,32 @@
1
+ /**
2
+ * Entity tags for static responses.
3
+ *
4
+ * Two rules from RFC 9110 that a hand-rolled digest tends to miss, and that
5
+ * both cost a conditional request when missed:
6
+ *
7
+ * - §8.8.3 — an entity-tag IS a quoted string. A bare hex digest is not one,
8
+ * and a strict cache is entitled to ignore it, which turns every
9
+ * revalidation back into a full transfer.
10
+ * - §13.1.2 — `If-None-Match` is a LIST, compared with the WEAK comparison
11
+ * function, so `W/"x"` and `"x"` match. Raw equality against the whole
12
+ * header value fails a client that sends two tags, and fails every client
13
+ * that sends back the weak form of a strong tag.
14
+ *
15
+ * Archive is agnostic, so this lives here rather than being imported from the
16
+ * framework; `@c9up/ream` carries the same two rules in its own `http/etag`.
17
+ */
18
+ /**
19
+ * The tag for a file, from its metadata rather than its bytes.
20
+ *
21
+ * `W/"<size hex>-<mtime hex>"`, which is what the `etag` package produces for
22
+ * a `Stats` and therefore what every static file server people have cached
23
+ * against emits. Weak because it is derived from metadata: two files with the
24
+ * same size and mtime are equivalent for caching, not provably identical.
25
+ */
26
+ export declare function statTag(stat: {
27
+ size: number;
28
+ mtimeMs: number;
29
+ }): string;
30
+ /** Whether `If-None-Match` covers `tag` (RFC 9110 §13.1.2). */
31
+ export declare function matchesIfNoneMatch(header: string | undefined, tag: string): boolean;
32
+ //# sourceMappingURL=etag.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"etag.d.ts","sourceRoot":"","sources":["../src/etag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAEvE;AAED,+DAA+D;AAC/D,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,EAAE,MAAM,GACT,OAAO,CAST"}
package/dist/etag.js ADDED
@@ -0,0 +1,41 @@
1
+ /**
2
+ * Entity tags for static responses.
3
+ *
4
+ * Two rules from RFC 9110 that a hand-rolled digest tends to miss, and that
5
+ * both cost a conditional request when missed:
6
+ *
7
+ * - §8.8.3 — an entity-tag IS a quoted string. A bare hex digest is not one,
8
+ * and a strict cache is entitled to ignore it, which turns every
9
+ * revalidation back into a full transfer.
10
+ * - §13.1.2 — `If-None-Match` is a LIST, compared with the WEAK comparison
11
+ * function, so `W/"x"` and `"x"` match. Raw equality against the whole
12
+ * header value fails a client that sends two tags, and fails every client
13
+ * that sends back the weak form of a strong tag.
14
+ *
15
+ * Archive is agnostic, so this lives here rather than being imported from the
16
+ * framework; `@c9up/ream` carries the same two rules in its own `http/etag`.
17
+ */
18
+ /**
19
+ * The tag for a file, from its metadata rather than its bytes.
20
+ *
21
+ * `W/"<size hex>-<mtime hex>"`, which is what the `etag` package produces for
22
+ * a `Stats` and therefore what every static file server people have cached
23
+ * against emits. Weak because it is derived from metadata: two files with the
24
+ * same size and mtime are equivalent for caching, not provably identical.
25
+ */
26
+ export function statTag(stat) {
27
+ return `W/"${stat.size.toString(16)}-${Math.floor(stat.mtimeMs).toString(16)}"`;
28
+ }
29
+ /** Whether `If-None-Match` covers `tag` (RFC 9110 §13.1.2). */
30
+ export function matchesIfNoneMatch(header, tag) {
31
+ if (!header || tag === "")
32
+ return false;
33
+ if (header.trim() === "*")
34
+ return true;
35
+ const bare = (value) => value.startsWith("W/") ? value.slice(2) : value;
36
+ const current = bare(tag);
37
+ return header
38
+ .split(",")
39
+ .some((candidate) => bare(candidate.trim()) === current);
40
+ }
41
+ //# sourceMappingURL=etag.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"etag.js","sourceRoot":"","sources":["../src/etag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH;;;;;;;GAOG;AACH,MAAM,UAAU,OAAO,CAAC,IAAuC;IAC9D,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC;AACjF,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,kBAAkB,CACjC,MAA0B,EAC1B,GAAW;IAEX,IAAI,CAAC,MAAM,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACvC,MAAM,IAAI,GAAG,CAAC,KAAa,EAAU,EAAE,CACtC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,MAAM;SACX,KAAK,CAAC,GAAG,CAAC;SACV,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC;AAC3D,CAAC"}
package/dist/expiry.d.ts CHANGED
@@ -11,12 +11,12 @@ export declare const MAX_EXPIRES_IN = 604800;
11
11
  * Normalise a signed-URL `expiresIn` into a number of seconds. Accepts
12
12
  * either a raw number of seconds (returned as-is) or a human-friendly
13
13
  * duration string such as `'30mins'`, `'7 days'`, `'1h'` — AdonisJS
14
- * Drive parity. Unrecognised strings throw `ARCHIVE_INVALID_EXPIRY`.
14
+ * Drive parity. Unrecognised strings throw `E_ARCHIVE_INVALID_EXPIRY`.
15
15
  */
16
16
  export declare function parseExpiry(expiresIn: number | string): number;
17
17
  /**
18
18
  * Reject non-finite, zero, negative, or out-of-range expiries. Throws
19
- * `ARCHIVE_INVALID_EXPIRY` so callers get a typed error with a hint.
19
+ * `E_ARCHIVE_INVALID_EXPIRY` so callers get a typed error with a hint.
20
20
  */
21
21
  export declare function assertValidExpiry(expiresIn: number): void;
22
22
  //# sourceMappingURL=expiry.d.ts.map
package/dist/expiry.js CHANGED
@@ -40,7 +40,7 @@ const UNIT_SECONDS = {
40
40
  * Normalise a signed-URL `expiresIn` into a number of seconds. Accepts
41
41
  * either a raw number of seconds (returned as-is) or a human-friendly
42
42
  * duration string such as `'30mins'`, `'7 days'`, `'1h'` — AdonisJS
43
- * Drive parity. Unrecognised strings throw `ARCHIVE_INVALID_EXPIRY`.
43
+ * Drive parity. Unrecognised strings throw `E_ARCHIVE_INVALID_EXPIRY`.
44
44
  */
45
45
  export function parseExpiry(expiresIn) {
46
46
  if (typeof expiresIn === "number")
@@ -49,7 +49,7 @@ export function parseExpiry(expiresIn) {
49
49
  const unitKey = match?.[2]?.toLowerCase() ?? "";
50
50
  const multiplier = unitKey === "" ? 1 : UNIT_SECONDS[unitKey];
51
51
  if (match === undefined || match === null || multiplier === undefined) {
52
- throw new ArchiveError("ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn string '${expiresIn}' could not be parsed`, {
52
+ throw new ArchiveError("E_ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn string '${expiresIn}' could not be parsed`, {
53
53
  hint: "Use a number of seconds, or a duration like '30mins', '1h', '7 days'.",
54
54
  });
55
55
  }
@@ -57,17 +57,17 @@ export function parseExpiry(expiresIn) {
57
57
  }
58
58
  /**
59
59
  * Reject non-finite, zero, negative, or out-of-range expiries. Throws
60
- * `ARCHIVE_INVALID_EXPIRY` so callers get a typed error with a hint.
60
+ * `E_ARCHIVE_INVALID_EXPIRY` so callers get a typed error with a hint.
61
61
  */
62
62
  export function assertValidExpiry(expiresIn) {
63
63
  if (!Number.isFinite(expiresIn)) {
64
- throw new ArchiveError("ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn must be finite, got ${expiresIn}`, { hint: "Pass a positive number of seconds between 1 and 604800." });
64
+ throw new ArchiveError("E_ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn must be finite, got ${expiresIn}`, { hint: "Pass a positive number of seconds between 1 and 604800." });
65
65
  }
66
66
  if (expiresIn <= 0) {
67
- throw new ArchiveError("ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn must be > 0 seconds, got ${expiresIn}`, { hint: "Pass a positive number of seconds between 1 and 604800." });
67
+ throw new ArchiveError("E_ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn must be > 0 seconds, got ${expiresIn}`, { hint: "Pass a positive number of seconds between 1 and 604800." });
68
68
  }
69
69
  if (expiresIn > MAX_EXPIRES_IN) {
70
- throw new ArchiveError("ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn must be <= ${MAX_EXPIRES_IN} seconds (7 days), got ${expiresIn}`, { hint: "AWS SigV4 caps presigned URLs at 7 days." });
70
+ throw new ArchiveError("E_ARCHIVE_INVALID_EXPIRY", `Signed-URL expiresIn must be <= ${MAX_EXPIRES_IN} seconds (7 days), got ${expiresIn}`, { hint: "AWS SigV4 caps presigned URLs at 7 days." });
71
71
  }
72
72
  }
73
73
  //# sourceMappingURL=expiry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"expiry.js","sourceRoot":"","sources":["../src/expiry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,2EAA2E;AAC3E,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC,CAAC,YAAY;AAEnD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,SAAS;AAEhD;;;;GAIG;AACH,MAAM,YAAY,GAA2B;IAC5C,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,CAAC,EAAE,EAAE;IACL,GAAG,EAAE,EAAE;IACP,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;IACX,CAAC,EAAE,IAAI;IACP,EAAE,EAAE,IAAI;IACR,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,CAAC,EAAE,MAAM;IACT,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,MAAM;IACZ,CAAC,EAAE,OAAO;IACV,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,OAAO;CACd,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,SAA0B;IACrD,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACpD,MAAM,KAAK,GAAG,qCAAqC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IAChD,MAAM,UAAU,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,IAAI,YAAY,CACrB,wBAAwB,EACxB,gCAAgC,SAAS,uBAAuB,EAChE;YACC,IAAI,EAAE,uEAAuE;SAC7E,CACD,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,YAAY,CACrB,wBAAwB,EACxB,4CAA4C,SAAS,EAAE,EACvD,EAAE,IAAI,EAAE,yDAAyD,EAAE,CACnE,CAAC;IACH,CAAC;IACD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,YAAY,CACrB,wBAAwB,EACxB,iDAAiD,SAAS,EAAE,EAC5D,EAAE,IAAI,EAAE,yDAAyD,EAAE,CACnE,CAAC;IACH,CAAC;IACD,IAAI,SAAS,GAAG,cAAc,EAAE,CAAC;QAChC,MAAM,IAAI,YAAY,CACrB,wBAAwB,EACxB,mCAAmC,cAAc,0BAA0B,SAAS,EAAE,EACtF,EAAE,IAAI,EAAE,0CAA0C,EAAE,CACpD,CAAC;IACH,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"expiry.js","sourceRoot":"","sources":["../src/expiry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,2EAA2E;AAC3E,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAC,CAAC,YAAY;AAEnD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,SAAS;AAEhD;;;;GAIG;AACH,MAAM,YAAY,GAA2B;IAC5C,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,CAAC;IACN,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;IACV,CAAC,EAAE,EAAE;IACL,GAAG,EAAE,EAAE;IACP,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;IACX,CAAC,EAAE,IAAI;IACP,EAAE,EAAE,IAAI;IACR,GAAG,EAAE,IAAI;IACT,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,CAAC,EAAE,MAAM;IACT,GAAG,EAAE,MAAM;IACX,IAAI,EAAE,MAAM;IACZ,CAAC,EAAE,OAAO;IACV,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,OAAO;CACd,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,SAA0B;IACrD,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACpD,MAAM,KAAK,GAAG,qCAAqC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IAChD,MAAM,UAAU,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,IAAI,YAAY,CACrB,0BAA0B,EAC1B,gCAAgC,SAAS,uBAAuB,EAChE;YACC,IAAI,EAAE,uEAAuE;SAC7E,CACD,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IAClD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,YAAY,CACrB,0BAA0B,EAC1B,4CAA4C,SAAS,EAAE,EACvD,EAAE,IAAI,EAAE,yDAAyD,EAAE,CACnE,CAAC;IACH,CAAC;IACD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;QACpB,MAAM,IAAI,YAAY,CACrB,0BAA0B,EAC1B,iDAAiD,SAAS,EAAE,EAC5D,EAAE,IAAI,EAAE,yDAAyD,EAAE,CACnE,CAAC;IACH,CAAC;IACD,IAAI,SAAS,GAAG,cAAc,EAAE,CAAC;QAChC,MAAM,IAAI,YAAY,CACrB,0BAA0B,EAC1B,mCAAmC,cAAc,0BAA0B,SAAS,EAAE,EACtF,EAAE,IAAI,EAAE,0CAA0C,EAAE,CACpD,CAAC;IACH,CAAC;AACF,CAAC"}
@@ -12,6 +12,17 @@
12
12
  import type { StorageManager } from "../StorageManager.js";
13
13
  /** @internal Bind the singleton (called by ArchiveProvider). */
14
14
  export declare function setStorage(value: StorageManager): void;
15
+ /**
16
+ * @internal Bind a way to build the singleton on first genuine use.
17
+ *
18
+ * For the unconfigured case, where building it at boot would create
19
+ * `./storage` for an application that may never touch storage — and fail
20
+ * outright on a read-only rootfs. Skipping it entirely left the container
21
+ * serving `storage` while this accessor threw "before boot": the same
22
+ * application, two answers. Nothing is built until something reaches for it,
23
+ * and then both paths give the same manager.
24
+ */
25
+ export declare function setStorageResolver(factory: () => StorageManager): void;
15
26
  /** @internal Read the singleton (or `undefined` pre-boot). */
16
27
  export declare function getStorage(): StorageManager | undefined;
17
28
  declare const storage: StorageManager;
@@ -1 +1 @@
1
- {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/services/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,gEAAgE;AAChE,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAEtD;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,IAAI,cAAc,GAAG,SAAS,CAEvD;AAED,QAAA,MAAM,OAAO,EAAE,cAqBb,CAAC;AAEH,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/services/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAK3D,gEAAgE;AAChE,wBAAgB,UAAU,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAGtD;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,cAAc,GAAG,IAAI,CAGtE;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,IAAI,cAAc,GAAG,SAAS,CAEvD;AAED,QAAA,MAAM,OAAO,EAAE,cAyBb,CAAC;AAEH,eAAe,OAAO,CAAC"}
@@ -10,9 +10,26 @@
10
10
  * Populated by `ArchiveProvider.boot()`.
11
11
  */
12
12
  let instance;
13
+ let resolve;
13
14
  /** @internal Bind the singleton (called by ArchiveProvider). */
14
15
  export function setStorage(value) {
15
16
  instance = value;
17
+ resolve = undefined;
18
+ }
19
+ /**
20
+ * @internal Bind a way to build the singleton on first genuine use.
21
+ *
22
+ * For the unconfigured case, where building it at boot would create
23
+ * `./storage` for an application that may never touch storage — and fail
24
+ * outright on a read-only rootfs. Skipping it entirely left the container
25
+ * serving `storage` while this accessor threw "before boot": the same
26
+ * application, two answers. Nothing is built until something reaches for it,
27
+ * and then both paths give the same manager.
28
+ */
29
+ export function setStorageResolver(factory) {
30
+ if (instance !== undefined)
31
+ return;
32
+ resolve = factory;
16
33
  }
17
34
  /** @internal Read the singleton (or `undefined` pre-boot). */
18
35
  export function getStorage() {
@@ -29,6 +46,10 @@ const storage = new Proxy({}, {
29
46
  if (typeof prop === "symbol" || prop === "then") {
30
47
  return undefined;
31
48
  }
49
+ if (instance === undefined && resolve !== undefined) {
50
+ instance = resolve();
51
+ resolve = undefined;
52
+ }
32
53
  if (!instance) {
33
54
  throw new Error("[archive] StorageManager singleton accessed before ArchiveProvider.boot() ran. " +
34
55
  "Check that `@c9up/archive/provider` is listed in your reamrc.ts providers, " +
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/services/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,IAAI,QAAoC,CAAC;AAEzC,gEAAgE;AAChE,MAAM,UAAU,UAAU,CAAC,KAAqB;IAC/C,QAAQ,GAAG,KAAK,CAAC;AAClB,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,UAAU;IACzB,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,MAAM,OAAO,GAAmB,IAAI,KAAK,CAAC,EAAoB,EAAE;IAC/D,GAAG,CAAC,OAAO,EAAE,IAAI;QAChB,2EAA2E;QAC3E,0EAA0E;QAC1E,8DAA8D;QAC9D,0EAA0E;QAC1E,0EAA0E;QAC1E,wEAAwE;QACxE,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACjD,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACd,iFAAiF;gBAChF,6EAA6E;gBAC7E,4CAA4C,CAC7C,CAAC;QACH,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACpD,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,CAAC;CACD,CAAC,CAAC;AAEH,eAAe,OAAO,CAAC"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/services/main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,IAAI,QAAoC,CAAC;AACzC,IAAI,OAA2C,CAAC;AAEhD,gEAAgE;AAChE,MAAM,UAAU,UAAU,CAAC,KAAqB;IAC/C,QAAQ,GAAG,KAAK,CAAC;IACjB,OAAO,GAAG,SAAS,CAAC;AACrB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAA6B;IAC/D,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO;IACnC,OAAO,GAAG,OAAO,CAAC;AACnB,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,UAAU;IACzB,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,MAAM,OAAO,GAAmB,IAAI,KAAK,CAAC,EAAoB,EAAE;IAC/D,GAAG,CAAC,OAAO,EAAE,IAAI;QAChB,2EAA2E;QAC3E,0EAA0E;QAC1E,8DAA8D;QAC9D,0EAA0E;QAC1E,0EAA0E;QAC1E,wEAAwE;QACxE,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACjD,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACrD,QAAQ,GAAG,OAAO,EAAE,CAAC;YACrB,OAAO,GAAG,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACd,iFAAiF;gBAChF,6EAA6E;gBAC7E,4CAA4C,CAC7C,CAAC;QACH,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACpD,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,CAAC;CACD,CAAC,CAAC;AAEH,eAAe,OAAO,CAAC"}
@@ -40,7 +40,7 @@ export class FakeStorage {
40
40
  async getBytes(filePath) {
41
41
  const obj = this.#store.get(filePath);
42
42
  if (!obj) {
43
- throw new ArchiveError("ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
43
+ throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
44
44
  }
45
45
  return new Uint8Array(obj.content);
46
46
  }
@@ -65,7 +65,7 @@ export class FakeStorage {
65
65
  async getStream(filePath) {
66
66
  const obj = this.#store.get(filePath);
67
67
  if (!obj) {
68
- throw new ArchiveError("ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
68
+ throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
69
69
  }
70
70
  return Readable.from(obj.content);
71
71
  }
@@ -105,14 +105,14 @@ export class FakeStorage {
105
105
  async getVisibility(filePath) {
106
106
  const obj = this.#store.get(filePath);
107
107
  if (!obj) {
108
- throw new ArchiveError("ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
108
+ throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
109
109
  }
110
110
  return obj.visibility;
111
111
  }
112
112
  async getMetadata(filePath) {
113
113
  const obj = this.#store.get(filePath);
114
114
  if (!obj) {
115
- throw new ArchiveError("ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
115
+ throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `Fake object does not exist at path '${filePath}'`, { hint: "put() it first, or verify the test setup." });
116
116
  }
117
117
  // Weak ETag deterministic on content hash — useful for
118
118
  // assertion stability in tests.
@@ -130,14 +130,14 @@ export class FakeStorage {
130
130
  async setVisibility(filePath, visibility) {
131
131
  const obj = this.#store.get(filePath);
132
132
  if (!obj) {
133
- throw new ArchiveError("ARCHIVE_NOT_FOUND", `Cannot set visibility — fake object does not exist at path '${filePath}'`, { hint: "put() the file before calling setVisibility()." });
133
+ throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `Cannot set visibility — fake object does not exist at path '${filePath}'`, { hint: "put() the file before calling setVisibility()." });
134
134
  }
135
135
  obj.visibility = visibility;
136
136
  }
137
137
  async copy(from, to, options) {
138
138
  const src = this.#store.get(from);
139
139
  if (!src) {
140
- throw new ArchiveError("ARCHIVE_NOT_FOUND", `Cannot copy — fake source does not exist at path '${from}'`, { hint: "Confirm the source path was put() first." });
140
+ throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `Cannot copy — fake source does not exist at path '${from}'`, { hint: "Confirm the source path was put() first." });
141
141
  }
142
142
  // Default visibility on the new object — matches LocalDriver
143
143
  // semantics (AC 4 from Story 43.6) unless the caller overrides it.
@@ -151,7 +151,7 @@ export class FakeStorage {
151
151
  async move(from, to, options) {
152
152
  const src = this.#store.get(from);
153
153
  if (!src) {
154
- throw new ArchiveError("ARCHIVE_NOT_FOUND", `Cannot move — fake source does not exist at path '${from}'`, { hint: "Confirm the source path was put() first." });
154
+ throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `Cannot move — fake source does not exist at path '${from}'`, { hint: "Confirm the source path was put() first." });
155
155
  }
156
156
  // Move preserves visibility — identity is preserved (an explicit
157
157
  // override wins).
@@ -1 +1 @@
1
- {"version":3,"file":"FakeStorage.js","sourceRoot":"","sources":["../../src/testing/FakeStorage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FakeStorage.js","sourceRoot":"","sources":["../../src/testing/FakeStorage.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@c9up/archive",
3
- "version": "0.1.13",
3
+ "version": "0.1.15",
4
4
  "description": "Archive — File storage abstraction for the Ream framework (Local + S3-compatible drivers)",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -31,7 +31,7 @@ import {
31
31
  type StorageDriver,
32
32
  StorageManager,
33
33
  } from "./StorageManager.js";
34
- import { setStorage } from "./services/main.js";
34
+ import { setStorage, setStorageResolver } from "./services/main.js";
35
35
 
36
36
  interface ArchiveContainer {
37
37
  singleton(token: unknown, factory: () => unknown): void;
@@ -64,31 +64,70 @@ const DEFAULT_CONFIG: ArchiveConfig = {
64
64
  };
65
65
 
66
66
  export default class ArchiveProvider {
67
+ /**
68
+ * The one lazily-built manager, read by BOTH ways in. Set by
69
+ * {@link register}, which always runs before {@link boot}.
70
+ */
71
+ #storage: (() => StorageManager) | undefined;
72
+
67
73
  constructor(protected app: ArchiveAppContext) {}
68
74
 
69
75
  register(): void {
70
- this.app.container.singleton(DriveManager, () => {
71
- const raw = this.app.config.get<ArchiveConfig | DriveConfig>("archive");
72
- return new DriveManager(resolveDriveConfig(raw));
73
- });
76
+ // ONE cell, shared by the container's bindings and the service accessor.
77
+ //
78
+ // The container had its own factory and boot() built a second manager
79
+ // for the accessor, so `services/main`'s storage and
80
+ // `container.resolve(StorageManager)` were different objects over
81
+ // different drivers: a fake bound in a test, or a driver swapped at
82
+ // runtime, was invisible from the other side.
83
+ //
84
+ // Memoised here rather than resolved through the container because the
85
+ // accessor is synchronous and the container is not — which is exactly
86
+ // why boot() could not simply reuse the container's instance.
87
+ let drive: DriveManager | undefined;
88
+ const driveManager = (): DriveManager => {
89
+ drive ??= new DriveManager(
90
+ resolveDriveConfig(
91
+ this.app.config.get<ArchiveConfig | DriveConfig>("archive"),
92
+ ),
93
+ );
94
+ return drive;
95
+ };
96
+ let manager: StorageManager | undefined;
97
+ const storageManager = (): StorageManager => {
98
+ manager ??= driveManager().use();
99
+ return manager;
100
+ };
101
+ this.#storage = storageManager;
102
+
103
+ this.app.container.singleton(DriveManager, () => driveManager());
74
104
  // Backward-compatible bindings — the default disk is what apps
75
105
  // previously resolved via `StorageManager` / the `storage` token.
76
- this.app.container.singleton(StorageManager, async () =>
77
- (await this.app.container.resolve<DriveManager>(DriveManager)).use(),
78
- );
79
- this.app.container.singleton("storage", async () =>
80
- this.app.container.resolve<StorageManager>(StorageManager),
81
- );
82
- this.app.container.singleton("drive", async () =>
83
- this.app.container.resolve<DriveManager>(DriveManager),
84
- );
106
+ this.app.container.singleton(StorageManager, () => storageManager());
107
+ this.app.container.singleton("storage", () => storageManager());
108
+ this.app.container.singleton("drive", () => driveManager());
85
109
  }
86
110
 
87
111
  async boot(): Promise<void> {
88
- // Skip eager resolution when archive is unconfigured: an app that
89
- // registers this provider but never uses storage should not trigger
90
- // LocalDriver's mkdirSync of './storage' at boot (breaks on
91
- // read-only rootfs). Explicit (object-shaped) configs still resolve.
112
+ const storage = this.#storage;
113
+ if (storage === undefined) {
114
+ throw new ArchiveError(
115
+ "E_ARCHIVE_PROVIDER_NOT_REGISTERED",
116
+ "ArchiveProvider.boot() ran before register().",
117
+ {
118
+ hint: "Providers register before they boot — call register() first.",
119
+ },
120
+ );
121
+ }
122
+ // The accessor reads the same cell the container's bindings read, so
123
+ // however storage is reached there is one manager behind it.
124
+ setStorageResolver(storage);
125
+
126
+ // No eager construction when archive is unconfigured: an app that
127
+ // registers this provider and never uses storage should not trigger
128
+ // LocalDriver's mkdir of './storage' at boot, which fails on a
129
+ // read-only rootfs. The resolver above is what keeps that lazy case
130
+ // answering instead of throwing "before boot".
92
131
  const archive = this.app.config.get<ArchiveConfig | DriveConfig>("archive");
93
132
  if (
94
133
  archive === undefined ||
@@ -97,9 +136,10 @@ export default class ArchiveProvider {
97
136
  ) {
98
137
  return;
99
138
  }
100
- const manager =
101
- await this.app.container.resolve<StorageManager>(StorageManager);
102
- setStorage(manager);
139
+ // Configured: build now, so a misspelled driver or a missing
140
+ // driver-specific block is a boot failure rather than a surprise on the
141
+ // first upload.
142
+ setStorage(storage());
103
143
  }
104
144
 
105
145
  async start(): Promise<void> {}
@@ -139,7 +179,7 @@ function buildDriver(config: ArchiveConfig): StorageDriver {
139
179
  if (config.driver === "s3") {
140
180
  if (!config.s3) {
141
181
  throw new ArchiveError(
142
- "ARCHIVE_CONFIG_MISSING",
182
+ "E_ARCHIVE_CONFIG_MISSING",
143
183
  "Archive config.driver is 's3' but config.s3 is missing",
144
184
  {
145
185
  hint: "Provide { bucket, accessKeyId, secretAccessKey, region?, endpoint? } under config.archive.s3.",
@@ -151,7 +191,7 @@ function buildDriver(config: ArchiveConfig): StorageDriver {
151
191
  if (config.driver === "gcs") {
152
192
  if (!config.gcs) {
153
193
  throw new ArchiveError(
154
- "ARCHIVE_CONFIG_MISSING",
194
+ "E_ARCHIVE_CONFIG_MISSING",
155
195
  "Archive config.driver is 'gcs' but config.gcs is missing",
156
196
  {
157
197
  hint: "Provide { bucket, serviceAccount: { client_email, private_key } } under config.archive.gcs.",
@@ -170,7 +210,7 @@ function buildDriver(config: ArchiveConfig): StorageDriver {
170
210
  // `{ driver: 'locla' }` does not silently fall through to the
171
211
  // local driver and write files to an unexpected location.
172
212
  throw new ArchiveError(
173
- "ARCHIVE_INVALID_DRIVER",
213
+ "E_ARCHIVE_INVALID_DRIVER",
174
214
  `Archive config.driver must be 'local', 's3', or 'gcs', got '${String(config.driver)}'`,
175
215
  { hint: "Set config.archive.driver to 'local', 's3', or 'gcs'." },
176
216
  );
@@ -90,7 +90,7 @@ export class DriveManager {
90
90
  constructor(config: DriveConfig) {
91
91
  if (config.services[config.default] === undefined) {
92
92
  throw new ArchiveError(
93
- "ARCHIVE_UNKNOWN_DISK",
93
+ "E_ARCHIVE_UNKNOWN_DISK",
94
94
  `Archive default disk '${config.default}' is not present in config.services`,
95
95
  {
96
96
  hint: `Add a '${config.default}' entry to config.services, or point config.default at an existing disk.`,
@@ -114,7 +114,7 @@ export class DriveManager {
114
114
  const factory = this.#config.services[name];
115
115
  if (factory === undefined) {
116
116
  throw new ArchiveError(
117
- "ARCHIVE_UNKNOWN_DISK",
117
+ "E_ARCHIVE_UNKNOWN_DISK",
118
118
  `Archive disk '${name}' is not configured`,
119
119
  {
120
120
  hint: `Known disks: ${Object.keys(this.#config.services).join(", ") || "(none)"}.`,
package/src/GcsDriver.ts CHANGED
@@ -131,7 +131,7 @@ export class GcsDriver implements StorageDriver {
131
131
  } catch (err) {
132
132
  if (err instanceof Error && err.name === "TimeoutError") {
133
133
  throw new ArchiveError(
134
- "ARCHIVE_REQUEST_TIMEOUT",
134
+ "E_ARCHIVE_REQUEST_TIMEOUT",
135
135
  `The storage provider did not answer within ${ms}ms.`,
136
136
  {
137
137
  hint: "Raise `requestTimeoutMs` for large objects, or check connectivity to the bucket.",
@@ -197,7 +197,7 @@ export class GcsDriver implements StorageDriver {
197
197
  const buf = await this.get(filePath);
198
198
  if (buf === null) {
199
199
  throw new ArchiveError(
200
- "ARCHIVE_NOT_FOUND",
200
+ "E_ARCHIVE_NOT_FOUND",
201
201
  `GCS object does not exist at path '${filePath}'`,
202
202
  {
203
203
  hint: "Confirm the bucket + key and that the object was put() first.",
@@ -256,7 +256,7 @@ export class GcsDriver implements StorageDriver {
256
256
  });
257
257
  if (res.status === 404) {
258
258
  throw new ArchiveError(
259
- "ARCHIVE_NOT_FOUND",
259
+ "E_ARCHIVE_NOT_FOUND",
260
260
  `GCS object does not exist at path '${filePath}'`,
261
261
  {
262
262
  hint: "Confirm the bucket + key and that the object was put() first.",
@@ -318,7 +318,7 @@ export class GcsDriver implements StorageDriver {
318
318
  });
319
319
  if (res.status === 404) {
320
320
  throw new ArchiveError(
321
- "ARCHIVE_NOT_FOUND",
321
+ "E_ARCHIVE_NOT_FOUND",
322
322
  `GCS object does not exist at path '${filePath}'`,
323
323
  { hint: "Confirm the bucket + key." },
324
324
  );
@@ -399,7 +399,7 @@ export class GcsDriver implements StorageDriver {
399
399
  });
400
400
  if (res.status === 404) {
401
401
  throw new ArchiveError(
402
- "ARCHIVE_NOT_FOUND",
402
+ "E_ARCHIVE_NOT_FOUND",
403
403
  `GCS copy source does not exist at path '${from}'`,
404
404
  { hint: "Confirm the source object was put() first." },
405
405
  );
package/src/S3Driver.ts CHANGED
@@ -91,7 +91,7 @@ export class S3Driver implements StorageDriver {
91
91
  } catch (err) {
92
92
  if (err instanceof Error && err.name === "TimeoutError") {
93
93
  throw new ArchiveError(
94
- "ARCHIVE_REQUEST_TIMEOUT",
94
+ "E_ARCHIVE_REQUEST_TIMEOUT",
95
95
  `The storage provider did not answer within ${ms}ms.`,
96
96
  {
97
97
  hint: "Raise `requestTimeoutMs` for large objects, or check connectivity to the bucket.",
@@ -236,7 +236,7 @@ export class S3Driver implements StorageDriver {
236
236
  const res = await this.#fetch(url, { method: "GET", headers });
237
237
  if (res.status === 404) {
238
238
  throw new ArchiveError(
239
- "ARCHIVE_NOT_FOUND",
239
+ "E_ARCHIVE_NOT_FOUND",
240
240
  `S3 object does not exist at path '${filePath}'`,
241
241
  {
242
242
  hint: "Confirm the bucket + key and that the object was put() first.",
@@ -273,7 +273,7 @@ export class S3Driver implements StorageDriver {
273
273
  const res = await this.#fetch(url, { method: "GET", headers });
274
274
  if (res.status === 404) {
275
275
  throw new ArchiveError(
276
- "ARCHIVE_NOT_FOUND",
276
+ "E_ARCHIVE_NOT_FOUND",
277
277
  `S3 object does not exist at path '${filePath}'`,
278
278
  {
279
279
  hint: "Confirm the bucket + key and that the object was put() first.",
@@ -325,7 +325,7 @@ export class S3Driver implements StorageDriver {
325
325
  });
326
326
  if (headRes.status === 404) {
327
327
  throw new ArchiveError(
328
- "ARCHIVE_NOT_FOUND",
328
+ "E_ARCHIVE_NOT_FOUND",
329
329
  `S3 object does not exist at path '${filePath}'`,
330
330
  {
331
331
  hint: "Confirm the bucket + key and that the object was put() first.",
@@ -394,7 +394,7 @@ export class S3Driver implements StorageDriver {
394
394
  });
395
395
  if (aclRes.status === 404) {
396
396
  throw new ArchiveError(
397
- "ARCHIVE_NOT_FOUND",
397
+ "E_ARCHIVE_NOT_FOUND",
398
398
  `S3 object does not exist at path '${filePath}'`,
399
399
  { hint: "Confirm the bucket + key." },
400
400
  );
@@ -547,7 +547,7 @@ export class S3Driver implements StorageDriver {
547
547
  const body = await res.text();
548
548
  if (/\bNoSuchKey\b/.test(body) || res.status === 404) {
549
549
  throw new ArchiveError(
550
- "ARCHIVE_NOT_FOUND",
550
+ "E_ARCHIVE_NOT_FOUND",
551
551
  `S3 copy source does not exist at path '${from}'`,
552
552
  { hint: "Confirm the source object was put() first." },
553
553
  );