@c9up/archive 0.1.5 → 0.1.7
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 +6 -0
- package/dist/ArchiveProvider.d.ts.map +1 -1
- package/dist/ArchiveProvider.js +33 -7
- package/dist/ArchiveProvider.js.map +1 -1
- package/dist/DriveManager.d.ts +80 -0
- package/dist/DriveManager.d.ts.map +1 -0
- package/dist/DriveManager.js +102 -0
- package/dist/DriveManager.js.map +1 -0
- package/dist/GcsDriver.d.ts +14 -4
- package/dist/GcsDriver.d.ts.map +1 -1
- package/dist/GcsDriver.js +126 -15
- package/dist/GcsDriver.js.map +1 -1
- package/dist/S3Driver.d.ts +14 -4
- package/dist/S3Driver.d.ts.map +1 -1
- package/dist/S3Driver.js +268 -15
- package/dist/S3Driver.js.map +1 -1
- package/dist/StorageManager.d.ts +128 -18
- package/dist/StorageManager.d.ts.map +1 -1
- package/dist/StorageManager.js +147 -13
- package/dist/StorageManager.js.map +1 -1
- package/dist/expiry.d.ts +7 -0
- package/dist/expiry.d.ts.map +1 -1
- package/dist/expiry.js +47 -0
- package/dist/expiry.js.map +1 -1
- package/dist/index.d.ts +20 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +18 -2
- package/dist/index.js.map +1 -1
- package/dist/objects.d.ts +50 -0
- package/dist/objects.d.ts.map +1 -0
- package/dist/objects.js +77 -0
- package/dist/objects.js.map +1 -0
- package/dist/testing/FakeStorage.d.ts +43 -4
- package/dist/testing/FakeStorage.d.ts.map +1 -1
- package/dist/testing/FakeStorage.js +153 -12
- package/dist/testing/FakeStorage.js.map +1 -1
- package/package.json +2 -1
- package/src/ArchiveProvider.ts +49 -9
- package/src/DriveManager.ts +151 -0
- package/src/GcsDriver.ts +166 -15
- package/src/S3Driver.ts +317 -15
- package/src/StorageManager.ts +294 -25
- package/src/expiry.ts +52 -0
- package/src/index.ts +34 -2
- package/src/objects.ts +92 -0
- package/src/testing/FakeStorage.ts +191 -12
|
@@ -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.
|
|
3
|
+
"version": "0.1.7",
|
|
4
4
|
"description": "Archive — File storage abstraction for the Ream framework (Local + S3-compatible drivers)",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -32,6 +32,7 @@
|
|
|
32
32
|
"@c9up/ream": "^0.1.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
|
+
"@biomejs/biome": "^2.4.10",
|
|
35
36
|
"@types/node": "^22.19.15",
|
|
36
37
|
"typescript": "^6.0.2",
|
|
37
38
|
"vitest": "^4.1.2"
|
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 { type DriveConfig, DriveManager } from "./DriveManager.js";
|
|
24
25
|
import { ArchiveError } from "./errors.js";
|
|
25
26
|
|
|
26
27
|
import { type GcsConfig, GcsDriver } from "./GcsDriver.js";
|
|
@@ -44,6 +45,12 @@ export interface ArchiveAppContext {
|
|
|
44
45
|
config: ArchiveConfigStore;
|
|
45
46
|
}
|
|
46
47
|
|
|
48
|
+
/**
|
|
49
|
+
* Legacy single-disk config shape (pre-parity). Still accepted: the
|
|
50
|
+
* provider wraps it in a one-service DriveManager under the disk name
|
|
51
|
+
* `default`. New apps should use the AdonisJS-parity {@link DriveConfig}
|
|
52
|
+
* (`{ default, services, fakes }`) built with `defineConfig` + `services.*`.
|
|
53
|
+
*/
|
|
47
54
|
export interface ArchiveConfig {
|
|
48
55
|
driver: "local" | "s3" | "gcs";
|
|
49
56
|
local?: { root: string; signingSecret?: string };
|
|
@@ -60,24 +67,29 @@ export default class ArchiveProvider {
|
|
|
60
67
|
constructor(protected app: ArchiveAppContext) {}
|
|
61
68
|
|
|
62
69
|
register(): void {
|
|
63
|
-
this.app.container.singleton(
|
|
64
|
-
const config
|
|
65
|
-
|
|
66
|
-
const driver: StorageDriver = buildDriver(config);
|
|
67
|
-
return new StorageManager(driver);
|
|
70
|
+
this.app.container.singleton(DriveManager, () => {
|
|
71
|
+
const raw = this.app.config.get<ArchiveConfig | DriveConfig>("archive");
|
|
72
|
+
return new DriveManager(resolveDriveConfig(raw));
|
|
68
73
|
});
|
|
74
|
+
// Backward-compatible bindings — the default disk is what apps
|
|
75
|
+
// previously resolved via `StorageManager` / the `storage` token.
|
|
76
|
+
this.app.container.singleton(StorageManager, () =>
|
|
77
|
+
this.app.container.resolve<DriveManager>(DriveManager).use(),
|
|
78
|
+
);
|
|
69
79
|
this.app.container.singleton("storage", () =>
|
|
70
80
|
this.app.container.resolve<StorageManager>(StorageManager),
|
|
71
81
|
);
|
|
82
|
+
this.app.container.singleton("drive", () =>
|
|
83
|
+
this.app.container.resolve<DriveManager>(DriveManager),
|
|
84
|
+
);
|
|
72
85
|
}
|
|
73
86
|
|
|
74
87
|
async boot(): Promise<void> {
|
|
75
|
-
// Skip eager
|
|
88
|
+
// Skip eager resolution when archive is unconfigured: an app that
|
|
76
89
|
// registers this provider but never uses storage should not trigger
|
|
77
90
|
// LocalDriver's mkdirSync of './storage' at boot (breaks on
|
|
78
|
-
// read-only rootfs). Explicit (object-shaped) configs still
|
|
79
|
-
|
|
80
|
-
const archive = this.app.config.get<ArchiveConfig>("archive");
|
|
91
|
+
// read-only rootfs). Explicit (object-shaped) configs still resolve.
|
|
92
|
+
const archive = this.app.config.get<ArchiveConfig | DriveConfig>("archive");
|
|
81
93
|
if (
|
|
82
94
|
archive === undefined ||
|
|
83
95
|
archive === null ||
|
|
@@ -94,6 +106,34 @@ export default class ArchiveProvider {
|
|
|
94
106
|
async shutdown(): Promise<void> {}
|
|
95
107
|
}
|
|
96
108
|
|
|
109
|
+
/** Narrow an unknown config value to the multi-disk {@link DriveConfig} shape. */
|
|
110
|
+
function isDriveConfig(config: unknown): config is DriveConfig {
|
|
111
|
+
return (
|
|
112
|
+
typeof config === "object" &&
|
|
113
|
+
config !== null &&
|
|
114
|
+
"services" in config &&
|
|
115
|
+
typeof (config as { services: unknown }).services === "object" &&
|
|
116
|
+
(config as { services: unknown }).services !== null
|
|
117
|
+
);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* Reconcile whatever shape the app configured into a {@link DriveConfig}:
|
|
122
|
+
* - `{ default, services, fakes }` → used as-is (parity path).
|
|
123
|
+
* - legacy `{ driver, local, s3, gcs }` → wrapped as one `default` disk.
|
|
124
|
+
* - unset → the built-in local default.
|
|
125
|
+
*/
|
|
126
|
+
function resolveDriveConfig(
|
|
127
|
+
raw: ArchiveConfig | DriveConfig | undefined,
|
|
128
|
+
): DriveConfig {
|
|
129
|
+
if (isDriveConfig(raw)) return raw;
|
|
130
|
+
const legacy: ArchiveConfig = raw ?? DEFAULT_CONFIG;
|
|
131
|
+
return {
|
|
132
|
+
default: "default",
|
|
133
|
+
services: { default: () => buildDriver(legacy) },
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
|
|
97
137
|
function buildDriver(config: ArchiveConfig): StorageDriver {
|
|
98
138
|
if (config.driver === "s3") {
|
|
99
139
|
if (!config.s3) {
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* DriveManager — multi-disk registry (AdonisJS Drive / flydrive parity).
|
|
3
|
+
*
|
|
4
|
+
* Holds a set of named services (each a factory that returns a
|
|
5
|
+
* {@link StorageDriver}), resolves them lazily into cached
|
|
6
|
+
* {@link StorageManager} instances via {@link DriveManager.use}, and
|
|
7
|
+
* offers a manager-level {@link DriveManager.fake}/{@link DriveManager.restore}
|
|
8
|
+
* pair for tests.
|
|
9
|
+
*
|
|
10
|
+
* const drive = new DriveManager({
|
|
11
|
+
* default: 'uploads',
|
|
12
|
+
* services: {
|
|
13
|
+
* uploads: services.fs({ location: './storage' }),
|
|
14
|
+
* s3: services.s3({ bucket, region, accessKeyId, secretAccessKey }),
|
|
15
|
+
* },
|
|
16
|
+
* })
|
|
17
|
+
* await drive.use().put('a.txt', 'hi') // default disk
|
|
18
|
+
* await drive.use('s3').put('a.txt', 'hi') // named disk
|
|
19
|
+
*/
|
|
20
|
+
|
|
21
|
+
import { ArchiveError } from "./errors.js";
|
|
22
|
+
import type { GcsConfig } from "./GcsDriver.js";
|
|
23
|
+
import { GcsDriver } from "./GcsDriver.js";
|
|
24
|
+
import type { S3Config } from "./S3Driver.js";
|
|
25
|
+
import { S3Driver } from "./S3Driver.js";
|
|
26
|
+
import {
|
|
27
|
+
LocalDriver,
|
|
28
|
+
type StorageDriver,
|
|
29
|
+
StorageManager,
|
|
30
|
+
} from "./StorageManager.js";
|
|
31
|
+
import { FakeStorageManager } from "./testing/FakeStorage.js";
|
|
32
|
+
|
|
33
|
+
/** A factory that constructs a fresh driver for a named disk. */
|
|
34
|
+
export type DriveServiceFactory = () => StorageDriver;
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Multi-disk configuration — AdonisJS Drive `defineConfig` shape:
|
|
38
|
+
* `{ default, services, fakes }`.
|
|
39
|
+
*/
|
|
40
|
+
export interface DriveConfig {
|
|
41
|
+
/** Name of the disk used when {@link DriveManager.use} is called with no argument. */
|
|
42
|
+
default: string;
|
|
43
|
+
/** Named disks, each a factory returning a driver (use the {@link services} helpers). */
|
|
44
|
+
services: Record<string, DriveServiceFactory>;
|
|
45
|
+
/** Optional fakes configuration (reserved; the in-memory fake needs no location). */
|
|
46
|
+
fakes?: { location?: string };
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** Options accepted by {@link services.fs}. */
|
|
50
|
+
export interface FsServiceOptions {
|
|
51
|
+
/** Storage root. `location` (Adonis name) and `root` are equivalent. */
|
|
52
|
+
location?: string;
|
|
53
|
+
/** Storage root (ream alias of `location`). */
|
|
54
|
+
root?: string;
|
|
55
|
+
/** HMAC secret enabling `getSignedUrl` on the LocalDriver. */
|
|
56
|
+
signingSecret?: string;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Config helpers mirroring AdonisJS Drive's `services.fs/s3/gcs`. Each
|
|
61
|
+
* returns a factory consumed by {@link DriveConfig.services}.
|
|
62
|
+
*
|
|
63
|
+
* DIVERGENCE (documented, deliberate): the ream `services.fs` builds URLs
|
|
64
|
+
* in-package via the LocalDriver + signed-route handler — it does NOT
|
|
65
|
+
* couple to the ream router the way Adonis wires `serveFiles`/`routeBasePath`.
|
|
66
|
+
*/
|
|
67
|
+
export const services: {
|
|
68
|
+
fs(options?: FsServiceOptions): DriveServiceFactory;
|
|
69
|
+
s3(config: S3Config): DriveServiceFactory;
|
|
70
|
+
gcs(config: GcsConfig): DriveServiceFactory;
|
|
71
|
+
} = {
|
|
72
|
+
fs(options) {
|
|
73
|
+
const root = options?.location ?? options?.root ?? "./storage";
|
|
74
|
+
return () =>
|
|
75
|
+
new LocalDriver(root, { signingSecret: options?.signingSecret });
|
|
76
|
+
},
|
|
77
|
+
s3(config) {
|
|
78
|
+
return () => new S3Driver(config);
|
|
79
|
+
},
|
|
80
|
+
gcs(config) {
|
|
81
|
+
return () => new GcsDriver(config);
|
|
82
|
+
},
|
|
83
|
+
};
|
|
84
|
+
|
|
85
|
+
export class DriveManager {
|
|
86
|
+
#config: DriveConfig;
|
|
87
|
+
#cache = new Map<string, StorageManager>();
|
|
88
|
+
#fakes = new Map<string, FakeStorageManager>();
|
|
89
|
+
|
|
90
|
+
constructor(config: DriveConfig) {
|
|
91
|
+
if (config.services[config.default] === undefined) {
|
|
92
|
+
throw new ArchiveError(
|
|
93
|
+
"ARCHIVE_UNKNOWN_DISK",
|
|
94
|
+
`Archive default disk '${config.default}' is not present in config.services`,
|
|
95
|
+
{
|
|
96
|
+
hint: `Add a '${config.default}' entry to config.services, or point config.default at an existing disk.`,
|
|
97
|
+
},
|
|
98
|
+
);
|
|
99
|
+
}
|
|
100
|
+
this.#config = config;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* Resolve a disk by name (default when omitted). Returns the active
|
|
105
|
+
* fake for the disk when one has been installed via {@link fake}.
|
|
106
|
+
* Instances are cached and reused.
|
|
107
|
+
*/
|
|
108
|
+
use(service?: string): StorageManager {
|
|
109
|
+
const name = service ?? this.#config.default;
|
|
110
|
+
const fake = this.#fakes.get(name);
|
|
111
|
+
if (fake) return fake;
|
|
112
|
+
const cached = this.#cache.get(name);
|
|
113
|
+
if (cached) return cached;
|
|
114
|
+
const factory = this.#config.services[name];
|
|
115
|
+
if (factory === undefined) {
|
|
116
|
+
throw new ArchiveError(
|
|
117
|
+
"ARCHIVE_UNKNOWN_DISK",
|
|
118
|
+
`Archive disk '${name}' is not configured`,
|
|
119
|
+
{
|
|
120
|
+
hint: `Known disks: ${Object.keys(this.#config.services).join(", ") || "(none)"}.`,
|
|
121
|
+
},
|
|
122
|
+
);
|
|
123
|
+
}
|
|
124
|
+
const manager = new StorageManager(factory());
|
|
125
|
+
this.#cache.set(name, manager);
|
|
126
|
+
return manager;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Swap a disk for an in-memory {@link FakeStorageManager}. Subsequent
|
|
131
|
+
* {@link use} calls for the same disk return the fake until
|
|
132
|
+
* {@link restore} is called. AdonisJS Drive parity.
|
|
133
|
+
*/
|
|
134
|
+
fake(service?: string): FakeStorageManager {
|
|
135
|
+
const name = service ?? this.#config.default;
|
|
136
|
+
this.restore(name);
|
|
137
|
+
const fake = new FakeStorageManager();
|
|
138
|
+
this.#fakes.set(name, fake);
|
|
139
|
+
return fake;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/** Remove the fake for a disk (default when omitted) and clear its state. */
|
|
143
|
+
restore(service?: string): void {
|
|
144
|
+
const name = service ?? this.#config.default;
|
|
145
|
+
const fake = this.#fakes.get(name);
|
|
146
|
+
if (fake) {
|
|
147
|
+
fake.clear();
|
|
148
|
+
this.#fakes.delete(name);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
package/src/GcsDriver.ts
CHANGED
|
@@ -13,15 +13,23 @@ import { createHash, createSign } from "node:crypto";
|
|
|
13
13
|
import { Readable } from "node:stream";
|
|
14
14
|
import type { ReadableStream as NodeReadableStream } from "node:stream/web";
|
|
15
15
|
import { ArchiveError } from "./errors.js";
|
|
16
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
assertValidExpiry,
|
|
18
|
+
DEFAULT_EXPIRES_IN,
|
|
19
|
+
parseExpiry,
|
|
20
|
+
} from "./expiry.js";
|
|
17
21
|
import { inferMimeType } from "./mime-types.js";
|
|
22
|
+
import { DriveDirectory, DriveFile } from "./objects.js";
|
|
18
23
|
import type {
|
|
24
|
+
ListAllOptions,
|
|
25
|
+
ListAllResult,
|
|
19
26
|
Metadata,
|
|
20
27
|
PutStreamOptions,
|
|
21
28
|
SignedUrlOptions,
|
|
22
29
|
StorageDriver,
|
|
23
30
|
StorageEntry,
|
|
24
31
|
Visibility,
|
|
32
|
+
WriteOptions,
|
|
25
33
|
} from "./StorageManager.js";
|
|
26
34
|
|
|
27
35
|
/** GCS V4 strict URL encoding — identical to AWS's RFC3986-unreserved
|
|
@@ -97,23 +105,51 @@ export class GcsDriver implements StorageDriver {
|
|
|
97
105
|
this.#config = config;
|
|
98
106
|
}
|
|
99
107
|
|
|
100
|
-
async put(
|
|
108
|
+
async put(
|
|
109
|
+
filePath: string,
|
|
110
|
+
content: Buffer | string,
|
|
111
|
+
options?: WriteOptions,
|
|
112
|
+
): Promise<void> {
|
|
101
113
|
const body = typeof content === "string" ? Buffer.from(content) : content;
|
|
102
114
|
const token = await this.#getAccessToken();
|
|
103
115
|
const url = `${GCS_UPLOAD_ROOT}/b/${this.#config.bucket}/o?uploadType=media&name=${gcsStrictEncode(filePath)}`;
|
|
104
116
|
const mime =
|
|
105
|
-
|
|
117
|
+
options?.contentType ??
|
|
118
|
+
(inferMimeType(extFromPath(filePath)) || "application/octet-stream");
|
|
119
|
+
const headers: Record<string, string> = {
|
|
120
|
+
authorization: `Bearer ${token}`,
|
|
121
|
+
"content-type": mime,
|
|
122
|
+
};
|
|
123
|
+
if (options?.cacheControl) headers["cache-control"] = options.cacheControl;
|
|
124
|
+
if (options?.contentDisposition) {
|
|
125
|
+
headers["content-disposition"] = options.contentDisposition;
|
|
126
|
+
}
|
|
106
127
|
const res = await fetch(url, {
|
|
107
128
|
method: "POST",
|
|
108
|
-
headers
|
|
109
|
-
authorization: `Bearer ${token}`,
|
|
110
|
-
"content-type": mime,
|
|
111
|
-
},
|
|
129
|
+
headers,
|
|
112
130
|
body: body as BodyInit,
|
|
113
131
|
});
|
|
114
132
|
if (!res.ok) {
|
|
115
133
|
throw new Error(`GCS PUT failed (${res.status}): ${await res.text()}`);
|
|
116
134
|
}
|
|
135
|
+
// GCS has no ACL in the media-upload call; apply visibility after.
|
|
136
|
+
if (options?.visibility !== undefined) {
|
|
137
|
+
await this.setVisibility(filePath, options.visibility);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
async getBytes(filePath: string): Promise<Uint8Array> {
|
|
142
|
+
const buf = await this.get(filePath);
|
|
143
|
+
if (buf === null) {
|
|
144
|
+
throw new ArchiveError(
|
|
145
|
+
"ARCHIVE_NOT_FOUND",
|
|
146
|
+
`GCS object does not exist at path '${filePath}'`,
|
|
147
|
+
{
|
|
148
|
+
hint: "Confirm the bucket + key and that the object was put() first.",
|
|
149
|
+
},
|
|
150
|
+
);
|
|
151
|
+
}
|
|
152
|
+
return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
|
|
117
153
|
}
|
|
118
154
|
|
|
119
155
|
async putStream(
|
|
@@ -251,15 +287,23 @@ export class GcsDriver implements StorageDriver {
|
|
|
251
287
|
? "public"
|
|
252
288
|
: "private"
|
|
253
289
|
: "private";
|
|
290
|
+
const size = Number.parseInt(json.size ?? "0", 10);
|
|
291
|
+
const mimeType = json.contentType ?? "application/octet-stream";
|
|
254
292
|
return {
|
|
255
|
-
size
|
|
256
|
-
|
|
293
|
+
size,
|
|
294
|
+
contentLength: size,
|
|
295
|
+
mimeType,
|
|
296
|
+
contentType: mimeType,
|
|
257
297
|
lastModified: json.updated ? new Date(json.updated) : new Date(0),
|
|
258
298
|
etag: (json.etag ?? "").replace(/^(W\/)?"(.*)"$/, "$1$2"),
|
|
259
299
|
visibility,
|
|
260
300
|
};
|
|
261
301
|
}
|
|
262
302
|
|
|
303
|
+
async getVisibility(filePath: string): Promise<Visibility> {
|
|
304
|
+
return (await this.getMetadata(filePath)).visibility;
|
|
305
|
+
}
|
|
306
|
+
|
|
263
307
|
async setVisibility(filePath: string, visibility: Visibility): Promise<void> {
|
|
264
308
|
const token = await this.#getAccessToken();
|
|
265
309
|
const base = `${GCS_META_ROOT}/b/${this.#config.bucket}/o/${gcsEncodeKey(filePath)}/acl`;
|
|
@@ -291,7 +335,7 @@ export class GcsDriver implements StorageDriver {
|
|
|
291
335
|
}
|
|
292
336
|
}
|
|
293
337
|
|
|
294
|
-
async copy(from: string, to: string): Promise<void> {
|
|
338
|
+
async copy(from: string, to: string, options?: WriteOptions): Promise<void> {
|
|
295
339
|
const token = await this.#getAccessToken();
|
|
296
340
|
const url = `${GCS_META_ROOT}/b/${this.#config.bucket}/o/${gcsEncodeKey(from)}/copyTo/b/${this.#config.bucket}/o/${gcsEncodeKey(to)}`;
|
|
297
341
|
const res = await fetch(url, {
|
|
@@ -308,14 +352,87 @@ export class GcsDriver implements StorageDriver {
|
|
|
308
352
|
if (!res.ok) {
|
|
309
353
|
throw new Error(`GCS COPY failed (${res.status}): ${await res.text()}`);
|
|
310
354
|
}
|
|
355
|
+
if (options?.visibility !== undefined) {
|
|
356
|
+
await this.setVisibility(to, options.visibility);
|
|
357
|
+
}
|
|
311
358
|
}
|
|
312
359
|
|
|
313
|
-
async move(from: string, to: string): Promise<void> {
|
|
360
|
+
async move(from: string, to: string, options?: WriteOptions): Promise<void> {
|
|
314
361
|
// Non-atomic: copy then delete. Same as S3.
|
|
315
|
-
await this.copy(from, to);
|
|
362
|
+
await this.copy(from, to, options);
|
|
316
363
|
await this.delete(from);
|
|
317
364
|
}
|
|
318
365
|
|
|
366
|
+
async deleteAll(prefix: string): Promise<void> {
|
|
367
|
+
// GCS has no batch-delete endpoint; drain the listing one object at
|
|
368
|
+
// a time. `list()` already paginates lazily.
|
|
369
|
+
const keys: string[] = [];
|
|
370
|
+
for await (const entry of this.list(prefix)) {
|
|
371
|
+
keys.push(entry.path);
|
|
372
|
+
}
|
|
373
|
+
for (const key of keys) {
|
|
374
|
+
await this.delete(key);
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
async listAll(
|
|
379
|
+
prefix: string,
|
|
380
|
+
options?: ListAllOptions,
|
|
381
|
+
): Promise<ListAllResult> {
|
|
382
|
+
const recursive = options?.recursive ?? false;
|
|
383
|
+
const normalizedPrefix =
|
|
384
|
+
prefix === "" || prefix === "/"
|
|
385
|
+
? ""
|
|
386
|
+
: !recursive && !prefix.endsWith("/")
|
|
387
|
+
? `${prefix}/`
|
|
388
|
+
: prefix;
|
|
389
|
+
const params = new URLSearchParams({ prefix: normalizedPrefix });
|
|
390
|
+
if (!recursive) params.set("delimiter", "/");
|
|
391
|
+
if (options?.paginationToken) {
|
|
392
|
+
params.set("pageToken", options.paginationToken);
|
|
393
|
+
}
|
|
394
|
+
const url = `${GCS_META_ROOT}/b/${this.#config.bucket}/o?${params.toString()}`;
|
|
395
|
+
const token = await this.#getAccessToken();
|
|
396
|
+
const res = await fetch(url, {
|
|
397
|
+
method: "GET",
|
|
398
|
+
headers: { authorization: `Bearer ${token}` },
|
|
399
|
+
});
|
|
400
|
+
if (!res.ok) {
|
|
401
|
+
throw new Error(`GCS LIST failed (${res.status}): ${await res.text()}`);
|
|
402
|
+
}
|
|
403
|
+
const json = (await res.json()) as {
|
|
404
|
+
items?: Array<{
|
|
405
|
+
name?: string;
|
|
406
|
+
size?: string;
|
|
407
|
+
updated?: string;
|
|
408
|
+
contentType?: string;
|
|
409
|
+
etag?: string;
|
|
410
|
+
}>;
|
|
411
|
+
prefixes?: string[];
|
|
412
|
+
nextPageToken?: string;
|
|
413
|
+
};
|
|
414
|
+
const objects: Array<DriveFile | DriveDirectory> = [];
|
|
415
|
+
for (const dir of json.prefixes ?? []) {
|
|
416
|
+
objects.push(new DriveDirectory(dir.replace(/\/$/, "")));
|
|
417
|
+
}
|
|
418
|
+
for (const item of json.items ?? []) {
|
|
419
|
+
const size = Number.parseInt(item.size ?? "0", 10);
|
|
420
|
+
const mimeType = item.contentType ?? "application/octet-stream";
|
|
421
|
+
objects.push(
|
|
422
|
+
new DriveFile(item.name ?? "", this, {
|
|
423
|
+
size,
|
|
424
|
+
contentLength: size,
|
|
425
|
+
mimeType,
|
|
426
|
+
contentType: mimeType,
|
|
427
|
+
lastModified: item.updated ? new Date(item.updated) : new Date(0),
|
|
428
|
+
etag: (item.etag ?? "").replace(/^(W\/)?"(.*)"$/, "$1$2"),
|
|
429
|
+
visibility: "private",
|
|
430
|
+
}),
|
|
431
|
+
);
|
|
432
|
+
}
|
|
433
|
+
return { paginationToken: json.nextPageToken, objects };
|
|
434
|
+
}
|
|
435
|
+
|
|
319
436
|
async *list(prefix: string): AsyncIterable<StorageEntry> {
|
|
320
437
|
let pageToken: string | undefined;
|
|
321
438
|
do {
|
|
@@ -346,7 +463,40 @@ export class GcsDriver implements StorageDriver {
|
|
|
346
463
|
}
|
|
347
464
|
|
|
348
465
|
getSignedUrl(filePath: string, options?: SignedUrlOptions): string {
|
|
349
|
-
const
|
|
466
|
+
const responseParams: Array<[string, string]> = [];
|
|
467
|
+
if (options?.contentType) {
|
|
468
|
+
responseParams.push(["response-content-type", options.contentType]);
|
|
469
|
+
}
|
|
470
|
+
if (options?.contentDisposition) {
|
|
471
|
+
responseParams.push([
|
|
472
|
+
"response-content-disposition",
|
|
473
|
+
options.contentDisposition,
|
|
474
|
+
]);
|
|
475
|
+
}
|
|
476
|
+
return this.#presign("GET", filePath, options, responseParams);
|
|
477
|
+
}
|
|
478
|
+
|
|
479
|
+
/**
|
|
480
|
+
* Presigned PUT URL for direct-to-GCS uploads. AdonisJS Drive parity.
|
|
481
|
+
* Signed headers are `host` only, so the uploading client is free to
|
|
482
|
+
* set its own `Content-Type`.
|
|
483
|
+
*/
|
|
484
|
+
getSignedUploadUrl(filePath: string, options?: SignedUrlOptions): string {
|
|
485
|
+
return this.#presign("PUT", filePath, options, []);
|
|
486
|
+
}
|
|
487
|
+
|
|
488
|
+
/**
|
|
489
|
+
* Shared GOOG4-RSA-SHA256 query-parameter presigner for GET (read)
|
|
490
|
+
* and PUT (upload) URLs. Signs `host` only; extra query params (e.g.
|
|
491
|
+
* `response-content-*`) participate in the signature.
|
|
492
|
+
*/
|
|
493
|
+
#presign(
|
|
494
|
+
method: "GET" | "PUT",
|
|
495
|
+
filePath: string,
|
|
496
|
+
options: SignedUrlOptions | undefined,
|
|
497
|
+
extraQueryParams: Array<[string, string]>,
|
|
498
|
+
): string {
|
|
499
|
+
const expiresIn = parseExpiry(options?.expiresIn ?? DEFAULT_EXPIRES_IN);
|
|
350
500
|
assertValidExpiry(expiresIn);
|
|
351
501
|
const dateStamp = amzDateNow();
|
|
352
502
|
const shortDate = dateStamp.slice(0, 8);
|
|
@@ -359,15 +509,16 @@ export class GcsDriver implements StorageDriver {
|
|
|
359
509
|
["X-Goog-Date", dateStamp],
|
|
360
510
|
["X-Goog-Expires", String(expiresIn)],
|
|
361
511
|
["X-Goog-SignedHeaders", "host"],
|
|
512
|
+
...extraQueryParams,
|
|
362
513
|
];
|
|
363
514
|
const canonicalQs = queryParams
|
|
364
515
|
.slice()
|
|
365
516
|
.sort((a, b) => (a[0] < b[0] ? -1 : 1))
|
|
366
|
-
.map(([k, v]) => `${k}=${gcsStrictEncode(v)}`)
|
|
517
|
+
.map(([k, v]) => `${gcsStrictEncode(k)}=${gcsStrictEncode(v)}`)
|
|
367
518
|
.join("&");
|
|
368
519
|
|
|
369
520
|
const canonicalRequest = [
|
|
370
|
-
|
|
521
|
+
method,
|
|
371
522
|
`/${this.#config.bucket}/${gcsEncodeKey(filePath)}`,
|
|
372
523
|
canonicalQs,
|
|
373
524
|
"host:storage.googleapis.com\n",
|