Merge pull request #13 from Q42/feature/sanitize-asset-src

Feature/sanitize asset src

Author: marcelduin

src/ts/image.ts

@@ -8,7 +8,7 @@ import type { PREDEFINED } from '../types/internal';
 import { BASEPATH, BASEPATH_V5, BASEPATH_V5_EU, DEFAULT_INFO, DEMO_IDS } from './globals';
 import { Camera } from './camera';
 import { readable, writable, get } from 'svelte/store';
-import { createGUID, deepCopy, fetchInfo, fetchJson, getIdVal, getLocalData, idIsV5, isFetching, loadSerialTour, once, sanitizeMarker } from './utils';
+import { createGUID, deepCopy, fetchInfo, fetchJson, getIdVal, getLocalData, idIsV5, isFetching, loadSerialTour, once, sanitizeImageData, sanitizeMarker } from './utils';
 import { State } from './state';
 import { archive } from './archive';
 
@@ -269,12 +269,7 @@ export class MicrioImage {
 		this.video.subscribe(v => this._video = v);
 
 		// Sanitize markers on data set
-		this.data.subscribe(d => {
-			// Ignore unpublished or deleted data languages
-			if(d?.revision) d.revision = Object.fromEntries(Object.entries((d?.revision??{})).filter(r => Number(r[1]) > 0));
-			d?.markers?.forEach(m => sanitizeMarker(m, this.is360, !this.isV5));
-			d?.embeds?.forEach(e => {if(!e.uuid) e.uuid = (e.id ?? e.micrioId)+'-'+Math.random()});
-		})
+		this.data.subscribe(d => sanitizeImageData(d, this.is360, this.isV5));
 	}
 
 	private setError(e:Error, err?:string) {

src/ts/utils.ts

@@ -213,10 +213,57 @@ export const fetchInfo = (id:string, path?:string) : Promise<Models.ImageInfo.Im
 			// Ancient Micrio support -- this is only the case for ancient static info.json files
 			/** @ts-ignore */
 			if(r) { if('Height' in r) { r.height = r['Height']; r.version = 1.0; r.tileSize = 512; } if('Width' in r) r.width = r['Width'] }
+			sanitizeImageInfo(r as Models.ImageInfo.ImageInfo|undefined);
 			return r as Models.ImageInfo.ImageInfo|undefined;
 		});
 }
 
+/** @internal */
+const ASSET_SRC_REPLACE: Record<string, string> = {
+	'micrio-cdn.azureedge.net': 'micrio.vangoghmuseum.nl/micrio',
+	'micrio-cdn.vangoghmuseum.nl': 'micrio.vangoghmuseum.nl/micrio',
+	'rijks-micrio.azureedge.net': 'micrio.rijksmuseum.nl'
+}
+
+/** @internal */
+export const sanitizeAsset = (a?:Models.Assets.BaseAsset) : void => {
+	if(a?.src) for(let r in ASSET_SRC_REPLACE)
+		if(a.src.includes(r)) a.src = a.src.replace(r, ASSET_SRC_REPLACE[r]);
+}
+
+/** @internal */
+const sanitizeImageInfo = (i:Models.ImageInfo.ImageInfo|undefined) => {
+	if(!i) return;
+	sanitizeAsset(i.organisation?.logo);
+	sanitizeAsset(i.settings?._markers?.markerIcon);
+	i.settings?._markers?.customIcons?.forEach(sanitizeAsset);
+	sanitizeAsset(i.settings?._360?.video);
+}
+
+/** @internal */
+export const sanitizeImageData = (d:Models.ImageData.ImageData|undefined, is360:boolean, isV5:boolean) => {
+	if (!d) return;
+	if(d.revision) d.revision = Object.fromEntries(Object.entries((d.revision??{})).filter(r => Number(r[1]) > 0));
+	d.embeds?.forEach(e => {
+		if(!e.uuid) e.uuid = (e.id ?? e.micrioId)+'-'+Math.random();
+		sanitizeAsset(e.video);
+	});
+	d.markers?.forEach(m => sanitizeMarker(m, is360, !isV5));
+	d.music?.items?.forEach(sanitizeAsset);
+	d.pages?.forEach(sanitizeMenuPage);
+}
+
+/** @internal */
+export const sanitizeSpaceData = (s:Models.Spaces.Space|undefined) => {
+	s?.icons?.forEach(sanitizeAsset);
+}
+
+/** @internal */
+const sanitizeMenuPage = (m:Models.ImageData.Menu) => {
+	sanitizeAsset(m.image);
+	m.children?.forEach(sanitizeMenuPage);
+}
+
 /** Fetch album/info.json from i.micr.io
  * @internal
 */
@@ -234,13 +281,6 @@ export const sanitizeMarker = (m:Models.ImageData.Marker, is360:boolean, isOld:b
 	if(!('type' in m)) m.type = 'default';
 	if(!m.popupType) m.popupType = 'popup';
 
-	// Old data model for split screen
-	const oldSplitLink = m.data?._meta?.secondary;
-	if(oldSplitLink) m.data.micrioSplitLink = oldSplitLink;
-
-	if(isOld && 'class' in m) m.tags.push(...(m.class as string).split(' ').map(t => t.trim()).filter(t => !!t && !m.tags.includes(t)))
-	if(m.tags.includes('default')) m.type = 'default';
-
 	// String-based marker icons
 	if(typeof m.data.icon == 'string') m.data.icon = {
 		title: '',
@@ -251,6 +291,18 @@ export const sanitizeMarker = (m:Models.ImageData.Marker, is360:boolean, isOld:b
 		src: m.data.icon as string
 	}
 
+	m.images?.forEach(sanitizeAsset);
+	sanitizeAsset(m.positionalAudio);
+	sanitizeAsset(m.data?.icon);
+	Object.values(m.i18n ?? {}).forEach(d => sanitizeAsset(d.audio))
+
+	// Old data model for split screen
+	const oldSplitLink = m.data?._meta?.secondary;
+	if(oldSplitLink) m.data.micrioSplitLink = oldSplitLink;
+
+	if(isOld && 'class' in m) m.tags.push(...(m.class as string).split(' ').map(t => t.trim()).filter(t => !!t && !m.tags.includes(t)))
+	if(m.tags.includes('default')) m.type = 'default';
+
 	// Correct 360 marker view on the X-edge
 	if(is360 && m.view && m.view[2] < m.view[0]) m.view[2]++;
 }
@@ -270,6 +322,7 @@ export async function loadSerialTour(image:MicrioImage, tour:Models.ImageData.Ma
 		)));
 
 	micData.forEach(d => d?.markers?.forEach(m => sanitizeMarker(m, image.is360, !image.isV5)));
+	sanitizeAsset(tour.image);
 
 	let chapter:number = -1;
 	const notFound:number[] = [];
@@ -281,10 +334,15 @@ export async function loadSerialTour(image:MicrioImage, tour:Models.ImageData.Ma
 		if(content?.title) chapter = i;
 		const vTourData = !m?.videoTour ? undefined : 'timeline' in m.videoTour ? <unknown>m as Models.ImageData.VideoTourCultureData
 			: m.videoTour.i18n?.[lang] ?? undefined;
+		sanitizeAsset(vTourData?.audio);
+		sanitizeAsset(vTourData?.subtitle);
 		if(!m) {
 			console.warn(`[Micrio] Warning: tour step ${i+1} with id [${id}] not found! Removing it from the tour`);
 			notFound.push(i);
 		}
+
+		sanitizeAsset(content?.audio);
+
 		return !m ? undefined : {
 			markerId: id,
 			marker: m,