markdown-exit-s3-image 0.0.2 → 0.0.3

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { r as Options } from "./types-CsakQe1p.mjs";
+import { n as Options } from "./types-DK7PR0JE.mjs";
 import { MarkdownExit } from "markdown-exit";
 
 //#region src/index.d.ts

package/dist/index.mjs

@@ -1,5 +1,3 @@
-import sharp from "sharp";
-import { rgbaToDataURL } from "thumbhash";
 import { promises } from "node:fs";
 
 //#region src/cache.ts
@@ -41,16 +39,18 @@ var ImageCache = class {
 		}
 	}
 	get(key) {
-		if (this.cache[key]) {
+		const decodedKey = decodeURIComponent(key);
+		if (this.cache[decodedKey]) {
 			this.stats.cacheHits++;
-			return this.cache[key];
+			return this.cache[decodedKey];
 		}
 		this.stats.apiRequests++;
 		return null;
 	}
 	set(key, value) {
-		if (JSON.stringify(this.cache[key]) !== JSON.stringify(value)) {
-			this.cache[key] = value;
+		const decodedKey = decodeURIComponent(key);
+		if (JSON.stringify(this.cache[decodedKey]) !== JSON.stringify(value)) {
+			this.cache[decodedKey] = value;
 			this.isDirty = true;
 		}
 	}
@@ -81,12 +81,16 @@ function resolveOptions(userOptions = {}) {
 				3e3
 			]
 		},
-		lazy: {
-			enable: true,
-			skip_first: 2
-		},
-		supported_domains: [],
-		ignore_formats: ["svg"],
+		ignore_formats: [
+			"svg",
+			"gif",
+			"webm"
+		],
+		bitiful_domains: [
+			"assets.vluv.space",
+			"s3.bitiful.net",
+			"bitiful.com"
+		],
 		cache_path: null
 	};
 	return {
@@ -96,35 +100,68 @@ function resolveOptions(userOptions = {}) {
 			...defaultOptions.progressive,
 			...userOptions.progressive
 		},
-		lazy: {
-			...defaultOptions.lazy,
-			...userOptions.lazy
-		},
-		supported_domains: userOptions.supported_domains ?? defaultOptions.supported_domains,
 		ignore_formats: userOptions.ignore_formats ?? defaultOptions.ignore_formats,
+		bitiful_domains: userOptions.bitiful_domains ?? defaultOptions.bitiful_domains,
 		cache_path: userOptions.cache_path ?? defaultOptions.cache_path
 	};
 }
 
 //#endregion
-//#region src/index.ts
+//#region src/bitiful.ts
 /**
-* Determine whether a remote URL matches the supported domain list.
-* Supports wildcards (*) for pattern matching.
+* Bitiful CDN integration utilities
 */
-function isSupportedDomain(url, patterns) {
-	if (patterns.length === 0) return true;
+/**
+* Check if URL belongs to Bitiful CDN.
+*/
+function isBitifulDomain(url, bitifulDomains) {
 	try {
 		const hostname = new URL(url).hostname;
-		return patterns.some((pattern) => {
-			const regexPattern = pattern.replace(/\./g, "\\.").replace(/\*/g, ".*");
-			return new RegExp(`^${regexPattern}$`, "i").test(hostname);
-		});
+		return bitifulDomains.some((domain) => hostname.includes(domain));
 	} catch {
 		return false;
 	}
 }
 /**
+* Fetch dimension info from Bitiful API.
+*/
+async function getBitifulDimension(imageUrl) {
+	try {
+		const baseUrl = imageUrl.split("?")[0];
+		const response = await fetch(`${baseUrl}?fmt=info`);
+		if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+		const { ImageWidth: width, ImageHeight: height } = await response.json();
+		if (typeof width === "number" && typeof height === "number") return {
+			width,
+			height
+		};
+		return null;
+	} catch (error) {
+		console.warn(`[Bitiful] Dimension error for ${imageUrl}:`, error instanceof Error ? error.message : String(error));
+		return null;
+	}
+}
+/**
+* Fetch thumbhash data URL from Bitiful API.
+*/
+async function getBitifulThumbhash(imageUrl) {
+	try {
+		const baseUrl = imageUrl.split("?")[0];
+		const response = await fetch(`${baseUrl}?fmt=thumbhash`);
+		if (!response.ok) throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+		const base64String = await response.text();
+		const thumbhashBytes = new Uint8Array(Buffer.from(base64String.trim(), "base64"));
+		const { thumbHashToDataURL } = await import("thumbhash");
+		return thumbHashToDataURL(thumbhashBytes);
+	} catch (error) {
+		console.warn(`[Bitiful] Thumbhash error for ${imageUrl}:`, error instanceof Error ? error.message : String(error));
+		return null;
+	}
+}
+
+//#endregion
+//#region src/index.ts
+/**
 * Check if file format should be ignored based on URL extension.
 */
 function shouldIgnoreFormat(url, formats) {
@@ -136,14 +173,9 @@ function image(md, userOptions) {
 	if (!options.progressive.enable) return;
 	const cachePath = options.cache_path;
 	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;
-	}
+	if (cache) cache.load().catch((err) => {
+		console.error("[ImageCache] Failed to load cache:", err);
+	});
 	process.once("beforeExit", () => {
 		if (cache) cache.save();
 	});
@@ -152,39 +184,28 @@ function image(md, userOptions) {
 	md.renderer.rules.image = async (tokens, idx, info, env, self) => {
 		const token = tokens[idx];
 		const src = token.attrGet("src");
-		if (!src) return imageRule(tokens, idx, info, env, self);
-		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);
-		try {
-			if (cache) {
-				const cached = cache.get(src);
-				if (cached) {
-					imageCount++;
-					return buildImageHTML(token.content, src, options, imageCount, cached.width, cached.height, cached.placeholder);
-				}
-			}
-			const response = await fetch(src);
-			const image$1 = sharp(Buffer.from(await response.arrayBuffer()));
-			const { width, height } = await image$1.metadata();
-			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
-			});
-			imageCount++;
-			return buildImageHTML(token.content, src, options, imageCount, width, height, placeholderUrl);
-		} catch (e) {
-			console.error(`[markdown-exit-image] Error processing image ${src}:`, e);
+		if (!src || !src.startsWith("http") || !isBitifulDomain(src, options.bitiful_domains) || shouldIgnoreFormat(src, options.ignore_formats) || process.env.NODE_ENV == "development") return imageRule(tokens, idx, info, env, self);
+		if (cache) {
+			const cached = cache.get(src);
+			if (cached) return buildImageHTML(token.content, src, options, cached.width, cached.height, cached.dataURL);
+		}
+		let width;
+		let height;
+		let placeholderUrl = "";
+		const [dimensionResult, thumbhashResult] = await Promise.all([getBitifulDimension(src), getBitifulThumbhash(src)]);
+		if (!dimensionResult) {
+			console.warn(`[ImagePlugin] Skipping progressive image for ${src} - dimensions unavailable`);
 			return imageRule(tokens, idx, info, env, self);
 		}
+		width = dimensionResult.width;
+		height = dimensionResult.height;
+		placeholderUrl = thumbhashResult || "";
+		if (cache && placeholderUrl) cache.set(src, {
+			width,
+			height,
+			dataURL: placeholderUrl
+		});
+		return buildImageHTML(token.content, src, options, width, height, placeholderUrl);
 	};
 }
 function generateSrcset(src, width, srcsetWidths) {
@@ -193,34 +214,34 @@ function generateSrcset(src, width, srcsetWidths) {
 		return `${w === width ? src : src.includes("?") ? `${src}&w=${w}` : `${src}?w=${w}`} ${w}w`;
 	}).join(", ");
 }
-function buildImageHTML(alt, src, options, imageIndex, width, height, dataURL) {
+function buildImageHTML(alt, src, options, width, height, dataURL) {
 	const srcset = generateSrcset(src, width, options.progressive.srcset_widths);
-	const shouldLazyLoad = options.lazy.enable && imageIndex > options.lazy.skip_first;
 	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';"`
+		`loading="lazy" decoding="async"`,
+		`style="width: 100%; height: 100%; object-fit: cover; opacity: 0; transition: opacity 0.6s ease-in-out;"`,
+		`onload="this.style.opacity=1; setTimeout(() => { this.parentElement.style.backgroundImage='none'; }, 600);"`
 	].filter(Boolean).join(" ");
-	return `
-    <div class="img-container" style="
-      position: relative;
-      overflow: hidden;
-      aspect-ratio: ${width} / ${height};
-      max-width: ${width}px;
-      width: 100%;
-      ${dataURL ? `background-image: url('${dataURL}');` : ""}
-      background-size: cover;
-      background-repeat: no-repeat;
-    ">
-      <img ${mainImgAttrs}>
-    </div>
-  `;
+	/**
+	* 3. 返回包装后的 HTML
+	* - 只有当有 dataURL 时才包装 div
+	* - 外层 div 设置背景和宽高比
+	*/
+	if (dataURL) return `<div class="pic" style="
+			position: relative;
+			overflow: hidden;
+			width: 100%;
+			max-width: ${width}px;
+			background-image: url('${dataURL}');
+			background-size: cover;
+			background-repeat: no-repeat;
+			aspect-ratio: ${width} / ${height};
+		">
+			<img ${mainImgAttrs}>
+		</div>`;
+	else return `<img ${mainImgAttrs}>`;
 }
 
 //#endregion

package/dist/{types-CsakQe1p.d.mts → types-DK7PR0JE.d.mts}

@@ -20,21 +20,6 @@ interface ProgressiveOptions {
    */
   sizes?: string;
 }
-/**
- * Options for controlling lazy loading behaviour.
- */
-interface LazyOptions {
-  /**
-   * Enable or disable lazy loading.
-   * @default true
-   */
-  enable?: boolean;
-  /**
-   * Number of images to skip before applying lazy loading.
-   * @default 2
-   */
-  skip_first?: number;
-}
 /**
  * Configuration options consumed by the plugin.
  */
@@ -44,22 +29,16 @@ interface Options {
    */
   progressive?: ProgressiveOptions;
   /**
-   * Domains that are eligible for processing. Supports wildcards.
-   * When empty, all remote domains are processed.
-   * @default []
-   * @example ["example.com", "*.cdn.example.com"]
+   * Domains that support Bitiful API for thumbhash and info.
+   * @default ["assets.vluv.space", "s3.bitiful.net", "bitiful.com"]
    */
-  supported_domains?: string[];
+  bitiful_domains?: string[];
   /**
    * Array of file format extensions to ignore (case-insensitive).
    * @default ["svg"]
    * @example ["svg", "gif"]
    */
   ignore_formats?: string[];
-  /**
-   * Options for lazy loading.
-   */
-  lazy?: LazyOptions;
   /**
    * Path to the cache file. When unset, caching is disabled.
    * @default null
@@ -75,13 +54,9 @@ interface ResolvedOptions extends Options {
     enable: boolean;
     srcset_widths: number[];
   };
-  lazy: LazyOptions & {
-    enable: boolean;
-    skip_first: number;
-  };
-  supported_domains: string[];
+  bitiful_domains: string[];
   ignore_formats: string[];
   cache_path: CachePathOption;
 }
 //#endregion
-export { ResolvedOptions as a, ProgressiveOptions as i, LazyOptions as n, Options as r, CachePathOption as t };
+export { ResolvedOptions as i, Options as n, ProgressiveOptions as r, CachePathOption as t };

package/dist/types.d.mts

@@ -1,2 +1,2 @@
-import { a as ResolvedOptions, i as ProgressiveOptions, n as LazyOptions, r as Options, t as CachePathOption } from "./types-CsakQe1p.mjs";
-export { CachePathOption, LazyOptions, Options, ProgressiveOptions, ResolvedOptions };
+import { i as ResolvedOptions, n as Options, r as ProgressiveOptions, t as CachePathOption } from "./types-DK7PR0JE.mjs";
+export { CachePathOption, Options, ProgressiveOptions, ResolvedOptions };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "markdown-exit-s3-image",
   "type": "module",
-  "author": "gnix_aij",
-  "version": "0.0.2",
+  "author": "GnixAij",
+  "version": "0.0.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -28,15 +28,13 @@
     "node": ">=20"
   },
   "scripts": {
-    "build": "tsdown"
+    "build": "tsdown",
+    "test": "bun run test/index.ts",
+    "test:clean": "rm -f test/cache.json test/output.html"
   },
   "peerDependencies": {
     "markdown-exit": "1.0.0-beta.6"
   },
-  "dependencies": {
-    "sharp": "^0.34.5",
-    "thumbhash": "^0.1.1"
-  },
   "devDependencies": {
     "@tsconfig/node20": "^20.1.8",
     "@types/node": "^24.10.1",