vitepress-plugin-filelist 0.6.0 → 0.6.2

package/README.md

@@ -8,7 +8,7 @@
 - ✅ 勾选文件；选中文件夹会自动加载并选中其下所有层级的文件
 - 📦 批量打包 ZIP（基于 `client-zip`），带进度、可取消；Chrome / Edge 边下载边写入磁盘，不受大小限制；保留目录结构，不同目录的同名文件不会互相覆盖
 - 📄 大目录每个文件夹先显示 200 条，可“显示更多 / 全部显示”
-- ⬇️ 单文件下载（`fs/get` 的 `raw_url`，回退 `/d/`）
+- ⬇️ 单文件下载（`fs/get` 的 `raw_url`，回退 `/d/`）：交给浏览器下载；OpenList 自己的 `/p/`、`/d/` 链接在当前页直接下载、不打开新标签页，存储直链在新标签页打开
 - 👁️ 弹窗预览（不跳转）：图片、音视频、文本、PDF；Office 等其它类型显示文件信息与下载
 - 🔐 目录密码输入，可选只读 token
 - 🔎 当前树过滤，按名称 / 大小 / 日期排序
@@ -134,7 +134,8 @@ interface FileListSource {
 
 - Chrome / Edge（含较新的 Android Chrome）：点“下载 ZIP”先弹出系统“另存为”窗口，之后边下载边写入，内存占用很小，不受大小限制
 - Firefox、Safari、iPhone：浏览器只能先把文件放进内存再打包。按已选总大小判断：超过 `zipWarnSize` 先确认，超过 `zipMaxSize` 不打包并建议分批
-- 打包期间操作条显示进度（大小与文件数），可随时取消；勾选暂时锁定。任一文件失败会整体取消并提示文件名
+- 打包期间操作条显示进度（大小与文件数），可随时取消；勾选暂时锁定。任一文件失败会整体取消，并弹窗说明是哪个文件、什么原因
+- 同时取 4 个文件（顺序不变），减少每个文件的网络等待；进度每 100 ms 更新一次
 - ZIP 只存储不压缩（网盘文件多为已压缩格式），支持超过 4 GB（Zip64）
 
 ## 大目录

package/dist/client/browser/index.d.ts

@@ -92,6 +92,11 @@ interface FileListLabels {
   unlockFolder: string;
   /** @deprecated Network failures now append `corsHint`. */
   networkHint: string;
+  /** Title of the dialog when a batch ZIP fails (the reason is the text). */
+  batchFailedTitle: string;
+  batchFailedHint: string;
+  /** Single file handed to the browser's download manager. `{name}` */
+  downloadStarted: string;
   /** Batch progress detail. `{done}` `{total}` sizes, `{files}` `{count}` file counts */
   batchProgress: string;
   /** Batch finished. `{name}` `{count}` `{size}` */

package/dist/client/browser/index.js

@@ -329,6 +329,7 @@ function createOpenListApi(base, token) {
 			return url;
 		},
 		directUrl,
+		isAttachmentUrl: (url) => !!root && (url.startsWith(`${root}/p/`) || url.startsWith(`${root}/d/`)),
 		clearCache(path) {
 			if (!path) urls.clear();
 			else for (const key of [...urls.keys()]) if (isWithin(key, path)) urls.delete(key);
@@ -517,6 +518,7 @@ function createDemoApi(delay = 220) {
 		}),
 		fileUrl: async () => "",
 		directUrl: () => "",
+		isAttachmentUrl: () => false,
 		clearCache: () => {}
 	};
 }
@@ -594,12 +596,21 @@ const _sfc_main$3 = /*@__PURE__*/ defineComponent({
 	}
 });
 // src/client/download.ts
-/** Open a file URL; OpenList serves `/p/` and `/d/` as attachments, so this downloads. */
-function openUrl(url) {
+/**
+* Hand a file URL to the browser's own download manager.
+*
+* `sameTab` is for links known to answer as attachments (OpenList `/p/`, `/d/`):
+* the browser downloads and the page stays put, with no tab flashing open.
+* Other links (a storage provider's direct URL may display inline) open in a
+* new tab so the document page is never replaced. `download` also keeps a
+* same-origin link out of the VitePress router and names the file.
+*/
+function openUrl(url, options) {
 	const anchor = document.createElement("a");
 	anchor.href = url;
-	anchor.target = "_blank";
+	anchor.download = options.name;
 	anchor.rel = "noopener";
+	if (!options.sameTab) anchor.target = "_blank";
 	document.body.appendChild(anchor);
 	anchor.click();
 	anchor.remove();
@@ -641,10 +652,14 @@ async function pickZipFile(name) {
 	}
 }
 /**
-* The ZIP as a stream: files are fetched one after another and passed through
+* The ZIP as a stream: files are fetched a few at a time and passed through
 * as they arrive, stored without compression (most shared files are already
 * compressed). Clashing entry names get ` (2)`, ` (3)`...
 */
+/** Files fetched at once: hides per-file latency, stays under the browser's 6 per host. */
+const CONCURRENCY = 4;
+/** Progress updates at most this often (ms), so the bar does not re-render per chunk. */
+const PROGRESS_INTERVAL = 100;
 async function zipStream(files, options) {
 	const { makeZip } = await import("client-zip");
 	const progress = {
@@ -653,12 +668,28 @@ async function zipStream(files, options) {
 		files: 0,
 		totalFiles: files.length
 	};
-	const report = () => options.onProgress({ ...progress });
-	report();
+	let reportedAt = 0;
+	const report = (force = false) => {
+		const now = Date.now();
+		if (!force && now - reportedAt < PROGRESS_INTERVAL) return;
+		reportedAt = now;
+		options.onProgress({ ...progress });
+	};
+	report(true);
 	async function* entries() {
 		const used = /* @__PURE__ */ new Set();
+		const ahead = [];
+		let started = 0;
+		const startNext = () => {
+			const file = files[started++];
+			const response = options.urlOf(file).then((url) => fetch(url, { signal: options.signal }));
+			response.catch(() => {});
+			ahead.push(response);
+		};
+		while (started < files.length && ahead.length < CONCURRENCY) startNext();
 		for (const file of files) {
-			const response = await fetch(await options.urlOf(file), { signal: options.signal });
+			const response = await ahead.shift();
+			if (started < files.length) startNext();
 			if (!response.ok || !response.body) throw new Error(`${file.name}：HTTP ${response.status}`);
 			const counted = response.body.pipeThrough(new TransformStream({
 				transform(chunk, controller) {
@@ -668,7 +699,7 @@ async function zipStream(files, options) {
 				},
 				flush() {
 					progress.files += 1;
-					report();
+					report(progress.files === progress.totalFiles);
 				}
 			}));
 			const modified = new Date(file.modified);
@@ -868,6 +899,9 @@ const fileListLocales = {
 		forgetPassword: "忘记",
 		unlockFolder: "输入 {name} 的密码",
 		networkHint: "可能被跨域拦截：请检查 OpenList 的 cors.allow_origins，或 OpenList-Worker 的 ALLOW_URLS。",
+		batchFailedTitle: "打包失败",
+		batchFailedHint: "可以减少勾选的文件后重试。",
+		downloadStarted: "已交给浏览器下载：{name}",
 		batchProgress: "{done} / {total} · {files} / {count} 个文件",
 		batchDone: "已打包 {name}（{count} 个文件，{size}）",
 		batchCanceled: "已取消下载",
@@ -945,6 +979,9 @@ const fileListLocales = {
 		forgetPassword: "Forget",
 		unlockFolder: "Enter the password for {name}",
 		networkHint: "Possibly blocked by CORS: check cors.allow_origins in OpenList, or ALLOW_URLS in OpenList-Worker.",
+		batchFailedTitle: "Could not create the ZIP",
+		batchFailedHint: "Try again with fewer files selected.",
+		downloadStarted: "Downloading {name} in your browser",
 		batchProgress: "{done} / {total} · {files} / {count} files",
 		batchDone: "Saved {name} ({count} files, {size})",
 		batchCanceled: "Download cancelled",
@@ -2244,7 +2281,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				return;
 			}
 			try {
-				openUrl(await fileUrlOf(node));
+				const url = await fileUrlOf(node);
+				openUrl(url, {
+					sameTab: api.value.isAttachmentUrl(url),
+					name: node.name
+				});
+				showToast(t("downloadStarted", { name: node.name }));
 			} catch (error) {
 				showToast(t("downloadFailed", { message: errorText(error) }));
 			}
@@ -2260,9 +2302,28 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				max: bytes(props.zipMaxSize, touch ? 1024 : 2048)
 			};
 		}
+		/** A ZIP question or notice: over the warning size, over the limit, or failed. */
 		const zipNotice = ref(null);
 		/** Only desktop browsers get “use Chrome or Edge”; on iPhone every browser is Safari. */
 		const zipTip = computed(() => typeof window !== "undefined" && !window.matchMedia?.("(pointer: coarse)").matches ? t("zipStreamTip") : "");
+		const zipDialog = computed(() => {
+			const notice = zipNotice.value;
+			if (!notice) return null;
+			if (notice.kind === "failed") return {
+				title: t("batchFailedTitle"),
+				text: notice.message,
+				tip: t("batchFailedHint"),
+				cancel: t("gotIt")
+			};
+			const warn = notice.kind === "warn";
+			return {
+				title: t(warn ? "zipWarnTitle" : "zipBlockTitle", { size: formatSize(notice.size) }),
+				text: t(warn ? "zipWarnText" : "zipBlockText", { limit: formatSize(notice.limit) }),
+				tip: zipTip.value,
+				confirm: warn ? t("zipContinue") : void 0,
+				cancel: warn ? t("cancel") : t("gotIt")
+			};
+		});
 		function zipName() {
 			return zipFileName(props.title || t("defaultZip"));
 		}
@@ -2331,7 +2392,11 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				}));
 				selected.value = /* @__PURE__ */ new Set();
 			} catch (error) {
-				showToast(controller.signal.aborted ? t("batchCanceled") : t("batchFailed", { message: errorText(error) }));
+				if (controller.signal.aborted) showToast(t("batchCanceled"));
+				else zipNotice.value = {
+					kind: "failed",
+					message: errorText(error)
+				};
 			} finally {
 				zipAbort = null;
 				batchBusy.value = false;
@@ -2779,12 +2844,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				createElementVNode("div", _hoisted_73, [createElementVNode("span", null, toDisplayString(t("loaded", { count: allFiles.value.length })) + " · " + toDisplayString(t("totalSize", { size: unref(formatSize)(unref(totalSize)(allFiles.value)) })), 1)]),
 				toast.value ? (openBlock(), createElementBlock("div", _hoisted_74, toDisplayString(toast.value), 1)) : createCommentVNode("v-if", true),
 				createVNode(_sfc_main$3, {
-					open: !!zipNotice.value,
-					title: zipNotice.value ? t(zipNotice.value.kind === "warn" ? "zipWarnTitle" : "zipBlockTitle", { size: unref(formatSize)(zipNotice.value.size) }) : "",
-					text: zipNotice.value ? t(zipNotice.value.kind === "warn" ? "zipWarnText" : "zipBlockText", { limit: unref(formatSize)(zipNotice.value.limit) }) : "",
-					tip: zipTip.value,
-					"confirm-label": zipNotice.value?.kind === "warn" ? t("zipContinue") : void 0,
-					"cancel-label": zipNotice.value?.kind === "warn" ? t("cancel") : t("gotIt"),
+					open: !!zipDialog.value,
+					title: zipDialog.value?.title ?? "",
+					text: zipDialog.value?.text ?? "",
+					tip: zipDialog.value?.tip,
+					"confirm-label": zipDialog.value?.confirm,
+					"cancel-label": zipDialog.value?.cancel ?? "",
 					onConfirm: confirmZip,
 					onClose: _cache[4] || (_cache[4] = ($event) => zipNotice.value = null)
 				}, null, 8, [

package/dist/client/ssr/index.d.ts

@@ -92,6 +92,11 @@ interface FileListLabels {
   unlockFolder: string;
   /** @deprecated Network failures now append `corsHint`. */
   networkHint: string;
+  /** Title of the dialog when a batch ZIP fails (the reason is the text). */
+  batchFailedTitle: string;
+  batchFailedHint: string;
+  /** Single file handed to the browser's download manager. `{name}` */
+  downloadStarted: string;
   /** Batch progress detail. `{done}` `{total}` sizes, `{files}` `{count}` file counts */
   batchProgress: string;
   /** Batch finished. `{name}` `{count}` `{size}` */

package/dist/client/ssr/index.js

@@ -329,6 +329,7 @@ function createOpenListApi(base, token) {
 			return url;
 		},
 		directUrl,
+		isAttachmentUrl: (url) => !!root && (url.startsWith(`${root}/p/`) || url.startsWith(`${root}/d/`)),
 		clearCache(path) {
 			if (!path) urls.clear();
 			else for (const key of [...urls.keys()]) if (isWithin(key, path)) urls.delete(key);
@@ -517,6 +518,7 @@ function createDemoApi(delay = 220) {
 		}),
 		fileUrl: async () => "",
 		directUrl: () => "",
+		isAttachmentUrl: () => false,
 		clearCache: () => {}
 	};
 }
@@ -575,12 +577,21 @@ _sfc_main$3.setup = (props, ctx) => {
 	return _sfc_setup$3 ? _sfc_setup$3(props, ctx) : void 0;
 };
 // src/client/download.ts
-/** Open a file URL; OpenList serves `/p/` and `/d/` as attachments, so this downloads. */
-function openUrl(url) {
+/**
+* Hand a file URL to the browser's own download manager.
+*
+* `sameTab` is for links known to answer as attachments (OpenList `/p/`, `/d/`):
+* the browser downloads and the page stays put, with no tab flashing open.
+* Other links (a storage provider's direct URL may display inline) open in a
+* new tab so the document page is never replaced. `download` also keeps a
+* same-origin link out of the VitePress router and names the file.
+*/
+function openUrl(url, options) {
 	const anchor = document.createElement("a");
 	anchor.href = url;
-	anchor.target = "_blank";
+	anchor.download = options.name;
 	anchor.rel = "noopener";
+	if (!options.sameTab) anchor.target = "_blank";
 	document.body.appendChild(anchor);
 	anchor.click();
 	anchor.remove();
@@ -600,10 +611,14 @@ function zipFileName(title) {
 	return `${title.replace(/[\\/:*?"<>|]/g, "_")}.zip`;
 }
 /**
-* The ZIP as a stream: files are fetched one after another and passed through
+* The ZIP as a stream: files are fetched a few at a time and passed through
 * as they arrive, stored without compression (most shared files are already
 * compressed). Clashing entry names get ` (2)`, ` (3)`...
 */
+/** Files fetched at once: hides per-file latency, stays under the browser's 6 per host. */
+const CONCURRENCY = 4;
+/** Progress updates at most this often (ms), so the bar does not re-render per chunk. */
+const PROGRESS_INTERVAL = 100;
 async function zipStream(files, options) {
 	const { makeZip } = await import("client-zip");
 	const progress = {
@@ -612,12 +627,28 @@ async function zipStream(files, options) {
 		files: 0,
 		totalFiles: files.length
 	};
-	const report = () => options.onProgress({ ...progress });
-	report();
+	let reportedAt = 0;
+	const report = (force = false) => {
+		const now = Date.now();
+		if (!force && now - reportedAt < PROGRESS_INTERVAL) return;
+		reportedAt = now;
+		options.onProgress({ ...progress });
+	};
+	report(true);
 	async function* entries() {
 		const used = /* @__PURE__ */ new Set();
+		const ahead = [];
+		let started = 0;
+		const startNext = () => {
+			const file = files[started++];
+			const response = options.urlOf(file).then((url) => fetch(url, { signal: options.signal }));
+			response.catch(() => {});
+			ahead.push(response);
+		};
+		while (started < files.length && ahead.length < CONCURRENCY) startNext();
 		for (const file of files) {
-			const response = await fetch(await options.urlOf(file), { signal: options.signal });
+			const response = await ahead.shift();
+			if (started < files.length) startNext();
 			if (!response.ok || !response.body) throw new Error(`${file.name}：HTTP ${response.status}`);
 			const counted = response.body.pipeThrough(new TransformStream({
 				transform(chunk, controller) {
@@ -627,7 +658,7 @@ async function zipStream(files, options) {
 				},
 				flush() {
 					progress.files += 1;
-					report();
+					report(progress.files === progress.totalFiles);
 				}
 			}));
 			const modified = new Date(file.modified);
@@ -821,6 +852,9 @@ const fileListLocales = {
 		forgetPassword: "忘记",
 		unlockFolder: "输入 {name} 的密码",
 		networkHint: "可能被跨域拦截：请检查 OpenList 的 cors.allow_origins，或 OpenList-Worker 的 ALLOW_URLS。",
+		batchFailedTitle: "打包失败",
+		batchFailedHint: "可以减少勾选的文件后重试。",
+		downloadStarted: "已交给浏览器下载：{name}",
 		batchProgress: "{done} / {total} · {files} / {count} 个文件",
 		batchDone: "已打包 {name}（{count} 个文件，{size}）",
 		batchCanceled: "已取消下载",
@@ -898,6 +932,9 @@ const fileListLocales = {
 		forgetPassword: "Forget",
 		unlockFolder: "Enter the password for {name}",
 		networkHint: "Possibly blocked by CORS: check cors.allow_origins in OpenList, or ALLOW_URLS in OpenList-Worker.",
+		batchFailedTitle: "Could not create the ZIP",
+		batchFailedHint: "Try again with fewer files selected.",
+		downloadStarted: "Downloading {name} in your browser",
 		batchProgress: "{done} / {total} · {files} / {count} files",
 		batchDone: "Saved {name} ({count} files, {size})",
 		batchCanceled: "Download cancelled",
@@ -1707,14 +1744,38 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				return;
 			}
 			try {
-				openUrl(await fileUrlOf(node));
+				const url = await fileUrlOf(node);
+				openUrl(url, {
+					sameTab: api.value.isAttachmentUrl(url),
+					name: node.name
+				});
+				showToast(t("downloadStarted", { name: node.name }));
 			} catch (error) {
 				showToast(t("downloadFailed", { message: errorText(error) }));
 			}
 		}
+		/** A ZIP question or notice: over the warning size, over the limit, or failed. */
 		const zipNotice = ref(null);
 		/** Only desktop browsers get “use Chrome or Edge”; on iPhone every browser is Safari. */
 		const zipTip = computed(() => typeof window !== "undefined" && !window.matchMedia?.("(pointer: coarse)").matches ? t("zipStreamTip") : "");
+		const zipDialog = computed(() => {
+			const notice = zipNotice.value;
+			if (!notice) return null;
+			if (notice.kind === "failed") return {
+				title: t("batchFailedTitle"),
+				text: notice.message,
+				tip: t("batchFailedHint"),
+				cancel: t("gotIt")
+			};
+			const warn = notice.kind === "warn";
+			return {
+				title: t(warn ? "zipWarnTitle" : "zipBlockTitle", { size: formatSize(notice.size) }),
+				text: t(warn ? "zipWarnText" : "zipBlockText", { limit: formatSize(notice.limit) }),
+				tip: zipTip.value,
+				confirm: warn ? t("zipContinue") : void 0,
+				cancel: warn ? t("cancel") : t("gotIt")
+			};
+		});
 		function zipName() {
 			return zipFileName(props.title || t("defaultZip"));
 		}
@@ -1745,7 +1806,11 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				}));
 				selected.value = /* @__PURE__ */ new Set();
 			} catch (error) {
-				showToast(controller.signal.aborted ? t("batchCanceled") : t("batchFailed", { message: errorText(error) }));
+				if (controller.signal.aborted) showToast(t("batchCanceled"));
+				else zipNotice.value = {
+					kind: "failed",
+					message: errorText(error)
+				};
 			} finally {
 				zipAbort = null;
 				batchBusy.value = false;
@@ -2042,12 +2107,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			if (toast.value) _push(`<div class="fl-toast" role="status">${ssrInterpolate(toast.value)}</div>`);
 			else _push(`<!---->`);
 			_push(ssrRenderComponent(_sfc_main$3, {
-				open: !!zipNotice.value,
-				title: zipNotice.value ? t(zipNotice.value.kind === "warn" ? "zipWarnTitle" : "zipBlockTitle", { size: unref(formatSize)(zipNotice.value.size) }) : "",
-				text: zipNotice.value ? t(zipNotice.value.kind === "warn" ? "zipWarnText" : "zipBlockText", { limit: unref(formatSize)(zipNotice.value.limit) }) : "",
-				tip: zipTip.value,
-				"confirm-label": zipNotice.value?.kind === "warn" ? t("zipContinue") : void 0,
-				"cancel-label": zipNotice.value?.kind === "warn" ? t("cancel") : t("gotIt"),
+				open: !!zipDialog.value,
+				title: zipDialog.value?.title ?? "",
+				text: zipDialog.value?.text ?? "",
+				tip: zipDialog.value?.tip,
+				"confirm-label": zipDialog.value?.confirm,
+				"cancel-label": zipDialog.value?.cancel ?? "",
 				onConfirm: confirmZip,
 				onClose: ($event) => zipNotice.value = null
 			}, null, _parent));

package/dist/client/style.css

@@ -787,11 +787,13 @@
 }
 
 .fl-toast {
-  position: absolute;
-  bottom: 14px;
+  /* the viewport, not the card: a long list would push the card's bottom off screen */
+  position: fixed;
+  bottom: calc(24px + env(safe-area-inset-bottom));
   left: 50%;
-  z-index: 5;
-  max-width: 92%;
+  z-index: 100;
+  box-sizing: border-box;
+  max-width: min(560px, calc(100vw - 32px));
   padding: 7px 14px;
   overflow: hidden;
   font-size: 13px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitepress-plugin-filelist",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "packageManager": "pnpm@11.25.0",
   "type": "module",
   "description": "OpenList file browser for VitePress: tree view, batch ZIP download, i18n, password and token support.",