Clipper: Fix process stopping because one resource can't be created (#10337)

packages/lib/services/rest/routes/notes.test.ts

@@ -151,12 +151,13 @@ describe('routes/notes', () => {
 	});
 
 	test('should not create resource from files that does not exist', async () => {
-		expect(
+		Logger.globalLogger.enabled = false;
-			async () => createResourcesFromPaths([
+		const result = await createResourcesFromPaths([
-				{ originalUrl: 'not-a-real-file', path: '/does/not/exist' },
+			{ originalUrl: 'not-a-real-file', path: '/does/not/exist' },
-			]),
+		]);
-		).rejects.toThrow('Cannot access /does/not/exist');
+		Logger.globalLogger.enabled = true;
 
+		expect(result[0].resource).toBe(null);
 		const resources = await Resource.all();
 		expect(resources.length).toBe(0);
 	});
@@ -173,4 +174,14 @@ describe('routes/notes', () => {
 		expect(await Note.load(note2.id)).toBeFalsy();
 	});
 
+	test('should not stop execution if a file can not be processed', async () => {
+		Logger.globalLogger.enabled = false;
+		const result = await createResourcesFromPaths([
+			{ originalUrl: 'asdf.png', path: `${__dirname}/bad-path-should-not-exist` },
+			{ originalUrl: 'asdf.png', path: `${__dirname}/../../../images/SideMenuHeader.png` },
+		]);
+		Logger.globalLogger.enabled = true;
+
+		expect(result.length).toBe(2);
+	});
 });

packages/lib/services/rest/routes/notes.ts

@@ -29,6 +29,7 @@ const { ErrorNotFound } = require('../utils/errors');
 import { fileUriToPath } from '@joplin/utils/url';
 import { NoteEntity, ResourceEntity } from '../../database/types';
 import { DownloadController } from '../../../downloadController';
+import { FetchBlobOptions } from '../../../types';
 
 const logger = Logger.create('routes/notes');
 
@@ -68,11 +69,11 @@ type RequestNote = {
 	stylesheets: any;
 };
 
-type FetchOptions = {
+interface FetchOptions extends FetchBlobOptions {
 	timeout?: number;
 	maxRedirects?: number;
 	downloadController?: DownloadController;
-};
+}
 
 
 type DownloadedMediaFile = {
@@ -80,7 +81,7 @@ type DownloadedMediaFile = {
 	path: string;
 };
 
-interface ResourceFromPath extends DownloadedMediaFile {
+export interface ResourceFromPath extends DownloadedMediaFile {
 	resource: ResourceEntity;
 }
 
@@ -315,20 +316,17 @@ async function downloadMediaFiles(urls: string[], fetchOptions?: FetchOptions, a
 }
 
 export async function createResourcesFromPaths(mediaFiles: DownloadedMediaFile[]) {
-	const resources: Promise<ResourceFromPath>[] = [];
+	const processFile = async (mediaFile: DownloadedMediaFile) => {
-
-	for (const mediaFile of mediaFiles) {
 		try {
-			resources.push(
+			const resource = await shim.createResourceFromPath(mediaFile.path);
-				shim.createResourceFromPath(mediaFile.path)
+			return { ...mediaFile, resource };
-					// eslint-disable-next-line
-					.then(resource => ({ ...mediaFile, resource }))
-			);
 		} catch (error) {
 			logger.warn(`Cannot create resource for ${mediaFile.originalUrl}`, error);
+			return { ...mediaFile, resource: null };
 		}
-	}
+	};
 
+	const resources = mediaFiles.map(processFile);
 	return Promise.all(resources);
 }
 

packages/lib/shim-init-node.ts

@@ -9,9 +9,9 @@ import * as fs from 'fs-extra';
 import * as pdfJsNamespace from 'pdfjs-dist';
 import { writeFile } from 'fs/promises';
 import { ResourceEntity } from './services/database/types';
-import { DownloadController } from './downloadController';
 import { TextItem } from 'pdfjs-dist/types/src/display/api';
 import replaceUnsupportedCharacters from './utils/replaceUnsupportedCharacters';
+import { FetchBlobOptions } from './types';
 
 import FileApiDriverLocal from './file-api-driver-local';
 const mimeUtils = require('./mime-utils.js').mime;
@@ -27,16 +27,6 @@ const dgram = require('dgram');
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 const proxySettings: any = {};
 
-type FetchBlobOptions = {
-	path?: string;
-	method?: string;
-	maxRedirects?: number;
-	timeout?: number;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
-	headers?: any;
-	downloadController?: DownloadController;
-};
-
 function fileExists(filePath: string) {
 	try {
 		return fs.statSync(filePath).isFile();

packages/lib/types.ts

@@ -1,3 +1,5 @@
+import { DownloadController } from './downloadController';
+
 export enum ApplicationPlatform {
 	Unknown = 0,
 	Windows = 1,
@@ -13,3 +15,12 @@ export enum ApplicationType {
 	Mobile = 2,
 	Cli = 3,
 }
+
+export type FetchBlobOptions = {
+	path?: string;
+	method?: string;
+	maxRedirects?: number;
+	timeout?: number;
+	headers?: Record<string, string>;
+	downloadController?: DownloadController;
+};