Merge pull request #1341 from melonjs/fix/loader-parser-bugs

Fix bugs in loader parsers

Author: obiot

packages/melonjs/src/loader/parsers/fontface.js

@@ -8,8 +8,8 @@ import { fontList } from "../cache.js";
  * @returns {number} the amount of corresponding resource parsed/preloaded
  * @ignore
  * @example
- * preloadFontFace(
- *     name: "'kenpixel'", type: "fontface",  src: "data/font/kenvector_future.woff2"
+ * preloadFontFace([
+ *     { name: "'kenpixel'", type: "fontface", src: "data/font/kenvector_future.woff2" }
  * ]);
  */
 export function preloadFontFace(data, onload, onerror) {
@@ -39,10 +39,10 @@ export function preloadFontFace(data, onload, onerror) {
 					onload();
 				}
 			},
-			() => {
+			(error) => {
 				// rejected
 				if (typeof onerror === "function") {
-					onerror(data.name);
+					onerror(error);
 				}
 			},
 		);

packages/melonjs/src/loader/parsers/script.js

@@ -12,7 +12,7 @@ export function preloadJavascript(data, onload, onerror, settings) {
 
 	script.src = data.src;
 	script.type = "text/javascript";
-	if (typeof crossOrigin === "string") {
+	if (typeof settings.crossOrigin === "string") {
 		script.crossOrigin = settings.crossOrigin;
 	}
 	script.defer = true;

packages/melonjs/src/loader/parsers/video.js

@@ -1,6 +1,6 @@
 import { hasVideoFormat } from "../../system/device.js";
 import * as fileUtil from "../../utils/file.ts";
-import { isDataUrl } from "./../../utils/string.ts";
+import { isDataUrl } from "../../utils/string.ts";
 import { videoList } from "../cache.js";
 import { fetchData } from "./fetchdata.js";
 
@@ -23,7 +23,8 @@ export function preloadVideo(data, onload, onerror, settings) {
 		globalThis.document.createElement("video"));
 
 	if (isDataUrl(data.src)) {
-		const mimeType = data.src.match(/[^:]\w+\/[\w-+\d.]+(?=;|,)/)[0];
+		const mimeMatch = data.src.match(/[^:]\w+\/[\w-+\d.]+(?=;|,)/);
+		const mimeType = mimeMatch ? mimeMatch[0] : null;
 		if (!mimeType || videoElement.canPlayType(mimeType) === "") {
 			throw new Error(
 				`Invalid dataURL or Video file format not supported: ${mimeType}`,
@@ -86,8 +87,8 @@ export function preloadVideo(data, onload, onerror, settings) {
 	}
 
 	if (typeof onerror === "function") {
-		videoElement.onerror = () => {
-			onerror();
+		videoElement.onerror = (error) => {
+			onerror(error);
 		};
 	}
 

packages/melonjs/tests/loader.spec.js

@@ -393,4 +393,86 @@ describe("loader", () => {
 		expect(loader.unload({ name: "nope", type: "tmx" })).toBe(false);
 		expect(loader.unload({ name: "nope", type: "video" })).toBe(false);
 	});
+
+	it("should call onerror for invalid image sources", async () => {
+		await expect(
+			new Promise((resolve, reject) => {
+				loader.load(
+					{
+						name: "bad_image",
+						type: "image",
+						src: "nonexistent/path/image.png",
+					},
+					() => {
+						reject(new Error("should not succeed"));
+					},
+					() => {
+						resolve(true);
+					},
+				);
+			}),
+		).resolves.toBe(true);
+	});
+
+	it("should call onerror for invalid JSON sources", async () => {
+		await expect(
+			new Promise((resolve, reject) => {
+				loader.load(
+					{
+						name: "bad_json",
+						type: "json",
+						src: "nonexistent/path/data.json",
+					},
+					() => {
+						reject(new Error("should not succeed"));
+					},
+					() => {
+						resolve(true);
+					},
+				);
+			}),
+		).resolves.toBe(true);
+	});
+
+	it("should call onerror for invalid binary sources", async () => {
+		await expect(
+			new Promise((resolve, reject) => {
+				loader.load(
+					{
+						name: "bad_binary",
+						type: "binary",
+						src: "nonexistent/path/data.bin",
+					},
+					() => {
+						reject(new Error("should not succeed"));
+					},
+					() => {
+						resolve(true);
+					},
+				);
+			}),
+		).resolves.toBe(true);
+	});
+
+	it("should handle inline TMX data and return 1", () => {
+		const result = loader.load(
+			{
+				name: "inline_tmx",
+				type: "tmx",
+				data: {
+					width: 1,
+					height: 1,
+					tilewidth: 32,
+					tileheight: 32,
+					orientation: "orthogonal",
+					renderorder: "right-down",
+					version: "1.10",
+					layers: [],
+					tilesets: [],
+				},
+			},
+			() => {},
+		);
+		expect(result).toBe(1);
+	});
 });