@adonis-agora/media 0.27.0 → 0.28.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +23 -0
- package/dist/providers/dashboard_provider.d.ts.map +1 -1
- package/dist/providers/dashboard_provider.js +53 -25
- package/dist/providers/dashboard_provider.js.map +1 -1
- package/dist/src/contents.d.ts.map +1 -1
- package/dist/src/contents.js +2 -1
- package/dist/src/contents.js.map +1 -1
- package/dist/src/dashboard/define_config.d.ts +40 -15
- package/dist/src/dashboard/define_config.d.ts.map +1 -1
- package/dist/src/dashboard/define_config.js.map +1 -1
- package/dist/src/dashboard/index.d.ts +1 -1
- package/dist/src/dashboard/index.d.ts.map +1 -1
- package/dist/src/dashboard/index.js.map +1 -1
- package/dist/src/dashboard/service.d.ts.map +1 -1
- package/dist/src/dashboard/service.js +3 -1
- package/dist/src/dashboard/service.js.map +1 -1
- package/dist/src/disk_read.d.ts +22 -0
- package/dist/src/disk_read.d.ts.map +1 -0
- package/dist/src/disk_read.js +34 -0
- package/dist/src/disk_read.js.map +1 -0
- package/dist/src/hls/delivery.d.ts.map +1 -1
- package/dist/src/hls/delivery.js +4 -3
- package/dist/src/hls/delivery.js.map +1 -1
- package/dist/src/internal_symbols.d.ts +13 -0
- package/dist/src/internal_symbols.d.ts.map +1 -0
- package/dist/src/internal_symbols.js +13 -0
- package/dist/src/internal_symbols.js.map +1 -0
- package/dist/src/media_access.d.ts.map +1 -1
- package/dist/src/media_access.js +11 -4
- package/dist/src/media_access.js.map +1 -1
- package/dist/src/media_library.d.ts +10 -0
- package/dist/src/media_library.d.ts.map +1 -1
- package/dist/src/media_library.js +60 -22
- package/dist/src/media_library.js.map +1 -1
- package/dist/src/upload_manager.d.ts.map +1 -1
- package/dist/src/upload_manager.js +6 -3
- package/dist/src/upload_manager.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Open an object for streaming and read its metadata in ONE round-trip's worth of latency: the
|
|
3
|
+
* `HEAD` (`getMetaData`) and the `GET` (`getStream`) are independent, so they are issued together
|
|
4
|
+
* instead of one after the other — on S3 that halves the time to first byte of every proxied file
|
|
5
|
+
* and HLS/DASH segment.
|
|
6
|
+
*
|
|
7
|
+
* Errors keep the sequential order's precedence: a metadata failure wins (and the stream that did
|
|
8
|
+
* open is destroyed, so no socket is leaked); otherwise a stream failure is thrown.
|
|
9
|
+
*
|
|
10
|
+
* @internal
|
|
11
|
+
*/
|
|
12
|
+
export async function openWithMetadata(disk, key) {
|
|
13
|
+
const [metadata, stream] = await Promise.allSettled([
|
|
14
|
+
(async () => disk.getMetaData(key))(),
|
|
15
|
+
(async () => disk.getStream(key))(),
|
|
16
|
+
]);
|
|
17
|
+
if (metadata.status === 'rejected') {
|
|
18
|
+
if (stream.status === 'fulfilled')
|
|
19
|
+
stream.value.destroy();
|
|
20
|
+
throw metadata.reason;
|
|
21
|
+
}
|
|
22
|
+
if (stream.status === 'rejected')
|
|
23
|
+
throw stream.reason;
|
|
24
|
+
return { metadata: metadata.value, stream: stream.value };
|
|
25
|
+
}
|
|
26
|
+
/** Decode disk bytes as UTF-8 without copying them into a fresh `Buffer` first. @internal */
|
|
27
|
+
export function utf8Of(bytes) {
|
|
28
|
+
return Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString('utf8');
|
|
29
|
+
}
|
|
30
|
+
/** A plain `Uint8Array` over the same memory as `bytes` (a Buffer), without copying it. @internal */
|
|
31
|
+
export function uint8View(bytes) {
|
|
32
|
+
return new Uint8Array(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=disk_read.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"disk_read.js","sourceRoot":"","sources":["../../src/disk_read.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAAU,EACV,GAAW;IAEX,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC;QAClD,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE;QACrC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE;KACpC,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW;YAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,QAAQ,CAAC,MAAM,CAAC;IACxB,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;QAAE,MAAM,MAAM,CAAC,MAAM,CAAC;IACtD,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;AAC5D,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,MAAM,CAAC,KAAiB;IACtC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AACxF,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,SAAS,CAAC,KAAiB;IACzC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;AAC1E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../../src/hls/delivery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../../src/hls/delivery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAQxD,iFAAiF;AACjF,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,gGAAgG;IAChG,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qEAAqE;AACrE,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,UAAU,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE1E,gEAAgE;AAChE,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GACzB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC5E,cAAc,CAAC;AAEnB,MAAM,WAAW,yBAAyB;IACxC,0GAA0G;IAC1G,OAAO,EAAE,YAAY,GAAG;QAAE,OAAO,EAAE,YAAY,CAAA;KAAE,CAAC;IAClD,uIAAuI;IACvI,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC;;;;;;OAMG;IACH,cAAc,EAAE,aAAa,CAAC;IAC9B;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC1C,wEAAwE;IACxE,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC;;;;OAIG;IACH,eAAe,CAAC,EAAE,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;CACrD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4B;IAC1D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAwB;IAExD,YAAY,OAAO,EAAE,yBAAyB,EAQ7C;IAEK,MAAM,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA8DpE;CACF"}
|
package/dist/src/hls/delivery.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DEFAULT_DELIVERY_SIGNED_TTL_SECONDS } from '../delivery.js';
|
|
2
|
+
import { openWithMetadata, utf8Of } from '../disk_read.js';
|
|
2
3
|
import { ConversionArtifactMissingError, MediaNotFoundError, TransformNotReadyError, } from '../errors.js';
|
|
3
4
|
import { HLS_PLAYLIST_CONTENT_TYPE, hlsArtifactContentType, resolvePackagePath, rewriteHlsPlaylist, } from './playlist.js';
|
|
4
5
|
/**
|
|
@@ -79,7 +80,7 @@ export class HlsDeliveryHandler {
|
|
|
79
80
|
const disk = this.library.storage.disk(variant.disk);
|
|
80
81
|
const key = `${prefix}${requested}`;
|
|
81
82
|
if (requested.toLowerCase().endsWith('.m3u8')) {
|
|
82
|
-
const content =
|
|
83
|
+
const content = utf8Of(await disk.getBytes(key));
|
|
83
84
|
const rewritten = await rewriteHlsPlaylist(content, async (ref) => {
|
|
84
85
|
const target = resolvePackagePath(requested, ref.uri);
|
|
85
86
|
// A relative reference that escapes the package or names a file the transformer never
|
|
@@ -105,10 +106,10 @@ export class HlsDeliveryHandler {
|
|
|
105
106
|
url: await disk.getSignedUrl(key, { expiresIn: this.segmentTtlSeconds }),
|
|
106
107
|
};
|
|
107
108
|
}
|
|
108
|
-
const metadata = await disk
|
|
109
|
+
const { metadata, stream } = await openWithMetadata(disk, key);
|
|
109
110
|
return {
|
|
110
111
|
kind: 'stream',
|
|
111
|
-
stream
|
|
112
|
+
stream,
|
|
112
113
|
mimeType: metadata.contentType ?? hlsArtifactContentType(requested) ?? 'application/octet-stream',
|
|
113
114
|
size: metadata.contentLength,
|
|
114
115
|
fileName: requested.slice(requested.lastIndexOf('/') + 1),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../../src/hls/delivery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../../src/hls/delivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Symbol-keyed entry points `MediaAccess` uses to hand `MediaLibrary` a record it has ALREADY
|
|
3
|
+
* fetched (and authorized), instead of the id — which would make the library look it up again.
|
|
4
|
+
* Not re-exported from the package entry: an internal seam, not public API.
|
|
5
|
+
*
|
|
6
|
+
* @internal
|
|
7
|
+
*/
|
|
8
|
+
export declare const imageOfRecord: unique symbol;
|
|
9
|
+
/** @internal */
|
|
10
|
+
export declare const streamOfRecord: unique symbol;
|
|
11
|
+
/** @internal */
|
|
12
|
+
export declare const deliverRecord: unique symbol;
|
|
13
|
+
//# sourceMappingURL=internal_symbols.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"internal_symbols.d.ts","sourceRoot":"","sources":["../../src/internal_symbols.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,EAAE,OAAO,MAAoD,CAAC;AACxF,gBAAgB;AAChB,eAAO,MAAM,cAAc,EAAE,OAAO,MAAqD,CAAC;AAC1F,gBAAgB;AAChB,eAAO,MAAM,aAAa,EAAE,OAAO,MAAoD,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Symbol-keyed entry points `MediaAccess` uses to hand `MediaLibrary` a record it has ALREADY
|
|
3
|
+
* fetched (and authorized), instead of the id — which would make the library look it up again.
|
|
4
|
+
* Not re-exported from the package entry: an internal seam, not public API.
|
|
5
|
+
*
|
|
6
|
+
* @internal
|
|
7
|
+
*/
|
|
8
|
+
export const imageOfRecord = Symbol('@adonis-agora/media:imageOfRecord');
|
|
9
|
+
/** @internal */
|
|
10
|
+
export const streamOfRecord = Symbol('@adonis-agora/media:streamOfRecord');
|
|
11
|
+
/** @internal */
|
|
12
|
+
export const deliverRecord = Symbol('@adonis-agora/media:deliverRecord');
|
|
13
|
+
//# sourceMappingURL=internal_symbols.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"internal_symbols.js","sourceRoot":"","sources":["../../src/internal_symbols.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,aAAa,GAAkB,MAAM,CAAC,mCAAmC,CAAC,CAAC;AACxF,gBAAgB;AAChB,MAAM,CAAC,MAAM,cAAc,GAAkB,MAAM,CAAC,oCAAoC,CAAC,CAAC;AAC1F,gBAAgB;AAChB,MAAM,CAAC,MAAM,aAAa,GAAkB,MAAM,CAAC,mCAAmC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media_access.d.ts","sourceRoot":"","sources":["../../src/media_access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"media_access.d.ts","sourceRoot":"","sources":["../../src/media_access.ts"],"names":[],"mappings":"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"}
|
package/dist/src/media_access.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { adonisAuthIdentity, toAuthorizer, } from './access.js';
|
|
2
2
|
import { deliveryQueryString } from './delivery_signing.js';
|
|
3
3
|
import { ConversionArtifactMissingError, ConversionNotDefinedError, DeliverySignatureError, ImageSizeNotAllowedError, MediaAccessDeniedError, MediaNotFoundError, NotAnImageError, TransformNotReadyError, } from './errors.js';
|
|
4
|
+
import { deliverRecord, imageOfRecord, streamOfRecord } from './internal_symbols.js';
|
|
4
5
|
import { streamFormatOf } from './streaming.js';
|
|
5
6
|
/**
|
|
6
7
|
* Authorization for media, wired to the app's identity (`access.identity` — authkit, AdonisJS
|
|
@@ -62,7 +63,8 @@ export class MediaAccess {
|
|
|
62
63
|
if (!record)
|
|
63
64
|
throw new MediaNotFoundError(id);
|
|
64
65
|
await this.authorize(ctx, 'read', record, authorize);
|
|
65
|
-
|
|
66
|
+
// The record just authorized is the one rendered — no second lookup.
|
|
67
|
+
return this.#library[imageOfRecord](record, imageOptions);
|
|
66
68
|
}
|
|
67
69
|
/**
|
|
68
70
|
* `media.library.stream(id)` for the current user: checks read access first (the collection's
|
|
@@ -79,7 +81,7 @@ export class MediaAccess {
|
|
|
79
81
|
if (!record)
|
|
80
82
|
throw new MediaNotFoundError(id);
|
|
81
83
|
await this.authorize(ctx, 'read', record, authorize);
|
|
82
|
-
return this.#library
|
|
84
|
+
return this.#library[streamOfRecord](record, streamOptions);
|
|
83
85
|
}
|
|
84
86
|
/**
|
|
85
87
|
* Authorize and answer one request for a file of a streaming package (HLS or DASH) — the core
|
|
@@ -193,7 +195,7 @@ export class MediaAccess {
|
|
|
193
195
|
const trusted = this.#library.checkDeliverySignature(signed, { required: false });
|
|
194
196
|
if (!trusted)
|
|
195
197
|
await this.authorize(ctx, 'read', record, options.authorize);
|
|
196
|
-
const
|
|
198
|
+
const deliverOptions = {
|
|
197
199
|
...(signed.conversion !== undefined ? { conversion: signed.conversion } : {}),
|
|
198
200
|
...(signed.width !== undefined && signed.width !== ''
|
|
199
201
|
? {
|
|
@@ -207,7 +209,12 @@ export class MediaAccess {
|
|
|
207
209
|
...(options.signedTtlSeconds !== undefined
|
|
208
210
|
? { signedTtlSeconds: options.signedTtlSeconds }
|
|
209
211
|
: {}),
|
|
210
|
-
}
|
|
212
|
+
};
|
|
213
|
+
// A record this call looked up itself is delivered as is; one the caller handed in is
|
|
214
|
+
// re-read by id, as before (it may not be the stored one).
|
|
215
|
+
const result = typeof target === 'string'
|
|
216
|
+
? await this.#library[deliverRecord](record, deliverOptions)
|
|
217
|
+
: await this.#library.deliver(id, deliverOptions);
|
|
211
218
|
response.header('cache-control', cacheControl);
|
|
212
219
|
if (result.vary)
|
|
213
220
|
response.header('vary', result.vary);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media_access.js","sourceRoot":"","sources":["../../src/media_access.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAKlB,YAAY,GACb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,kBAAkB,EAClB,eAAe,EACf,sBAAsB,GACvB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"media_access.js","sourceRoot":"","sources":["../../src/media_access.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { Readable } from 'node:stream';
|
|
|
2
2
|
import { type DeliveryMode, type DeliveryResult, type OnDemandImageConfig } from './delivery.js';
|
|
3
3
|
import { type DeliverySigningConfig } from './delivery_signing.js';
|
|
4
4
|
import { type FocalPoint, type ImageProcessor } from './image_processor.js';
|
|
5
|
+
import { deliverRecord, imageOfRecord, streamOfRecord } from './internal_symbols.js';
|
|
5
6
|
import { type MediaCollectionConfig, MediaCollectionRegistry } from './media_collection.js';
|
|
6
7
|
import type { MediaRecord } from './media_record.js';
|
|
7
8
|
import type { MediaStore } from './media_store.js';
|
|
@@ -279,6 +280,8 @@ export declare class MediaLibrary {
|
|
|
279
280
|
* `srcSet`. Like {@link url}, this answers "how", not "who": authorize the caller first.
|
|
280
281
|
*/
|
|
281
282
|
image(id: string, options?: ResponsiveImageOptions): Promise<ResponsiveImage>;
|
|
283
|
+
/** {@link image} for a record already fetched (by `media.access.image`). @internal */
|
|
284
|
+
[imageOfRecord](fetched: MediaRecord, options?: ResponsiveImageOptions): Promise<ResponsiveImage>;
|
|
282
285
|
/**
|
|
283
286
|
* URL of the delivery route (`delivery.path`, default `/media/:id`) for a record — optionally a
|
|
284
287
|
* conversion, or resized (`width`/`quality`). With `delivery.signing` configured it is signed and
|
|
@@ -319,6 +322,11 @@ export declare class MediaLibrary {
|
|
|
319
322
|
/** Signed-URL lifetime in seconds (with `delivery.signing`). */
|
|
320
323
|
expiresIn?: number;
|
|
321
324
|
}): Promise<MediaStream>;
|
|
325
|
+
/** {@link stream} for a record already fetched (by `media.access.stream`). @internal */
|
|
326
|
+
[streamOfRecord](record: MediaRecord, options?: {
|
|
327
|
+
conversions?: readonly string[];
|
|
328
|
+
expiresIn?: number;
|
|
329
|
+
}): MediaStream;
|
|
322
330
|
/**
|
|
323
331
|
* URL of one file of a streaming package on the stream route — signed for the whole package
|
|
324
332
|
* with `delivery.signing`. {@link stream} builds the entry URLs with it.
|
|
@@ -383,6 +391,8 @@ export declare class MediaLibrary {
|
|
|
383
391
|
* ```
|
|
384
392
|
*/
|
|
385
393
|
deliver(id: string, options?: DeliverOptions): Promise<DeliveryResult>;
|
|
394
|
+
/** {@link deliver} for a record already fetched (by `media.access.serve`). @internal */
|
|
395
|
+
[deliverRecord](record: MediaRecord, options?: DeliverOptions): Promise<DeliveryResult>;
|
|
386
396
|
/**
|
|
387
397
|
* Signed, expiring URL for a media record or one of its conversions.
|
|
388
398
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media_library.d.ts","sourceRoot":"","sources":["../../src/media_library.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAG5C,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,EAEL,KAAK,qBAAqB,EAK3B,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"media_library.d.ts","sourceRoot":"","sources":["../../src/media_library.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,12 @@ import { asBuffer, peekContents, peekStream, toBytes } from './contents.js';
|
|
|
4
4
|
import { DEFAULT_DELIVERY_SIGNED_TTL_SECONDS, DEFAULT_IMAGE_QUALITIES, DEFAULT_IMAGE_WIDTHS, resolveDeliveryMode, } from './delivery.js';
|
|
5
5
|
import { DEFAULT_DELIVERY_SIGNING_TTL_SECONDS, deliveryExpiry, deliveryQueryString, signDelivery, verifyDelivery, } from './delivery_signing.js';
|
|
6
6
|
import { publishMedia } from './diagnostics.js';
|
|
7
|
+
import { openWithMetadata, utf8Of } from './disk_read.js';
|
|
7
8
|
import { ContentSignatureUnrecognizedError, ContentTypeMismatchError, ConversionArtifactMissingError, ConversionNotDefinedError, DeliverySignatureError, ImageProcessorMissingError, ImageSizeNotAllowedError, MediaNotFoundError, MediaObjectMissingError, MimeNotAllowedError, NotAnImageError, TransformerNotDefinedError, TransformerOutputError, TransformNotReadyError, UploadNotSupportedError, } from './errors.js';
|
|
8
9
|
import { isExtendedDisk } from './extended_disk.js';
|
|
9
10
|
import { sanitizeFileName } from './file_name.js';
|
|
10
11
|
import { focalPointOf, presetCrops, } from './image_processor.js';
|
|
12
|
+
import { deliverRecord, imageOfRecord, streamOfRecord } from './internal_symbols.js';
|
|
11
13
|
import { MediaCollectionRegistry } from './media_collection.js';
|
|
12
14
|
import { resolveDeclaredMimeType } from './mime_type.js';
|
|
13
15
|
import { BROWSER_IMAGE_TYPES, imageCandidates, } from './responsive_image.js';
|
|
@@ -549,7 +551,15 @@ export class MediaLibrary {
|
|
|
549
551
|
* record that is not an image.
|
|
550
552
|
*/
|
|
551
553
|
async resized(id, request) {
|
|
552
|
-
const
|
|
554
|
+
const size = this.#resizeParams(request);
|
|
555
|
+
const record = await this.store.find(id);
|
|
556
|
+
if (!record)
|
|
557
|
+
throw new MediaNotFoundError(id);
|
|
558
|
+
return this.#resizedOf(record, size, request.accept);
|
|
559
|
+
}
|
|
560
|
+
/** Validate a `?w=`/`?q=` request against `delivery.images` (before any lookup, as always). */
|
|
561
|
+
#resizeParams(request) {
|
|
562
|
+
const { widths, qualities } = this.deliveryImages;
|
|
553
563
|
const width = request.trusted
|
|
554
564
|
? numberInRange('width', request.width, 1, MAX_SIGNED_WIDTH)
|
|
555
565
|
: allowedNumber('width', request.width, widths);
|
|
@@ -558,14 +568,16 @@ export class MediaLibrary {
|
|
|
558
568
|
: request.trusted
|
|
559
569
|
? numberInRange('quality', request.quality, 1, 100)
|
|
560
570
|
: allowedNumber('quality', request.quality, qualities);
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
571
|
+
return { width, quality };
|
|
572
|
+
}
|
|
573
|
+
/** {@link resized} for a record already in hand, with validated params. */
|
|
574
|
+
async #resizedOf(record, { width, quality }, accept) {
|
|
575
|
+
const { id } = record;
|
|
564
576
|
if (record.mimeType.startsWith('image/svg'))
|
|
565
577
|
return { record, conversion: undefined };
|
|
566
578
|
if (!record.mimeType.startsWith('image/'))
|
|
567
579
|
throw new NotAnImageError(id, record.mimeType);
|
|
568
|
-
const format = negotiateFormat(
|
|
580
|
+
const format = negotiateFormat(accept, this.deliveryImages.formats, record.mimeType);
|
|
569
581
|
const name = `@w${width}q${quality}-${format}`;
|
|
570
582
|
if (record.conversions[name])
|
|
571
583
|
return { record, conversion: name };
|
|
@@ -856,9 +868,15 @@ export class MediaLibrary {
|
|
|
856
868
|
* `srcSet`. Like {@link url}, this answers "how", not "who": authorize the caller first.
|
|
857
869
|
*/
|
|
858
870
|
async image(id, options = {}) {
|
|
859
|
-
|
|
871
|
+
const record = await this.store.find(id);
|
|
860
872
|
if (!record)
|
|
861
873
|
throw new MediaNotFoundError(id);
|
|
874
|
+
return this[imageOfRecord](record, options);
|
|
875
|
+
}
|
|
876
|
+
/** {@link image} for a record already fetched (by `media.access.image`). @internal */
|
|
877
|
+
async [imageOfRecord](fetched, options = {}) {
|
|
878
|
+
const { id } = fetched;
|
|
879
|
+
let record = fetched;
|
|
862
880
|
if (options.onDemand)
|
|
863
881
|
return this.#onDemandImage(record, options.onDemand);
|
|
864
882
|
const presets = this.collections.get(record.collection).conversions ?? [];
|
|
@@ -1001,6 +1019,11 @@ export class MediaLibrary {
|
|
|
1001
1019
|
const record = await this.store.find(id);
|
|
1002
1020
|
if (!record)
|
|
1003
1021
|
throw new MediaNotFoundError(id);
|
|
1022
|
+
return this[streamOfRecord](record, options);
|
|
1023
|
+
}
|
|
1024
|
+
/** {@link stream} for a record already fetched (by `media.access.stream`). @internal */
|
|
1025
|
+
[streamOfRecord](record, options = {}) {
|
|
1026
|
+
const { id } = record;
|
|
1004
1027
|
const entries = streamEntries(record, options.conversions);
|
|
1005
1028
|
const first = entries[0];
|
|
1006
1029
|
if (!first)
|
|
@@ -1082,7 +1105,7 @@ export class MediaLibrary {
|
|
|
1082
1105
|
const fileName = file.slice(file.lastIndexOf('/') + 1);
|
|
1083
1106
|
const format = streamFormatOf(file);
|
|
1084
1107
|
if (format) {
|
|
1085
|
-
const stored =
|
|
1108
|
+
const stored = utf8Of(await disk.getBytes(key));
|
|
1086
1109
|
return {
|
|
1087
1110
|
kind: 'manifest',
|
|
1088
1111
|
content: await signManifest(file, stored, options.query ?? ''),
|
|
@@ -1097,10 +1120,10 @@ export class MediaLibrary {
|
|
|
1097
1120
|
const expiresIn = options.signedTtlSeconds ?? this.deliverySignedTtlSeconds;
|
|
1098
1121
|
return { kind: 'redirect', url: await disk.getSignedUrl(key, { expiresIn }) };
|
|
1099
1122
|
}
|
|
1100
|
-
const metadata = await disk
|
|
1123
|
+
const { metadata, stream } = await openWithMetadata(disk, key);
|
|
1101
1124
|
return {
|
|
1102
1125
|
kind: 'stream',
|
|
1103
|
-
stream
|
|
1126
|
+
stream,
|
|
1104
1127
|
// A disk that stores everything as a generic type (S3 multipart) would make a player
|
|
1105
1128
|
// refuse the segment; the extension knows better.
|
|
1106
1129
|
mimeType: metadata.contentType && metadata.contentType !== 'application/octet-stream'
|
|
@@ -1142,17 +1165,32 @@ export class MediaLibrary {
|
|
|
1142
1165
|
* ```
|
|
1143
1166
|
*/
|
|
1144
1167
|
async deliver(id, options = {}) {
|
|
1145
|
-
|
|
1146
|
-
const
|
|
1147
|
-
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1153
|
-
|
|
1154
|
-
|
|
1155
|
-
|
|
1168
|
+
// Size params are validated before the lookup, so a bad `?w=` is refused even for an unknown id.
|
|
1169
|
+
const size = this.#deliverySize(options);
|
|
1170
|
+
const record = await this.store.find(id);
|
|
1171
|
+
if (!record)
|
|
1172
|
+
throw new MediaNotFoundError(id);
|
|
1173
|
+
return this.#deliverOf(record, options, size);
|
|
1174
|
+
}
|
|
1175
|
+
/** {@link deliver} for a record already fetched (by `media.access.serve`). @internal */
|
|
1176
|
+
async [deliverRecord](record, options = {}) {
|
|
1177
|
+
return this.#deliverOf(record, options, this.#deliverySize(options));
|
|
1178
|
+
}
|
|
1179
|
+
#deliverySize(options) {
|
|
1180
|
+
if (options.width === undefined || options.width === '')
|
|
1181
|
+
return undefined;
|
|
1182
|
+
return this.#resizeParams({
|
|
1183
|
+
width: options.width,
|
|
1184
|
+
quality: options.quality,
|
|
1185
|
+
trusted: options.trusted,
|
|
1186
|
+
});
|
|
1187
|
+
}
|
|
1188
|
+
async #deliverOf(found, options, size) {
|
|
1189
|
+
// The resize hands back the record it generated into, so the target needs no second lookup.
|
|
1190
|
+
const resized = size ? await this.#resizedOf(found, size, options.accept) : undefined;
|
|
1191
|
+
const conversion = resized ? resized.conversion : options.conversion;
|
|
1192
|
+
const vary = resized && options.accept !== undefined ? { vary: 'Accept' } : {};
|
|
1193
|
+
const target = await this.#targetOf(resized?.record ?? found, conversion);
|
|
1156
1194
|
const disk = this.storage.disk(target.disk);
|
|
1157
1195
|
const mode = await resolveDeliveryMode(options.mode ?? this.deliveryMode, disk, target.path);
|
|
1158
1196
|
if (mode === 'public') {
|
|
@@ -1168,10 +1206,10 @@ export class MediaLibrary {
|
|
|
1168
1206
|
}
|
|
1169
1207
|
// Prefer the disk's own metadata over the record's: for a conversion the record describes the
|
|
1170
1208
|
// ORIGINAL (a `thumb` of a PNG may well be a WEBP), and its `size` is the original's too.
|
|
1171
|
-
const metadata = await disk
|
|
1209
|
+
const { metadata, stream } = await openWithMetadata(disk, target.path);
|
|
1172
1210
|
return {
|
|
1173
1211
|
kind: 'stream',
|
|
1174
|
-
stream
|
|
1212
|
+
stream,
|
|
1175
1213
|
mimeType: deliveredMimeType(metadata.contentType, target.record.mimeType, conversion),
|
|
1176
1214
|
size: metadata.contentLength,
|
|
1177
1215
|
fileName: target.fileName,
|