@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.
- 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/routes/media/assets.d.ts +3 -2
- package/dist/routes/media/assets.js +11 -6
- package/dist/routes/media/assets.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/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 +4 -4
- 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/package.json +15 -15
- 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 -21
- package/src/declared/records.ts +31 -2
- package/src/fixed-id.ts +18 -0
- package/src/routes/media/assets.ts +14 -6
- 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/routes/storage-keys.test.ts +23 -0
- package/src/test/unit/transform-ops.test.ts +29 -1
- package/src/transform-ops.ts +32 -2
|
@@ -146,335 +146,359 @@ function assetPath(asset: UploadedAsset, preset?: string): string {
|
|
|
146
146
|
: `/media/${asset.id}/${name}`;
|
|
147
147
|
}
|
|
148
148
|
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
let jpeg: UploadedAsset;
|
|
149
|
+
let client: AxiosInstance;
|
|
150
|
+
let token: string;
|
|
151
|
+
let folderId: string;
|
|
152
|
+
let jpeg: UploadedAsset;
|
|
154
153
|
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
154
|
+
function describeDeliveryLinks(): void {
|
|
155
|
+
describe("delivery links and caching", () => {
|
|
156
|
+
it("redirects members to a signed URL that is never cached", async () => {
|
|
157
|
+
const auth = { Authorization: `Bearer ${token}` };
|
|
158
|
+
const first = await deliver(assetPath(jpeg), auth);
|
|
159
|
+
expect(first.status).to.equal(HTTP_FOUND);
|
|
160
|
+
expect(first.headers.get("cache-control")).to.equal("no-store");
|
|
161
|
+
const again = await deliver(assetPath(jpeg), auth);
|
|
162
|
+
expect(again.headers.get("location")).to.equal(
|
|
163
|
+
first.headers.get("location"),
|
|
164
|
+
);
|
|
162
165
|
});
|
|
163
|
-
expect(folder.status).to.equal(HTTP_OK);
|
|
164
|
-
folderId = readBody(folder, createdBody).id;
|
|
165
|
-
jpeg = await uploadAsset(
|
|
166
|
-
client,
|
|
167
|
-
folderId,
|
|
168
|
-
"photo.jpg",
|
|
169
|
-
"image/jpeg",
|
|
170
|
-
await photo(),
|
|
171
|
-
);
|
|
172
|
-
});
|
|
173
|
-
|
|
174
|
-
after(async () => {
|
|
175
|
-
await client.delete(`/api/media/folders/${folderId}`);
|
|
176
|
-
});
|
|
177
166
|
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
167
|
+
it("answers a bare 401 to scripts and sends browsers to the file page", async () => {
|
|
168
|
+
const anonymous = await deliver(assetPath(jpeg));
|
|
169
|
+
expect(anonymous.status).to.equal(HTTP_UNAUTHORIZED);
|
|
170
|
+
const browser = await deliver(assetPath(jpeg), { Accept: "text/html" });
|
|
171
|
+
const location = browser.headers.get("location") ?? "";
|
|
172
|
+
const isFilePageRedirect =
|
|
173
|
+
browser.status === HTTP_FOUND &&
|
|
174
|
+
location.endsWith(`/modules/media/file?asset=${jpeg.id}`);
|
|
175
|
+
const isSignInPage =
|
|
176
|
+
browser.status === HTTP_UNAUTHORIZED &&
|
|
177
|
+
(browser.headers.get("content-type") ?? "").startsWith("text/html");
|
|
178
|
+
expect(isFilePageRedirect || isSignInPage).to.equal(true);
|
|
179
|
+
});
|
|
188
180
|
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
(
|
|
200
|
-
|
|
201
|
-
});
|
|
181
|
+
it("sends stale or empty file names to the canonical URL", async () => {
|
|
182
|
+
const auth = { Authorization: `Bearer ${token}` };
|
|
183
|
+
const renamed = await deliver(`/media/${jpeg.id}/other.exe`, auth);
|
|
184
|
+
expect(renamed.status).to.equal(HTTP_FOUND);
|
|
185
|
+
expect(renamed.headers.get("location")).to.equal(assetPath(jpeg));
|
|
186
|
+
const derivative = await deliver(`/media/${jpeg.id}/thumb/x.jpg`, auth);
|
|
187
|
+
expect(derivative.headers.get("location")).to.equal(
|
|
188
|
+
assetPath(jpeg, "thumb"),
|
|
189
|
+
);
|
|
190
|
+
const empty = await deliver(`/media/${jpeg.id}/thumb/`, auth);
|
|
191
|
+
expect(empty.status).to.equal(HTTP_NOT_FOUND);
|
|
192
|
+
});
|
|
202
193
|
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
});
|
|
194
|
+
it("names derivatives readably and leaves updatedAt alone when rendering them", async () => {
|
|
195
|
+
const auth = { Authorization: `Bearer ${token}` };
|
|
196
|
+
const before = await client.get(`/api/media/assets/${jpeg.id}`);
|
|
197
|
+
const thumb = await follow(assetPath(jpeg, "thumb"), auth);
|
|
198
|
+
expect(thumb.status).to.equal(HTTP_OK);
|
|
199
|
+
expect(thumb.headers.get("content-disposition")).to.contain(
|
|
200
|
+
'filename="photo-thumb.webp"',
|
|
201
|
+
);
|
|
202
|
+
const after = await client.get(`/api/media/assets/${jpeg.id}`);
|
|
203
|
+
expect(after.data.asset.updatedAt).to.equal(before.data.asset.updatedAt);
|
|
204
|
+
});
|
|
215
205
|
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
206
|
+
it("redirects public files without caching the redirect, and opens CORS", async () => {
|
|
207
|
+
const flip = await client.post(
|
|
208
|
+
`/api/media/folders/${folderId}/visibility`,
|
|
209
|
+
{ visibility: "public" },
|
|
210
|
+
);
|
|
211
|
+
expect(flip.status).to.equal(HTTP_OK);
|
|
212
|
+
const first = await deliver(assetPath(jpeg, "thumb"), {
|
|
213
|
+
Origin: FOREIGN_ORIGIN,
|
|
214
|
+
});
|
|
215
|
+
expect(first.status).to.equal(HTTP_FOUND);
|
|
216
|
+
expect(first.headers.get("cache-control")).to.equal("no-cache");
|
|
217
|
+
expect(first.headers.get("access-control-allow-origin")).to.equal("*");
|
|
218
|
+
const second = await deliver(assetPath(jpeg, "thumb"));
|
|
219
|
+
expect(second.headers.get("location")).to.equal(
|
|
220
|
+
first.headers.get("location"),
|
|
221
|
+
);
|
|
222
|
+
await client.post(`/api/media/folders/${folderId}/visibility`, {
|
|
223
|
+
visibility: "private",
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
226
|
});
|
|
227
|
+
}
|
|
227
228
|
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
{
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
229
|
+
function describeRenderedImages(): void {
|
|
230
|
+
describe("edited and rendered images", () => {
|
|
231
|
+
it("points the same link at the edited image right after an edit", async () => {
|
|
232
|
+
const auth = { Authorization: `Bearer ${token}` };
|
|
233
|
+
const before = await deliver(assetPath(jpeg, "thumb"), auth);
|
|
234
|
+
const edit = await client.post(`/api/media/assets/${jpeg.id}/transform`, {
|
|
235
|
+
rotate: 90,
|
|
236
|
+
});
|
|
237
|
+
expect(edit.status).to.equal(HTTP_OK);
|
|
238
|
+
const after = await follow(assetPath(jpeg), auth);
|
|
239
|
+
const metadata = await sharp(after.body).metadata();
|
|
240
|
+
expect([metadata.width, metadata.height]).to.deep.equal([
|
|
241
|
+
PHOTO_HEIGHT,
|
|
242
|
+
PHOTO_WIDTH,
|
|
243
|
+
]);
|
|
244
|
+
const thumb = await deliver(assetPath(jpeg, "thumb"), auth);
|
|
245
|
+
expect(thumb.headers.get("location")).to.not.equal(
|
|
246
|
+
before.headers.get("location"),
|
|
247
|
+
);
|
|
248
|
+
await client.post(`/api/media/assets/${jpeg.id}/revert`);
|
|
236
249
|
});
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
250
|
+
|
|
251
|
+
it("renders derivatives upright for EXIF-rotated photos", async () => {
|
|
252
|
+
const rotated = await sharp(await photo())
|
|
253
|
+
.withMetadata({ orientation: EXIF_ROTATED_RIGHT })
|
|
254
|
+
.jpeg()
|
|
255
|
+
.toBuffer();
|
|
256
|
+
const asset = await uploadAsset(
|
|
257
|
+
client,
|
|
258
|
+
folderId,
|
|
259
|
+
"phone.jpg",
|
|
260
|
+
"image/jpeg",
|
|
261
|
+
rotated,
|
|
262
|
+
);
|
|
263
|
+
const preview = await follow(assetPath(asset, "preview"), {
|
|
264
|
+
Authorization: `Bearer ${token}`,
|
|
265
|
+
});
|
|
266
|
+
const metadata = await sharp(preview.body).metadata();
|
|
267
|
+
expect([metadata.width, metadata.height]).to.deep.equal([
|
|
268
|
+
PHOTO_HEIGHT,
|
|
269
|
+
PHOTO_WIDTH,
|
|
270
|
+
]);
|
|
246
271
|
});
|
|
247
|
-
});
|
|
248
272
|
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
273
|
+
it("keeps animation, rasterizes vectors sharply and sandboxes SVG", async () => {
|
|
274
|
+
const auth = { Authorization: `Bearer ${token}` };
|
|
275
|
+
const gif = await uploadAsset(
|
|
276
|
+
client,
|
|
277
|
+
folderId,
|
|
278
|
+
"loop.gif",
|
|
279
|
+
"image/gif",
|
|
280
|
+
await animatedGif(),
|
|
281
|
+
);
|
|
282
|
+
const preview = await follow(assetPath(gif, "preview"), auth);
|
|
283
|
+
expect((await sharp(preview.body).metadata()).pages).to.equal(3);
|
|
284
|
+
const svg = await uploadAsset(
|
|
285
|
+
client,
|
|
286
|
+
folderId,
|
|
287
|
+
"logo.svg",
|
|
288
|
+
"image/svg+xml",
|
|
289
|
+
Buffer.from(SVG_SOURCE),
|
|
290
|
+
);
|
|
291
|
+
const thumb = await follow(assetPath(svg, "thumb"), auth);
|
|
292
|
+
expect((await sharp(thumb.body).metadata()).width).to.equal(300);
|
|
293
|
+
const original = await deliver(assetPath(svg), auth);
|
|
294
|
+
expect(original.status).to.equal(HTTP_OK);
|
|
295
|
+
expect(original.headers.get("content-security-policy")).to.equal(
|
|
296
|
+
"sandbox",
|
|
297
|
+
);
|
|
298
|
+
const etag = original.headers.get("etag");
|
|
299
|
+
assert.isNotNull(etag, "etag");
|
|
300
|
+
const revalidated = await deliver(assetPath(svg), {
|
|
301
|
+
...auth,
|
|
302
|
+
"If-None-Match": etag,
|
|
303
|
+
});
|
|
304
|
+
expect(revalidated.status).to.equal(HTTP_NOT_MODIFIED);
|
|
254
305
|
});
|
|
255
|
-
expect(edit.status).to.equal(HTTP_OK);
|
|
256
|
-
const after = await follow(assetPath(jpeg), auth);
|
|
257
|
-
const metadata = await sharp(after.body).metadata();
|
|
258
|
-
expect([metadata.width, metadata.height]).to.deep.equal([
|
|
259
|
-
PHOTO_HEIGHT,
|
|
260
|
-
PHOTO_WIDTH,
|
|
261
|
-
]);
|
|
262
|
-
const thumb = await deliver(assetPath(jpeg, "thumb"), auth);
|
|
263
|
-
expect(thumb.headers.get("location")).to.not.equal(
|
|
264
|
-
before.headers.get("location"),
|
|
265
|
-
);
|
|
266
|
-
await client.post(`/api/media/assets/${jpeg.id}/revert`);
|
|
267
306
|
});
|
|
307
|
+
}
|
|
268
308
|
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
309
|
+
function describeUnusualFiles(): void {
|
|
310
|
+
describe("vectors and unreadable files", () => {
|
|
311
|
+
it("fits a wide vector inside its library thumbnail instead of cropping it", async () => {
|
|
312
|
+
const logo = await uploadAsset(
|
|
313
|
+
client,
|
|
314
|
+
folderId,
|
|
315
|
+
"wide-logo.svg",
|
|
316
|
+
"image/svg+xml",
|
|
317
|
+
Buffer.from(WIDE_SVG_SOURCE),
|
|
318
|
+
);
|
|
319
|
+
const banner = await uploadAsset(
|
|
320
|
+
client,
|
|
321
|
+
folderId,
|
|
322
|
+
"wide-banner.png",
|
|
323
|
+
"image/png",
|
|
324
|
+
await sharp({
|
|
325
|
+
create: {
|
|
326
|
+
/** Larger than the thumb both ways, so its square crop shows. */
|
|
327
|
+
width: WIDE_SVG_WIDTH * 2,
|
|
328
|
+
height: WIDE_SVG_HEIGHT * 2,
|
|
329
|
+
channels: 3,
|
|
330
|
+
background: { r: 240, g: 160, b: 0 },
|
|
331
|
+
},
|
|
332
|
+
})
|
|
333
|
+
.png()
|
|
334
|
+
.toBuffer(),
|
|
335
|
+
);
|
|
336
|
+
const answer = await client.get(
|
|
337
|
+
`/api/media/previews?ids=${logo.id}&ids=${banner.id}`,
|
|
338
|
+
);
|
|
339
|
+
expect(answer.status).to.equal(HTTP_OK);
|
|
340
|
+
const { previews } = readBody(answer, previewsBody);
|
|
341
|
+
const [vector, raster] = await Promise.all(
|
|
342
|
+
[logo.id, banner.id].map(async (id) => {
|
|
343
|
+
const preview = previews.get(id);
|
|
344
|
+
assert.isDefined(preview, `preview of ${id}`);
|
|
345
|
+
const response = await fetch(preview);
|
|
346
|
+
return sharp(Buffer.from(await response.arrayBuffer())).metadata();
|
|
347
|
+
}),
|
|
348
|
+
);
|
|
349
|
+
expect((vector.width ?? 0) / (vector.height ?? 1)).to.be.closeTo(
|
|
350
|
+
WIDE_SVG_WIDTH / WIDE_SVG_HEIGHT,
|
|
351
|
+
0.05,
|
|
352
|
+
);
|
|
353
|
+
expect(raster.width).to.equal(raster.height);
|
|
283
354
|
});
|
|
284
|
-
const metadata = await sharp(preview.body).metadata();
|
|
285
|
-
expect([metadata.width, metadata.height]).to.deep.equal([
|
|
286
|
-
PHOTO_HEIGHT,
|
|
287
|
-
PHOTO_WIDTH,
|
|
288
|
-
]);
|
|
289
|
-
});
|
|
290
355
|
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
await
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
folderId,
|
|
305
|
-
"logo.svg",
|
|
306
|
-
"image/svg+xml",
|
|
307
|
-
Buffer.from(SVG_SOURCE),
|
|
308
|
-
);
|
|
309
|
-
const thumb = await follow(assetPath(svg, "thumb"), auth);
|
|
310
|
-
expect((await sharp(thumb.body).metadata()).width).to.equal(300);
|
|
311
|
-
const original = await deliver(assetPath(svg), auth);
|
|
312
|
-
expect(original.status).to.equal(HTTP_OK);
|
|
313
|
-
expect(original.headers.get("content-security-policy")).to.equal("sandbox");
|
|
314
|
-
const etag = original.headers.get("etag");
|
|
315
|
-
assert.isNotNull(etag, "etag");
|
|
316
|
-
const revalidated = await deliver(assetPath(svg), {
|
|
317
|
-
...auth,
|
|
318
|
-
"If-None-Match": etag,
|
|
356
|
+
it("never serves an HTML file inline", async () => {
|
|
357
|
+
const id = await insertStoredAsset(
|
|
358
|
+
folderId,
|
|
359
|
+
"page.html",
|
|
360
|
+
"text/html",
|
|
361
|
+
Buffer.from("<script>alert(1)</script>"),
|
|
362
|
+
);
|
|
363
|
+
const page = await deliver(`/media/${id}/page.html`, {
|
|
364
|
+
Authorization: `Bearer ${token}`,
|
|
365
|
+
});
|
|
366
|
+
expect(page.status).to.equal(HTTP_OK);
|
|
367
|
+
expect(page.headers.get("content-disposition")).to.match(/^attachment;/);
|
|
368
|
+
expect(page.headers.get("content-security-policy")).to.equal("sandbox");
|
|
319
369
|
});
|
|
320
|
-
expect(revalidated.status).to.equal(HTTP_NOT_MODIFIED);
|
|
321
|
-
});
|
|
322
370
|
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
await sharp({
|
|
337
|
-
create: {
|
|
338
|
-
/** Larger than the thumb both ways, so its square crop shows. */
|
|
339
|
-
width: WIDE_SVG_WIDTH * 2,
|
|
340
|
-
height: WIDE_SVG_HEIGHT * 2,
|
|
341
|
-
channels: 3,
|
|
342
|
-
background: { r: 240, g: 160, b: 0 },
|
|
343
|
-
},
|
|
344
|
-
})
|
|
345
|
-
.png()
|
|
346
|
-
.toBuffer(),
|
|
347
|
-
);
|
|
348
|
-
const answer = await client.get(
|
|
349
|
-
`/api/media/previews?ids=${logo.id}&ids=${banner.id}`,
|
|
350
|
-
);
|
|
351
|
-
expect(answer.status).to.equal(HTTP_OK);
|
|
352
|
-
const { previews } = readBody(answer, previewsBody);
|
|
353
|
-
const [vector, raster] = await Promise.all(
|
|
354
|
-
[logo.id, banner.id].map(async (id) => {
|
|
355
|
-
const preview = previews.get(id);
|
|
356
|
-
assert.isDefined(preview, `preview of ${id}`);
|
|
357
|
-
const response = await fetch(preview);
|
|
358
|
-
return sharp(Buffer.from(await response.arrayBuffer())).metadata();
|
|
359
|
-
}),
|
|
360
|
-
);
|
|
361
|
-
expect((vector.width ?? 0) / (vector.height ?? 1)).to.be.closeTo(
|
|
362
|
-
WIDE_SVG_WIDTH / WIDE_SVG_HEIGHT,
|
|
363
|
-
0.05,
|
|
364
|
-
);
|
|
365
|
-
expect(raster.width).to.equal(raster.height);
|
|
366
|
-
});
|
|
371
|
+
it("answers 422 instead of 500 for an unreadable image", async () => {
|
|
372
|
+
const id = await insertStoredAsset(
|
|
373
|
+
folderId,
|
|
374
|
+
"broken.png",
|
|
375
|
+
"image/png",
|
|
376
|
+
Buffer.from("not an image"),
|
|
377
|
+
);
|
|
378
|
+
const auth = { Authorization: `Bearer ${token}` };
|
|
379
|
+
const thumb = await deliver(`/media/${id}/thumb/broken.png`, auth);
|
|
380
|
+
expect(thumb.status).to.equal(HTTP_UNPROCESSABLE_ENTITY);
|
|
381
|
+
const again = await deliver(`/media/${id}/thumb/broken.png`, auth);
|
|
382
|
+
expect(again.status).to.equal(HTTP_UNPROCESSABLE_ENTITY);
|
|
383
|
+
});
|
|
367
384
|
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
385
|
+
it("hides storage keys when a size cannot be rendered for another reason", async () => {
|
|
386
|
+
const id = await GetModel(MediaAssetModel, DEFAULT_TENANT_ID).insert({
|
|
387
|
+
folderId,
|
|
388
|
+
mediaRevision: randomUUID(),
|
|
389
|
+
json_retiredFiles: "[]",
|
|
390
|
+
name: "gone.png",
|
|
391
|
+
mimetype: "image/png",
|
|
392
|
+
size: 1,
|
|
393
|
+
storageKey: `delivery-tests/missing-${randomUUID()}.png`,
|
|
394
|
+
visibility: "inherit",
|
|
395
|
+
createdBy: "delivery-tests",
|
|
396
|
+
});
|
|
397
|
+
const auth = { Authorization: `Bearer ${token}` };
|
|
398
|
+
for (const attempt of [1, 2]) {
|
|
399
|
+
const thumb = await deliver(`/media/${id[0]}/thumb/gone.png`, auth);
|
|
400
|
+
expect(thumb.status, `attempt ${attempt}`).to.equal(
|
|
401
|
+
HTTP_SERVICE_UNAVAILABLE,
|
|
402
|
+
);
|
|
403
|
+
expect(thumb.body.toString()).to.not.contain("delivery-tests/");
|
|
404
|
+
}
|
|
377
405
|
});
|
|
378
|
-
expect(page.status).to.equal(HTTP_OK);
|
|
379
|
-
expect(page.headers.get("content-disposition")).to.match(/^attachment;/);
|
|
380
|
-
expect(page.headers.get("content-security-policy")).to.equal("sandbox");
|
|
381
406
|
});
|
|
407
|
+
}
|
|
382
408
|
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
409
|
+
function describeEdits(): void {
|
|
410
|
+
describe("copies, successive edits and replaced versions", () => {
|
|
411
|
+
it("saves an edit as a copy next to the untouched source", async () => {
|
|
412
|
+
const copy = await client.post(
|
|
413
|
+
`/api/media/assets/${jpeg.id}/transform/copy`,
|
|
414
|
+
{ crop: { x: 0, y: 0, width: 0.5, height: 1 } },
|
|
415
|
+
);
|
|
416
|
+
expect(copy.status).to.equal(HTTP_OK);
|
|
417
|
+
expect(copy.data.asset.name).to.equal("photo (2).jpg");
|
|
418
|
+
expect(copy.data.asset.folderId).to.equal(folderId);
|
|
419
|
+
expect([copy.data.asset.width, copy.data.asset.height]).to.deep.equal([
|
|
420
|
+
PHOTO_WIDTH / 2,
|
|
421
|
+
PHOTO_HEIGHT,
|
|
422
|
+
]);
|
|
423
|
+
const source = await client.get(`/api/media/assets/${jpeg.id}`);
|
|
424
|
+
expect(source.data.asset.width).to.equal(PHOTO_WIDTH);
|
|
425
|
+
expect(source.data.asset.hasOriginal).to.equal(false);
|
|
426
|
+
});
|
|
396
427
|
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
428
|
+
it("renders successive edits from the original and resets on revert", async () => {
|
|
429
|
+
const model = GetModel(MediaAssetModel, DEFAULT_TENANT_ID);
|
|
430
|
+
const transform = (body: ImageTransformOps) =>
|
|
431
|
+
client.post(`/api/media/assets/${jpeg.id}/transform`, body);
|
|
432
|
+
expect((await transform({ rotate: 90 })).status).to.equal(HTTP_OK);
|
|
433
|
+
const cropped = await transform({
|
|
434
|
+
crop: { x: 0, y: 0, width: 1, height: 0.5 },
|
|
435
|
+
});
|
|
436
|
+
expect([
|
|
437
|
+
cropped.data.asset.width,
|
|
438
|
+
cropped.data.asset.height,
|
|
439
|
+
]).to.deep.equal([PHOTO_HEIGHT, PHOTO_WIDTH / 2]);
|
|
440
|
+
const edited = await model.get(jpeg.id);
|
|
441
|
+
expect(edited?.json_transform).to.be.a("string").and.not.equal("");
|
|
442
|
+
expect(edited?.originalSize).to.be.greaterThan(0);
|
|
443
|
+
const reverted = await client.post(`/api/media/assets/${jpeg.id}/revert`);
|
|
444
|
+
expect(reverted.data.asset.width).to.equal(PHOTO_WIDTH);
|
|
445
|
+
const restored = await model.get(jpeg.id);
|
|
446
|
+
expect(restored?.json_transform).to.equal("");
|
|
447
|
+
expect(restored?.originalSize).to.equal(0);
|
|
408
448
|
});
|
|
409
|
-
const auth = { Authorization: `Bearer ${token}` };
|
|
410
|
-
for (const attempt of [1, 2]) {
|
|
411
|
-
const thumb = await deliver(`/media/${id[0]}/thumb/gone.png`, auth);
|
|
412
|
-
expect(thumb.status, `attempt ${attempt}`).to.equal(
|
|
413
|
-
HTTP_SERVICE_UNAVAILABLE,
|
|
414
|
-
);
|
|
415
|
-
expect(thumb.body.toString()).to.not.contain("delivery-tests/");
|
|
416
|
-
}
|
|
417
|
-
});
|
|
418
449
|
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
450
|
+
it("refuses an edit rendered from a version someone replaced", async () => {
|
|
451
|
+
const model = GetModel(MediaAssetModel, DEFAULT_TENANT_ID);
|
|
452
|
+
const stale = await model.get(jpeg.id);
|
|
453
|
+
const edit = await client.post(`/api/media/assets/${jpeg.id}/transform`, {
|
|
454
|
+
rotate: 180,
|
|
455
|
+
});
|
|
456
|
+
expect(edit.status).to.equal(HTTP_OK);
|
|
457
|
+
const outcome = await applyImageTransform(model, stale!, {
|
|
458
|
+
rotate: 90,
|
|
459
|
+
}).catch((error: unknown) => error);
|
|
460
|
+
expect(outcome).to.be.instanceOf(MediaAssetChangedError);
|
|
461
|
+
const both = await Promise.all(
|
|
462
|
+
[90, 270].map((rotate) =>
|
|
463
|
+
client.post(`/api/media/assets/${jpeg.id}/transform`, { rotate }),
|
|
464
|
+
),
|
|
465
|
+
);
|
|
466
|
+
const statuses = both.map((response) => response.status);
|
|
467
|
+
expect(statuses).to.include(HTTP_OK);
|
|
468
|
+
expect(
|
|
469
|
+
statuses.every((s) => s === HTTP_OK || s === HTTP_CONFLICT),
|
|
470
|
+
).to.equal(true);
|
|
471
|
+
await client.post(`/api/media/assets/${jpeg.id}/revert`);
|
|
472
|
+
});
|
|
434
473
|
});
|
|
474
|
+
}
|
|
435
475
|
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
476
|
+
describe("[integration] media delivery and editing — cache, orientation, active content, copies", () => {
|
|
477
|
+
before(async function () {
|
|
478
|
+
this.timeout(40_000);
|
|
479
|
+
const session = await ensureOwnerSession();
|
|
480
|
+
token = session.accessToken;
|
|
481
|
+
client = authorizedClient(token);
|
|
482
|
+
const folder = await client.post("/api/media/folders", {
|
|
483
|
+
name: "Delivery and editing",
|
|
443
484
|
});
|
|
444
|
-
expect(
|
|
445
|
-
|
|
485
|
+
expect(folder.status).to.equal(HTTP_OK);
|
|
486
|
+
folderId = readBody(folder, createdBody).id;
|
|
487
|
+
jpeg = await uploadAsset(
|
|
488
|
+
client,
|
|
489
|
+
folderId,
|
|
490
|
+
"photo.jpg",
|
|
491
|
+
"image/jpeg",
|
|
492
|
+
await photo(),
|
|
446
493
|
);
|
|
447
|
-
const edited = await model.get(jpeg.id);
|
|
448
|
-
expect(edited?.json_transform).to.be.a("string").and.not.equal("");
|
|
449
|
-
expect(edited?.originalSize).to.be.greaterThan(0);
|
|
450
|
-
const reverted = await client.post(`/api/media/assets/${jpeg.id}/revert`);
|
|
451
|
-
expect(reverted.data.asset.width).to.equal(PHOTO_WIDTH);
|
|
452
|
-
const restored = await model.get(jpeg.id);
|
|
453
|
-
expect(restored?.json_transform).to.equal("");
|
|
454
|
-
expect(restored?.originalSize).to.equal(0);
|
|
455
494
|
});
|
|
456
495
|
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
const stale = await model.get(jpeg.id);
|
|
460
|
-
const edit = await client.post(`/api/media/assets/${jpeg.id}/transform`, {
|
|
461
|
-
rotate: 180,
|
|
462
|
-
});
|
|
463
|
-
expect(edit.status).to.equal(HTTP_OK);
|
|
464
|
-
const outcome = await applyImageTransform(model, stale!, {
|
|
465
|
-
rotate: 90,
|
|
466
|
-
}).catch((error: unknown) => error);
|
|
467
|
-
expect(outcome).to.be.instanceOf(MediaAssetChangedError);
|
|
468
|
-
const both = await Promise.all(
|
|
469
|
-
[90, 270].map((rotate) =>
|
|
470
|
-
client.post(`/api/media/assets/${jpeg.id}/transform`, { rotate }),
|
|
471
|
-
),
|
|
472
|
-
);
|
|
473
|
-
const statuses = both.map((response) => response.status);
|
|
474
|
-
expect(statuses).to.include(HTTP_OK);
|
|
475
|
-
expect(
|
|
476
|
-
statuses.every((s) => s === HTTP_OK || s === HTTP_CONFLICT),
|
|
477
|
-
).to.equal(true);
|
|
478
|
-
await client.post(`/api/media/assets/${jpeg.id}/revert`);
|
|
496
|
+
after(async () => {
|
|
497
|
+
await client.delete(`/api/media/folders/${folderId}`);
|
|
479
498
|
});
|
|
499
|
+
|
|
500
|
+
describeDeliveryLinks();
|
|
501
|
+
describeRenderedImages();
|
|
502
|
+
describeUnusualFiles();
|
|
503
|
+
describeEdits();
|
|
480
504
|
});
|