markdown-exit-s3-image 0.0.1 → 0.0.2

package/dist/index.mjs

@@ -138,6 +138,12 @@ function image(md, userOptions) {
 	const cache = cachePath ? new ImageCache(cachePath) : null;
 	let cacheLoaded = false;
 	let imageCount = 0;
+	if (cache && !cacheLoaded) {
+		cache.load().catch((err) => {
+			console.error("[ImageCache] Failed to load cache:", err);
+		});
+		cacheLoaded = true;
+	}
 	process.once("beforeExit", () => {
 		if (cache) cache.save();
 	});
@@ -150,10 +156,6 @@ function image(md, userOptions) {
 		if (!src.startsWith("http")) return imageRule(tokens, idx, info, env, self);
 		if (!isSupportedDomain(src, options.supported_domains)) return imageRule(tokens, idx, info, env, self);
 		if (shouldIgnoreFormat(src, options.ignore_formats)) return imageRule(tokens, idx, info, env, self);
-		if (!cacheLoaded && cache) {
-			await cache.load();
-			cacheLoaded = true;
-		}
 		try {
 			if (cache) {
 				const cached = cache.get(src);
@@ -165,9 +167,14 @@ function image(md, userOptions) {
 			const response = await fetch(src);
 			const image$1 = sharp(Buffer.from(await response.arrayBuffer()));
 			const { width, height } = await image$1.metadata();
-			const { data: thumbnailBuffer, info: thumbnailInfo } = await image$1.resize(100, 100, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
-			const placeholderUrl = rgbaToDataURL(thumbnailInfo.width, thumbnailInfo.height, new Uint8Array(thumbnailBuffer));
-			if (cache) cache.set(src, {
+			let placeholderUrl = "";
+			try {
+				const { data: thumbnailBuffer, info: thumbnailInfo } = await image$1.resize(100, 100, { fit: "inside" }).ensureAlpha().raw().toBuffer({ resolveWithObject: true });
+				placeholderUrl = rgbaToDataURL(thumbnailInfo.width, thumbnailInfo.height, new Uint8Array(thumbnailBuffer));
+			} catch (thumbErr) {
+				console.warn(`[ImageCache] Failed to generate placeholder for ${src}: ${thumbErr instanceof Error ? thumbErr.message : String(thumbErr)}`);
+			}
+			if (cache && placeholderUrl) cache.set(src, {
 				width,
 				height,
 				placeholder: placeholderUrl
@@ -189,12 +196,17 @@ function generateSrcset(src, width, srcsetWidths) {
 function buildImageHTML(alt, src, options, imageIndex, width, height, dataURL) {
 	const srcset = generateSrcset(src, width, options.progressive.srcset_widths);
 	const shouldLazyLoad = options.lazy.enable && imageIndex > options.lazy.skip_first;
-	/**
-	* 4. 返回包装后的 HTML
-	* - 外层 div 控制最大宽度并占用占位空间
-	* - aspect-ratio 确保容器高度在图片加载前就已确定
-	* - background-image 放置低分辨率模糊预览图 (dataURL)
-	*/
+	const mainImgAttrs = [
+		`src="${src}"`,
+		`alt="${alt}"`,
+		`width="${width}"`,
+		`height="${height}"`,
+		`srcset="${srcset}"`,
+		`sizes="${options.progressive.sizes || `(max-width: ${width}px) 100vw, ${width}px`}"`,
+		shouldLazyLoad ? "loading=\"lazy\" decoding=\"async\"" : "fetchpriority=\"high\"",
+		`style="width: 100%; height: auto; display: block; transition: opacity 0.4s; opacity: 0;"`,
+		`onload="this.style.opacity=1; this.parentElement.style.backgroundImage='none';"`
+	].filter(Boolean).join(" ");
 	return `
     <div class="img-container" style="
       position: relative;
@@ -202,21 +214,11 @@ function buildImageHTML(alt, src, options, imageIndex, width, height, dataURL) {
       aspect-ratio: ${width} / ${height};
       max-width: ${width}px;
       width: 100%;
-      background-image: url('${dataURL}');
+      ${dataURL ? `background-image: url('${dataURL}');` : ""}
       background-size: cover;
       background-repeat: no-repeat;
     ">
-      <img ${[
-		`src="${src}"`,
-		`alt="${alt}"`,
-		`width="${width}"`,
-		`height="${height}"`,
-		`srcset="${srcset}"`,
-		`sizes="${options.progressive.sizes || `(max-width: ${width}px) 100vw, ${width}px`}"`,
-		shouldLazyLoad ? "loading=\"lazy\" decoding=\"async\"" : "fetchpriority=\"high\"",
-		`style="width: 100%; height: auto; display: block; transition: opacity 0.4s; opacity: 0;"`,
-		`onload="this.style.opacity=1; this.parentElement.style.backgroundImage='none';"`
-	].filter(Boolean).join(" ")}>
+      <img ${mainImgAttrs}>
     </div>
   `;
 }

package/package.json

@@ -2,8 +2,12 @@
   "name": "markdown-exit-s3-image",
   "type": "module",
   "author": "gnix_aij",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Efterklang/markdown-exit-s3-image.git"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -36,6 +40,7 @@
   "devDependencies": {
     "@tsconfig/node20": "^20.1.8",
     "@types/node": "^24.10.1",
-    "tsdown": "^0.16.6"
+    "tsdown": "^0.16.6",
+    "typescript": "^5.9.3"
   }
 }