satoru-render 1.0.11 → 1.0.12

package/dist/workers-parent.js

@@ -547,6 +547,7 @@ var SatoruBase = class {
 		this.currentFontMap = options.fontMap ?? DEFAULT_FONT_MAP;
 		const instancePtr = mod.create_instance();
 		mod.set_font_map(instancePtr, this.currentFontMap);
+		mod.set_collect_profile_enabled(instancePtr, profileEnabled);
 		try {
 			const defaultResolver = (r) => this.resolveDefaultResource(r, baseUrl, options.userAgent);
 			const resolver = options.resolveResource ? async (r) => {
@@ -590,6 +591,8 @@ var SatoruBase = class {
 			};
 			const inputHtmls = Array.isArray(value) ? value : [value];
 			const processedHtmls = [];
+			const utf8Decoder = new TextDecoder();
+			const utf8Encoder = new TextEncoder();
 			const resolvedResources = /* @__PURE__ */ new Set();
 			for (const rawHtml of inputHtmls) {
 				let processedHtml = rawHtml;
@@ -597,7 +600,16 @@ var SatoruBase = class {
 					addProfile("collectResourcesCount", 1);
 					const collectStart = now();
 					mod.collect_resources(instancePtr, processedHtml, width, height, options.mediaType === "print" ? 1 : 0);
-					addProfile("collectResources", now() - collectStart);
+					const collectElapsed = now() - collectStart;
+					addProfile("collectResources", collectElapsed);
+					addProfile(`collectResourcesRound${i + 1}`, collectElapsed);
+					if (profileEnabled) try {
+						const collectProfile = JSON.parse(mod.get_collect_profile(instancePtr));
+						for (const [key, value] of Object.entries(collectProfile)) {
+							addProfile(key, value);
+							addProfile(`${key}Round${i + 1}`, value);
+						}
+					} catch {}
 					const pendingStart = now();
 					const binary = mod.get_pending_resources(instancePtr);
 					addProfile("getPendingResources", now() - pendingStart);
@@ -613,15 +625,15 @@ var SatoruBase = class {
 						const redraw_on_ready = view.getUint8(offset++) !== 0;
 						const urlLen = view.getUint32(offset, true);
 						offset += 4;
-						const url = new TextDecoder().decode(new Uint8Array(binary.buffer, binary.byteOffset + offset, urlLen));
+						const url = utf8Decoder.decode(new Uint8Array(binary.buffer, binary.byteOffset + offset, urlLen));
 						offset += urlLen;
 						const nameLen = view.getUint32(offset, true);
 						offset += 4;
-						const name = new TextDecoder().decode(new Uint8Array(binary.buffer, binary.byteOffset + offset, nameLen));
+						const name = utf8Decoder.decode(new Uint8Array(binary.buffer, binary.byteOffset + offset, nameLen));
 						offset += nameLen;
 						const charsLen = view.getUint32(offset, true);
 						offset += 4;
-						const characters = new TextDecoder().decode(new Uint8Array(binary.buffer, binary.byteOffset + offset, charsLen));
+						const characters = utf8Decoder.decode(new Uint8Array(binary.buffer, binary.byteOffset + offset, charsLen));
 						offset += charsLen;
 						let type = "font";
 						if (typeInt === 2) type = "image";
@@ -636,16 +648,31 @@ var SatoruBase = class {
 					}
 					const pending = resources.filter((r) => {
 						const key = `${r.type}:${r.url}:${r.characters ?? ""}`;
+						if (r.type === "font" && resolvedResources.has(`font:${r.url}:`)) return false;
 						return !resolvedResources.has(key);
 					});
+					addProfile("pendingResourcesCount", pending.length);
+					addProfile(`pendingResourcesRound${i + 1}Count`, pending.length);
+					for (const r of pending) if (r.type === "font") {
+						addProfile("pendingFontResourcesCount", 1);
+						addProfile(`pendingFontResourcesRound${i + 1}Count`, 1);
+					} else if (r.type === "css") {
+						addProfile("pendingCssResourcesCount", 1);
+						addProfile(`pendingCssResourcesRound${i + 1}Count`, 1);
+					} else if (r.type === "image") {
+						addProfile("pendingImageResourcesCount", 1);
+						addProfile(`pendingImageResourcesRound${i + 1}Count`, 1);
+					}
 					addProfile("parsePendingResources", now() - parseStart);
 					if (pending.length === 0) break;
+					addProfile("pendingResourceRoundsCount", 1);
 					const loadStart = now();
 					await Promise.all(pending.map(async (r) => {
 						try {
 							if (r.url.startsWith("data:")) return;
 							const key = `${r.type}:${r.url}:${r.characters ?? ""}`;
 							resolvedResources.add(key);
+							if (r.type === "font") resolvedResources.add(`font:${r.url}:`);
 							const data = await cachedResolver({ ...r });
 							if (!data) return;
 							if (typeof data === "object" && "css" in data && "fonts" in data) {
@@ -661,7 +688,7 @@ var SatoruBase = class {
 							if (data instanceof Uint8Array || ArrayBuffer.isView(data)) {
 								let finalUint8 = data instanceof Uint8Array ? data : new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
 								if (r.type === "css") {
-									const cssText = new TextDecoder().decode(finalUint8);
+									const cssText = utf8Decoder.decode(finalUint8);
 									const isAbsolute = /^[a-z][a-z0-9+.-]*:/i.test(r.url) || r.url.startsWith("data:");
 									let cssBaseUrl = r.url;
 									if (!isAbsolute && baseUrl) try {
@@ -677,7 +704,7 @@ var SatoruBase = class {
 												return match;
 											}
 										});
-										finalUint8 = new TextEncoder().encode(rewrittenCss);
+										finalUint8 = utf8Encoder.encode(rewrittenCss);
 									}
 								}
 								await loadResourceData(r, finalUint8);
@@ -744,7 +771,7 @@ var SatoruBase = class {
 			}
 			if (format === "svg") {
 				const decodeStart = now();
-				const svg = new TextDecoder().decode(result);
+				const svg = utf8Decoder.decode(result);
 				addProfile("decodeResult", now() - decodeStart);
 				options.onProfile?.(profile);
 				return svg;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "satoru-render",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "High-fidelity HTML/CSS to SVG/PNG/PDF converter running in WebAssembly",
   "type": "module",
   "main": "./dist/index.js",
@@ -8,10 +8,6 @@
   "bin": {
     "satoru-render": "./dist/cli.js"
   },
-  "scripts": {
-    "build": "tsc -b && rolldown -c rolldown.config.js",
-    "deploy": "npm publish"
-  },
   "exports": {
     ".": {
       "workerd": {
@@ -164,5 +160,9 @@
     "@unocss/preset-wind4": {
       "optional": true
     }
+  },
+  "scripts": {
+    "build": "tsc -b && rolldown -c rolldown.config.js",
+    "deploy": "npm publish"
   }
-}
+}