@antelopejs/dms-media 0.7.2 → 0.8.0
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 +10 -10
- package/dist/acl/entries.js +20 -2
- package/dist/acl/entries.js.map +1 -1
- package/dist/asset-lifecycle.js +5 -1
- package/dist/asset-lifecycle.js.map +1 -1
- package/dist/bindings.d.ts +1 -0
- package/dist/bindings.js +36 -25
- package/dist/bindings.js.map +1 -1
- package/dist/db/models/mediaAssets.model.d.ts +3 -3
- package/dist/db/models/mediaDeclarations.model.d.ts +3 -3
- package/dist/db/models/mediaEvents.model.d.ts +3 -3
- package/dist/db/models/mediaFavorites.model.d.ts +3 -3
- package/dist/db/models/mediaFolders.model.d.ts +3 -3
- package/dist/db/models/mediaUploads.model.d.ts +3 -3
- package/dist/declared/assets.js +39 -25
- package/dist/declared/assets.js.map +1 -1
- package/dist/declared/folders.js +27 -14
- package/dist/declared/folders.js.map +1 -1
- package/dist/declared/records.d.ts +1 -0
- package/dist/declared/records.js +18 -1
- package/dist/declared/records.js.map +1 -1
- package/dist/fixed-id.d.ts +1 -0
- package/dist/fixed-id.js +16 -0
- package/dist/fixed-id.js.map +1 -0
- package/dist/library/folder-stats.d.ts +1 -1
- package/dist/library/folder-stats.js.map +1 -1
- package/dist/library/listing.d.ts +2 -0
- package/dist/library/listing.js +14 -4
- package/dist/library/listing.js.map +1 -1
- package/dist/routes/media/assets.d.ts +3 -2
- package/dist/routes/media/assets.js +15 -10
- package/dist/routes/media/assets.js.map +1 -1
- package/dist/routes/media/bulk.js +4 -4
- package/dist/routes/media/bulk.js.map +1 -1
- package/dist/routes/media/folders.js +4 -4
- package/dist/routes/media/folders.js.map +1 -1
- package/dist/routes/media/library.js +6 -12
- package/dist/routes/media/library.js.map +1 -1
- package/dist/routes/media/storage-keys.js +10 -1
- package/dist/routes/media/storage-keys.js.map +1 -1
- package/dist/test/helpers/assets.d.ts +2 -2
- package/dist/test/helpers/folders.d.ts +6 -6
- package/dist/test/helpers/permissions-world.d.ts +6 -6
- package/dist/test/integration/binding-folder-race.test.d.ts +1 -0
- package/dist/test/integration/binding-folder-race.test.js +66 -0
- package/dist/test/integration/binding-folder-race.test.js.map +1 -0
- package/dist/test/integration/declared-asset-race.test.d.ts +1 -0
- package/dist/test/integration/declared-asset-race.test.js +78 -0
- package/dist/test/integration/declared-asset-race.test.js.map +1 -0
- package/dist/test/integration/declared-folder-race.test.d.ts +1 -0
- package/dist/test/integration/declared-folder-race.test.js +43 -0
- package/dist/test/integration/declared-folder-race.test.js.map +1 -0
- package/dist/test/integration/media-activity-overview.test.js +27 -22
- package/dist/test/integration/media-activity-overview.test.js.map +1 -1
- package/dist/test/integration/media-api.test.js +9 -5
- package/dist/test/integration/media-api.test.js.map +1 -1
- package/dist/test/integration/media-bindings.test.js +16 -13
- package/dist/test/integration/media-bindings.test.js.map +1 -1
- package/dist/test/integration/media-cleanup.test.js +14 -5
- package/dist/test/integration/media-cleanup.test.js.map +1 -1
- package/dist/test/integration/media-declared-content.test.js +107 -91
- package/dist/test/integration/media-declared-content.test.js.map +1 -1
- package/dist/test/integration/media-delivery-editing.test.js +238 -215
- package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
- package/dist/test/integration/media-explorer-writes.test.js +131 -112
- package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
- package/dist/test/integration/media-guards.test.js +38 -37
- package/dist/test/integration/media-guards.test.js.map +1 -1
- package/dist/test/integration/media-library.test.js +244 -224
- package/dist/test/integration/media-library.test.js.map +1 -1
- package/dist/test/integration/media-linked-subfolders.test.js +173 -158
- package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
- package/dist/test/integration/media-permissions.test.js +31 -11
- package/dist/test/integration/media-permissions.test.js.map +1 -1
- package/dist/test/integration/media-search-query.test.js +8 -6
- package/dist/test/integration/media-search-query.test.js.map +1 -1
- package/dist/test/integration/media-search-views.test.js +12 -8
- package/dist/test/integration/media-search-views.test.js.map +1 -1
- package/dist/test/integration/media-upload-policy.test.js +228 -200
- package/dist/test/integration/media-upload-policy.test.js.map +1 -1
- package/dist/test/stack-modules.json +5 -5
- package/dist/test/unit/acl/entries.test.js +19 -0
- package/dist/test/unit/acl/entries.test.js.map +1 -1
- package/dist/test/unit/acl/resolver.test.js +9 -1
- package/dist/test/unit/acl/resolver.test.js.map +1 -1
- package/dist/test/unit/asset-lifecycle.test.d.ts +1 -0
- package/dist/test/unit/asset-lifecycle.test.js +18 -0
- package/dist/test/unit/asset-lifecycle.test.js.map +1 -0
- package/dist/test/unit/library/zip-names.test.js +6 -3
- package/dist/test/unit/library/zip-names.test.js.map +1 -1
- package/dist/test/unit/routes/storage-keys.test.d.ts +1 -0
- package/dist/test/unit/routes/storage-keys.test.js +18 -0
- package/dist/test/unit/routes/storage-keys.test.js.map +1 -0
- package/dist/test/unit/transform-ops.test.js +19 -0
- package/dist/test/unit/transform-ops.test.js.map +1 -1
- package/dist/transform-ops.js +25 -1
- package/dist/transform-ops.js.map +1 -1
- package/dist/validation/declared.schema.d.ts +6 -6
- package/dist/validation/library.schema.d.ts +4 -4
- package/dist/validation/media.schema.d.ts +5 -5
- package/dist/validation/media.schema.js +10 -6
- package/dist/validation/media.schema.js.map +1 -1
- package/frontend-vue/app/components/Explorer.vue +2 -0
- package/frontend-vue/app/components/FileProperties.vue +1 -1
- package/frontend-vue/app/components/ImageEditor.vue +5 -5
- package/frontend-vue/app/components/RecentFiles.vue +2 -2
- package/frontend-vue/app/components/UploadQueue.vue +4 -4
- package/frontend-vue/app/components/dialogs/DeleteFilesDialog.vue +1 -1
- package/frontend-vue/app/components/dialogs/ShortcutsDialog.vue +1 -1
- package/frontend-vue/app/components/dialogs/VisibilityDialog.vue +1 -1
- package/frontend-vue/app/components/explorer/ExplorerInspector.vue +1 -1
- package/frontend-vue/app/components/explorer/ExplorerSidebar.vue +2 -2
- package/frontend-vue/app/components/explorer/FolderStrip.vue +1 -1
- package/frontend-vue/app/components/explorer/GridView.vue +1 -1
- package/frontend-vue/app/components/shared/AltTextField.vue +2 -2
- package/frontend-vue/build/backend-boundary.ts +8 -3
- package/frontend-vue/eslint.config.mjs +0 -1
- package/frontend-vue/package.json +2 -2
- package/frontend-vue/pnpm-lock.yaml +45 -14
- package/frontend-vue/tests/backend-boundary.test.ts +6 -4
- package/frontend-vue/tests/fixtures/serverRender.ts +3 -3
- package/frontend-vue/tests/registration.test.ts +5 -0
- package/frontend-vue/tsconfig.json +1 -2
- package/package.json +17 -17
- package/src/acl/entries.ts +30 -7
- package/src/asset-lifecycle.ts +6 -2
- package/src/bindings.ts +41 -38
- package/src/declared/assets.ts +45 -28
- package/src/declared/folders.ts +30 -20
- package/src/declared/records.ts +31 -2
- package/src/fixed-id.ts +18 -0
- package/src/library/folder-stats.ts +1 -1
- package/src/library/listing.ts +24 -4
- package/src/routes/media/assets.ts +23 -11
- package/src/routes/media/bulk.ts +7 -5
- package/src/routes/media/folders.ts +9 -5
- package/src/routes/media/library.ts +10 -18
- package/src/routes/media/storage-keys.ts +14 -2
- package/src/test/integration/binding-folder-race.test.ts +82 -0
- package/src/test/integration/declared-asset-race.test.ts +115 -0
- package/src/test/integration/declared-folder-race.test.ts +50 -0
- package/src/test/integration/media-activity-overview.test.ts +40 -27
- package/src/test/integration/media-api.test.ts +9 -5
- package/src/test/integration/media-bindings.test.ts +17 -13
- package/src/test/integration/media-cleanup.test.ts +17 -5
- package/src/test/integration/media-declared-content.test.ts +129 -112
- package/src/test/integration/media-delivery-editing.test.ts +323 -299
- package/src/test/integration/media-explorer-writes.test.ts +161 -135
- package/src/test/integration/media-guards.test.ts +40 -38
- package/src/test/integration/media-library.test.ts +325 -296
- package/src/test/integration/media-linked-subfolders.test.ts +207 -186
- package/src/test/integration/media-permissions.test.ts +33 -14
- package/src/test/integration/media-search-query.test.ts +24 -8
- package/src/test/integration/media-search-views.test.ts +39 -32
- package/src/test/integration/media-upload-policy.test.ts +283 -254
- package/src/test/stack-modules.json +5 -5
- package/src/test/unit/acl/entries.test.ts +23 -0
- package/src/test/unit/acl/resolver.test.ts +9 -1
- package/src/test/unit/asset-lifecycle.test.ts +21 -0
- package/src/test/unit/library/zip-names.test.ts +9 -7
- package/src/test/unit/routes/storage-keys.test.ts +23 -0
- package/src/test/unit/transform-ops.test.ts +29 -1
- package/src/transform-ops.ts +32 -2
- package/src/validation/media.schema.ts +14 -15
|
@@ -13,7 +13,9 @@ import {
|
|
|
13
13
|
} from "../../library/favorites";
|
|
14
14
|
import { computeFolderStats } from "../../library/folder-stats";
|
|
15
15
|
import {
|
|
16
|
+
type AssetCountFields,
|
|
16
17
|
countByTypeGroup,
|
|
18
|
+
loadAssetCountFields,
|
|
17
19
|
loadAssetsInFolders,
|
|
18
20
|
pageAssets,
|
|
19
21
|
} from "../../library/listing";
|
|
@@ -73,6 +75,10 @@ const SMART_VIEW_DEFAULT_SORTS: Partial<Record<SmartView, ViewSort>> = {
|
|
|
73
75
|
largest: { sort: "size", direction: "desc" },
|
|
74
76
|
};
|
|
75
77
|
|
|
78
|
+
function isMissingAlt(asset: Pick<MediaAsset, "mimetype" | "alt">): boolean {
|
|
79
|
+
return isDescribableImage(asset.mimetype) && !asset.alt?.trim();
|
|
80
|
+
}
|
|
81
|
+
|
|
76
82
|
const SMART_VIEW_FILTERS: Record<SmartView, SmartViewFilter> = {
|
|
77
83
|
recent: (assets) =>
|
|
78
84
|
[...assets]
|
|
@@ -82,26 +88,12 @@ const SMART_VIEW_FILTERS: Record<SmartView, SmartViewFilter> = {
|
|
|
82
88
|
.slice(0, RECENT_VIEW_LIMIT),
|
|
83
89
|
starred: (assets, { starredAssetIds }) =>
|
|
84
90
|
assets.filter((asset) => starredAssetIds.has(asset._id)),
|
|
85
|
-
"missing-alt": (assets) =>
|
|
86
|
-
assets.filter(
|
|
87
|
-
(asset) => isDescribableImage(asset.mimetype) && !asset.alt?.trim(),
|
|
88
|
-
),
|
|
91
|
+
"missing-alt": (assets) => assets.filter(isMissingAlt),
|
|
89
92
|
largest: (assets) => assets,
|
|
90
93
|
public: (assets, { visibilityOf }) =>
|
|
91
94
|
assets.filter((asset) => visibilityOf(asset) === "public"),
|
|
92
95
|
};
|
|
93
96
|
|
|
94
|
-
function readableAssets(context: MediaRequestContext): Promise<MediaAsset[]> {
|
|
95
|
-
return loadAssetsInFolders(context.assetModel, [...context.access.readable]);
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
function countMissingAlt(assets: MediaAsset[]): number {
|
|
99
|
-
return SMART_VIEW_FILTERS["missing-alt"](assets, {
|
|
100
|
-
starredAssetIds: new Set(),
|
|
101
|
-
visibilityOf: () => "private",
|
|
102
|
-
}).length;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
97
|
function folderPathName(
|
|
106
98
|
context: MediaRequestContext,
|
|
107
99
|
folder: MediaFolder | undefined,
|
|
@@ -154,7 +146,7 @@ function treeViewScope(
|
|
|
154
146
|
}
|
|
155
147
|
|
|
156
148
|
function countViews(
|
|
157
|
-
assets:
|
|
149
|
+
assets: AssetCountFields[],
|
|
158
150
|
starred: StarredTargets,
|
|
159
151
|
scope: Set<string> | undefined,
|
|
160
152
|
) {
|
|
@@ -165,7 +157,7 @@ function countViews(
|
|
|
165
157
|
starred:
|
|
166
158
|
scoped.filter((asset) => starred.assetIds.has(asset._id)).length +
|
|
167
159
|
starredFolders,
|
|
168
|
-
missingAlt:
|
|
160
|
+
missingAlt: scoped.filter(isMissingAlt).length,
|
|
169
161
|
};
|
|
170
162
|
}
|
|
171
163
|
|
|
@@ -198,7 +190,7 @@ export class MediaLibraryController extends MediaApiController {
|
|
|
198
190
|
async tree() {
|
|
199
191
|
const context = await this.resolveContext();
|
|
200
192
|
const [assets, starred] = await Promise.all([
|
|
201
|
-
|
|
193
|
+
loadAssetCountFields(context.assetModel, [...context.access.readable]),
|
|
202
194
|
loadStarredTargets(this.owner(context)),
|
|
203
195
|
]);
|
|
204
196
|
const stats = computeFolderStats(context.folders, assets);
|
|
@@ -1,9 +1,21 @@
|
|
|
1
1
|
import type { MediaAsset } from "../../db";
|
|
2
|
+
import { isObject, isString } from "../../guards";
|
|
3
|
+
|
|
4
|
+
function isStringMap(value: unknown): value is Record<string, string> {
|
|
5
|
+
return (
|
|
6
|
+
isObject(value) &&
|
|
7
|
+
!Array.isArray(value) &&
|
|
8
|
+
Object.values(value).every(isString)
|
|
9
|
+
);
|
|
10
|
+
}
|
|
2
11
|
|
|
3
12
|
export function parseDerivatives(asset: MediaAsset): Record<string, string> {
|
|
4
13
|
if (!asset.json_derivatives) return {};
|
|
5
|
-
|
|
6
|
-
|
|
14
|
+
const parsed: unknown = JSON.parse(asset.json_derivatives);
|
|
15
|
+
if (isStringMap(parsed)) return parsed;
|
|
16
|
+
throw new Error(
|
|
17
|
+
`Media asset '${asset._id}' has image sizes that are not a map of storage keys`,
|
|
18
|
+
);
|
|
7
19
|
}
|
|
8
20
|
|
|
9
21
|
export function collectAssetStorageKeys(asset: MediaAsset): string[] {
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
2
|
+
import { Schema } from "@antelopejs/interface-database";
|
|
3
|
+
import { TENANT_SCHEMA_NAME } from "@antelopejs/interface-dms/constants";
|
|
4
|
+
import { expect } from "chai";
|
|
5
|
+
import {
|
|
6
|
+
addAssetBinding,
|
|
7
|
+
bindingFolderId,
|
|
8
|
+
CONTENT_ROOT_BINDING,
|
|
9
|
+
ensureTenantBindings,
|
|
10
|
+
removeAssetBinding,
|
|
11
|
+
} from "../../bindings";
|
|
12
|
+
import { type MediaFolder, MediaFolderModel } from "../../db";
|
|
13
|
+
|
|
14
|
+
const TENANT_ID = "binding-folder-race";
|
|
15
|
+
const BINDING = "race.cover";
|
|
16
|
+
const READ_PERMISSION = "race.cover.read";
|
|
17
|
+
|
|
18
|
+
/** A folder model whose `getAll` answers as it did before another process wrote. */
|
|
19
|
+
class StaleReadFolderModel extends MediaFolderModel {
|
|
20
|
+
override getAll(): Promise<MediaFolder[]> {
|
|
21
|
+
return Promise.resolve([]);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
describe("[integration] media bindings — two processes provisioning one tenant", () => {
|
|
26
|
+
before(async () => {
|
|
27
|
+
const schema = Schema.get(TENANT_SCHEMA_NAME);
|
|
28
|
+
if (!schema) throw new Error("Tenant schema is missing");
|
|
29
|
+
await schema.createInstance(TENANT_ID).run();
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
after(() => removeAssetBinding(BINDING));
|
|
33
|
+
|
|
34
|
+
it("keeps the content root and linked folder another process inserted after this one read, and applies the binding ACL", async () => {
|
|
35
|
+
const folders = GetModel(MediaFolderModel, TENANT_ID);
|
|
36
|
+
const rootId = bindingFolderId(TENANT_ID, CONTENT_ROOT_BINDING);
|
|
37
|
+
const folderId = bindingFolderId(TENANT_ID, BINDING);
|
|
38
|
+
await folders.insert({
|
|
39
|
+
_id: rootId,
|
|
40
|
+
name: "Content",
|
|
41
|
+
path: [],
|
|
42
|
+
binding: CONTENT_ROOT_BINDING,
|
|
43
|
+
json_acl: "[]",
|
|
44
|
+
visibility: "private",
|
|
45
|
+
});
|
|
46
|
+
await folders.insert({
|
|
47
|
+
_id: folderId,
|
|
48
|
+
name: "Race covers",
|
|
49
|
+
parentId: rootId,
|
|
50
|
+
path: [rootId],
|
|
51
|
+
binding: BINDING,
|
|
52
|
+
json_acl: "[]",
|
|
53
|
+
visibility: "private",
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
addAssetBinding(BINDING, {
|
|
57
|
+
id: BINDING,
|
|
58
|
+
folderName: "Race covers",
|
|
59
|
+
permissionMapping: { read: [READ_PERMISSION] },
|
|
60
|
+
});
|
|
61
|
+
await ensureTenantBindings(
|
|
62
|
+
TENANT_ID,
|
|
63
|
+
GetModel(StaleReadFolderModel, TENANT_ID),
|
|
64
|
+
);
|
|
65
|
+
|
|
66
|
+
const stored = await folders.getAll();
|
|
67
|
+
const idsOf = (binding: string) =>
|
|
68
|
+
stored
|
|
69
|
+
.filter((folder) => folder.binding === binding)
|
|
70
|
+
.map((folder) => folder._id);
|
|
71
|
+
expect(idsOf(CONTENT_ROOT_BINDING)).to.deep.equal([rootId]);
|
|
72
|
+
expect(idsOf(BINDING)).to.deep.equal([folderId]);
|
|
73
|
+
expect((await folders.get(folderId))?.json_acl).to.equal(
|
|
74
|
+
JSON.stringify([
|
|
75
|
+
{
|
|
76
|
+
subject: { kind: "permission", id: READ_PERMISSION },
|
|
77
|
+
rights: ["read"],
|
|
78
|
+
},
|
|
79
|
+
]),
|
|
80
|
+
);
|
|
81
|
+
});
|
|
82
|
+
});
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
3
|
+
import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
|
|
4
|
+
import {
|
|
5
|
+
EnsureMediaFolder,
|
|
6
|
+
ImportMediaAsset,
|
|
7
|
+
} from "@antelopejs/interface-dms-media";
|
|
8
|
+
import { FileExists } from "@antelopejs/interface-file-storage";
|
|
9
|
+
import { expect } from "chai";
|
|
10
|
+
import {
|
|
11
|
+
MediaAssetModel,
|
|
12
|
+
MediaDeclarationModel,
|
|
13
|
+
MediaEventModel,
|
|
14
|
+
MediaFolderModel,
|
|
15
|
+
} from "../../db";
|
|
16
|
+
import { uploadStorageBytes } from "../../derivatives";
|
|
17
|
+
import { ONE_PIXEL_PNG, PNG_MIMETYPE } from "../helpers/assets";
|
|
18
|
+
import { patchMethod } from "../helpers/prototype";
|
|
19
|
+
|
|
20
|
+
const KEY = "declared.race.logo";
|
|
21
|
+
const FOLDER_KEY = "declared.race.assets";
|
|
22
|
+
const NAME = "race-logo.png";
|
|
23
|
+
|
|
24
|
+
function assetModel() {
|
|
25
|
+
return GetModel(MediaAssetModel, DEFAULT_TENANT_ID);
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function declarationModel() {
|
|
29
|
+
return GetModel(MediaDeclarationModel, DEFAULT_TENANT_ID);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Lets another process importing the same key insert its asset, pointing at
|
|
34
|
+
* `winnerKey`, just before this process's own insert runs.
|
|
35
|
+
*/
|
|
36
|
+
function insertAnotherProcessFirst(
|
|
37
|
+
winnerKey: string,
|
|
38
|
+
loserKeys: string[],
|
|
39
|
+
): () => void {
|
|
40
|
+
const restore = patchMethod<MediaAssetModel, "insert">(
|
|
41
|
+
MediaAssetModel.prototype,
|
|
42
|
+
"insert",
|
|
43
|
+
(original) =>
|
|
44
|
+
async function (this: MediaAssetModel, obj, options) {
|
|
45
|
+
restore();
|
|
46
|
+
if (Array.isArray(obj) || obj.storageKey === undefined)
|
|
47
|
+
throw new Error("Expected one asset insert from the import");
|
|
48
|
+
loserKeys.push(obj.storageKey);
|
|
49
|
+
await original.call(this, { ...obj, storageKey: winnerKey }, options);
|
|
50
|
+
return original.call(this, obj, options);
|
|
51
|
+
},
|
|
52
|
+
);
|
|
53
|
+
return restore;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
describe("[integration] media declared assets — two processes importing one key", () => {
|
|
57
|
+
let restoreInsert: (() => void) | undefined;
|
|
58
|
+
let folderId: string | undefined;
|
|
59
|
+
|
|
60
|
+
after(async () => {
|
|
61
|
+
restoreInsert?.();
|
|
62
|
+
if (folderId) {
|
|
63
|
+
for (const asset of await assetModel().getBy("folderId", folderId))
|
|
64
|
+
await assetModel().delete(asset._id);
|
|
65
|
+
await GetModel(MediaFolderModel, DEFAULT_TENANT_ID).delete(folderId);
|
|
66
|
+
}
|
|
67
|
+
for (const key of [KEY, FOLDER_KEY])
|
|
68
|
+
for (const record of await declarationModel().getBy("key", key))
|
|
69
|
+
await declarationModel().delete(record._id);
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
it("keeps the asset another process inserted between this one's checks and its insert", async () => {
|
|
73
|
+
folderId = (
|
|
74
|
+
await EnsureMediaFolder({
|
|
75
|
+
tenantId: DEFAULT_TENANT_ID,
|
|
76
|
+
key: FOLDER_KEY,
|
|
77
|
+
name: "Race assets",
|
|
78
|
+
})
|
|
79
|
+
).id;
|
|
80
|
+
const winnerKey = await uploadStorageBytes(
|
|
81
|
+
ONE_PIXEL_PNG,
|
|
82
|
+
NAME,
|
|
83
|
+
PNG_MIMETYPE,
|
|
84
|
+
`media/${DEFAULT_TENANT_ID}/${folderId}/${randomUUID()}`,
|
|
85
|
+
undefined,
|
|
86
|
+
);
|
|
87
|
+
const loserKeys: string[] = [];
|
|
88
|
+
restoreInsert = insertAnotherProcessFirst(winnerKey, loserKeys);
|
|
89
|
+
|
|
90
|
+
const result = await ImportMediaAsset({
|
|
91
|
+
tenantId: DEFAULT_TENANT_ID,
|
|
92
|
+
key: KEY,
|
|
93
|
+
folder: { key: FOLDER_KEY },
|
|
94
|
+
name: NAME,
|
|
95
|
+
mimetype: PNG_MIMETYPE,
|
|
96
|
+
source: { bytes: ONE_PIXEL_PNG },
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
const stored = await assetModel().getBy("folderId", folderId);
|
|
100
|
+
expect(stored.map((asset) => asset.storageKey)).to.deep.equal([winnerKey]);
|
|
101
|
+
expect(result).to.deep.equal({ status: "kept", id: stored[0]?._id });
|
|
102
|
+
const records = await declarationModel().getBy("key", KEY);
|
|
103
|
+
expect(records.map((record) => record.targetId)).to.deep.equal([
|
|
104
|
+
stored[0]?._id,
|
|
105
|
+
]);
|
|
106
|
+
expect(loserKeys).to.have.length(1);
|
|
107
|
+
expect(await FileExists(loserKeys[0] ?? "")).to.equal(false);
|
|
108
|
+
expect(await FileExists(winnerKey)).to.equal(true);
|
|
109
|
+
const events = await GetModel(
|
|
110
|
+
MediaEventModel,
|
|
111
|
+
DEFAULT_TENANT_ID,
|
|
112
|
+
).listByAsset(stored[0]?._id ?? "");
|
|
113
|
+
expect(events.map((event) => event.kind)).to.deep.equal([]);
|
|
114
|
+
});
|
|
115
|
+
});
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { GetModel } from "@antelopejs/interface-database-decorators";
|
|
2
|
+
import { DEFAULT_TENANT_ID } from "@antelopejs/interface-dms/constants";
|
|
3
|
+
import { EnsureMediaFolder } from "@antelopejs/interface-dms-media";
|
|
4
|
+
import { expect } from "chai";
|
|
5
|
+
import { MediaDeclarationModel, MediaFolderModel } from "../../db";
|
|
6
|
+
import { declaredId } from "../../declared/records";
|
|
7
|
+
|
|
8
|
+
const KEY = "declared.race.reports";
|
|
9
|
+
const NAME = "Race reports";
|
|
10
|
+
|
|
11
|
+
function folderModel() {
|
|
12
|
+
return GetModel(MediaFolderModel, DEFAULT_TENANT_ID);
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
function declarationModel() {
|
|
16
|
+
return GetModel(MediaDeclarationModel, DEFAULT_TENANT_ID);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
describe("[integration] media declared folders — two processes declaring one key", () => {
|
|
20
|
+
const id = declaredId(DEFAULT_TENANT_ID, "folder", KEY);
|
|
21
|
+
|
|
22
|
+
after(async () => {
|
|
23
|
+
await folderModel().delete(id);
|
|
24
|
+
for (const record of await declarationModel().getBy("key", KEY))
|
|
25
|
+
await declarationModel().delete(record._id);
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
it("keeps the folder another process inserted between this one's checks and its insert", async () => {
|
|
29
|
+
await folderModel().insert({
|
|
30
|
+
_id: id,
|
|
31
|
+
name: NAME,
|
|
32
|
+
path: [],
|
|
33
|
+
visibility: "private",
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
const result = await EnsureMediaFolder({
|
|
37
|
+
tenantId: DEFAULT_TENANT_ID,
|
|
38
|
+
key: KEY,
|
|
39
|
+
name: NAME,
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
expect(result).to.deep.equal({ status: "kept", id });
|
|
43
|
+
const named = (await folderModel().getAll()).filter(
|
|
44
|
+
(folder) => folder.name === NAME,
|
|
45
|
+
);
|
|
46
|
+
expect(named.map((folder) => folder._id)).to.deep.equal([id]);
|
|
47
|
+
const records = await declarationModel().getBy("key", KEY);
|
|
48
|
+
expect(records.map((record) => record.targetId)).to.deep.equal([id]);
|
|
49
|
+
});
|
|
50
|
+
});
|
|
@@ -43,6 +43,43 @@ const activityBody = z.object({
|
|
|
43
43
|
items: z.array(z.object({ title: z.string(), to: z.string().optional() })),
|
|
44
44
|
});
|
|
45
45
|
|
|
46
|
+
function reportRetriedBatch(
|
|
47
|
+
client: AxiosInstance,
|
|
48
|
+
folderId: string,
|
|
49
|
+
uploaded: number,
|
|
50
|
+
failed: number,
|
|
51
|
+
) {
|
|
52
|
+
return client.post("/api/media/upload/batches", {
|
|
53
|
+
batchId: BATCH_ID,
|
|
54
|
+
folderId,
|
|
55
|
+
total: 2,
|
|
56
|
+
uploaded,
|
|
57
|
+
failed,
|
|
58
|
+
size: 10,
|
|
59
|
+
failures: failed
|
|
60
|
+
? [{ name: "overview-b.txt", reason: "Network error" }]
|
|
61
|
+
: [],
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
async function flaggedFailures(client: AxiosInstance): Promise<number> {
|
|
66
|
+
const rows = await client.get("/api/media/upload/batches", {
|
|
67
|
+
params: { filter_attention: "is:yes" },
|
|
68
|
+
});
|
|
69
|
+
return readBody(rows, batchesBody).results.reduce(
|
|
70
|
+
(total, row) => total + row.failed,
|
|
71
|
+
0,
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
async function countedFailures(client: AxiosInstance): Promise<number> {
|
|
76
|
+
const attention = await client.get("/api/media/stats/attention");
|
|
77
|
+
const item = readBody(attention, attentionBody).items.find(
|
|
78
|
+
(entry) => entry.id === "failed-uploads",
|
|
79
|
+
);
|
|
80
|
+
return item?.value ?? 0;
|
|
81
|
+
}
|
|
82
|
+
|
|
46
83
|
describe("[integration] media activity and overview — figures, upload history and module catalog", () => {
|
|
47
84
|
let client: AxiosInstance;
|
|
48
85
|
let folderId: string;
|
|
@@ -74,17 +111,7 @@ describe("[integration] media activity and overview — figures, upload history
|
|
|
74
111
|
it("keeps the newest report of a retried batch only", async () => {
|
|
75
112
|
await uploadAsset(client, folderId, "overview-a.txt", TEXT_MIMETYPE, BODY);
|
|
76
113
|
const report = (uploaded: number, failed: number) =>
|
|
77
|
-
client
|
|
78
|
-
batchId: BATCH_ID,
|
|
79
|
-
folderId,
|
|
80
|
-
total: 2,
|
|
81
|
-
uploaded,
|
|
82
|
-
failed,
|
|
83
|
-
size: 10,
|
|
84
|
-
failures: failed
|
|
85
|
-
? [{ name: "overview-b.txt", reason: "Network error" }]
|
|
86
|
-
: [],
|
|
87
|
-
});
|
|
114
|
+
reportRetriedBatch(client, folderId, uploaded, failed);
|
|
88
115
|
expect((await report(1, 1)).status).to.equal(HTTP_OK);
|
|
89
116
|
const failedOnly = await client.get("/api/media/upload/batches", {
|
|
90
117
|
params: { filter_result: "is:partial,failed" },
|
|
@@ -121,22 +148,8 @@ describe("[integration] media activity and overview — figures, upload history
|
|
|
121
148
|
failed: 3,
|
|
122
149
|
size: 0,
|
|
123
150
|
});
|
|
124
|
-
const flagged =
|
|
125
|
-
|
|
126
|
-
params: { filter_attention: "is:yes" },
|
|
127
|
-
});
|
|
128
|
-
return readBody(rows, batchesBody).results.reduce(
|
|
129
|
-
(total, row) => total + row.failed,
|
|
130
|
-
0,
|
|
131
|
-
);
|
|
132
|
-
};
|
|
133
|
-
const counted = async () => {
|
|
134
|
-
const attention = await client.get("/api/media/stats/attention");
|
|
135
|
-
const item = readBody(attention, attentionBody).items.find(
|
|
136
|
-
(entry) => entry.id === "failed-uploads",
|
|
137
|
-
);
|
|
138
|
-
return item?.value ?? 0;
|
|
139
|
-
};
|
|
151
|
+
const flagged = () => flaggedFailures(client);
|
|
152
|
+
const counted = () => countedFailures(client);
|
|
140
153
|
const before = await counted();
|
|
141
154
|
expect(before).to.equal(await flagged());
|
|
142
155
|
expect(before).to.be.at.least(3);
|
|
@@ -40,12 +40,12 @@ const treeBody = z.object({
|
|
|
40
40
|
),
|
|
41
41
|
});
|
|
42
42
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
let assetId: string;
|
|
43
|
+
let client: AxiosInstance;
|
|
44
|
+
let brandFolderId: string;
|
|
45
|
+
let subFolderId: string;
|
|
46
|
+
let assetId: string;
|
|
48
47
|
|
|
48
|
+
describe("[integration] media API — owner lifecycle: folders", () => {
|
|
49
49
|
before(async function () {
|
|
50
50
|
this.timeout(READY_TIMEOUT_MS + 10_000);
|
|
51
51
|
const session = await ensureOwnerSession();
|
|
@@ -94,7 +94,9 @@ describe("[integration] media API — owner lifecycle", () => {
|
|
|
94
94
|
});
|
|
95
95
|
expect(duplicate.status).to.equal(409);
|
|
96
96
|
});
|
|
97
|
+
});
|
|
97
98
|
|
|
99
|
+
describe("[integration] media API — owner lifecycle: asset", () => {
|
|
98
100
|
it("uploads a file through presign, PUT and confirm", async () => {
|
|
99
101
|
const body = Buffer.from(FILE_CONTENT);
|
|
100
102
|
const presign = await client.post("/api/media/upload/presign", {
|
|
@@ -163,7 +165,9 @@ describe("[integration] media API — owner lifecycle", () => {
|
|
|
163
165
|
expect(detail.data.asset.folderId).to.equal(subFolderId);
|
|
164
166
|
expect(detail.data.asset.effectiveVisibility).to.equal("public");
|
|
165
167
|
});
|
|
168
|
+
});
|
|
166
169
|
|
|
170
|
+
describe("[integration] media API — owner lifecycle: teardown", () => {
|
|
167
171
|
it("moves and renames folders with cycle protection", async () => {
|
|
168
172
|
const renamed = await client.post(
|
|
169
173
|
`/api/media/folders/${subFolderId}/rename`,
|
|
@@ -29,6 +29,22 @@ class PageBoundProbePage extends PageController("page-bound-probe", {
|
|
|
29
29
|
static content = CustomComponent("dms-media-page-bound-probe");
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
function registerProbeBindings(): void {
|
|
33
|
+
RegisterAssetBinding({
|
|
34
|
+
id: BINDING_ID,
|
|
35
|
+
folderName: "Article covers",
|
|
36
|
+
permissionMapping: {
|
|
37
|
+
read: ["articles.page"],
|
|
38
|
+
write: ["articles.page.table.edit"],
|
|
39
|
+
},
|
|
40
|
+
});
|
|
41
|
+
RegisterAssetBinding({
|
|
42
|
+
id: PAGE_BOUND_BINDING_ID,
|
|
43
|
+
folderName: PAGE_BOUND_FOLDER_NAME,
|
|
44
|
+
permissionsFromPage: PageBoundProbePage,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
|
|
32
48
|
describe("[integration] media bindings — linked folder provisioning", () => {
|
|
33
49
|
let client: AxiosInstance;
|
|
34
50
|
let contentRootId: string;
|
|
@@ -36,19 +52,7 @@ describe("[integration] media bindings — linked folder provisioning", () => {
|
|
|
36
52
|
|
|
37
53
|
before(async function () {
|
|
38
54
|
this.timeout(40_000);
|
|
39
|
-
|
|
40
|
-
id: BINDING_ID,
|
|
41
|
-
folderName: "Article covers",
|
|
42
|
-
permissionMapping: {
|
|
43
|
-
read: ["articles.page"],
|
|
44
|
-
write: ["articles.page.table.edit"],
|
|
45
|
-
},
|
|
46
|
-
});
|
|
47
|
-
RegisterAssetBinding({
|
|
48
|
-
id: PAGE_BOUND_BINDING_ID,
|
|
49
|
-
folderName: PAGE_BOUND_FOLDER_NAME,
|
|
50
|
-
permissionsFromPage: PageBoundProbePage,
|
|
51
|
-
});
|
|
55
|
+
registerProbeBindings();
|
|
52
56
|
const session = await ensureOwnerSession();
|
|
53
57
|
client = authorizedClient(session.accessToken);
|
|
54
58
|
});
|
|
@@ -64,12 +64,12 @@ async function insertAsset(model: MediaAssetModel): Promise<MediaAsset> {
|
|
|
64
64
|
return (await model.get(_id))!;
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
let restoreMutation: () => void = () => undefined;
|
|
67
|
+
let model: MediaAssetModel;
|
|
68
|
+
let asset: MediaAsset;
|
|
69
|
+
let compare: MediaAssetModel["compareMedia"];
|
|
70
|
+
let restoreMutation: () => void = () => undefined;
|
|
72
71
|
|
|
72
|
+
function useCleanupFixture(): void {
|
|
73
73
|
beforeEach(async () => {
|
|
74
74
|
model = GetModel(MediaAssetModel, TENANT);
|
|
75
75
|
asset = await insertAsset(model);
|
|
@@ -82,6 +82,10 @@ describe("[integration] replayable media cleanup", () => {
|
|
|
82
82
|
restoreMutation();
|
|
83
83
|
await deleteMediaAsset(model, asset._id);
|
|
84
84
|
});
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
describe("[integration] replayable media cleanup — competing publications", () => {
|
|
88
|
+
useCleanupFixture();
|
|
85
89
|
|
|
86
90
|
it("allows exactly one competing revision and keeps creation/update modifiers", async () => {
|
|
87
91
|
const patches = [{ alt: "first" }, { alt: "second" }];
|
|
@@ -142,6 +146,10 @@ describe("[integration] replayable media cleanup", () => {
|
|
|
142
146
|
});
|
|
143
147
|
expect(await storage.FileExists(key)).to.equal(true);
|
|
144
148
|
});
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
describe("[integration] replayable media cleanup — sweep and replay", () => {
|
|
152
|
+
useCleanupFixture();
|
|
145
153
|
|
|
146
154
|
it("stops on unknown write acknowledgement and replays durable cleanup later", async () => {
|
|
147
155
|
const key = await upload();
|
|
@@ -242,6 +250,10 @@ describe("[integration] replayable media cleanup", () => {
|
|
|
242
250
|
await cleanupAssetFiles(model, asset._id);
|
|
243
251
|
expect(retiredFiles((await model.get(asset._id))!)).to.deep.equal([]);
|
|
244
252
|
});
|
|
253
|
+
});
|
|
254
|
+
|
|
255
|
+
describe("[integration] replayable media cleanup — deletion and replacement", () => {
|
|
256
|
+
useCleanupFixture();
|
|
245
257
|
|
|
246
258
|
it("tombstones before external deletion and rejects late publication", async () => {
|
|
247
259
|
await deleteMediaAsset(model, asset._id, async () => {
|