@c9up/archive 0.1.14 → 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.
- package/dist/ArchiveProvider.d.ts +1 -0
- package/dist/ArchiveProvider.d.ts.map +1 -1
- package/dist/ArchiveProvider.js +50 -14
- package/dist/ArchiveProvider.js.map +1 -1
- package/dist/StaticMiddleware.d.ts.map +1 -1
- package/dist/StaticMiddleware.js +31 -11
- package/dist/StaticMiddleware.js.map +1 -1
- package/dist/StorageManager.d.ts +8 -0
- package/dist/StorageManager.d.ts.map +1 -1
- package/dist/StorageManager.js +162 -101
- package/dist/StorageManager.js.map +1 -1
- package/dist/etag.d.ts +32 -0
- package/dist/etag.d.ts.map +1 -0
- package/dist/etag.js +41 -0
- package/dist/etag.js.map +1 -0
- package/dist/services/main.d.ts +11 -0
- package/dist/services/main.d.ts.map +1 -1
- package/dist/services/main.js +21 -0
- package/dist/services/main.js.map +1 -1
- package/package.json +1 -1
- package/src/ArchiveProvider.ts +61 -21
- package/src/StaticMiddleware.ts +32 -11
- package/src/StorageManager.ts +162 -98
- package/src/etag.ts +44 -0
- package/src/services/main.ts +21 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchiveProvider.d.ts","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,eAAe,CAAC;AAQxD,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
|
|
1
|
+
{"version":3,"file":"ArchiveProvider.d.ts","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,eAAe,CAAC;AAQxD,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;;IAOvB,SAAS,CAAC,GAAG,EAAE,iBAAiB;gBAAtB,GAAG,EAAE,iBAAiB;IAE5C,QAAQ,IAAI,IAAI;IAoCV,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IACtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}
|
package/dist/ArchiveProvider.js
CHANGED
|
@@ -26,40 +26,76 @@ import { ArchiveError } from "./errors.js";
|
|
|
26
26
|
import { GcsDriver } from "./GcsDriver.js";
|
|
27
27
|
import { S3Driver } from "./S3Driver.js";
|
|
28
28
|
import { LocalDriver, StorageManager, } from "./StorageManager.js";
|
|
29
|
-
import { setStorage } from "./services/main.js";
|
|
29
|
+
import { setStorage, setStorageResolver } from "./services/main.js";
|
|
30
30
|
const DEFAULT_CONFIG = {
|
|
31
31
|
driver: "local",
|
|
32
32
|
local: { root: "./storage" },
|
|
33
33
|
};
|
|
34
34
|
export default class ArchiveProvider {
|
|
35
35
|
app;
|
|
36
|
+
/**
|
|
37
|
+
* The one lazily-built manager, read by BOTH ways in. Set by
|
|
38
|
+
* {@link register}, which always runs before {@link boot}.
|
|
39
|
+
*/
|
|
40
|
+
#storage;
|
|
36
41
|
constructor(app) {
|
|
37
42
|
this.app = app;
|
|
38
43
|
}
|
|
39
44
|
register() {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
45
|
+
// ONE cell, shared by the container's bindings and the service accessor.
|
|
46
|
+
//
|
|
47
|
+
// The container had its own factory and boot() built a second manager
|
|
48
|
+
// for the accessor, so `services/main`'s storage and
|
|
49
|
+
// `container.resolve(StorageManager)` were different objects over
|
|
50
|
+
// different drivers: a fake bound in a test, or a driver swapped at
|
|
51
|
+
// runtime, was invisible from the other side.
|
|
52
|
+
//
|
|
53
|
+
// Memoised here rather than resolved through the container because the
|
|
54
|
+
// accessor is synchronous and the container is not — which is exactly
|
|
55
|
+
// why boot() could not simply reuse the container's instance.
|
|
56
|
+
let drive;
|
|
57
|
+
const driveManager = () => {
|
|
58
|
+
drive ??= new DriveManager(resolveDriveConfig(this.app.config.get("archive")));
|
|
59
|
+
return drive;
|
|
60
|
+
};
|
|
61
|
+
let manager;
|
|
62
|
+
const storageManager = () => {
|
|
63
|
+
manager ??= driveManager().use();
|
|
64
|
+
return manager;
|
|
65
|
+
};
|
|
66
|
+
this.#storage = storageManager;
|
|
67
|
+
this.app.container.singleton(DriveManager, () => driveManager());
|
|
44
68
|
// Backward-compatible bindings — the default disk is what apps
|
|
45
69
|
// previously resolved via `StorageManager` / the `storage` token.
|
|
46
|
-
this.app.container.singleton(StorageManager,
|
|
47
|
-
this.app.container.singleton("storage",
|
|
48
|
-
this.app.container.singleton("drive",
|
|
70
|
+
this.app.container.singleton(StorageManager, () => storageManager());
|
|
71
|
+
this.app.container.singleton("storage", () => storageManager());
|
|
72
|
+
this.app.container.singleton("drive", () => driveManager());
|
|
49
73
|
}
|
|
50
74
|
async boot() {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
75
|
+
const storage = this.#storage;
|
|
76
|
+
if (storage === undefined) {
|
|
77
|
+
throw new ArchiveError("E_ARCHIVE_PROVIDER_NOT_REGISTERED", "ArchiveProvider.boot() ran before register().", {
|
|
78
|
+
hint: "Providers register before they boot — call register() first.",
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
// The accessor reads the same cell the container's bindings read, so
|
|
82
|
+
// however storage is reached there is one manager behind it.
|
|
83
|
+
setStorageResolver(storage);
|
|
84
|
+
// No eager construction when archive is unconfigured: an app that
|
|
85
|
+
// registers this provider and never uses storage should not trigger
|
|
86
|
+
// LocalDriver's mkdir of './storage' at boot, which fails on a
|
|
87
|
+
// read-only rootfs. The resolver above is what keeps that lazy case
|
|
88
|
+
// answering instead of throwing "before boot".
|
|
55
89
|
const archive = this.app.config.get("archive");
|
|
56
90
|
if (archive === undefined ||
|
|
57
91
|
archive === null ||
|
|
58
92
|
typeof archive !== "object") {
|
|
59
93
|
return;
|
|
60
94
|
}
|
|
61
|
-
|
|
62
|
-
|
|
95
|
+
// Configured: build now, so a misspelled driver or a missing
|
|
96
|
+
// driver-specific block is a boot failure rather than a surprise on the
|
|
97
|
+
// first upload.
|
|
98
|
+
setStorage(storage());
|
|
63
99
|
}
|
|
64
100
|
async start() { }
|
|
65
101
|
async ready() { }
|
|
@@ -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,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ArchiveProvider.js","sourceRoot":"","sources":["../src/ArchiveProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,4EAA4E;IAC5E,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;
|
|
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,4EAA4E;IAC5E,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;CAmHhB"}
|
package/dist/StaticMiddleware.js
CHANGED
|
@@ -9,10 +9,10 @@
|
|
|
9
9
|
*
|
|
10
10
|
* @implements MISS-25
|
|
11
11
|
*/
|
|
12
|
-
import { createHash } from "node:crypto";
|
|
13
12
|
import * as fs from "node:fs";
|
|
14
13
|
import * as fsp from "node:fs/promises";
|
|
15
14
|
import * as path from "node:path";
|
|
15
|
+
import { matchesIfNoneMatch, statTag } from "./etag.js";
|
|
16
16
|
import { DEFAULT_EXTENSIONS, inferMimeType } from "./mime-types.js";
|
|
17
17
|
import { VISIBILITY_SIDECAR_SUFFIX } from "./StorageManager.js";
|
|
18
18
|
export class StaticMiddleware {
|
|
@@ -91,12 +91,13 @@ export class StaticMiddleware {
|
|
|
91
91
|
catch {
|
|
92
92
|
return next();
|
|
93
93
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
// ETag check — 304 Not Modified
|
|
98
|
-
|
|
99
|
-
|
|
94
|
+
// Quoted and weak (RFC 9110 §8.8.3): the bare md5 hex this used to send
|
|
95
|
+
// is not a valid entity-tag, and a strict cache may ignore it outright.
|
|
96
|
+
const etag = statTag(stat);
|
|
97
|
+
// ETag check — 304 Not Modified. The header is a list compared weakly
|
|
98
|
+
// (§13.1.2); raw equality missed a client sending two tags, or one
|
|
99
|
+
// sending back `W/"x"` for a tag we wrote as `"x"`.
|
|
100
|
+
if (matchesIfNoneMatch(ctx.request.header("if-none-match"), etag)) {
|
|
100
101
|
ctx.response.status(304);
|
|
101
102
|
return;
|
|
102
103
|
}
|
|
@@ -109,10 +110,29 @@ export class StaticMiddleware {
|
|
|
109
110
|
ctx.response.status(200);
|
|
110
111
|
return;
|
|
111
112
|
}
|
|
112
|
-
//
|
|
113
|
-
//
|
|
114
|
-
//
|
|
115
|
-
|
|
113
|
+
// Opened with O_NOFOLLOW rather than read by name.
|
|
114
|
+
//
|
|
115
|
+
// Reading the canonicalised path narrowed the window but did not close
|
|
116
|
+
// it: between `realpath` and the read, the last component of that path
|
|
117
|
+
// can be replaced by a symlink pointing anywhere, and a read by name
|
|
118
|
+
// follows it. Refusing to follow a link at open time takes the swap off
|
|
119
|
+
// the table — the open fails instead of serving a file outside the root.
|
|
120
|
+
//
|
|
121
|
+
// A parent directory swapped in the same window is not covered; that
|
|
122
|
+
// needs openat-relative-to-a-descriptor, which Node does not expose.
|
|
123
|
+
let content;
|
|
124
|
+
try {
|
|
125
|
+
const handle = await fsp.open(realPath, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW);
|
|
126
|
+
try {
|
|
127
|
+
content = await handle.readFile();
|
|
128
|
+
}
|
|
129
|
+
finally {
|
|
130
|
+
await handle.close();
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
return next();
|
|
135
|
+
}
|
|
116
136
|
// Send the raw Buffer — NOT content.toString() which would destroy binary
|
|
117
137
|
// data (PNG, PDF, ZIP, etc.) by interpreting it as UTF-8.
|
|
118
138
|
ctx.response.status(200).sendBuffer(content);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StaticMiddleware.js","sourceRoot":"","sources":["../src/StaticMiddleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"StaticMiddleware.js","sourceRoot":"","sources":["../src/StaticMiddleware.ts"],"names":[],"mappings":"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"}
|
package/dist/StorageManager.d.ts
CHANGED
|
@@ -223,6 +223,14 @@ export interface LocalDriverOptions {
|
|
|
223
223
|
}
|
|
224
224
|
export declare class LocalDriver implements StorageDriver {
|
|
225
225
|
#private;
|
|
226
|
+
/**
|
|
227
|
+
* The only synchronous filesystem access left in this driver, and the only
|
|
228
|
+
* one that cannot be anything else: a constructor cannot await. It runs
|
|
229
|
+
* once, at boot, before the server is serving. Every method below is
|
|
230
|
+
* asynchronous — they used to be async signatures over `writeFileSync` /
|
|
231
|
+
* `readFileSync`, so a large upload or download stalled every other
|
|
232
|
+
* request in the process for its whole duration.
|
|
233
|
+
*/
|
|
226
234
|
constructor(root: string, options?: LocalDriverOptions);
|
|
227
235
|
put(filePath: string, content: Buffer | string, options?: WriteOptions): Promise<void>;
|
|
228
236
|
getBytes(filePath: string): Promise<Uint8Array>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageManager.d.ts","sourceRoot":"","sources":["../src/StorageManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"StorageManager.d.ts","sourceRoot":"","sources":["../src/StorageManager.ts"],"names":[],"mappings":"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"}
|