@antelopejs/dms-media 0.7.3 → 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.
Files changed (141) hide show
  1. package/README.md +10 -10
  2. package/dist/acl/entries.js +20 -2
  3. package/dist/acl/entries.js.map +1 -1
  4. package/dist/asset-lifecycle.js +5 -1
  5. package/dist/asset-lifecycle.js.map +1 -1
  6. package/dist/bindings.d.ts +1 -0
  7. package/dist/bindings.js +36 -25
  8. package/dist/bindings.js.map +1 -1
  9. package/dist/db/models/mediaAssets.model.d.ts +3 -3
  10. package/dist/db/models/mediaDeclarations.model.d.ts +3 -3
  11. package/dist/db/models/mediaEvents.model.d.ts +3 -3
  12. package/dist/db/models/mediaFavorites.model.d.ts +3 -3
  13. package/dist/db/models/mediaFolders.model.d.ts +3 -3
  14. package/dist/db/models/mediaUploads.model.d.ts +3 -3
  15. package/dist/declared/assets.js +39 -25
  16. package/dist/declared/assets.js.map +1 -1
  17. package/dist/declared/folders.js +27 -14
  18. package/dist/declared/folders.js.map +1 -1
  19. package/dist/declared/records.d.ts +1 -0
  20. package/dist/declared/records.js +18 -1
  21. package/dist/declared/records.js.map +1 -1
  22. package/dist/fixed-id.d.ts +1 -0
  23. package/dist/fixed-id.js +16 -0
  24. package/dist/fixed-id.js.map +1 -0
  25. package/dist/routes/media/assets.d.ts +3 -2
  26. package/dist/routes/media/assets.js +11 -6
  27. package/dist/routes/media/assets.js.map +1 -1
  28. package/dist/routes/media/storage-keys.js +10 -1
  29. package/dist/routes/media/storage-keys.js.map +1 -1
  30. package/dist/test/helpers/assets.d.ts +2 -2
  31. package/dist/test/helpers/folders.d.ts +6 -6
  32. package/dist/test/helpers/permissions-world.d.ts +6 -6
  33. package/dist/test/integration/binding-folder-race.test.d.ts +1 -0
  34. package/dist/test/integration/binding-folder-race.test.js +66 -0
  35. package/dist/test/integration/binding-folder-race.test.js.map +1 -0
  36. package/dist/test/integration/declared-asset-race.test.d.ts +1 -0
  37. package/dist/test/integration/declared-asset-race.test.js +78 -0
  38. package/dist/test/integration/declared-asset-race.test.js.map +1 -0
  39. package/dist/test/integration/declared-folder-race.test.d.ts +1 -0
  40. package/dist/test/integration/declared-folder-race.test.js +43 -0
  41. package/dist/test/integration/declared-folder-race.test.js.map +1 -0
  42. package/dist/test/integration/media-activity-overview.test.js +27 -22
  43. package/dist/test/integration/media-activity-overview.test.js.map +1 -1
  44. package/dist/test/integration/media-api.test.js +9 -5
  45. package/dist/test/integration/media-api.test.js.map +1 -1
  46. package/dist/test/integration/media-bindings.test.js +16 -13
  47. package/dist/test/integration/media-bindings.test.js.map +1 -1
  48. package/dist/test/integration/media-cleanup.test.js +14 -5
  49. package/dist/test/integration/media-cleanup.test.js.map +1 -1
  50. package/dist/test/integration/media-declared-content.test.js +107 -91
  51. package/dist/test/integration/media-declared-content.test.js.map +1 -1
  52. package/dist/test/integration/media-delivery-editing.test.js +238 -215
  53. package/dist/test/integration/media-delivery-editing.test.js.map +1 -1
  54. package/dist/test/integration/media-explorer-writes.test.js +131 -112
  55. package/dist/test/integration/media-explorer-writes.test.js.map +1 -1
  56. package/dist/test/integration/media-guards.test.js +38 -37
  57. package/dist/test/integration/media-guards.test.js.map +1 -1
  58. package/dist/test/integration/media-library.test.js +244 -224
  59. package/dist/test/integration/media-library.test.js.map +1 -1
  60. package/dist/test/integration/media-linked-subfolders.test.js +173 -158
  61. package/dist/test/integration/media-linked-subfolders.test.js.map +1 -1
  62. package/dist/test/integration/media-permissions.test.js +31 -11
  63. package/dist/test/integration/media-permissions.test.js.map +1 -1
  64. package/dist/test/integration/media-search-query.test.js +8 -6
  65. package/dist/test/integration/media-search-query.test.js.map +1 -1
  66. package/dist/test/integration/media-search-views.test.js +12 -8
  67. package/dist/test/integration/media-search-views.test.js.map +1 -1
  68. package/dist/test/integration/media-upload-policy.test.js +228 -200
  69. package/dist/test/integration/media-upload-policy.test.js.map +1 -1
  70. package/dist/test/stack-modules.json +5 -5
  71. package/dist/test/unit/acl/entries.test.js +19 -0
  72. package/dist/test/unit/acl/entries.test.js.map +1 -1
  73. package/dist/test/unit/acl/resolver.test.js +9 -1
  74. package/dist/test/unit/acl/resolver.test.js.map +1 -1
  75. package/dist/test/unit/asset-lifecycle.test.d.ts +1 -0
  76. package/dist/test/unit/asset-lifecycle.test.js +18 -0
  77. package/dist/test/unit/asset-lifecycle.test.js.map +1 -0
  78. package/dist/test/unit/routes/storage-keys.test.d.ts +1 -0
  79. package/dist/test/unit/routes/storage-keys.test.js +18 -0
  80. package/dist/test/unit/routes/storage-keys.test.js.map +1 -0
  81. package/dist/test/unit/transform-ops.test.js +19 -0
  82. package/dist/test/unit/transform-ops.test.js.map +1 -1
  83. package/dist/transform-ops.js +25 -1
  84. package/dist/transform-ops.js.map +1 -1
  85. package/dist/validation/declared.schema.d.ts +6 -6
  86. package/dist/validation/library.schema.d.ts +4 -4
  87. package/dist/validation/media.schema.d.ts +4 -4
  88. package/frontend-vue/app/components/Explorer.vue +2 -0
  89. package/frontend-vue/app/components/FileProperties.vue +1 -1
  90. package/frontend-vue/app/components/ImageEditor.vue +5 -5
  91. package/frontend-vue/app/components/RecentFiles.vue +2 -2
  92. package/frontend-vue/app/components/UploadQueue.vue +4 -4
  93. package/frontend-vue/app/components/dialogs/DeleteFilesDialog.vue +1 -1
  94. package/frontend-vue/app/components/dialogs/ShortcutsDialog.vue +1 -1
  95. package/frontend-vue/app/components/dialogs/VisibilityDialog.vue +1 -1
  96. package/frontend-vue/app/components/explorer/ExplorerInspector.vue +1 -1
  97. package/frontend-vue/app/components/explorer/ExplorerSidebar.vue +2 -2
  98. package/frontend-vue/app/components/explorer/FolderStrip.vue +1 -1
  99. package/frontend-vue/app/components/explorer/GridView.vue +1 -1
  100. package/frontend-vue/app/components/shared/AltTextField.vue +2 -2
  101. package/frontend-vue/build/backend-boundary.ts +8 -3
  102. package/frontend-vue/eslint.config.mjs +0 -1
  103. package/frontend-vue/package.json +2 -2
  104. package/frontend-vue/pnpm-lock.yaml +45 -14
  105. package/frontend-vue/tests/backend-boundary.test.ts +6 -4
  106. package/frontend-vue/tests/fixtures/serverRender.ts +3 -3
  107. package/frontend-vue/tests/registration.test.ts +5 -0
  108. package/package.json +15 -15
  109. package/src/acl/entries.ts +30 -7
  110. package/src/asset-lifecycle.ts +6 -2
  111. package/src/bindings.ts +41 -38
  112. package/src/declared/assets.ts +45 -28
  113. package/src/declared/folders.ts +30 -21
  114. package/src/declared/records.ts +31 -2
  115. package/src/fixed-id.ts +18 -0
  116. package/src/routes/media/assets.ts +14 -6
  117. package/src/routes/media/storage-keys.ts +14 -2
  118. package/src/test/integration/binding-folder-race.test.ts +82 -0
  119. package/src/test/integration/declared-asset-race.test.ts +115 -0
  120. package/src/test/integration/declared-folder-race.test.ts +50 -0
  121. package/src/test/integration/media-activity-overview.test.ts +40 -27
  122. package/src/test/integration/media-api.test.ts +9 -5
  123. package/src/test/integration/media-bindings.test.ts +17 -13
  124. package/src/test/integration/media-cleanup.test.ts +17 -5
  125. package/src/test/integration/media-declared-content.test.ts +129 -112
  126. package/src/test/integration/media-delivery-editing.test.ts +323 -299
  127. package/src/test/integration/media-explorer-writes.test.ts +161 -135
  128. package/src/test/integration/media-guards.test.ts +40 -38
  129. package/src/test/integration/media-library.test.ts +325 -296
  130. package/src/test/integration/media-linked-subfolders.test.ts +207 -186
  131. package/src/test/integration/media-permissions.test.ts +33 -14
  132. package/src/test/integration/media-search-query.test.ts +24 -8
  133. package/src/test/integration/media-search-views.test.ts +39 -32
  134. package/src/test/integration/media-upload-policy.test.ts +283 -254
  135. package/src/test/stack-modules.json +5 -5
  136. package/src/test/unit/acl/entries.test.ts +23 -0
  137. package/src/test/unit/acl/resolver.test.ts +9 -1
  138. package/src/test/unit/asset-lifecycle.test.ts +21 -0
  139. package/src/test/unit/routes/storage-keys.test.ts +23 -0
  140. package/src/test/unit/transform-ops.test.ts +29 -1
  141. package/src/transform-ops.ts +32 -2
@@ -1 +1 @@
1
- {"version":3,"file":"records.js","sourceRoot":"","sources":["../../src/declared/records.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"records.js","sourceRoot":"","sources":["../../src/declared/records.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export declare function fixedId(...parts: string[]): string;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.fixedId = fixedId;
4
+ const node_crypto_1 = require("node:crypto");
5
+ function fixedId(...parts) {
6
+ const hex = (0, node_crypto_1.createHash)("sha256").update(JSON.stringify(parts)).digest("hex");
7
+ const variant = ((Number.parseInt(hex.charAt(16), 16) % 4) + 8).toString(16);
8
+ return [
9
+ hex.slice(0, 8),
10
+ hex.slice(8, 12),
11
+ `8${hex.slice(13, 16)}`,
12
+ `${variant}${hex.slice(17, 20)}`,
13
+ hex.slice(20, 32),
14
+ ].join("-");
15
+ }
16
+ //# sourceMappingURL=fixed-id.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fixed-id.js","sourceRoot":"","sources":["../src/fixed-id.ts"],"names":[],"mappings":";;AAOA,0BAUC;AAjBD,6CAAyC;AAOzC,SAAgB,OAAO,CAAC,GAAG,KAAe;IACxC,MAAM,GAAG,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7E,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7E,OAAO;QACL,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QAChB,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;QACvB,GAAG,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;QAChC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;KAClB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { MediaApiController } from "./controller";
2
+ import { type QueryValue } from "@antelopejs/interface-api";
2
3
  import { type MediaAsset } from "../../db";
3
4
  import { type MediaRequestContext } from "./context";
4
5
  export declare function requireReadableAsset(context: MediaRequestContext, assetId: string): Promise<MediaAsset>;
@@ -12,13 +13,13 @@ export declare class MediaAssetsController extends MediaApiController {
12
13
  [k: string]: string;
13
14
  };
14
15
  }>;
15
- search(q?: string, mime?: string, folderId?: string): Promise<{
16
+ search(q: QueryValue, mime: QueryValue, folderIdQuery: QueryValue): Promise<{
16
17
  assets: import("./dto").MediaAssetDto[];
17
18
  }>;
18
19
  getAsset(assetId: string): Promise<{
19
20
  asset: import("./dto").MediaAssetDto;
20
21
  }>;
21
- readUrl(assetId: string, presetId?: string): Promise<{
22
+ readUrl(assetId: string, preset: QueryValue): Promise<{
22
23
  url: string;
23
24
  expiresAt: number | undefined;
24
25
  }>;
@@ -33,6 +33,9 @@ const MAX_SEARCH_RESULTS = 100;
33
33
  const MAX_LISTING_RESULTS = 1000;
34
34
  const THUMB_PRESET_ID = "thumb";
35
35
  const UNCROPPED_PRESET_ID = "preview";
36
+ function queryText(value) {
37
+ return value === true ? "" : (value ?? "");
38
+ }
36
39
  function previewPresetOf(asset, presets) {
37
40
  const isVector = asset.mimetype === presets_1.SVG_MIMETYPE;
38
41
  const isUncropped = presets.uncropped && presets.uncropped.fit !== "cover";
@@ -98,16 +101,17 @@ class MediaAssetsController extends controller_1.MediaApiController {
98
101
  const previews = Object.fromEntries(entries.filter((entry) => entry !== null));
99
102
  return { previews };
100
103
  }
101
- async search(q, mime, folderId) {
104
+ async search(q, mime, folderIdQuery) {
102
105
  const context = await this.resolveContext();
106
+ const folderId = queryText(folderIdQuery);
103
107
  const searchedFolders = folderId
104
108
  ? [(0, context_1.requireFolderRight)(context, folderId, "read")._id]
105
109
  : [...context.access.readable];
106
110
  if (searchedFolders.length === 0)
107
111
  return { assets: [] };
108
112
  const candidates = context.assetModel.table.getAll(searchedFolders.length === 1 ? searchedFolders[0] : searchedFolders, "folderId");
109
- const term = (q ?? "").trim().toLowerCase();
110
- const mimePrefix = (mime ?? "").trim().toLowerCase();
113
+ const term = queryText(q).trim().toLowerCase();
114
+ const mimePrefix = queryText(mime).trim().toLowerCase();
111
115
  const assets = [];
112
116
  for await (const row of candidates) {
113
117
  const asset = db_1.MediaAssetModel.fromDatabase(row);
@@ -124,7 +128,8 @@ class MediaAssetsController extends controller_1.MediaApiController {
124
128
  const asset = await requireReadableAsset(context, assetId);
125
129
  return { asset: (0, dto_1.buildAssetDto)(context, asset) };
126
130
  }
127
- async readUrl(assetId, presetId) {
131
+ async readUrl(assetId, preset) {
132
+ const presetId = queryText(preset);
128
133
  const context = await this.resolveContext();
129
134
  const asset = await requireReadableAsset(context, assetId);
130
135
  let storageKey = asset.storageKey;
@@ -184,7 +189,7 @@ __decorate([
184
189
  __param(1, (0, interface_api_1.Parameter)("mime", "query")),
185
190
  __param(2, (0, interface_api_1.Parameter)("folderId", "query")),
186
191
  __metadata("design:type", Function),
187
- __metadata("design:paramtypes", [String, String, String]),
192
+ __metadata("design:paramtypes", [Object, Object, Object]),
188
193
  __metadata("design:returntype", Promise)
189
194
  ], MediaAssetsController.prototype, "search", null);
190
195
  __decorate([
@@ -199,7 +204,7 @@ __decorate([
199
204
  __param(0, (0, interface_api_1.Parameter)("assetId", "param")),
200
205
  __param(1, (0, interface_api_1.Parameter)("preset", "query")),
201
206
  __metadata("design:type", Function),
202
- __metadata("design:paramtypes", [String, String]),
207
+ __metadata("design:paramtypes", [String, Object]),
203
208
  __metadata("design:returntype", Promise)
204
209
  ], MediaAssetsController.prototype, "readUrl", null);
205
210
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/routes/media/assets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/routes/media/assets.ts"],"names":[],"mappings":"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"}
@@ -2,10 +2,19 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parseDerivatives = parseDerivatives;
4
4
  exports.collectAssetStorageKeys = collectAssetStorageKeys;
5
+ const guards_1 = require("../../guards");
6
+ function isStringMap(value) {
7
+ return ((0, guards_1.isObject)(value) &&
8
+ !Array.isArray(value) &&
9
+ Object.values(value).every(guards_1.isString));
10
+ }
5
11
  function parseDerivatives(asset) {
6
12
  if (!asset.json_derivatives)
7
13
  return {};
8
- return JSON.parse(asset.json_derivatives);
14
+ const parsed = JSON.parse(asset.json_derivatives);
15
+ if (isStringMap(parsed))
16
+ return parsed;
17
+ throw new Error(`Media asset '${asset._id}' has image sizes that are not a map of storage keys`);
9
18
  }
10
19
  function collectAssetStorageKeys(asset) {
11
20
  const keys = new Set([asset.storageKey]);
@@ -1 +1 @@
1
- {"version":3,"file":"storage-keys.js","sourceRoot":"","sources":["../../../src/routes/media/storage-keys.ts"],"names":[],"mappings":";;AAEA,4CAIC;AAED,0DAOC;AAbD,SAAgB,gBAAgB,CAAC,KAAiB;IAChD,IAAI,CAAC,KAAK,CAAC,gBAAgB;QAAE,OAAO,EAAE,CAAC;IAEvC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAA2B,CAAC;AACtE,CAAC;AAED,SAAgB,uBAAuB,CAAC,KAAiB;IACvD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IACjD,IAAI,KAAK,CAAC,WAAW;QAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACnD,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"storage-keys.js","sourceRoot":"","sources":["../../../src/routes/media/storage-keys.ts"],"names":[],"mappings":";;AAWA,4CAOC;AAED,0DAOC;AA1BD,yCAAkD;AAElD,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,CACL,IAAA,iBAAQ,EAAC,KAAK,CAAC;QACf,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAQ,CAAC,CACrC,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAAC,KAAiB;IAChD,IAAI,CAAC,KAAK,CAAC,gBAAgB;QAAE,OAAO,EAAE,CAAC;IACvC,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC3D,IAAI,WAAW,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IACvC,MAAM,IAAI,KAAK,CACb,gBAAgB,KAAK,CAAC,GAAG,sDAAsD,CAChF,CAAC;AACJ,CAAC;AAED,SAAgB,uBAAuB,CAAC,KAAiB;IACvD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IACjD,IAAI,KAAK,CAAC,WAAW;QAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACnD,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AACnB,CAAC"}
@@ -12,15 +12,15 @@ declare const uploadedAssetBody: z.ZodObject<{
12
12
  height: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
13
13
  url: z.ZodString;
14
14
  }, "strip", z.ZodTypeAny, {
15
- id: string;
16
15
  name: string;
16
+ id: string;
17
17
  url: string;
18
18
  folderId: string;
19
19
  width?: number | null | undefined;
20
20
  height?: number | null | undefined;
21
21
  }, {
22
- id: string;
23
22
  name: string;
23
+ id: string;
24
24
  url: string;
25
25
  folderId: string;
26
26
  width?: number | null | undefined;
@@ -12,16 +12,16 @@ declare const folderNodeSchema: z.ZodObject<{
12
12
  acceptsSubfolders: z.ZodBoolean;
13
13
  accepts: z.ZodNullable<z.ZodArray<z.ZodString, "many">>;
14
14
  }, "strip", z.ZodTypeAny, {
15
- id: string;
16
15
  name: string;
16
+ id: string;
17
17
  binding: string | null;
18
18
  parentId: string | null;
19
19
  bound: boolean;
20
20
  acceptsSubfolders: boolean;
21
21
  accepts: string[] | null;
22
22
  }, {
23
- id: string;
24
23
  name: string;
24
+ id: string;
25
25
  binding: string | null;
26
26
  parentId: string | null;
27
27
  bound: boolean;
@@ -39,16 +39,16 @@ export declare const folderTreeBody: z.ZodObject<{
39
39
  acceptsSubfolders: z.ZodBoolean;
40
40
  accepts: z.ZodNullable<z.ZodArray<z.ZodString, "many">>;
41
41
  }, "strip", z.ZodTypeAny, {
42
- id: string;
43
42
  name: string;
43
+ id: string;
44
44
  binding: string | null;
45
45
  parentId: string | null;
46
46
  bound: boolean;
47
47
  acceptsSubfolders: boolean;
48
48
  accepts: string[] | null;
49
49
  }, {
50
- id: string;
51
50
  name: string;
51
+ id: string;
52
52
  binding: string | null;
53
53
  parentId: string | null;
54
54
  bound: boolean;
@@ -57,8 +57,8 @@ export declare const folderTreeBody: z.ZodObject<{
57
57
  }>, "many">;
58
58
  }, "strip", z.ZodTypeAny, {
59
59
  folders: {
60
- id: string;
61
60
  name: string;
61
+ id: string;
62
62
  binding: string | null;
63
63
  parentId: string | null;
64
64
  bound: boolean;
@@ -67,8 +67,8 @@ export declare const folderTreeBody: z.ZodObject<{
67
67
  }[];
68
68
  }, {
69
69
  folders: {
70
- id: string;
71
70
  name: string;
71
+ id: string;
72
72
  binding: string | null;
73
73
  parentId: string | null;
74
74
  bound: boolean;
@@ -38,8 +38,8 @@ declare const treeFolderNodeBody: z.ZodObject<{
38
38
  manage: boolean;
39
39
  }>;
40
40
  }, "strip", z.ZodTypeAny, {
41
- id: string;
42
41
  name: string;
42
+ id: string;
43
43
  shell: boolean;
44
44
  visibility: string;
45
45
  parentId: string | null;
@@ -50,8 +50,8 @@ declare const treeFolderNodeBody: z.ZodObject<{
50
50
  };
51
51
  bound: boolean;
52
52
  }, {
53
- id: string;
54
53
  name: string;
54
+ id: string;
55
55
  shell: boolean;
56
56
  visibility: string;
57
57
  parentId: string | null;
@@ -84,8 +84,8 @@ declare const treeBody: z.ZodObject<{
84
84
  manage: boolean;
85
85
  }>;
86
86
  }, "strip", z.ZodTypeAny, {
87
- id: string;
88
87
  name: string;
88
+ id: string;
89
89
  shell: boolean;
90
90
  visibility: string;
91
91
  parentId: string | null;
@@ -96,8 +96,8 @@ declare const treeBody: z.ZodObject<{
96
96
  };
97
97
  bound: boolean;
98
98
  }, {
99
- id: string;
100
99
  name: string;
100
+ id: string;
101
101
  shell: boolean;
102
102
  visibility: string;
103
103
  parentId: string | null;
@@ -124,8 +124,8 @@ declare const treeBody: z.ZodObject<{
124
124
  manage: boolean;
125
125
  };
126
126
  folders: {
127
- id: string;
128
127
  name: string;
128
+ id: string;
129
129
  shell: boolean;
130
130
  visibility: string;
131
131
  parentId: string | null;
@@ -142,8 +142,8 @@ declare const treeBody: z.ZodObject<{
142
142
  manage: boolean;
143
143
  };
144
144
  folders: {
145
- id: string;
146
145
  name: string;
146
+ id: string;
147
147
  shell: boolean;
148
148
  visibility: string;
149
149
  parentId: string | null;
@@ -0,0 +1,66 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
4
+ const interface_database_1 = require("@antelopejs/interface-database");
5
+ const constants_1 = require("@antelopejs/interface-dms/constants");
6
+ const chai_1 = require("chai");
7
+ const bindings_1 = require("../../bindings");
8
+ const db_1 = require("../../db");
9
+ const TENANT_ID = "binding-folder-race";
10
+ const BINDING = "race.cover";
11
+ const READ_PERMISSION = "race.cover.read";
12
+ class StaleReadFolderModel extends db_1.MediaFolderModel {
13
+ getAll() {
14
+ return Promise.resolve([]);
15
+ }
16
+ }
17
+ describe("[integration] media bindings — two processes provisioning one tenant", () => {
18
+ before(async () => {
19
+ const schema = interface_database_1.Schema.get(constants_1.TENANT_SCHEMA_NAME);
20
+ if (!schema)
21
+ throw new Error("Tenant schema is missing");
22
+ await schema.createInstance(TENANT_ID).run();
23
+ });
24
+ after(() => (0, bindings_1.removeAssetBinding)(BINDING));
25
+ it("keeps the content root and linked folder another process inserted after this one read, and applies the binding ACL", async () => {
26
+ const folders = (0, interface_database_decorators_1.GetModel)(db_1.MediaFolderModel, TENANT_ID);
27
+ const rootId = (0, bindings_1.bindingFolderId)(TENANT_ID, bindings_1.CONTENT_ROOT_BINDING);
28
+ const folderId = (0, bindings_1.bindingFolderId)(TENANT_ID, BINDING);
29
+ await folders.insert({
30
+ _id: rootId,
31
+ name: "Content",
32
+ path: [],
33
+ binding: bindings_1.CONTENT_ROOT_BINDING,
34
+ json_acl: "[]",
35
+ visibility: "private",
36
+ });
37
+ await folders.insert({
38
+ _id: folderId,
39
+ name: "Race covers",
40
+ parentId: rootId,
41
+ path: [rootId],
42
+ binding: BINDING,
43
+ json_acl: "[]",
44
+ visibility: "private",
45
+ });
46
+ (0, bindings_1.addAssetBinding)(BINDING, {
47
+ id: BINDING,
48
+ folderName: "Race covers",
49
+ permissionMapping: { read: [READ_PERMISSION] },
50
+ });
51
+ await (0, bindings_1.ensureTenantBindings)(TENANT_ID, (0, interface_database_decorators_1.GetModel)(StaleReadFolderModel, TENANT_ID));
52
+ const stored = await folders.getAll();
53
+ const idsOf = (binding) => stored
54
+ .filter((folder) => folder.binding === binding)
55
+ .map((folder) => folder._id);
56
+ (0, chai_1.expect)(idsOf(bindings_1.CONTENT_ROOT_BINDING)).to.deep.equal([rootId]);
57
+ (0, chai_1.expect)(idsOf(BINDING)).to.deep.equal([folderId]);
58
+ (0, chai_1.expect)((await folders.get(folderId))?.json_acl).to.equal(JSON.stringify([
59
+ {
60
+ subject: { kind: "permission", id: READ_PERMISSION },
61
+ rights: ["read"],
62
+ },
63
+ ]));
64
+ });
65
+ });
66
+ //# sourceMappingURL=binding-folder-race.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"binding-folder-race.test.js","sourceRoot":"","sources":["../../../src/test/integration/binding-folder-race.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,78 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const node_crypto_1 = require("node:crypto");
4
+ const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
5
+ const constants_1 = require("@antelopejs/interface-dms/constants");
6
+ const interface_dms_media_1 = require("@antelopejs/interface-dms-media");
7
+ const interface_file_storage_1 = require("@antelopejs/interface-file-storage");
8
+ const chai_1 = require("chai");
9
+ const db_1 = require("../../db");
10
+ const derivatives_1 = require("../../derivatives");
11
+ const assets_1 = require("../helpers/assets");
12
+ const prototype_1 = require("../helpers/prototype");
13
+ const KEY = "declared.race.logo";
14
+ const FOLDER_KEY = "declared.race.assets";
15
+ const NAME = "race-logo.png";
16
+ function assetModel() {
17
+ return (0, interface_database_decorators_1.GetModel)(db_1.MediaAssetModel, constants_1.DEFAULT_TENANT_ID);
18
+ }
19
+ function declarationModel() {
20
+ return (0, interface_database_decorators_1.GetModel)(db_1.MediaDeclarationModel, constants_1.DEFAULT_TENANT_ID);
21
+ }
22
+ function insertAnotherProcessFirst(winnerKey, loserKeys) {
23
+ const restore = (0, prototype_1.patchMethod)(db_1.MediaAssetModel.prototype, "insert", (original) => async function (obj, options) {
24
+ restore();
25
+ if (Array.isArray(obj) || obj.storageKey === undefined)
26
+ throw new Error("Expected one asset insert from the import");
27
+ loserKeys.push(obj.storageKey);
28
+ await original.call(this, { ...obj, storageKey: winnerKey }, options);
29
+ return original.call(this, obj, options);
30
+ });
31
+ return restore;
32
+ }
33
+ describe("[integration] media declared assets — two processes importing one key", () => {
34
+ let restoreInsert;
35
+ let folderId;
36
+ after(async () => {
37
+ restoreInsert?.();
38
+ if (folderId) {
39
+ for (const asset of await assetModel().getBy("folderId", folderId))
40
+ await assetModel().delete(asset._id);
41
+ await (0, interface_database_decorators_1.GetModel)(db_1.MediaFolderModel, constants_1.DEFAULT_TENANT_ID).delete(folderId);
42
+ }
43
+ for (const key of [KEY, FOLDER_KEY])
44
+ for (const record of await declarationModel().getBy("key", key))
45
+ await declarationModel().delete(record._id);
46
+ });
47
+ it("keeps the asset another process inserted between this one's checks and its insert", async () => {
48
+ folderId = (await (0, interface_dms_media_1.EnsureMediaFolder)({
49
+ tenantId: constants_1.DEFAULT_TENANT_ID,
50
+ key: FOLDER_KEY,
51
+ name: "Race assets",
52
+ })).id;
53
+ const winnerKey = await (0, derivatives_1.uploadStorageBytes)(assets_1.ONE_PIXEL_PNG, NAME, assets_1.PNG_MIMETYPE, `media/${constants_1.DEFAULT_TENANT_ID}/${folderId}/${(0, node_crypto_1.randomUUID)()}`, undefined);
54
+ const loserKeys = [];
55
+ restoreInsert = insertAnotherProcessFirst(winnerKey, loserKeys);
56
+ const result = await (0, interface_dms_media_1.ImportMediaAsset)({
57
+ tenantId: constants_1.DEFAULT_TENANT_ID,
58
+ key: KEY,
59
+ folder: { key: FOLDER_KEY },
60
+ name: NAME,
61
+ mimetype: assets_1.PNG_MIMETYPE,
62
+ source: { bytes: assets_1.ONE_PIXEL_PNG },
63
+ });
64
+ const stored = await assetModel().getBy("folderId", folderId);
65
+ (0, chai_1.expect)(stored.map((asset) => asset.storageKey)).to.deep.equal([winnerKey]);
66
+ (0, chai_1.expect)(result).to.deep.equal({ status: "kept", id: stored[0]?._id });
67
+ const records = await declarationModel().getBy("key", KEY);
68
+ (0, chai_1.expect)(records.map((record) => record.targetId)).to.deep.equal([
69
+ stored[0]?._id,
70
+ ]);
71
+ (0, chai_1.expect)(loserKeys).to.have.length(1);
72
+ (0, chai_1.expect)(await (0, interface_file_storage_1.FileExists)(loserKeys[0] ?? "")).to.equal(false);
73
+ (0, chai_1.expect)(await (0, interface_file_storage_1.FileExists)(winnerKey)).to.equal(true);
74
+ const events = await (0, interface_database_decorators_1.GetModel)(db_1.MediaEventModel, constants_1.DEFAULT_TENANT_ID).listByAsset(stored[0]?._id ?? "");
75
+ (0, chai_1.expect)(events.map((event) => event.kind)).to.deep.equal([]);
76
+ });
77
+ });
78
+ //# sourceMappingURL=declared-asset-race.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"declared-asset-race.test.js","sourceRoot":"","sources":["../../../src/test/integration/declared-asset-race.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,43 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
4
+ const constants_1 = require("@antelopejs/interface-dms/constants");
5
+ const interface_dms_media_1 = require("@antelopejs/interface-dms-media");
6
+ const chai_1 = require("chai");
7
+ const db_1 = require("../../db");
8
+ const records_1 = require("../../declared/records");
9
+ const KEY = "declared.race.reports";
10
+ const NAME = "Race reports";
11
+ function folderModel() {
12
+ return (0, interface_database_decorators_1.GetModel)(db_1.MediaFolderModel, constants_1.DEFAULT_TENANT_ID);
13
+ }
14
+ function declarationModel() {
15
+ return (0, interface_database_decorators_1.GetModel)(db_1.MediaDeclarationModel, constants_1.DEFAULT_TENANT_ID);
16
+ }
17
+ describe("[integration] media declared folders — two processes declaring one key", () => {
18
+ const id = (0, records_1.declaredId)(constants_1.DEFAULT_TENANT_ID, "folder", KEY);
19
+ after(async () => {
20
+ await folderModel().delete(id);
21
+ for (const record of await declarationModel().getBy("key", KEY))
22
+ await declarationModel().delete(record._id);
23
+ });
24
+ it("keeps the folder another process inserted between this one's checks and its insert", async () => {
25
+ await folderModel().insert({
26
+ _id: id,
27
+ name: NAME,
28
+ path: [],
29
+ visibility: "private",
30
+ });
31
+ const result = await (0, interface_dms_media_1.EnsureMediaFolder)({
32
+ tenantId: constants_1.DEFAULT_TENANT_ID,
33
+ key: KEY,
34
+ name: NAME,
35
+ });
36
+ (0, chai_1.expect)(result).to.deep.equal({ status: "kept", id });
37
+ const named = (await folderModel().getAll()).filter((folder) => folder.name === NAME);
38
+ (0, chai_1.expect)(named.map((folder) => folder._id)).to.deep.equal([id]);
39
+ const records = await declarationModel().getBy("key", KEY);
40
+ (0, chai_1.expect)(records.map((record) => record.targetId)).to.deep.equal([id]);
41
+ });
42
+ });
43
+ //# sourceMappingURL=declared-folder-race.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"declared-folder-race.test.js","sourceRoot":"","sources":["../../../src/test/integration/declared-folder-race.test.ts"],"names":[],"mappings":";;AAAA,6FAAqE;AACrE,mEAAwE;AACxE,yEAAoE;AACpE,+BAA8B;AAC9B,iCAAmE;AACnE,oDAAoD;AAEpD,MAAM,GAAG,GAAG,uBAAuB,CAAC;AACpC,MAAM,IAAI,GAAG,cAAc,CAAC;AAE5B,SAAS,WAAW;IAClB,OAAO,IAAA,wCAAQ,EAAC,qBAAgB,EAAE,6BAAiB,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO,IAAA,wCAAQ,EAAC,0BAAqB,EAAE,6BAAiB,CAAC,CAAC;AAC5D,CAAC;AAED,QAAQ,CAAC,wEAAwE,EAAE,GAAG,EAAE;IACtF,MAAM,EAAE,GAAG,IAAA,oBAAU,EAAC,6BAAiB,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAExD,KAAK,CAAC,KAAK,IAAI,EAAE;QACf,MAAM,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,KAAK,MAAM,MAAM,IAAI,MAAM,gBAAgB,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC;YAC7D,MAAM,gBAAgB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;QAClG,MAAM,WAAW,EAAE,CAAC,MAAM,CAAC;YACzB,GAAG,EAAE,EAAE;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,SAAS;SACtB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,IAAA,uCAAiB,EAAC;YACrC,QAAQ,EAAE,6BAAiB;YAC3B,GAAG,EAAE,GAAG;YACR,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QAEH,IAAA,aAAM,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,CAAC,MAAM,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CACjD,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CACjC,CAAC;QACF,IAAA,aAAM,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,MAAM,gBAAgB,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -38,6 +38,30 @@ const attentionBody = zod_1.z.object({
38
38
  const activityBody = zod_1.z.object({
39
39
  items: zod_1.z.array(zod_1.z.object({ title: zod_1.z.string(), to: zod_1.z.string().optional() })),
40
40
  });
41
+ function reportRetriedBatch(client, folderId, uploaded, failed) {
42
+ return client.post("/api/media/upload/batches", {
43
+ batchId: BATCH_ID,
44
+ folderId,
45
+ total: 2,
46
+ uploaded,
47
+ failed,
48
+ size: 10,
49
+ failures: failed
50
+ ? [{ name: "overview-b.txt", reason: "Network error" }]
51
+ : [],
52
+ });
53
+ }
54
+ async function flaggedFailures(client) {
55
+ const rows = await client.get("/api/media/upload/batches", {
56
+ params: { filter_attention: "is:yes" },
57
+ });
58
+ return (0, bodies_1.readBody)(rows, batchesBody).results.reduce((total, row) => total + row.failed, 0);
59
+ }
60
+ async function countedFailures(client) {
61
+ const attention = await client.get("/api/media/stats/attention");
62
+ const item = (0, bodies_1.readBody)(attention, attentionBody).items.find((entry) => entry.id === "failed-uploads");
63
+ return item?.value ?? 0;
64
+ }
41
65
  describe("[integration] media activity and overview — figures, upload history and module catalog", () => {
42
66
  let client;
43
67
  let folderId;
@@ -61,17 +85,7 @@ describe("[integration] media activity and overview — figures, upload history
61
85
  });
62
86
  it("keeps the newest report of a retried batch only", async () => {
63
87
  await (0, assets_1.uploadAsset)(client, folderId, "overview-a.txt", TEXT_MIMETYPE, BODY);
64
- const report = (uploaded, failed) => client.post("/api/media/upload/batches", {
65
- batchId: BATCH_ID,
66
- folderId,
67
- total: 2,
68
- uploaded,
69
- failed,
70
- size: 10,
71
- failures: failed
72
- ? [{ name: "overview-b.txt", reason: "Network error" }]
73
- : [],
74
- });
88
+ const report = (uploaded, failed) => reportRetriedBatch(client, folderId, uploaded, failed);
75
89
  (0, chai_1.expect)((await report(1, 1)).status).to.equal(HTTP_OK);
76
90
  const failedOnly = await client.get("/api/media/upload/batches", {
77
91
  params: { filter_result: "is:partial,failed" },
@@ -98,17 +112,8 @@ describe("[integration] media activity and overview — figures, upload history
98
112
  failed: 3,
99
113
  size: 0,
100
114
  });
101
- const flagged = async () => {
102
- const rows = await client.get("/api/media/upload/batches", {
103
- params: { filter_attention: "is:yes" },
104
- });
105
- return (0, bodies_1.readBody)(rows, batchesBody).results.reduce((total, row) => total + row.failed, 0);
106
- };
107
- const counted = async () => {
108
- const attention = await client.get("/api/media/stats/attention");
109
- const item = (0, bodies_1.readBody)(attention, attentionBody).items.find((entry) => entry.id === "failed-uploads");
110
- return item?.value ?? 0;
111
- };
115
+ const flagged = () => flaggedFailures(client);
116
+ const counted = () => countedFailures(client);
112
117
  const before = await counted();
113
118
  (0, chai_1.expect)(before).to.equal(await flagged());
114
119
  (0, chai_1.expect)(before).to.be.at.least(3);