@c9up/archive 0.1.15 → 0.1.17
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.
- package/dist/ArchiveProvider.d.ts +24 -0
- package/dist/ArchiveProvider.d.ts.map +1 -1
- package/dist/ArchiveProvider.js +23 -3
- package/dist/ArchiveProvider.js.map +1 -1
- package/dist/StaticMiddleware.d.ts +16 -1
- package/dist/StaticMiddleware.d.ts.map +1 -1
- package/dist/StaticMiddleware.js +5 -1
- package/dist/StaticMiddleware.js.map +1 -1
- package/dist/StorageManager.d.ts.map +1 -1
- package/dist/StorageManager.js +72 -8
- package/dist/StorageManager.js.map +1 -1
- package/dist/augmentations.d.ts +37 -0
- package/dist/augmentations.d.ts.map +1 -0
- package/dist/augmentations.js +18 -0
- package/dist/augmentations.js.map +1 -0
- package/dist/expiry.d.ts.map +1 -1
- package/dist/expiry.js +2 -1
- package/dist/expiry.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/services/main.d.ts +9 -0
- package/dist/services/main.d.ts.map +1 -1
- package/dist/services/main.js +11 -0
- package/dist/services/main.js.map +1 -1
- package/package.json +5 -3
- package/src/ArchiveProvider.ts +29 -3
- package/src/StaticMiddleware.ts +21 -2
- package/src/StorageManager.ts +86 -12
- package/src/augmentations.ts +41 -0
- package/src/expiry.ts +2 -1
- package/src/index.ts +2 -0
- package/src/services/main.ts +12 -0
|
@@ -1,3 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ArchiveProvider — registers a shared StorageManager in the host
|
|
3
|
+
* framework's container. Apps add `@c9up/archive/provider` to their
|
|
4
|
+
* `reamrc.ts` providers list and configure the driver under the
|
|
5
|
+
* `archive` config key.
|
|
6
|
+
*
|
|
7
|
+
* Duck-typed against `ArchiveAppContext` so archive does NOT import
|
|
8
|
+
* `@c9up/ream` — keeps the package publishable standalone.
|
|
9
|
+
*
|
|
10
|
+
* @example
|
|
11
|
+
* // reamrc.ts
|
|
12
|
+
* providers: [() => import('@c9up/archive/provider')]
|
|
13
|
+
*
|
|
14
|
+
* // config/archive.ts
|
|
15
|
+
* export default {
|
|
16
|
+
* driver: 'local',
|
|
17
|
+
* local: { root: './storage' },
|
|
18
|
+
* }
|
|
19
|
+
*
|
|
20
|
+
* // anywhere
|
|
21
|
+
* import storage from '@c9up/archive/services/main'
|
|
22
|
+
* await storage.put('uploads/avatar.png', buffer)
|
|
23
|
+
*/
|
|
24
|
+
import "./augmentations.js";
|
|
1
25
|
import { type GcsConfig } from "./GcsDriver.js";
|
|
2
26
|
import { type S3Config } from "./S3Driver.js";
|
|
3
27
|
interface ArchiveContainer {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchiveProvider.d.ts","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ArchiveProvider.d.ts","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,oBAAoB,CAAC;AAI5B,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,eAAe,CAAC;AAaxD,UAAU,gBAAgB;IACzB,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,GAAG,IAAI,CAAC;IACxD,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACjD;AACD,UAAU,kBAAkB;IAC3B,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;CAC7C;AACD,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,gBAAgB,CAAC;IAC5B,MAAM,EAAE,kBAAkB,CAAC;CAC3B;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC;IAC/B,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjD,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,GAAG,CAAC,EAAE,SAAS,CAAC;CAChB;AAOD,MAAM,CAAC,OAAO,OAAO,eAAe;;IAUvB,SAAS,CAAC,GAAG,EAAE,iBAAiB;gBAAtB,GAAG,EAAE,iBAAiB;IAE5C,QAAQ,IAAI,IAAI;IA2CV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAS/B"}
|
package/dist/ArchiveProvider.js
CHANGED
|
@@ -21,18 +21,21 @@
|
|
|
21
21
|
* import storage from '@c9up/archive/services/main'
|
|
22
22
|
* await storage.put('uploads/avatar.png', buffer)
|
|
23
23
|
*/
|
|
24
|
+
import "./augmentations.js";
|
|
24
25
|
import { DriveManager } from "./DriveManager.js";
|
|
25
26
|
import { ArchiveError } from "./errors.js";
|
|
26
27
|
import { GcsDriver } from "./GcsDriver.js";
|
|
27
28
|
import { S3Driver } from "./S3Driver.js";
|
|
28
29
|
import { LocalDriver, StorageManager, } from "./StorageManager.js";
|
|
29
|
-
import { setStorage, setStorageResolver } from "./services/main.js";
|
|
30
|
+
import { clearStorage, getStorage, setStorage, setStorageResolver, } from "./services/main.js";
|
|
30
31
|
const DEFAULT_CONFIG = {
|
|
31
32
|
driver: "local",
|
|
32
33
|
local: { root: "./storage" },
|
|
33
34
|
};
|
|
34
35
|
export default class ArchiveProvider {
|
|
35
36
|
app;
|
|
37
|
+
/** What this provider bound, so shutdown only clears its own. */
|
|
38
|
+
#owned;
|
|
36
39
|
/**
|
|
37
40
|
* The one lazily-built manager, read by BOTH ways in. Set by
|
|
38
41
|
* {@link register}, which always runs before {@link boot}.
|
|
@@ -68,7 +71,14 @@ export default class ArchiveProvider {
|
|
|
68
71
|
// Backward-compatible bindings — the default disk is what apps
|
|
69
72
|
// previously resolved via `StorageManager` / the `storage` token.
|
|
70
73
|
this.app.container.singleton(StorageManager, () => storageManager());
|
|
74
|
+
// Namespaced by the package that owns it, the way upstream namespaces
|
|
75
|
+
// `lucid.db`, `auth.manager` and `drive.manager` by theirs. The bare
|
|
76
|
+
// token stays bound beside it: it is what every existing
|
|
77
|
+
// `container.make(...)` asks for, and a token is not worth breaking an
|
|
78
|
+
// application over.
|
|
79
|
+
this.app.container.singleton("archive.storage", () => storageManager());
|
|
71
80
|
this.app.container.singleton("storage", () => storageManager());
|
|
81
|
+
this.app.container.singleton("archive.drive", () => driveManager());
|
|
72
82
|
this.app.container.singleton("drive", () => driveManager());
|
|
73
83
|
}
|
|
74
84
|
async boot() {
|
|
@@ -95,11 +105,21 @@ export default class ArchiveProvider {
|
|
|
95
105
|
// Configured: build now, so a misspelled driver or a missing
|
|
96
106
|
// driver-specific block is a boot failure rather than a surprise on the
|
|
97
107
|
// first upload.
|
|
98
|
-
|
|
108
|
+
const manager = storage();
|
|
109
|
+
this.#owned = manager;
|
|
110
|
+
setStorage(manager);
|
|
99
111
|
}
|
|
100
112
|
async start() { }
|
|
101
113
|
async ready() { }
|
|
102
|
-
async shutdown() {
|
|
114
|
+
async shutdown() {
|
|
115
|
+
// Release the module-level singleton, while it is still ours. A stopped
|
|
116
|
+
// application left a dead storage manager reachable through `services/main`, and
|
|
117
|
+
// with two applications in one process the survivor's binding must not
|
|
118
|
+
// be the one cleared.
|
|
119
|
+
if (this.#owned !== undefined && getStorage() === this.#owned)
|
|
120
|
+
clearStorage();
|
|
121
|
+
this.#owned = undefined;
|
|
122
|
+
}
|
|
103
123
|
}
|
|
104
124
|
/** Narrow an unknown config value to the multi-disk {@link DriveConfig} shape. */
|
|
105
125
|
function isDriveConfig(config) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchiveProvider.js","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAoB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAkB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAiB,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EACN,WAAW,EAEX,cAAc,GACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"ArchiveProvider.js","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,22 @@ export interface StaticConfig {
|
|
|
33
33
|
root: string;
|
|
34
34
|
/** URL prefix (default: /static). */
|
|
35
35
|
prefix?: string;
|
|
36
|
-
/**
|
|
36
|
+
/**
|
|
37
|
+
* `max-age` in seconds. Default 0, as AdonisJS's static server is.
|
|
38
|
+
*
|
|
39
|
+
* Zero does NOT mean "do not cache": the response still carries an ETag and
|
|
40
|
+
* a Last-Modified, so a browser keeps the bytes and asks whether they are
|
|
41
|
+
* still good — answered with a 304 and no body. What zero removes is the
|
|
42
|
+
* window in which it does not ask at all.
|
|
43
|
+
*
|
|
44
|
+
* The old default was a day, which is right for fingerprinted assets and
|
|
45
|
+
* wrong for everything else: a stylesheet rebuilt during development was
|
|
46
|
+
* not re-fetched for 24 hours, so the page kept rendering with the previous
|
|
47
|
+
* one and nothing about it looked broken.
|
|
48
|
+
*
|
|
49
|
+
* Set it high for content served under a content-addressed name, or put a
|
|
50
|
+
* CDN in front — which is what upstream recommends for production anyway.
|
|
51
|
+
*/
|
|
37
52
|
maxAge?: number;
|
|
38
53
|
/** File extensions to serve (default: common web assets). */
|
|
39
54
|
extensions?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticMiddleware.d.ts","sourceRoot":"","sources":["../src/StaticMiddleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH;;;;;GAKG;AACH,MAAM,WAAW,wBAAwB;IACxC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAAC;IAC/C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,wBAAwB,CAAC;IAC9D,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,2BAA2B;IAC3C,OAAO,EAAE;QACR,MAAM,IAAI,MAAM,CAAC;QACjB,IAAI,IAAI,MAAM,CAAC;QACf,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KACzC,CAAC;IACF,QAAQ,EAAE,wBAAwB,CAAC;CACnC;AAED,MAAM,WAAW,YAAY;IAC5B,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB
|
|
1
|
+
{"version":3,"file":"StaticMiddleware.d.ts","sourceRoot":"","sources":["../src/StaticMiddleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AASH;;;;;GAKG;AACH,MAAM,WAAW,wBAAwB;IACxC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAAC;IAC/C,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,wBAAwB,CAAC;IAC9D,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,2BAA2B;IAC3C,OAAO,EAAE;QACR,MAAM,IAAI,MAAM,CAAC;QACjB,IAAI,IAAI,MAAM,CAAC;QACf,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KACzC,CAAC;IACF,QAAQ,EAAE,wBAAwB,CAAC;CACnC;AAED,MAAM,WAAW,YAAY;IAC5B,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,qBAAa,gBAAgB;;gBAMhB,MAAM,EAAE,YAAY;IAoB1B,MAAM,CACX,GAAG,EAAE,2BAA2B,EAChC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACvB,OAAO,CAAC,IAAI,CAAC;CAuHhB"}
|
package/dist/StaticMiddleware.js
CHANGED
|
@@ -34,7 +34,7 @@ export class StaticMiddleware {
|
|
|
34
34
|
// detect symlink-based escapes consistently.
|
|
35
35
|
this.#root = fs.existsSync(resolved) ? fs.realpathSync(resolved) : resolved;
|
|
36
36
|
this.#prefix = prefix;
|
|
37
|
-
this.#maxAge = config.maxAge ??
|
|
37
|
+
this.#maxAge = config.maxAge ?? 0;
|
|
38
38
|
this.#extensions = new Set(config.extensions ?? DEFAULT_EXTENSIONS);
|
|
39
39
|
}
|
|
40
40
|
async handle(ctx, next) {
|
|
@@ -106,6 +106,10 @@ export class StaticMiddleware {
|
|
|
106
106
|
ctx.response.header("Content-Length", String(stat.size));
|
|
107
107
|
ctx.response.header("Cache-Control", `public, max-age=${this.#maxAge}`);
|
|
108
108
|
ctx.response.header("ETag", etag);
|
|
109
|
+
// Sent alongside the ETag, as upstream does. A client that revalidates
|
|
110
|
+
// with `If-Modified-Since` rather than `If-None-Match` has nothing to
|
|
111
|
+
// compare against without it.
|
|
112
|
+
ctx.response.header("Last-Modified", stat.mtime.toUTCString());
|
|
109
113
|
if (ctx.request.method() === "HEAD") {
|
|
110
114
|
ctx.response.status(200);
|
|
111
115
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticMiddleware.js","sourceRoot":"","sources":["../src/StaticMiddleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"StaticMiddleware.js","sourceRoot":"","sources":["../src/StaticMiddleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAiDhE,MAAM,OAAO,gBAAgB;IAC5B,KAAK,CAAS;IACd,OAAO,CAAS;IAChB,OAAO,CAAS;IAChB,WAAW,CAAc;IAEzB,YAAY,MAAoB;QAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC;QAC1C,gEAAgE;QAChE,+DAA+D;QAC/D,8DAA8D;QAC9D,sDAAsD;QACtD,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACd,sGAAsG,CACtG,CAAC;QACH,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,8DAA8D;QAC9D,6CAA6C;QAC7C,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC5E,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,kBAAkB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,MAAM,CACX,GAAgC,EAChC,IAAyB;QAEzB,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,MAAM,EAAE,CAAC;YACvE,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,wEAAwE;QACxE,yEAAyE;QACzE,wBAAwB;QACxB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,GAAG,EAAE,CAAC;YACtD,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QAED,qCAAqC;QACrC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC;QAEzE,kEAAkE;QAClE,iEAAiE;QACjE,kEAAkE;QAClE,gEAAgE;QAChE,6CAA6C;QAC7C,0DAA0D;QAC1D,wCAAwC;QACxC,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;YACpE,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QAErD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QAED,gDAAgD;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;QAC3E,IACC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC;YAC3C,QAAQ,KAAK,IAAI,CAAC,KAAK,EACtB,CAAC;YACF,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QAED,IAAI,IAA0C,CAAC;QAC/C,IAAI,QAAgB,CAAC;QACrB,IAAI,CAAC;YACJ,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAAE,OAAO,IAAI,EAAE,CAAC;YAClC,yDAAyD;YACzD,qDAAqD;YACrD,QAAQ,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACxC,IACC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC;gBAC3C,QAAQ,KAAK,IAAI,CAAC,KAAK,EACtB,CAAC;gBACF,OAAO,IAAI,EAAE,CAAC;YACf,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QAED,wEAAwE;QACxE,wEAAwE;QACxE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3B,sEAAsE;QACtE,mEAAmE;QACnE,oDAAoD;QACpD,IAAI,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC;YACnE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO;QACR,CAAC;QAED,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QAChC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC1C,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,mBAAmB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACxE,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClC,uEAAuE;QACvE,sEAAsE;QACtE,8BAA8B;QAC9B,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QAE/D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,MAAM,EAAE,CAAC;YACrC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACzB,OAAO;QACR,CAAC;QAED,mDAAmD;QACnD,EAAE;QACF,uEAAuE;QACvE,uEAAuE;QACvE,qEAAqE;QACrE,wEAAwE;QACxE,yEAAyE;QACzE,EAAE;QACF,qEAAqE;QACrE,qEAAqE;QACrE,IAAI,OAAe,CAAC;QACpB,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAC5B,QAAQ,EACR,EAAE,CAAC,SAAS,CAAC,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,CAC/C,CAAC;YACF,IAAI,CAAC;gBACJ,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACnC,CAAC;oBAAS,CAAC;gBACV,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,IAAI,EAAE,CAAC;QACf,CAAC;QACD,0EAA0E;QAC1E,0DAA0D;QAC1D,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageManager.d.ts","sourceRoot":"","sources":["../src/StorageManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"StorageManager.d.ts","sourceRoot":"","sources":["../src/StorageManager.ts"],"names":[],"mappings":"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"}
|
package/dist/StorageManager.js
CHANGED
|
@@ -18,6 +18,14 @@ export { DriveDirectory, DriveFile } from "./objects.js";
|
|
|
18
18
|
* on the LocalDriver. Kept as a package-internal constant so the static
|
|
19
19
|
* middleware can exclude it by the same name. */
|
|
20
20
|
export const VISIBILITY_SIDECAR_SUFFIX = ".archive-visibility.json";
|
|
21
|
+
/**
|
|
22
|
+
* `O_NOFOLLOW`, or nothing on a platform without it.
|
|
23
|
+
*
|
|
24
|
+
* Windows has no symlink-refusing open and leaves `fs.constants.O_NOFOLLOW`
|
|
25
|
+
* undefined; or-ing that into the flags yields `NaN` and every open fails, so
|
|
26
|
+
* the flag is contributed only where it exists.
|
|
27
|
+
*/
|
|
28
|
+
const O_NOFOLLOW = fs.constants.O_NOFOLLOW ?? 0;
|
|
21
29
|
export class LocalDriver {
|
|
22
30
|
#root;
|
|
23
31
|
#signingSecret;
|
|
@@ -116,7 +124,24 @@ export class LocalDriver {
|
|
|
116
124
|
async put(filePath, content, options) {
|
|
117
125
|
const full = await this.#safePath(filePath);
|
|
118
126
|
await fsp.mkdir(path.dirname(full), { recursive: true });
|
|
119
|
-
|
|
127
|
+
// Written through a descriptor opened with O_NOFOLLOW, not by name.
|
|
128
|
+
//
|
|
129
|
+
// `#safePath` canonicalises and checks, then returns a STRING, and the
|
|
130
|
+
// write happened later against that string. Between the two, the last
|
|
131
|
+
// component can be replaced by a symlink pointing anywhere, and a write
|
|
132
|
+
// by name follows it — the check passed on one object and the write
|
|
133
|
+
// landed on another. Refusing to follow a link at open time takes the
|
|
134
|
+
// swap off the table: the open fails instead of writing outside the root.
|
|
135
|
+
const handle = await fsp.open(full, fs.constants.O_WRONLY |
|
|
136
|
+
fs.constants.O_CREAT |
|
|
137
|
+
fs.constants.O_TRUNC |
|
|
138
|
+
O_NOFOLLOW, 0o666);
|
|
139
|
+
try {
|
|
140
|
+
await handle.writeFile(content);
|
|
141
|
+
}
|
|
142
|
+
finally {
|
|
143
|
+
await handle.close();
|
|
144
|
+
}
|
|
120
145
|
// Only `visibility` has a filesystem-equivalent (the sidecar).
|
|
121
146
|
// contentType/cacheControl/... have no local meaning.
|
|
122
147
|
if (options?.visibility !== undefined) {
|
|
@@ -136,14 +161,28 @@ export class LocalDriver {
|
|
|
136
161
|
_options) {
|
|
137
162
|
const full = await this.#safePath(filePath);
|
|
138
163
|
await fsp.mkdir(path.dirname(full), { recursive: true });
|
|
164
|
+
// Same descriptor-first rule as put(): the stream is created FROM the
|
|
165
|
+
// handle, so it writes to the object the open accepted rather than to
|
|
166
|
+
// whatever the name points at by the time the first chunk arrives.
|
|
167
|
+
const handle = await fsp.open(full, fs.constants.O_WRONLY |
|
|
168
|
+
fs.constants.O_CREAT |
|
|
169
|
+
fs.constants.O_TRUNC |
|
|
170
|
+
O_NOFOLLOW, 0o666);
|
|
139
171
|
// `pipeline` propagates errors and destroys the write target on
|
|
140
|
-
// failure —
|
|
141
|
-
await pipeline(readable,
|
|
172
|
+
// failure — and closing the stream closes the handle it was made from.
|
|
173
|
+
await pipeline(readable, handle.createWriteStream());
|
|
142
174
|
}
|
|
143
175
|
async get(filePath) {
|
|
144
176
|
const full = await this.#safePath(filePath);
|
|
145
177
|
try {
|
|
146
|
-
|
|
178
|
+
// Read through a descriptor, refusing to follow a link — see put().
|
|
179
|
+
const handle = await fsp.open(full, fs.constants.O_RDONLY | O_NOFOLLOW);
|
|
180
|
+
try {
|
|
181
|
+
return await handle.readFile();
|
|
182
|
+
}
|
|
183
|
+
finally {
|
|
184
|
+
await handle.close();
|
|
185
|
+
}
|
|
147
186
|
}
|
|
148
187
|
catch (err) {
|
|
149
188
|
// One syscall instead of exists-then-read: the pair also answered
|
|
@@ -155,10 +194,22 @@ export class LocalDriver {
|
|
|
155
194
|
}
|
|
156
195
|
async getStream(filePath) {
|
|
157
196
|
const full = await this.#safePath(filePath);
|
|
158
|
-
|
|
159
|
-
|
|
197
|
+
// One open instead of exists-then-create: the pair also handed back a
|
|
198
|
+
// stream over whatever replaced the file between the two calls, and it
|
|
199
|
+
// followed a symlink planted there. The open refuses the link and IS the
|
|
200
|
+
// existence check.
|
|
201
|
+
let handle;
|
|
202
|
+
try {
|
|
203
|
+
handle = await fsp.open(full, fs.constants.O_RDONLY | O_NOFOLLOW);
|
|
204
|
+
}
|
|
205
|
+
catch (err) {
|
|
206
|
+
if (err.code === "ENOENT") {
|
|
207
|
+
throw new ArchiveError("E_ARCHIVE_NOT_FOUND", `File does not exist at path '${filePath}'`, { hint: "Confirm the path and that the file was put() first." });
|
|
208
|
+
}
|
|
209
|
+
throw err;
|
|
160
210
|
}
|
|
161
|
-
|
|
211
|
+
// Closing the stream closes the handle it was made from.
|
|
212
|
+
return handle.createReadStream();
|
|
162
213
|
}
|
|
163
214
|
async delete(filePath) {
|
|
164
215
|
const full = await this.#safePath(filePath);
|
|
@@ -281,7 +332,20 @@ export class LocalDriver {
|
|
|
281
332
|
hint: "Delete the sidecar file and re-apply visibility via setVisibility().",
|
|
282
333
|
});
|
|
283
334
|
}
|
|
284
|
-
|
|
335
|
+
// Fail CLOSED on anything that is not exactly one of the two values.
|
|
336
|
+
//
|
|
337
|
+
// `=== "private" ? "private" : "public"` treated every other input as
|
|
338
|
+
// public, so a sidecar holding `{}`, `{"visibility":"PRIVATE"}` or a
|
|
339
|
+
// truncated write silently downgraded a private file — `url()` then
|
|
340
|
+
// handed out `/storage/<path>` instead of a signed URL. The doc comment
|
|
341
|
+
// above already promised this for unparseable JSON; a JSON document
|
|
342
|
+
// that parses and says nothing usable is the same situation.
|
|
343
|
+
if (parsed.visibility === "private" || parsed.visibility === "public") {
|
|
344
|
+
return parsed.visibility;
|
|
345
|
+
}
|
|
346
|
+
throw new ArchiveError("E_ARCHIVE_VISIBILITY_CORRUPT", `Sidecar for '${filePath}' carries no usable visibility (${JSON.stringify(parsed.visibility)}); refusing to default to 'public'.`, {
|
|
347
|
+
hint: "Delete the sidecar file and re-apply visibility via setVisibility().",
|
|
348
|
+
});
|
|
285
349
|
}
|
|
286
350
|
getSignedUrl(filePath, options) {
|
|
287
351
|
// Fail fast on unsafe paths instead of producing a signed URL that
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageManager.js","sourceRoot":"","sources":["../src/StorageManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"StorageManager.js","sourceRoot":"","sources":["../src/StorageManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Teach ream's `ContainerBindings` what `container.make(...)` returns for the
|
|
3
|
+
* tokens archive binds.
|
|
4
|
+
*
|
|
5
|
+
* ream declares that interface open on purpose: it registers its own entries
|
|
6
|
+
* and expects each package to contribute the ones it owns. Nothing filled
|
|
7
|
+
* these in, so resolving by the string token answered `unknown` and every call
|
|
8
|
+
* site had to assert a type it could not prove.
|
|
9
|
+
*
|
|
10
|
+
* Loaded from the package barrel, so importing Archive anywhere in the
|
|
11
|
+
* application is enough — nobody writes a `declare module` of their own.
|
|
12
|
+
*
|
|
13
|
+
* Type-only, and ream stays an OPTIONAL peer: nothing here reaches a runtime
|
|
14
|
+
* import, and a `declare module` for a specifier that does not resolve is
|
|
15
|
+
* simply inert.
|
|
16
|
+
*/
|
|
17
|
+
import type { DriveManager } from "./DriveManager.js";
|
|
18
|
+
import type { StorageManager } from "./StorageManager.js";
|
|
19
|
+
declare module "@c9up/ream/types" {
|
|
20
|
+
interface ContainerBindings {
|
|
21
|
+
/** The drive manager, bound by `ArchiveProvider`. */
|
|
22
|
+
"archive.drive": DriveManager;
|
|
23
|
+
/**
|
|
24
|
+
* The same binding under the name it had before the token carried its
|
|
25
|
+
* package. Kept bound so an existing `container.make(...)` resolves.
|
|
26
|
+
*/
|
|
27
|
+
drive: DriveManager;
|
|
28
|
+
/** The default disk, bound by `ArchiveProvider`. */
|
|
29
|
+
"archive.storage": StorageManager;
|
|
30
|
+
/**
|
|
31
|
+
* The same binding under the name it had before the token carried its
|
|
32
|
+
* package. Kept bound so an existing `container.make(...)` resolves.
|
|
33
|
+
*/
|
|
34
|
+
storage: StorageManager;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=augmentations.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"augmentations.d.ts","sourceRoot":"","sources":["../src/augmentations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,QAAQ,kBAAkB,CAAC;IACjC,UAAU,iBAAiB;QAC1B,qDAAqD;QACrD,eAAe,EAAE,YAAY,CAAC;QAC9B;;;WAGG;QACH,KAAK,EAAE,YAAY,CAAC;QACpB,oDAAoD;QACpD,iBAAiB,EAAE,cAAc,CAAC;QAClC;;;WAGG;QACH,OAAO,EAAE,cAAc,CAAC;KACxB;CACD"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Teach ream's `ContainerBindings` what `container.make(...)` returns for the
|
|
3
|
+
* tokens archive binds.
|
|
4
|
+
*
|
|
5
|
+
* ream declares that interface open on purpose: it registers its own entries
|
|
6
|
+
* and expects each package to contribute the ones it owns. Nothing filled
|
|
7
|
+
* these in, so resolving by the string token answered `unknown` and every call
|
|
8
|
+
* site had to assert a type it could not prove.
|
|
9
|
+
*
|
|
10
|
+
* Loaded from the package barrel, so importing Archive anywhere in the
|
|
11
|
+
* application is enough — nobody writes a `declare module` of their own.
|
|
12
|
+
*
|
|
13
|
+
* Type-only, and ream stays an OPTIONAL peer: nothing here reaches a runtime
|
|
14
|
+
* import, and a `declare module` for a specifier that does not resolve is
|
|
15
|
+
* simply inert.
|
|
16
|
+
*/
|
|
17
|
+
export {};
|
|
18
|
+
//# sourceMappingURL=augmentations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"augmentations.js","sourceRoot":"","sources":["../src/augmentations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG"}
|
package/dist/expiry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expiry.d.ts","sourceRoot":"","sources":["../src/expiry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,8CAA8C;AAC9C,eAAO,MAAM,cAAc,SAAU,CAAC;AA+BtC;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"expiry.d.ts","sourceRoot":"","sources":["../src/expiry.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,2EAA2E;AAC3E,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAEtC,8CAA8C;AAC9C,eAAO,MAAM,cAAc,SAAU,CAAC;AA+BtC;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAgB9D;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAsBzD"}
|
package/dist/expiry.js
CHANGED
|
@@ -53,7 +53,8 @@ export function parseExpiry(expiresIn) {
|
|
|
53
53
|
hint: "Use a number of seconds, or a duration like '30mins', '1h', '7 days'.",
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
-
|
|
56
|
+
const [, amount] = match;
|
|
57
|
+
return Math.round(Number.parseFloat(amount ?? "0") * multiplier);
|
|
57
58
|
}
|
|
58
59
|
/**
|
|
59
60
|
* Reject non-finite, zero, negative, or out-of-range expiries. Throws
|
package/dist/expiry.js.map
CHANGED
|
@@ -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,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,
|
|
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,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;IACzB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC;AAClE,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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
* (`use(name?)`), plus a `StaticMiddleware` for serving files over HTTP
|
|
11
11
|
* and a signed-route handler for serving HMAC-signed Local URLs.
|
|
12
12
|
*/
|
|
13
|
+
import "./augmentations.js";
|
|
13
14
|
export type { ArchiveConfig } from "./ArchiveProvider.js";
|
|
14
15
|
export { type DriveConfig, DriveManager, type DriveServiceFactory, type FsServiceOptions, services, } from "./DriveManager.js";
|
|
15
16
|
export { ArchiveError } from "./errors.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACN,KAAK,WAAW,EAChB,YAAY,EACZ,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EACN,KAAK,SAAS,EACd,SAAS,EACT,KAAK,iBAAiB,GACtB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EACN,KAAK,YAAY,EACjB,gBAAgB,EAChB,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,GAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACN,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,WAAW,EACX,KAAK,kBAAkB,EACvB,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,cAAc,EACd,KAAK,UAAU,EACf,KAAK,YAAY,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,wBAAwB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,aAAa,EACjE,MAAM,EAAE,CAAC,GACP,CAAC,CAEH"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,oBAAoB,CAAC;AAE5B,YAAY,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EACN,KAAK,WAAW,EAChB,YAAY,EACZ,KAAK,mBAAmB,EACxB,KAAK,gBAAgB,EACrB,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EACN,KAAK,SAAS,EACd,SAAS,EACT,KAAK,iBAAiB,GACtB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,KAAK,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EACN,KAAK,YAAY,EACjB,gBAAgB,EAChB,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,GAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACN,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,WAAW,EACX,KAAK,kBAAkB,EACvB,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,cAAc,EACd,KAAK,UAAU,EACf,KAAK,YAAY,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,wBAAwB,EACxB,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,GAAG,aAAa,EACjE,MAAM,EAAE,CAAC,GACP,CAAC,CAEH"}
|
package/dist/index.js
CHANGED
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
* (`use(name?)`), plus a `StaticMiddleware` for serving files over HTTP
|
|
11
11
|
* and a signed-route handler for serving HMAC-signed Local URLs.
|
|
12
12
|
*/
|
|
13
|
+
import "./augmentations.js";
|
|
13
14
|
export { DriveManager, services, } from "./DriveManager.js";
|
|
14
15
|
export { ArchiveError } from "./errors.js";
|
|
15
16
|
export { GcsDriver, } from "./GcsDriver.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,oBAAoB,CAAC;AAG5B,OAAO,EAEN,YAAY,EAGZ,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAEN,SAAS,GAET,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAiB,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAEN,gBAAgB,GAGhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAGN,WAAW,EAOX,cAAc,GAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,wBAAwB,GAIxB,MAAM,mBAAmB,CAAC;AAK3B;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAC3B,MAAS;IAET,OAAO,MAAM,CAAC;AACf,CAAC"}
|
package/dist/services/main.d.ts
CHANGED
|
@@ -25,6 +25,15 @@ export declare function setStorage(value: StorageManager): void;
|
|
|
25
25
|
export declare function setStorageResolver(factory: () => StorageManager): void;
|
|
26
26
|
/** @internal Read the singleton (or `undefined` pre-boot). */
|
|
27
27
|
export declare function getStorage(): StorageManager | undefined;
|
|
28
|
+
/**
|
|
29
|
+
* @internal Release the singleton, so a shut-down application does not leave a
|
|
30
|
+
* dead storage manager reachable through `services/main`.
|
|
31
|
+
*
|
|
32
|
+
* The caller checks ownership first (`getStorage() === mine`): two applications
|
|
33
|
+
* share this module in one process, and the one shutting down must not clear
|
|
34
|
+
* what the other has since bound.
|
|
35
|
+
*/
|
|
36
|
+
export declare function clearStorage(): void;
|
|
28
37
|
declare const storage: StorageManager;
|
|
29
38
|
export default storage;
|
|
30
39
|
//# sourceMappingURL=main.d.ts.map
|
|
@@ -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;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"}
|
|
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;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,IAAI,CAEnC;AAED,QAAA,MAAM,OAAO,EAAE,cAyBb,CAAC;AAEH,eAAe,OAAO,CAAC"}
|
package/dist/services/main.js
CHANGED
|
@@ -35,6 +35,17 @@ export function setStorageResolver(factory) {
|
|
|
35
35
|
export function getStorage() {
|
|
36
36
|
return instance;
|
|
37
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* @internal Release the singleton, so a shut-down application does not leave a
|
|
40
|
+
* dead storage manager reachable through `services/main`.
|
|
41
|
+
*
|
|
42
|
+
* The caller checks ownership first (`getStorage() === mine`): two applications
|
|
43
|
+
* share this module in one process, and the one shutting down must not clear
|
|
44
|
+
* what the other has since bound.
|
|
45
|
+
*/
|
|
46
|
+
export function clearStorage() {
|
|
47
|
+
instance = undefined;
|
|
48
|
+
}
|
|
38
49
|
const storage = new Proxy({}, {
|
|
39
50
|
get(_target, prop) {
|
|
40
51
|
// A module loader inspects what it imports before anyone uses it: it reads
|
|
@@ -1 +1 @@
|
|
|
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"}
|
|
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;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY;IAC3B,QAAQ,GAAG,SAAS,CAAC;AACtB,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@c9up/archive",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.17",
|
|
4
4
|
"description": "Archive — File storage abstraction for the Ream framework (Local + S3-compatible drivers)",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -40,8 +40,10 @@
|
|
|
40
40
|
"@biomejs/biome": "^2.4.10",
|
|
41
41
|
"@c9up/helix": "^0.2.0",
|
|
42
42
|
"@types/node": "^22.19.15",
|
|
43
|
+
"@vitest/coverage-v8": "^4.1.2",
|
|
43
44
|
"typescript": "^6.0.2",
|
|
44
|
-
"vitest": "^4.1.2"
|
|
45
|
+
"vitest": "^4.1.2",
|
|
46
|
+
"@c9up/ream": "^0.2.0"
|
|
45
47
|
},
|
|
46
48
|
"files": [
|
|
47
49
|
"LICENSE",
|
|
@@ -71,7 +73,7 @@
|
|
|
71
73
|
"build": "tsc -p tsconfig.build.json",
|
|
72
74
|
"typecheck": "tsc --noEmit",
|
|
73
75
|
"test": "vitest run",
|
|
74
|
-
"lint": "biome check src/",
|
|
76
|
+
"lint": "biome check src/ tests/",
|
|
75
77
|
"test:coverage": "vitest run --coverage"
|
|
76
78
|
}
|
|
77
79
|
}
|
package/src/ArchiveProvider.ts
CHANGED
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
* import storage from '@c9up/archive/services/main'
|
|
22
22
|
* await storage.put('uploads/avatar.png', buffer)
|
|
23
23
|
*/
|
|
24
|
+
import "./augmentations.js";
|
|
24
25
|
import { type DriveConfig, DriveManager } from "./DriveManager.js";
|
|
25
26
|
import { ArchiveError } from "./errors.js";
|
|
26
27
|
|
|
@@ -31,7 +32,12 @@ import {
|
|
|
31
32
|
type StorageDriver,
|
|
32
33
|
StorageManager,
|
|
33
34
|
} from "./StorageManager.js";
|
|
34
|
-
import {
|
|
35
|
+
import {
|
|
36
|
+
clearStorage,
|
|
37
|
+
getStorage,
|
|
38
|
+
setStorage,
|
|
39
|
+
setStorageResolver,
|
|
40
|
+
} from "./services/main.js";
|
|
35
41
|
|
|
36
42
|
interface ArchiveContainer {
|
|
37
43
|
singleton(token: unknown, factory: () => unknown): void;
|
|
@@ -64,6 +70,9 @@ const DEFAULT_CONFIG: ArchiveConfig = {
|
|
|
64
70
|
};
|
|
65
71
|
|
|
66
72
|
export default class ArchiveProvider {
|
|
73
|
+
/** What this provider bound, so shutdown only clears its own. */
|
|
74
|
+
#owned: StorageManager | undefined;
|
|
75
|
+
|
|
67
76
|
/**
|
|
68
77
|
* The one lazily-built manager, read by BOTH ways in. Set by
|
|
69
78
|
* {@link register}, which always runs before {@link boot}.
|
|
@@ -104,7 +113,14 @@ export default class ArchiveProvider {
|
|
|
104
113
|
// Backward-compatible bindings — the default disk is what apps
|
|
105
114
|
// previously resolved via `StorageManager` / the `storage` token.
|
|
106
115
|
this.app.container.singleton(StorageManager, () => storageManager());
|
|
116
|
+
// Namespaced by the package that owns it, the way upstream namespaces
|
|
117
|
+
// `lucid.db`, `auth.manager` and `drive.manager` by theirs. The bare
|
|
118
|
+
// token stays bound beside it: it is what every existing
|
|
119
|
+
// `container.make(...)` asks for, and a token is not worth breaking an
|
|
120
|
+
// application over.
|
|
121
|
+
this.app.container.singleton("archive.storage", () => storageManager());
|
|
107
122
|
this.app.container.singleton("storage", () => storageManager());
|
|
123
|
+
this.app.container.singleton("archive.drive", () => driveManager());
|
|
108
124
|
this.app.container.singleton("drive", () => driveManager());
|
|
109
125
|
}
|
|
110
126
|
|
|
@@ -139,12 +155,22 @@ export default class ArchiveProvider {
|
|
|
139
155
|
// Configured: build now, so a misspelled driver or a missing
|
|
140
156
|
// driver-specific block is a boot failure rather than a surprise on the
|
|
141
157
|
// first upload.
|
|
142
|
-
|
|
158
|
+
const manager = storage();
|
|
159
|
+
this.#owned = manager;
|
|
160
|
+
setStorage(manager);
|
|
143
161
|
}
|
|
144
162
|
|
|
145
163
|
async start(): Promise<void> {}
|
|
146
164
|
async ready(): Promise<void> {}
|
|
147
|
-
async shutdown(): Promise<void> {
|
|
165
|
+
async shutdown(): Promise<void> {
|
|
166
|
+
// Release the module-level singleton, while it is still ours. A stopped
|
|
167
|
+
// application left a dead storage manager reachable through `services/main`, and
|
|
168
|
+
// with two applications in one process the survivor's binding must not
|
|
169
|
+
// be the one cleared.
|
|
170
|
+
if (this.#owned !== undefined && getStorage() === this.#owned)
|
|
171
|
+
clearStorage();
|
|
172
|
+
this.#owned = undefined;
|
|
173
|
+
}
|
|
148
174
|
}
|
|
149
175
|
|
|
150
176
|
/** Narrow an unknown config value to the multi-disk {@link DriveConfig} shape. */
|
package/src/StaticMiddleware.ts
CHANGED
|
@@ -43,7 +43,22 @@ export interface StaticConfig {
|
|
|
43
43
|
root: string;
|
|
44
44
|
/** URL prefix (default: /static). */
|
|
45
45
|
prefix?: string;
|
|
46
|
-
/**
|
|
46
|
+
/**
|
|
47
|
+
* `max-age` in seconds. Default 0, as AdonisJS's static server is.
|
|
48
|
+
*
|
|
49
|
+
* Zero does NOT mean "do not cache": the response still carries an ETag and
|
|
50
|
+
* a Last-Modified, so a browser keeps the bytes and asks whether they are
|
|
51
|
+
* still good — answered with a 304 and no body. What zero removes is the
|
|
52
|
+
* window in which it does not ask at all.
|
|
53
|
+
*
|
|
54
|
+
* The old default was a day, which is right for fingerprinted assets and
|
|
55
|
+
* wrong for everything else: a stylesheet rebuilt during development was
|
|
56
|
+
* not re-fetched for 24 hours, so the page kept rendering with the previous
|
|
57
|
+
* one and nothing about it looked broken.
|
|
58
|
+
*
|
|
59
|
+
* Set it high for content served under a content-addressed name, or put a
|
|
60
|
+
* CDN in front — which is what upstream recommends for production anyway.
|
|
61
|
+
*/
|
|
47
62
|
maxAge?: number;
|
|
48
63
|
/** File extensions to serve (default: common web assets). */
|
|
49
64
|
extensions?: string[];
|
|
@@ -71,7 +86,7 @@ export class StaticMiddleware {
|
|
|
71
86
|
// detect symlink-based escapes consistently.
|
|
72
87
|
this.#root = fs.existsSync(resolved) ? fs.realpathSync(resolved) : resolved;
|
|
73
88
|
this.#prefix = prefix;
|
|
74
|
-
this.#maxAge = config.maxAge ??
|
|
89
|
+
this.#maxAge = config.maxAge ?? 0;
|
|
75
90
|
this.#extensions = new Set(config.extensions ?? DEFAULT_EXTENSIONS);
|
|
76
91
|
}
|
|
77
92
|
|
|
@@ -159,6 +174,10 @@ export class StaticMiddleware {
|
|
|
159
174
|
ctx.response.header("Content-Length", String(stat.size));
|
|
160
175
|
ctx.response.header("Cache-Control", `public, max-age=${this.#maxAge}`);
|
|
161
176
|
ctx.response.header("ETag", etag);
|
|
177
|
+
// Sent alongside the ETag, as upstream does. A client that revalidates
|
|
178
|
+
// with `If-Modified-Since` rather than `If-None-Match` has nothing to
|
|
179
|
+
// compare against without it.
|
|
180
|
+
ctx.response.header("Last-Modified", stat.mtime.toUTCString());
|
|
162
181
|
|
|
163
182
|
if (ctx.request.method() === "HEAD") {
|
|
164
183
|
ctx.response.status(200);
|
package/src/StorageManager.ts
CHANGED
|
@@ -262,6 +262,15 @@ export interface LocalDriverOptions {
|
|
|
262
262
|
signingSecret?: string;
|
|
263
263
|
}
|
|
264
264
|
|
|
265
|
+
/**
|
|
266
|
+
* `O_NOFOLLOW`, or nothing on a platform without it.
|
|
267
|
+
*
|
|
268
|
+
* Windows has no symlink-refusing open and leaves `fs.constants.O_NOFOLLOW`
|
|
269
|
+
* undefined; or-ing that into the flags yields `NaN` and every open fails, so
|
|
270
|
+
* the flag is contributed only where it exists.
|
|
271
|
+
*/
|
|
272
|
+
const O_NOFOLLOW = fs.constants.O_NOFOLLOW ?? 0;
|
|
273
|
+
|
|
265
274
|
export class LocalDriver implements StorageDriver {
|
|
266
275
|
#root: string;
|
|
267
276
|
#signingSecret: string | null;
|
|
@@ -377,7 +386,27 @@ export class LocalDriver implements StorageDriver {
|
|
|
377
386
|
): Promise<void> {
|
|
378
387
|
const full = await this.#safePath(filePath);
|
|
379
388
|
await fsp.mkdir(path.dirname(full), { recursive: true });
|
|
380
|
-
|
|
389
|
+
// Written through a descriptor opened with O_NOFOLLOW, not by name.
|
|
390
|
+
//
|
|
391
|
+
// `#safePath` canonicalises and checks, then returns a STRING, and the
|
|
392
|
+
// write happened later against that string. Between the two, the last
|
|
393
|
+
// component can be replaced by a symlink pointing anywhere, and a write
|
|
394
|
+
// by name follows it — the check passed on one object and the write
|
|
395
|
+
// landed on another. Refusing to follow a link at open time takes the
|
|
396
|
+
// swap off the table: the open fails instead of writing outside the root.
|
|
397
|
+
const handle = await fsp.open(
|
|
398
|
+
full,
|
|
399
|
+
fs.constants.O_WRONLY |
|
|
400
|
+
fs.constants.O_CREAT |
|
|
401
|
+
fs.constants.O_TRUNC |
|
|
402
|
+
O_NOFOLLOW,
|
|
403
|
+
0o666,
|
|
404
|
+
);
|
|
405
|
+
try {
|
|
406
|
+
await handle.writeFile(content);
|
|
407
|
+
} finally {
|
|
408
|
+
await handle.close();
|
|
409
|
+
}
|
|
381
410
|
// Only `visibility` has a filesystem-equivalent (the sidecar).
|
|
382
411
|
// contentType/cacheControl/... have no local meaning.
|
|
383
412
|
if (options?.visibility !== undefined) {
|
|
@@ -406,15 +435,32 @@ export class LocalDriver implements StorageDriver {
|
|
|
406
435
|
): Promise<void> {
|
|
407
436
|
const full = await this.#safePath(filePath);
|
|
408
437
|
await fsp.mkdir(path.dirname(full), { recursive: true });
|
|
438
|
+
// Same descriptor-first rule as put(): the stream is created FROM the
|
|
439
|
+
// handle, so it writes to the object the open accepted rather than to
|
|
440
|
+
// whatever the name points at by the time the first chunk arrives.
|
|
441
|
+
const handle = await fsp.open(
|
|
442
|
+
full,
|
|
443
|
+
fs.constants.O_WRONLY |
|
|
444
|
+
fs.constants.O_CREAT |
|
|
445
|
+
fs.constants.O_TRUNC |
|
|
446
|
+
O_NOFOLLOW,
|
|
447
|
+
0o666,
|
|
448
|
+
);
|
|
409
449
|
// `pipeline` propagates errors and destroys the write target on
|
|
410
|
-
// failure —
|
|
411
|
-
await pipeline(readable,
|
|
450
|
+
// failure — and closing the stream closes the handle it was made from.
|
|
451
|
+
await pipeline(readable, handle.createWriteStream());
|
|
412
452
|
}
|
|
413
453
|
|
|
414
454
|
async get(filePath: string): Promise<Buffer | null> {
|
|
415
455
|
const full = await this.#safePath(filePath);
|
|
416
456
|
try {
|
|
417
|
-
|
|
457
|
+
// Read through a descriptor, refusing to follow a link — see put().
|
|
458
|
+
const handle = await fsp.open(full, fs.constants.O_RDONLY | O_NOFOLLOW);
|
|
459
|
+
try {
|
|
460
|
+
return await handle.readFile();
|
|
461
|
+
} finally {
|
|
462
|
+
await handle.close();
|
|
463
|
+
}
|
|
418
464
|
} catch (err) {
|
|
419
465
|
// One syscall instead of exists-then-read: the pair also answered
|
|
420
466
|
// `null` for a file that was deleted between the two.
|
|
@@ -425,14 +471,25 @@ export class LocalDriver implements StorageDriver {
|
|
|
425
471
|
|
|
426
472
|
async getStream(filePath: string): Promise<NodeJS.ReadableStream> {
|
|
427
473
|
const full = await this.#safePath(filePath);
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
474
|
+
// One open instead of exists-then-create: the pair also handed back a
|
|
475
|
+
// stream over whatever replaced the file between the two calls, and it
|
|
476
|
+
// followed a symlink planted there. The open refuses the link and IS the
|
|
477
|
+
// existence check.
|
|
478
|
+
let handle: fsp.FileHandle;
|
|
479
|
+
try {
|
|
480
|
+
handle = await fsp.open(full, fs.constants.O_RDONLY | O_NOFOLLOW);
|
|
481
|
+
} catch (err) {
|
|
482
|
+
if ((err as NodeJS.ErrnoException).code === "ENOENT") {
|
|
483
|
+
throw new ArchiveError(
|
|
484
|
+
"E_ARCHIVE_NOT_FOUND",
|
|
485
|
+
`File does not exist at path '${filePath}'`,
|
|
486
|
+
{ hint: "Confirm the path and that the file was put() first." },
|
|
487
|
+
);
|
|
488
|
+
}
|
|
489
|
+
throw err;
|
|
434
490
|
}
|
|
435
|
-
|
|
491
|
+
// Closing the stream closes the handle it was made from.
|
|
492
|
+
return handle.createReadStream();
|
|
436
493
|
}
|
|
437
494
|
|
|
438
495
|
async delete(filePath: string): Promise<boolean> {
|
|
@@ -571,7 +628,24 @@ export class LocalDriver implements StorageDriver {
|
|
|
571
628
|
},
|
|
572
629
|
);
|
|
573
630
|
}
|
|
574
|
-
|
|
631
|
+
// Fail CLOSED on anything that is not exactly one of the two values.
|
|
632
|
+
//
|
|
633
|
+
// `=== "private" ? "private" : "public"` treated every other input as
|
|
634
|
+
// public, so a sidecar holding `{}`, `{"visibility":"PRIVATE"}` or a
|
|
635
|
+
// truncated write silently downgraded a private file — `url()` then
|
|
636
|
+
// handed out `/storage/<path>` instead of a signed URL. The doc comment
|
|
637
|
+
// above already promised this for unparseable JSON; a JSON document
|
|
638
|
+
// that parses and says nothing usable is the same situation.
|
|
639
|
+
if (parsed.visibility === "private" || parsed.visibility === "public") {
|
|
640
|
+
return parsed.visibility;
|
|
641
|
+
}
|
|
642
|
+
throw new ArchiveError(
|
|
643
|
+
"E_ARCHIVE_VISIBILITY_CORRUPT",
|
|
644
|
+
`Sidecar for '${filePath}' carries no usable visibility (${JSON.stringify(parsed.visibility)}); refusing to default to 'public'.`,
|
|
645
|
+
{
|
|
646
|
+
hint: "Delete the sidecar file and re-apply visibility via setVisibility().",
|
|
647
|
+
},
|
|
648
|
+
);
|
|
575
649
|
}
|
|
576
650
|
|
|
577
651
|
getSignedUrl(filePath: string, options?: SignedUrlOptions): string {
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Teach ream's `ContainerBindings` what `container.make(...)` returns for the
|
|
3
|
+
* tokens archive binds.
|
|
4
|
+
*
|
|
5
|
+
* ream declares that interface open on purpose: it registers its own entries
|
|
6
|
+
* and expects each package to contribute the ones it owns. Nothing filled
|
|
7
|
+
* these in, so resolving by the string token answered `unknown` and every call
|
|
8
|
+
* site had to assert a type it could not prove.
|
|
9
|
+
*
|
|
10
|
+
* Loaded from the package barrel, so importing Archive anywhere in the
|
|
11
|
+
* application is enough — nobody writes a `declare module` of their own.
|
|
12
|
+
*
|
|
13
|
+
* Type-only, and ream stays an OPTIONAL peer: nothing here reaches a runtime
|
|
14
|
+
* import, and a `declare module` for a specifier that does not resolve is
|
|
15
|
+
* simply inert.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
// Referenced so the augmentation below resolves the module it augments.
|
|
19
|
+
import type {} from "@c9up/ream/types";
|
|
20
|
+
|
|
21
|
+
import type { DriveManager } from "./DriveManager.js";
|
|
22
|
+
import type { StorageManager } from "./StorageManager.js";
|
|
23
|
+
|
|
24
|
+
declare module "@c9up/ream/types" {
|
|
25
|
+
interface ContainerBindings {
|
|
26
|
+
/** The drive manager, bound by `ArchiveProvider`. */
|
|
27
|
+
"archive.drive": DriveManager;
|
|
28
|
+
/**
|
|
29
|
+
* The same binding under the name it had before the token carried its
|
|
30
|
+
* package. Kept bound so an existing `container.make(...)` resolves.
|
|
31
|
+
*/
|
|
32
|
+
drive: DriveManager;
|
|
33
|
+
/** The default disk, bound by `ArchiveProvider`. */
|
|
34
|
+
"archive.storage": StorageManager;
|
|
35
|
+
/**
|
|
36
|
+
* The same binding under the name it had before the token carried its
|
|
37
|
+
* package. Kept bound so an existing `container.make(...)` resolves.
|
|
38
|
+
*/
|
|
39
|
+
storage: StorageManager;
|
|
40
|
+
}
|
|
41
|
+
}
|
package/src/expiry.ts
CHANGED
|
@@ -61,7 +61,8 @@ export function parseExpiry(expiresIn: number | string): number {
|
|
|
61
61
|
},
|
|
62
62
|
);
|
|
63
63
|
}
|
|
64
|
-
|
|
64
|
+
const [, amount] = match;
|
|
65
|
+
return Math.round(Number.parseFloat(amount ?? "0") * multiplier);
|
|
65
66
|
}
|
|
66
67
|
|
|
67
68
|
/**
|
package/src/index.ts
CHANGED
package/src/services/main.ts
CHANGED
|
@@ -41,6 +41,18 @@ export function getStorage(): StorageManager | undefined {
|
|
|
41
41
|
return instance;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
+
/**
|
|
45
|
+
* @internal Release the singleton, so a shut-down application does not leave a
|
|
46
|
+
* dead storage manager reachable through `services/main`.
|
|
47
|
+
*
|
|
48
|
+
* The caller checks ownership first (`getStorage() === mine`): two applications
|
|
49
|
+
* share this module in one process, and the one shutting down must not clear
|
|
50
|
+
* what the other has since bound.
|
|
51
|
+
*/
|
|
52
|
+
export function clearStorage(): void {
|
|
53
|
+
instance = undefined;
|
|
54
|
+
}
|
|
55
|
+
|
|
44
56
|
const storage: StorageManager = new Proxy({} as StorageManager, {
|
|
45
57
|
get(_target, prop) {
|
|
46
58
|
// A module loader inspects what it imports before anyone uses it: it reads
|