@antelopejs/dms-media 0.6.0 → 0.6.2
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/README.md +18 -3
- package/dist/acl/entries.js +1 -2
- package/dist/acl/entries.js.map +1 -1
- package/dist/bindings.js +1 -3
- package/dist/bindings.js.map +1 -1
- package/dist/db/models/mediaFolders.model.d.ts +0 -3
- package/dist/db/models/mediaFolders.model.js +0 -29
- package/dist/db/models/mediaFolders.model.js.map +1 -1
- package/dist/db/tables/mediaDeclarations.table.d.ts +0 -4
- package/dist/db/tables/mediaDeclarations.table.js +0 -16
- package/dist/db/tables/mediaDeclarations.table.js.map +1 -1
- package/dist/declared/assets.d.ts +0 -2
- package/dist/declared/assets.js +12 -140
- package/dist/declared/assets.js.map +1 -1
- package/dist/declared/folders.d.ts +1 -5
- package/dist/declared/folders.js +17 -82
- package/dist/declared/folders.js.map +1 -1
- package/dist/declared/index.d.ts +0 -2
- package/dist/declared/index.js +0 -2
- package/dist/declared/index.js.map +1 -1
- package/dist/declared/records.d.ts +4 -32
- package/dist/declared/records.js +6 -35
- package/dist/declared/records.js.map +1 -1
- package/dist/derivatives.js +14 -23
- package/dist/derivatives.js.map +1 -1
- package/dist/guards.d.ts +4 -0
- package/dist/guards.js +19 -0
- package/dist/guards.js.map +1 -0
- package/dist/implementations/interface-dms-media/index.d.ts +1 -3
- package/dist/implementations/interface-dms-media/index.js +0 -2
- package/dist/implementations/interface-dms-media/index.js.map +1 -1
- package/dist/library/activity.js +7 -5
- package/dist/library/activity.js.map +1 -1
- package/dist/library/batches.js +6 -3
- package/dist/library/batches.js.map +1 -1
- package/dist/library/events.js +4 -4
- package/dist/library/events.js.map +1 -1
- package/dist/library/module-readout.js +5 -2
- package/dist/library/module-readout.js.map +1 -1
- package/dist/library/realtime.js.map +1 -1
- package/dist/pages/activity.js +1 -1
- package/dist/pages/activity.js.map +1 -1
- package/dist/routes/media/assets.d.ts +1 -1
- package/dist/routes/media/assets.js +5 -5
- package/dist/routes/media/assets.js.map +1 -1
- package/dist/routes/media/bulk.js +17 -13
- package/dist/routes/media/bulk.js.map +1 -1
- package/dist/routes/media/delivery-headers.js +9 -9
- package/dist/routes/media/delivery-headers.js.map +1 -1
- package/dist/routes/media/delivery-stream.js +7 -21
- package/dist/routes/media/delivery-stream.js.map +1 -1
- package/dist/routes/media/delivery.js.map +1 -1
- package/dist/routes/media/manage.js.map +1 -1
- package/dist/routes/media/transform.js +13 -8
- package/dist/routes/media/transform.js.map +1 -1
- package/dist/routes/media/upload.js +2 -5
- package/dist/routes/media/upload.js.map +1 -1
- package/dist/test/antelope.test.js +17 -16
- package/dist/test/antelope.test.js.map +1 -1
- package/dist/test/helpers/folders.d.ts +27 -0
- package/dist/test/helpers/folders.js +15 -0
- package/dist/test/helpers/folders.js.map +1 -1
- package/dist/test/helpers/pages.js +10 -6
- package/dist/test/helpers/pages.js.map +1 -1
- package/dist/test/helpers/permissions-world.d.ts +98 -0
- package/dist/test/helpers/permissions-world.js +205 -0
- package/dist/test/helpers/permissions-world.js.map +1 -0
- package/dist/test/helpers/prototype.d.ts +1 -0
- package/dist/test/helpers/prototype.js +11 -0
- package/dist/test/helpers/prototype.js.map +1 -0
- package/dist/test/integration/derivative-sweep-query.test.js +13 -16
- package/dist/test/integration/derivative-sweep-query.test.js.map +1 -1
- package/dist/test/integration/folder-query.test.js +5 -9
- package/dist/test/integration/folder-query.test.js.map +1 -1
- package/dist/test/integration/media-bindings.test.js +2 -2
- package/dist/test/integration/media-bindings.test.js.map +1 -1
- package/dist/test/integration/media-cleanup.test.js +14 -17
- package/dist/test/integration/media-cleanup.test.js.map +1 -1
- package/dist/test/integration/media-declared-content.test.js +19 -318
- package/dist/test/integration/media-declared-content.test.js.map +1 -1
- package/dist/test/integration/media-delivery-editing.test.js +7 -5
- package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
- package/dist/test/integration/media-delivery.test.js +19 -5
- package/dist/test/integration/media-delivery.test.js.map +1 -1
- package/dist/test/integration/media-explorer-writes.test.js +2 -2
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-guards.test.js +18 -7
- package/dist/test/integration/media-guards.test.js.map +1 -1
- package/dist/test/integration/media-library.test.js +1 -1
- package/dist/test/integration/media-library.test.js.map +1 -1
- package/dist/test/integration/media-linked-subfolders.test.js +6 -6
- package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
- package/dist/test/integration/media-member-access.test.js +2 -5
- package/dist/test/integration/media-member-access.test.js.map +1 -1
- package/dist/test/integration/media-permissions.test.js +142 -473
- package/dist/test/integration/media-permissions.test.js.map +1 -1
- package/dist/test/integration/media-project-field.test.js +3 -5
- package/dist/test/integration/media-project-field.test.js.map +1 -1
- package/dist/test/integration/media-search-query.test.js +11 -16
- package/dist/test/integration/media-search-query.test.js.map +1 -1
- package/dist/test/integration/media-storage-origin-unreachable.test.js +80 -0
- package/dist/test/integration/media-storage-origin-unreachable.test.js.map +1 -0
- package/dist/test/integration/media-upload-policy.test.js +2 -2
- package/dist/test/integration/media-upload-policy.test.js.map +1 -1
- package/dist/test/integration/permissions-management.d.ts +2 -0
- package/dist/test/integration/permissions-management.js +189 -0
- package/dist/test/integration/permissions-management.js.map +1 -0
- package/dist/test/unit/acl/entries.test.js +2 -1
- package/dist/test/unit/acl/entries.test.js.map +1 -1
- package/dist/test/unit/acl/resolver.test.js +10 -3
- package/dist/test/unit/acl/resolver.test.js.map +1 -1
- package/dist/test/unit/declared.test.js +0 -66
- package/dist/test/unit/declared.test.js.map +1 -1
- package/dist/test/unit/library/fixtures.d.ts +1 -1
- package/dist/test/unit/library/fixtures.js +6 -1
- package/dist/test/unit/library/fixtures.js.map +1 -1
- package/dist/test/unit/library/library.test.js +0 -1
- package/dist/test/unit/library/library.test.js.map +1 -1
- package/dist/test/unit/library/realtime.test.js +1 -0
- package/dist/test/unit/library/realtime.test.js.map +1 -1
- package/dist/test/unit/library/search-facets.test.js +2 -2
- package/dist/test/unit/library/search-facets.test.js.map +1 -1
- package/dist/test/unit/pages/toolbar.test.js +24 -7
- package/dist/test/unit/pages/toolbar.test.js.map +1 -1
- package/dist/test/unit/routes/dto.test.js +7 -6
- package/dist/test/unit/routes/dto.test.js.map +1 -1
- package/dist/test/unit/routes/file-page.test.js +5 -7
- package/dist/test/unit/routes/file-page.test.js.map +1 -1
- package/dist/test/unit/routes/preset-row.test.js +2 -1
- package/dist/test/unit/routes/preset-row.test.js.map +1 -1
- package/dist/transform.js +6 -6
- package/dist/transform.js.map +1 -1
- package/dist/upload-checks.d.ts +8 -2
- package/dist/upload-checks.js.map +1 -1
- package/dist/upload-policy.js +8 -8
- package/dist/upload-policy.js.map +1 -1
- package/dist/validation/declared.schema.d.ts +7 -36
- package/dist/validation/declared.schema.js +15 -20
- package/dist/validation/declared.schema.js.map +1 -1
- package/dist/validation/media.schema.d.ts +1 -1
- package/dist/validation/media.schema.js +2 -2
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/app/build/imageEditor/editorShapes.ts +118 -0
- package/frontend-vue/app/build/imageEditor/useEditorSaving.ts +86 -0
- package/frontend-vue/app/build/library/libraryActions.ts +444 -0
- package/frontend-vue/app/build/library/libraryCore.ts +136 -0
- package/frontend-vue/app/components/ImageEditor.vue +22 -179
- package/frontend-vue/app/composables/library/useMediaLibrary.ts +3 -575
- package/frontend-vue/app/composables/useMediaApi.ts +21 -5
- package/frontend-vue/build/backend-boundary.ts +122 -0
- package/frontend-vue/dms.frontend.build.ts +3 -0
- package/frontend-vue/eslint.config.mjs +13 -0
- package/frontend-vue/package.json +3 -1
- package/frontend-vue/pnpm-lock.yaml +217 -61
- package/frontend-vue/tests/backend-boundary.test.ts +203 -0
- package/frontend-vue/tests/mediaPreviews.test.ts +39 -0
- package/package.json +10 -16
- package/skills/dms-media/SKILL.md +12 -24
- package/skills/dms-media/cases.json +38 -0
- package/src/acl/entries.ts +6 -4
- package/src/bindings.ts +3 -3
- package/src/db/models/mediaFolders.model.ts +0 -44
- package/src/db/tables/mediaDeclarations.table.ts +3 -19
- package/src/declared/assets.ts +19 -210
- package/src/declared/folders.ts +25 -138
- package/src/declared/index.ts +0 -2
- package/src/declared/records.ts +17 -90
- package/src/derivatives.ts +17 -23
- package/src/guards.ts +19 -0
- package/src/implementations/interface-dms-media/index.ts +1 -8
- package/src/library/activity.ts +17 -9
- package/src/library/batches.ts +12 -9
- package/src/library/events.ts +7 -4
- package/src/library/module-readout.ts +6 -2
- package/src/library/realtime.ts +5 -1
- package/src/library/zip.ts +1 -1
- package/src/pages/activity.ts +6 -2
- package/src/routes/media/assets.ts +4 -3
- package/src/routes/media/bulk.ts +16 -14
- package/src/routes/media/delivery-headers.ts +9 -12
- package/src/routes/media/delivery-stream.ts +13 -28
- package/src/routes/media/delivery.ts +4 -2
- package/src/routes/media/manage.ts +4 -6
- package/src/routes/media/transform.ts +27 -23
- package/src/routes/media/upload.ts +4 -6
- package/src/test/antelope.test.ts +25 -21
- package/src/test/helpers/folders.ts +22 -0
- package/src/test/helpers/pages.ts +12 -5
- package/src/test/helpers/permissions-world.ts +326 -0
- package/src/test/helpers/prototype.ts +12 -0
- package/src/test/integration/derivative-sweep-query.test.ts +19 -21
- package/src/test/integration/folder-query.test.ts +11 -11
- package/src/test/integration/media-bindings.test.ts +7 -7
- package/src/test/integration/media-cleanup.test.ts +25 -37
- package/src/test/integration/media-declared-content.test.ts +35 -379
- package/src/test/integration/media-delivery-editing.test.ts +11 -7
- package/src/test/integration/media-delivery.test.ts +29 -8
- package/src/test/integration/media-explorer-writes.test.ts +2 -7
- package/src/test/integration/media-guards.test.ts +21 -7
- package/src/test/integration/media-library.test.ts +1 -1
- package/src/test/integration/media-linked-subfolders.test.ts +12 -21
- package/src/test/integration/media-member-access.test.ts +5 -9
- package/src/test/integration/media-permissions.test.ts +56 -570
- package/src/test/integration/media-project-field.test.ts +5 -7
- package/src/test/integration/media-search-query.test.ts +16 -20
- package/src/test/integration/media-storage-origin-unreachable.test.ts +111 -0
- package/src/test/integration/media-upload-policy.test.ts +2 -8
- package/src/test/integration/permissions-management.ts +292 -0
- package/src/test/unit/acl/entries.test.ts +2 -1
- package/src/test/unit/acl/resolver.test.ts +19 -7
- package/src/test/unit/declared.test.ts +0 -87
- package/src/test/unit/library/fixtures.ts +9 -3
- package/src/test/unit/library/library.test.ts +1 -7
- package/src/test/unit/library/realtime.test.ts +2 -0
- package/src/test/unit/library/search-facets.test.ts +2 -2
- package/src/test/unit/pages/toolbar.test.ts +42 -17
- package/src/test/unit/routes/dto.test.ts +7 -6
- package/src/test/unit/routes/file-page.test.ts +10 -9
- package/src/test/unit/routes/preset-row.test.ts +2 -2
- package/src/transform.ts +6 -6
- package/src/upload-checks.ts +12 -3
- package/src/upload-policy.ts +8 -8
- package/src/validation/declared.schema.ts +17 -25
- package/src/validation/media.schema.ts +6 -6
- package/dist/declared/readiness.d.ts +0 -2
- package/dist/declared/readiness.js +0 -52
- package/dist/declared/readiness.js.map +0 -1
- package/dist/declared/retire.d.ts +0 -3
- package/dist/declared/retire.js +0 -118
- package/dist/declared/retire.js.map +0 -1
- package/dist/test/integration/media-declared-retire.test.js +0 -186
- package/dist/test/integration/media-declared-retire.test.js.map +0 -1
- package/frontend-vue/tests/engines.test.ts +0 -20
- package/frontend-vue/tests/locales.test.ts +0 -61
- package/src/declared/readiness.ts +0 -64
- package/src/declared/retire.ts +0 -206
- package/src/test/integration/media-declared-retire.test.ts +0 -257
- /package/dist/test/integration/{media-declared-retire.test.d.ts → media-storage-origin-unreachable.test.d.ts} +0 -0
package/src/derivatives.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { buffer } from "node:stream/consumers";
|
|
2
3
|
import {
|
|
3
|
-
CreateUploadUrl,
|
|
4
4
|
DeleteFile,
|
|
5
|
+
ReadFile,
|
|
6
|
+
WriteFile,
|
|
5
7
|
} from "@antelopejs/interface-file-storage";
|
|
6
8
|
import sharp from "sharp";
|
|
7
9
|
import { TECHNICAL_MUTATION, updateAssetMedia } from "./asset-lifecycle";
|
|
@@ -15,7 +17,6 @@ import {
|
|
|
15
17
|
RASTERIZED_SVG_FORMAT,
|
|
16
18
|
SVG_MIMETYPE,
|
|
17
19
|
} from "./presets";
|
|
18
|
-
import { signedReadUrl } from "./read-urls";
|
|
19
20
|
import { parseDerivatives } from "./routes/media/storage-keys";
|
|
20
21
|
|
|
21
22
|
const DERIVATIVES_PATH_PREFIX = "media-derivatives";
|
|
@@ -31,7 +32,8 @@ export class UnreadableImageError extends Error {}
|
|
|
31
32
|
|
|
32
33
|
interface GenerationFailure {
|
|
33
34
|
failedAt: number;
|
|
34
|
-
|
|
35
|
+
/** Set when the stored bytes could not be decoded: that error is rethrown while the failure is remembered. */
|
|
36
|
+
unreadable?: UnreadableImageError;
|
|
35
37
|
}
|
|
36
38
|
|
|
37
39
|
const generationLocks = new Map<string, Promise<string>>();
|
|
@@ -41,11 +43,7 @@ export async function downloadStorageBytes(
|
|
|
41
43
|
storageKey: string,
|
|
42
44
|
storage: string | undefined,
|
|
43
45
|
): Promise<Buffer> {
|
|
44
|
-
|
|
45
|
-
if (!response.ok) {
|
|
46
|
-
throw new Error(`Failed to download ${storageKey}: ${response.status}`);
|
|
47
|
-
}
|
|
48
|
-
return Buffer.from(await response.arrayBuffer());
|
|
46
|
+
return buffer((await ReadFile(storageKey, storage)).body);
|
|
49
47
|
}
|
|
50
48
|
|
|
51
49
|
export async function uploadStorageBytes(
|
|
@@ -55,7 +53,7 @@ export async function uploadStorageBytes(
|
|
|
55
53
|
path: string,
|
|
56
54
|
storage: string | undefined,
|
|
57
55
|
): Promise<string> {
|
|
58
|
-
const
|
|
56
|
+
const { resourceKey } = await WriteFile(
|
|
59
57
|
{
|
|
60
58
|
filename,
|
|
61
59
|
size: bytes.byteLength,
|
|
@@ -63,18 +61,11 @@ export async function uploadStorageBytes(
|
|
|
63
61
|
path,
|
|
64
62
|
metadata: { [ORIGINAL_FILENAME_METADATA_KEY]: filename },
|
|
65
63
|
},
|
|
64
|
+
bytes,
|
|
66
65
|
undefined,
|
|
67
66
|
storage,
|
|
68
67
|
);
|
|
69
|
-
|
|
70
|
-
method: "PUT",
|
|
71
|
-
headers: presigned.headers,
|
|
72
|
-
body: new Uint8Array(bytes),
|
|
73
|
-
});
|
|
74
|
-
if (!response.ok) {
|
|
75
|
-
throw new Error(`Failed to upload ${filename}: ${response.status}`);
|
|
76
|
-
}
|
|
77
|
-
return presigned.resourceKey;
|
|
68
|
+
return resourceKey;
|
|
78
69
|
}
|
|
79
70
|
|
|
80
71
|
async function readSourceMetadata(source: Buffer): Promise<sharp.Metadata> {
|
|
@@ -251,15 +242,15 @@ export function partitionDerivatives(
|
|
|
251
242
|
return { fresh, stale };
|
|
252
243
|
}
|
|
253
244
|
|
|
254
|
-
function failureRetryDelay(
|
|
255
|
-
return
|
|
245
|
+
function failureRetryDelay(failure: GenerationFailure): number {
|
|
246
|
+
return failure.unreadable
|
|
256
247
|
? UNREADABLE_IMAGE_RETRY_MS
|
|
257
248
|
: GENERATION_FAILURE_RETRY_MS;
|
|
258
249
|
}
|
|
259
250
|
|
|
260
251
|
function pruneExpiredGenerationFailures(now: number): void {
|
|
261
252
|
for (const [lockKey, failure] of generationFailures) {
|
|
262
|
-
if (now - failure.failedAt >= failureRetryDelay(failure
|
|
253
|
+
if (now - failure.failedAt >= failureRetryDelay(failure)) {
|
|
263
254
|
generationFailures.delete(lockKey);
|
|
264
255
|
}
|
|
265
256
|
}
|
|
@@ -269,7 +260,7 @@ function assertNoRecentGenerationFailure(lockKey: string): void {
|
|
|
269
260
|
pruneExpiredGenerationFailures(Date.now());
|
|
270
261
|
const failure = generationFailures.get(lockKey);
|
|
271
262
|
if (!failure) return;
|
|
272
|
-
if (failure.
|
|
263
|
+
if (failure.unreadable) throw failure.unreadable;
|
|
273
264
|
throw new Error("Derivative generation recently failed");
|
|
274
265
|
}
|
|
275
266
|
|
|
@@ -294,7 +285,10 @@ export async function ensureDerivative(
|
|
|
294
285
|
return storageKey;
|
|
295
286
|
})
|
|
296
287
|
.catch((error: unknown) => {
|
|
297
|
-
generationFailures.set(lockKey, {
|
|
288
|
+
generationFailures.set(lockKey, {
|
|
289
|
+
failedAt: Date.now(),
|
|
290
|
+
unreadable: error instanceof UnreadableImageError ? error : undefined,
|
|
291
|
+
});
|
|
298
292
|
throw error;
|
|
299
293
|
})
|
|
300
294
|
.finally(() => generationLocks.delete(lockKey));
|
package/src/guards.ts
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/** Whether `value` is a string. */
|
|
2
|
+
export function isString(value: unknown): value is string {
|
|
3
|
+
return typeof value === "string";
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
/** Whether `value` is a non-null object, arrays included. */
|
|
7
|
+
export function isObject(value: unknown): value is object {
|
|
8
|
+
return typeof value === "object" && value !== null;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
/** Whether `value` can carry properties of its own: a non-null object or a function. */
|
|
12
|
+
export function isObjectLike(value: unknown): value is object {
|
|
13
|
+
return isObject(value) || isCallable(value);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** Whether `typeof` reports `value` as a function: classes included, as TypeScript narrows it. */
|
|
17
|
+
export function isCallable(value: unknown): value is Function {
|
|
18
|
+
return typeof value === "function";
|
|
19
|
+
}
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import type { AssetBindingConfig } from "@antelopejs/interface-dms-media";
|
|
2
2
|
import { addAssetBinding, removeAssetBinding } from "../../bindings";
|
|
3
|
-
import {
|
|
4
|
-
ensureDeclaredFolder,
|
|
5
|
-
importDeclaredAsset,
|
|
6
|
-
pruneDeclarations,
|
|
7
|
-
retireDeclaration,
|
|
8
|
-
} from "../../declared";
|
|
3
|
+
import { ensureDeclaredFolder, importDeclaredAsset } from "../../declared";
|
|
9
4
|
|
|
10
5
|
export namespace internal {
|
|
11
6
|
export const RegisterAssetBinding = {
|
|
@@ -18,6 +13,4 @@ export namespace internal {
|
|
|
18
13
|
};
|
|
19
14
|
export const EnsureMediaFolder = ensureDeclaredFolder;
|
|
20
15
|
export const ImportMediaAsset = importDeclaredAsset;
|
|
21
|
-
export const RetireMediaDeclaration = retireDeclaration;
|
|
22
|
-
export const PruneMediaDeclarations = pruneDeclarations;
|
|
23
16
|
}
|
package/src/library/activity.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { ActivityFeedItem } from "@antelopejs/interface-dms/base/activity-feed";
|
|
2
|
-
import type { ComposedTextParam } from "@antelopejs/interface-dms/base/types";
|
|
3
2
|
import type { Tone } from "@antelopejs/interface-dms/base/types/tone";
|
|
4
3
|
import type { MediaEvent, MediaFolder } from "../db";
|
|
5
4
|
import { countParam } from "./composed-text";
|
|
@@ -67,6 +66,11 @@ const EVENT_PRESENTATIONS: Record<MediaEventKind, EventPresentation> = {
|
|
|
67
66
|
"folder.visibility": { icon: "i-ph-globe", tone: "success" },
|
|
68
67
|
};
|
|
69
68
|
|
|
69
|
+
/** Whether a stored event kind is one this release records and presents. */
|
|
70
|
+
function isMediaEventKind(kind: string): kind is MediaEventKind {
|
|
71
|
+
return Object.hasOwn(EVENT_PRESENTATIONS, kind);
|
|
72
|
+
}
|
|
73
|
+
|
|
70
74
|
const NEUTRAL_PRESENTATION: EventPresentation = {
|
|
71
75
|
icon: "i-ph-clock-counter-clockwise",
|
|
72
76
|
tone: "neutral",
|
|
@@ -163,9 +167,12 @@ function visibleDetails(details: MediaEventDetails): MediaEventDetails {
|
|
|
163
167
|
);
|
|
164
168
|
}
|
|
165
169
|
|
|
166
|
-
|
|
170
|
+
/** The parameters of a feed item's title and meta texts. */
|
|
171
|
+
type FeedParams = NonNullable<ActivityFeedItem["params"]>;
|
|
172
|
+
|
|
173
|
+
function toParams(entry: ActivityEntry): FeedParams {
|
|
167
174
|
const details = visibleDetails(readEventDetails(entry.event));
|
|
168
|
-
const params:
|
|
175
|
+
const params: FeedParams = {
|
|
169
176
|
actor: entry.event.actorName,
|
|
170
177
|
name: entry.event.targetName,
|
|
171
178
|
count: countParam(entry.count),
|
|
@@ -186,7 +193,7 @@ function titleSuffix(event: MediaEvent): string {
|
|
|
186
193
|
return `_${visibility.replace(VISIBILITY_KEY_PREFIX, "")}`;
|
|
187
194
|
}
|
|
188
195
|
|
|
189
|
-
function batchParams(event: MediaEvent):
|
|
196
|
+
function batchParams(event: MediaEvent): FeedParams {
|
|
190
197
|
const details = readEventDetails(event);
|
|
191
198
|
return {
|
|
192
199
|
uploaded: countParam(event.count ?? 0),
|
|
@@ -200,11 +207,12 @@ function presentEntry(
|
|
|
200
207
|
context: ActivityContext,
|
|
201
208
|
): ActivityFeedItem {
|
|
202
209
|
const { event } = entry;
|
|
203
|
-
const kind = event
|
|
210
|
+
const { kind } = event;
|
|
211
|
+
const known = isMediaEventKind(kind) ? kind : undefined;
|
|
204
212
|
const isReport = kind === BATCH_REPORT_KIND;
|
|
205
213
|
const presentation = isReport
|
|
206
214
|
? BATCH_PRESENTATIONS[batchOutcome(event)]
|
|
207
|
-
: (EVENT_PRESENTATIONS[
|
|
215
|
+
: ((known && EVENT_PRESENTATIONS[known]) ?? NEUTRAL_PRESENTATION);
|
|
208
216
|
const path = folderPath(subjectFolderId(event), context.foldersById);
|
|
209
217
|
const isGone = Boolean(
|
|
210
218
|
event.assetId && context.deletedAssetIds.has(event.assetId),
|
|
@@ -300,9 +308,9 @@ function foldBulkActions(entries: ActivityEntry[]): ActivityEntry[] {
|
|
|
300
308
|
|
|
301
309
|
function deletedAssets(events: MediaEvent[]): Set<string> {
|
|
302
310
|
return new Set(
|
|
303
|
-
events
|
|
304
|
-
|
|
305
|
-
|
|
311
|
+
events.flatMap((event) =>
|
|
312
|
+
event.kind === "asset.delete" && event.assetId ? [event.assetId] : [],
|
|
313
|
+
),
|
|
306
314
|
);
|
|
307
315
|
}
|
|
308
316
|
|
package/src/library/batches.ts
CHANGED
|
@@ -8,6 +8,8 @@ import {
|
|
|
8
8
|
readEventDetails,
|
|
9
9
|
UPLOAD_KIND,
|
|
10
10
|
} from "./events";
|
|
11
|
+
import { z } from "zod";
|
|
12
|
+
import { isString } from "../guards";
|
|
11
13
|
|
|
12
14
|
export interface UploadBatchRow {
|
|
13
15
|
_id: string;
|
|
@@ -33,10 +35,11 @@ type BatchAttention = "yes" | "no";
|
|
|
33
35
|
/** How long a failed upload keeps asking for attention. */
|
|
34
36
|
export const FAILURE_WINDOW_MS = 24 * 60 * 60 * 1000;
|
|
35
37
|
|
|
36
|
-
|
|
37
|
-
name: string
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
const uploadFailuresSchema = z.array(
|
|
39
|
+
z.object({ name: z.string(), reason: z.string().optional() }),
|
|
40
|
+
);
|
|
41
|
+
|
|
42
|
+
type UploadFailures = z.infer<typeof uploadFailuresSchema>;
|
|
40
43
|
|
|
41
44
|
const HISTORY_TEXTS = "dms_media.uploads.history";
|
|
42
45
|
const FAILURES_SHOWN = 3;
|
|
@@ -51,7 +54,7 @@ interface BatchAccumulator {
|
|
|
51
54
|
by: string;
|
|
52
55
|
files: number;
|
|
53
56
|
failed: number;
|
|
54
|
-
failures:
|
|
57
|
+
failures: UploadFailures;
|
|
55
58
|
size: number;
|
|
56
59
|
finishedAt: Date;
|
|
57
60
|
reportedAt?: Date;
|
|
@@ -71,12 +74,12 @@ function newBatch(key: string, event: MediaEvent): BatchAccumulator {
|
|
|
71
74
|
}
|
|
72
75
|
|
|
73
76
|
/** The files a batch report names as failed, with their reasons. */
|
|
74
|
-
function readBatchFailures(event: MediaEvent):
|
|
77
|
+
function readBatchFailures(event: MediaEvent): UploadFailures {
|
|
75
78
|
const raw = readEventDetails(event).failures;
|
|
76
|
-
if (
|
|
79
|
+
if (!isString(raw)) return [];
|
|
77
80
|
try {
|
|
78
|
-
const parsed
|
|
79
|
-
return
|
|
81
|
+
const parsed = uploadFailuresSchema.safeParse(JSON.parse(raw));
|
|
82
|
+
return parsed.success ? parsed.data : [];
|
|
80
83
|
} catch {
|
|
81
84
|
return [];
|
|
82
85
|
}
|
package/src/library/events.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
|
2
2
|
import { Logging } from "@antelopejs/interface-core/logging";
|
|
3
3
|
import type { User } from "@antelopejs/interface-dms/auth/db";
|
|
4
4
|
import { type MediaEvent, MediaEventModel } from "../db";
|
|
5
|
+
import { z } from "zod";
|
|
5
6
|
import { announceLibraryChange, UPLOAD_ANNOUNCE_WINDOW_MS } from "./realtime";
|
|
6
7
|
|
|
7
8
|
const MEDIA_EVENT_KINDS = [
|
|
@@ -25,6 +26,10 @@ export type MediaEventKind = (typeof MEDIA_EVENT_KINDS)[number];
|
|
|
25
26
|
|
|
26
27
|
export type MediaEventDetails = Record<string, string | number>;
|
|
27
28
|
|
|
29
|
+
const eventDetailsSchema: z.ZodType<MediaEventDetails> = z.record(
|
|
30
|
+
z.union([z.string(), z.number()]),
|
|
31
|
+
);
|
|
32
|
+
|
|
28
33
|
export interface MediaEventInput {
|
|
29
34
|
kind: MediaEventKind;
|
|
30
35
|
targetName: string;
|
|
@@ -77,10 +82,8 @@ export async function recordMediaEvent(
|
|
|
77
82
|
export function readEventDetails(event: MediaEvent): MediaEventDetails {
|
|
78
83
|
if (!event.json_details) return {};
|
|
79
84
|
try {
|
|
80
|
-
const parsed
|
|
81
|
-
return parsed
|
|
82
|
-
? (parsed as MediaEventDetails)
|
|
83
|
-
: {};
|
|
85
|
+
const parsed = eventDetailsSchema.safeParse(JSON.parse(event.json_details));
|
|
86
|
+
return parsed.success ? parsed.data : {};
|
|
84
87
|
} catch {
|
|
85
88
|
return {};
|
|
86
89
|
}
|
|
@@ -13,6 +13,7 @@ import { loadAssetsInFolders } from "./listing";
|
|
|
13
13
|
import { storedSize } from "./overview";
|
|
14
14
|
import { isDescribableImage } from "./type-groups";
|
|
15
15
|
import { loadUploadHistoryEvents } from "./upload-history";
|
|
16
|
+
import { isObject, isString } from "../guards";
|
|
16
17
|
|
|
17
18
|
const TEXTS = "$dms_media.readout";
|
|
18
19
|
const DEFAULT_LANGUAGE = "en";
|
|
@@ -38,8 +39,11 @@ export function readModuleVersion(): string | undefined {
|
|
|
38
39
|
const manifest: unknown = JSON.parse(
|
|
39
40
|
readFileSync(PACKAGE_MANIFEST, "utf8"),
|
|
40
41
|
);
|
|
41
|
-
const version =
|
|
42
|
-
|
|
42
|
+
const version =
|
|
43
|
+
isObject(manifest) && "version" in manifest
|
|
44
|
+
? manifest.version
|
|
45
|
+
: undefined;
|
|
46
|
+
return isString(version) ? version : undefined;
|
|
43
47
|
} catch {
|
|
44
48
|
return undefined;
|
|
45
49
|
}
|
package/src/library/realtime.ts
CHANGED
|
@@ -13,9 +13,13 @@ let pendingDueAt = 0;
|
|
|
13
13
|
let pendingChanges = 0;
|
|
14
14
|
let version = 0;
|
|
15
15
|
|
|
16
|
+
/**
|
|
17
|
+
* Publishes the changes waiting to be announced as one message whose
|
|
18
|
+
* `payload.count` says how many it stands for: a paused page counts that many
|
|
19
|
+
* missed changes, not one per announcement.
|
|
20
|
+
*/
|
|
16
21
|
async function publishNow(): Promise<void> {
|
|
17
22
|
pending = undefined;
|
|
18
|
-
// A paused page counts `payload.count` as that many missed changes, not one per announcement.
|
|
19
23
|
const count = pendingChanges;
|
|
20
24
|
pendingChanges = 0;
|
|
21
25
|
try {
|
package/src/library/zip.ts
CHANGED
|
@@ -23,7 +23,7 @@ interface CentralEntry {
|
|
|
23
23
|
|
|
24
24
|
export type ZipChunkWriter = (chunk: Buffer) => void;
|
|
25
25
|
|
|
26
|
-
function dosDateTime(date: Date):
|
|
26
|
+
function dosDateTime(date: Date): Pick<CentralEntry, "time" | "date"> {
|
|
27
27
|
const year = Math.max(date.getFullYear(), DOS_EPOCH_YEAR);
|
|
28
28
|
return {
|
|
29
29
|
time:
|
package/src/pages/activity.ts
CHANGED
|
@@ -4,7 +4,11 @@ import { DefaultLayout } from "@antelopejs/interface-dms/base/layouts";
|
|
|
4
4
|
import { Tab } from "@antelopejs/interface-dms/base/tab";
|
|
5
5
|
import { PageController, RegisterPage } from "@antelopejs/interface-dms/page";
|
|
6
6
|
import { MEDIA_LIBRARY_TOPIC } from "../constants";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
ACTIVITY_FILTERS,
|
|
9
|
+
type ActivityFilter,
|
|
10
|
+
isActivityFilter,
|
|
11
|
+
} from "../library/activity";
|
|
8
12
|
import { libraryCategory, MEDIA_MODULE_ID } from "./module";
|
|
9
13
|
import { blockMeta } from "./texts";
|
|
10
14
|
import { MEDIA_LIVE, mediaPageToolbar } from "./toolbar";
|
|
@@ -14,7 +18,7 @@ const FEED_LENGTH = 50;
|
|
|
14
18
|
const SKELETON_ROWS = 8;
|
|
15
19
|
const ALL_SLOT = "all";
|
|
16
20
|
|
|
17
|
-
const FILTERS = Object.keys(ACTIVITY_FILTERS)
|
|
21
|
+
const FILTERS = Object.keys(ACTIVITY_FILTERS).filter(isActivityFilter);
|
|
18
22
|
|
|
19
23
|
function feed(filter?: ActivityFilter) {
|
|
20
24
|
const query = filter ? `&type=${filter}` : "";
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
Delete,
|
|
10
10
|
Get,
|
|
11
11
|
JSONBody,
|
|
12
|
+
MultiParameter,
|
|
12
13
|
Parameter,
|
|
13
14
|
Post,
|
|
14
15
|
} from "@antelopejs/interface-api";
|
|
@@ -131,9 +132,9 @@ export class MediaAssetsController extends MediaApiController {
|
|
|
131
132
|
return { assets, truncated };
|
|
132
133
|
}
|
|
133
134
|
|
|
134
|
-
@
|
|
135
|
-
async previews(@
|
|
136
|
-
const { ids } = parseBody(
|
|
135
|
+
@Get("/previews")
|
|
136
|
+
async previews(@MultiParameter("ids", "query") queryIds: string[]) {
|
|
137
|
+
const { ids } = parseBody({ ids: queryIds }, previewIdsSchema);
|
|
137
138
|
const context = await this.resolveContext();
|
|
138
139
|
const { presets } = getMediaConfig();
|
|
139
140
|
const thumb = presets.get(THUMB_PRESET_ID);
|
package/src/routes/media/bulk.ts
CHANGED
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
type MediaRequestContext,
|
|
24
24
|
requireFolderRight,
|
|
25
25
|
} from "./context";
|
|
26
|
+
import { isString } from "../../guards";
|
|
26
27
|
|
|
27
28
|
const HTTP_OK = 200;
|
|
28
29
|
const HTTP_INTERNAL_ERROR = 500;
|
|
@@ -55,19 +56,6 @@ export interface BulkOutcome {
|
|
|
55
56
|
refused: BulkRefusal[];
|
|
56
57
|
}
|
|
57
58
|
|
|
58
|
-
function describeFailure(id: string, error: unknown): BulkRefusal {
|
|
59
|
-
if (error instanceof HTTPResult) {
|
|
60
|
-
const body: unknown = error.getBody();
|
|
61
|
-
const message = typeof body === "string" ? body : JSON.stringify(body);
|
|
62
|
-
return { id, status: error.getStatus(), message: message ?? "" };
|
|
63
|
-
}
|
|
64
|
-
return {
|
|
65
|
-
id,
|
|
66
|
-
status: HTTP_INTERNAL_ERROR,
|
|
67
|
-
message: error instanceof Error ? error.message : String(error),
|
|
68
|
-
};
|
|
69
|
-
}
|
|
70
|
-
|
|
71
59
|
/** Runs one operation per asset in order, keeping going past the ones refused. */
|
|
72
60
|
async function applyToEach(
|
|
73
61
|
context: MediaRequestContext,
|
|
@@ -81,7 +69,21 @@ async function applyToEach(
|
|
|
81
69
|
await operation(context, asset);
|
|
82
70
|
outcome.done.push(id);
|
|
83
71
|
} catch (error) {
|
|
84
|
-
|
|
72
|
+
if (error instanceof HTTPResult) {
|
|
73
|
+
const body: unknown = error.getBody();
|
|
74
|
+
const message = isString(body) ? body : JSON.stringify(body);
|
|
75
|
+
outcome.refused.push({
|
|
76
|
+
id,
|
|
77
|
+
status: error.getStatus(),
|
|
78
|
+
message: message ?? "",
|
|
79
|
+
});
|
|
80
|
+
} else {
|
|
81
|
+
outcome.refused.push({
|
|
82
|
+
id,
|
|
83
|
+
status: HTTP_INTERNAL_ERROR,
|
|
84
|
+
message: error instanceof Error ? error.message : String(error),
|
|
85
|
+
});
|
|
86
|
+
}
|
|
85
87
|
}
|
|
86
88
|
}
|
|
87
89
|
return outcome;
|
|
@@ -12,13 +12,13 @@ type Disposition = "inline" | "attachment";
|
|
|
12
12
|
* Types a browser would run as a page from the API origin. SVG stays inline
|
|
13
13
|
* (it is an image) but sandboxed; documents are only ever downloaded.
|
|
14
14
|
*/
|
|
15
|
-
const ACTIVE_CONTENT_DISPOSITIONS
|
|
16
|
-
"image/svg+xml"
|
|
17
|
-
"text/html"
|
|
18
|
-
"application/xhtml+xml"
|
|
19
|
-
"text/xml"
|
|
20
|
-
"application/xml"
|
|
21
|
-
|
|
15
|
+
const ACTIVE_CONTENT_DISPOSITIONS = new Map<string, Disposition>([
|
|
16
|
+
["image/svg+xml", "inline"],
|
|
17
|
+
["text/html", "attachment"],
|
|
18
|
+
["application/xhtml+xml", "attachment"],
|
|
19
|
+
["text/xml", "attachment"],
|
|
20
|
+
["application/xml", "attachment"],
|
|
21
|
+
]);
|
|
22
22
|
|
|
23
23
|
export function normalizedMimetype(mimetype: string): string {
|
|
24
24
|
const essence = mimetype
|
|
@@ -29,10 +29,7 @@ export function normalizedMimetype(mimetype: string): string {
|
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
export function isActiveContent(mimetype: string): boolean {
|
|
32
|
-
return
|
|
33
|
-
ACTIVE_CONTENT_DISPOSITIONS,
|
|
34
|
-
normalizedMimetype(mimetype),
|
|
35
|
-
);
|
|
32
|
+
return ACTIVE_CONTENT_DISPOSITIONS.has(normalizedMimetype(mimetype));
|
|
36
33
|
}
|
|
37
34
|
|
|
38
35
|
function asciiFilename(filename: string): string {
|
|
@@ -47,7 +44,7 @@ function asciiFilename(filename: string): string {
|
|
|
47
44
|
|
|
48
45
|
export function contentDisposition(mimetype: string, filename: string): string {
|
|
49
46
|
const disposition =
|
|
50
|
-
ACTIVE_CONTENT_DISPOSITIONS
|
|
47
|
+
ACTIVE_CONTENT_DISPOSITIONS.get(normalizedMimetype(mimetype)) ?? "inline";
|
|
51
48
|
const extended = encodeURIComponent(filename).replace(
|
|
52
49
|
/['()*]/g,
|
|
53
50
|
(character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`,
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
-
import { Readable } from "node:stream";
|
|
3
|
-
import type { ReadableStream as WebReadableStream } from "node:stream/web";
|
|
4
2
|
import type { HTTPResult, RequestContext } from "@antelopejs/interface-api";
|
|
5
3
|
import { assert } from "@antelopejs/interface-api-util";
|
|
6
|
-
import {
|
|
4
|
+
import { ReadFile } from "@antelopejs/interface-file-storage";
|
|
7
5
|
import { PRIVATE_CACHE_CONTROL, PUBLIC_CACHE_CONTROL } from "./constants";
|
|
8
6
|
import {
|
|
9
7
|
contentDisposition,
|
|
@@ -11,6 +9,7 @@ import {
|
|
|
11
9
|
normalizedMimetype,
|
|
12
10
|
} from "./delivery-headers";
|
|
13
11
|
|
|
12
|
+
const HTTP_OK = 200;
|
|
14
13
|
const HTTP_NOT_MODIFIED = 304;
|
|
15
14
|
const HTTP_BAD_GATEWAY = 502;
|
|
16
15
|
const ETAG_HASH_LENGTH = 24;
|
|
@@ -18,11 +17,6 @@ const ANY_MATCH = "*";
|
|
|
18
17
|
const ANY_ORIGIN = "*";
|
|
19
18
|
const DENIED_ORIGIN = "false";
|
|
20
19
|
const HEAD_METHOD = "HEAD";
|
|
21
|
-
const FORWARDED_UPSTREAM_HEADERS = [
|
|
22
|
-
"Content-Length",
|
|
23
|
-
"Content-Range",
|
|
24
|
-
"Accept-Ranges",
|
|
25
|
-
];
|
|
26
20
|
|
|
27
21
|
/** One stored file as the delivery route hands it out. */
|
|
28
22
|
export interface DeliveredFile {
|
|
@@ -79,24 +73,15 @@ function addRepresentationHeaders(
|
|
|
79
73
|
if (file.isPublic) openPublicCors(response);
|
|
80
74
|
}
|
|
81
75
|
|
|
82
|
-
async function fetchUpstream(
|
|
83
|
-
ctx: RequestContext,
|
|
84
|
-
file: DeliveredFile,
|
|
85
|
-
): Promise<Response> {
|
|
86
|
-
const range = ctx.rawRequest.headers.range;
|
|
87
|
-
const upstream = await fetch(
|
|
88
|
-
await signedReadUrl(file.storageKey, file.storage),
|
|
89
|
-
{ headers: range ? { Range: range } : {} },
|
|
90
|
-
);
|
|
91
|
-
assert(upstream.ok && upstream.body, HTTP_BAD_GATEWAY, "File unavailable");
|
|
92
|
-
return upstream;
|
|
93
|
-
}
|
|
94
|
-
|
|
95
76
|
/**
|
|
96
77
|
* Serves the bytes through the API. Only used for active content (SVG,
|
|
97
78
|
* legacy HTML/XML): the storage's signed URL cannot carry the sandbox policy
|
|
98
79
|
* or the attachment disposition these files need, every other file is
|
|
99
80
|
* redirected to the storage so its bandwidth never goes through Node.
|
|
81
|
+
* Byte ranges are not served: these files are small and rendered whole.
|
|
82
|
+
* The bytes are read from the storage itself, not through its read URL: that
|
|
83
|
+
* URL is the public origin, which the server may not reach (private network,
|
|
84
|
+
* egress policy).
|
|
100
85
|
*/
|
|
101
86
|
export async function streamStoredFile(
|
|
102
87
|
ctx: RequestContext,
|
|
@@ -110,16 +95,16 @@ export async function streamStoredFile(
|
|
|
110
95
|
response.setBody("");
|
|
111
96
|
return response;
|
|
112
97
|
}
|
|
113
|
-
const
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
98
|
+
const stored = await ReadFile(file.storageKey, file.storage).catch(
|
|
99
|
+
() => undefined,
|
|
100
|
+
);
|
|
101
|
+
assert(stored, HTTP_BAD_GATEWAY, "File unavailable");
|
|
102
|
+
response.addHeader("Content-Length", String(stored.size));
|
|
118
103
|
const stream = response.getWriteStream(
|
|
119
104
|
normalizedMimetype(file.mimetype),
|
|
120
|
-
|
|
105
|
+
HTTP_OK,
|
|
121
106
|
);
|
|
122
|
-
const body =
|
|
107
|
+
const body = stored.body;
|
|
123
108
|
if (ctx.rawRequest.method === HEAD_METHOD) {
|
|
124
109
|
body.destroy();
|
|
125
110
|
stream.end();
|
|
@@ -312,6 +312,10 @@ export class MediaDeliveryController extends Controller("/media") {
|
|
|
312
312
|
return deliverAsset(ctx, resolved);
|
|
313
313
|
}
|
|
314
314
|
|
|
315
|
+
/**
|
|
316
|
+
* Resolves (and authorizes) the asset before it touches the preset, so an
|
|
317
|
+
* unauthenticated caller cannot probe which preset IDs are configured.
|
|
318
|
+
*/
|
|
315
319
|
@Get("/:assetId/:presetId/:filename")
|
|
316
320
|
async deliverDerivative(
|
|
317
321
|
@Context() ctx: RequestContext,
|
|
@@ -320,8 +324,6 @@ export class MediaDeliveryController extends Controller("/media") {
|
|
|
320
324
|
@IfAuthUser() user?: User,
|
|
321
325
|
) {
|
|
322
326
|
assertNamedSegment(ctx);
|
|
323
|
-
// Resolve (and authorize) the asset before touching the preset so an
|
|
324
|
-
// unauthenticated caller cannot probe which preset IDs are configured.
|
|
325
327
|
const resolved = await guardSignIn(
|
|
326
328
|
ctx,
|
|
327
329
|
resolveDeliverableAsset(ctx, assetId, user),
|
|
@@ -4,6 +4,7 @@ import { getMediaConfig } from "../../config";
|
|
|
4
4
|
import { getLastSweep, SWEEP_DERIVATIVES_SCHEDULE } from "../../crons";
|
|
5
5
|
import type { MediaAsset } from "../../db";
|
|
6
6
|
import { buildUploadBatches, type UploadBatchRow } from "../../library/batches";
|
|
7
|
+
import type { MediaEventDetails } from "../../library/events";
|
|
7
8
|
import { loadUploadHistoryEvents } from "../../library/upload-history";
|
|
8
9
|
import { presetsConfigSnippet } from "../../library/snippets";
|
|
9
10
|
import { loadAssetsInFolders } from "../../library/listing";
|
|
@@ -60,8 +61,8 @@ function matchesFilters(
|
|
|
60
61
|
);
|
|
61
62
|
}
|
|
62
63
|
|
|
63
|
-
function batchDetails(summary: BatchSummary):
|
|
64
|
-
const details:
|
|
64
|
+
function batchDetails(summary: BatchSummary): MediaEventDetails {
|
|
65
|
+
const details: MediaEventDetails = {
|
|
65
66
|
batchId: summary.batchId,
|
|
66
67
|
total: summary.total,
|
|
67
68
|
failed: summary.failed,
|
|
@@ -110,10 +111,7 @@ function readSourcePage(query: Record<string, string>): SourcePage {
|
|
|
110
111
|
return { offset, limit };
|
|
111
112
|
}
|
|
112
113
|
|
|
113
|
-
function pageRows<T>(
|
|
114
|
-
rows: T[],
|
|
115
|
-
page: SourcePage,
|
|
116
|
-
): { results: T[]; total: number } {
|
|
114
|
+
function pageRows<T>(rows: T[], page: SourcePage) {
|
|
117
115
|
const results = page.limit
|
|
118
116
|
? rows.slice(page.offset, page.offset + page.limit)
|
|
119
117
|
: rows.slice(page.offset);
|