Fixing mismatch with asset exporting to NPX files (#391)

app/src/app/epics/NotepadEpics.ts

@@ -599,27 +599,18 @@ async function getNotepadMarkdownWithAssets(notepad: Notepad): Promise<IExported
 	return { title: notepad.title, content: await notepad.toMarkdown(assets) };
 }
 
-export function getAssets(notepadAssets: string[]): Promise<Asset[]> {
-	return new Promise<Asset[]>(resolve => {
-		const assets: Asset[] = [];
-
-		if (!notepadAssets || notepadAssets.length === 0) {
-			resolve(assets);
-			return;
-		}
-
-		const resolvedAssets: Promise<Blob | null>[] = [];
-		for (let uuid of notepadAssets) {
-			resolvedAssets.push(ASSET_STORAGE.getItem(uuid));
-		}
-
-		Promise.all(resolvedAssets)
-			.then((blobs: Array<Blob | null>) => {
-				blobs
-					.filter((blob): blob is Blob => !!blob)
-					.forEach((blob: Blob, i: number) => assets.push(new Asset(blob, notepadAssets[i])));
-
-				resolve(assets);
-			});
-	});
+export async function getAssets(notepadAssets: string[]): Promise<Asset[]> {
+	const resolvedAssets: Array<Asset | null> = await Promise.all(notepadAssets.map(uuid =>
+		ASSET_STORAGE.getItem<Blob>(uuid)
+			.then(blob => {
+				if (!blob) return null;
+				return new Asset(blob, uuid);
+			})
+			.catch(e => {
+				console.warn('skipping asset in export because: ', e);
+				return null;
+			})
+	));
+
+	return resolvedAssets.filter((asset): asset is Asset => !!asset);
 }

app/src/app/services/DifferenceEngine.ts

@@ -138,7 +138,7 @@ export function uploadAsset(url: string, asset: Blob): Observable<void> {
 		body: asset,
 		crossDomain: true,
 		headers: {
-			'Content-Type': 'application/octet-stream'
+			'Content-Type': asset.type
 		}
 	}).pipe(
 		map(() => undefined),