npm - @seayoo-web/finder - Versions diffs - 2.2.2 → 2.2.4 - Mend

@seayoo-web/finder 2.2.2 → 2.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md CHANGED Viewed

@@ -1,3 +1,113 @@
 # webFinder 代理工具
-!! internal use only
+> !! internal use only
+把构建产物（目录或单文件）压缩并部署到 finder 服务器的代理工具，可直接调用 API，也可作为 Vite 插件在构建结束后自动部署。
+## 安装
+```bash
+pnpm add -D @seayoo-web/finder
+```
+> 需要 Node >= 22。
+## API
+### `finderDeploy(option)`
+部署一个目录。返回 `Promise<string>`（部署成功的目标地址，多目标时以逗号连接）。
+```ts
+import { finderDeploy } from "@seayoo-web/finder";
+await finderDeploy({
+  dist: "./dist",
+  deployTo: "finder.seayoo.io/my-project",
+  user: process.env.FINDER_USER!,
+  key: process.env.FINDER_KEY!,
+  preview: true,
+  commitLogs: "feat: 首页改版\nfix: 修复登录跳转",
+});
+```
+| 参数          | 类型                              | 必填 | 说明                                                                       |
+| ------------- | --------------------------------- | ---- | -------------------------------------------------------------------------- |
+| `dist`        | `string`                          | 是   | 需要部署的代码目录                                                         |
+| `deployTo`    | `string \| string[]`              | 是   | 部署目标地址，传数组则部署到多个目标                                       |
+| `user`        | `string`                          | 是   | 部署认证 user                                                              |
+| `key`         | `string`                          | 是   | 部署认证 key                                                               |
+| `ignoreFiles` | `string[]`                        | 否   | 额外忽略规则，见下方「忽略规则」                                           |
+| `preview`     | `boolean \| string \| string[]`   | 否   | 部署后是否打开预览；`true` 打开默认 `index.html`，也可指定一个或多个文件   |
+| `commitLogs`  | `string`                          | 否   | 本次部署的更新说明，换行用 `\n`                                            |
+| `debug`       | `boolean`                         | 否   | 输出更多调试信息                                                           |
+| `ignoreCache` | `boolean`                         | 否   | 忽略本地缓存的服务器支持项目列表，强制重新拉取                             |
+多目标部署会并发尝试所有目标：全部成功才正常返回，存在失败时会在尝试完所有目标后抛出聚合错误（包含每个失败目标及原因），不会因为单点失败而丢掉其余目标的结果。
+### `finderUpload(option)`
+上传单个文件。`filePath` 与 `fileContent` 二选一，`filePath` 优先级更高。
+```ts
+import { finderUpload } from "@seayoo-web/finder";
+await finderUpload({
+  fileContent: JSON.stringify({ version: "1.0.0" }),
+  deployTo: "finder.seayoo.io/my-project/meta.json",
+  user: process.env.FINDER_USER!,
+  key: process.env.FINDER_KEY!,
+});
+```
+| 参数          | 类型               | 必填 | 说明                                       |
+| ------------- | ------------------ | ---- | ------------------------------------------ |
+| `deployTo`    | `string`           | 是   | 部署目标全路径，需包含文件名               |
+| `user`        | `string`           | 是   | 部署认证 user                              |
+| `key`         | `string`           | 是   | 部署认证 key                               |
+| `filePath`    | `string`           | 否\* | 需要上传的文件路径（与 `fileContent` 二选一） |
+| `fileContent` | `string \| Buffer` | 否\* | 需要上传的文件内容（与 `filePath` 二选一）   |
+| `preview`     | `boolean`          | 否   | 上传后是否打开预览地址                      |
+| `debug`       | `boolean`          | 否   | 输出更多调试信息                           |
+| `ignoreCache` | `boolean`          | 否   | 忽略本地缓存的服务器支持项目列表           |
+> \* `filePath` 与 `fileContent` 至少提供其一。
+### `viteDeployPlugin(option)`
+Vite 插件，在 `closeBundle` 阶段自动取构建产物目录并调用 `finderDeploy`（`preview` 默认为 `true`）。
+```ts
+// vite.config.ts
+import { defineConfig } from "vite";
+import { viteDeployPlugin } from "@seayoo-web/finder";
+export default defineConfig({
+  plugins: [
+    viteDeployPlugin({
+      deployTo: "finder.seayoo.io/my-project",
+      user: process.env.FINDER_USER!,
+      key: process.env.FINDER_KEY!,
+      onBeforeDeploy: (distDir) => console.log("即将部署", distDir),
+      onFinished: () => console.log("部署完成"),
+      onError: (error) => console.error("部署失败", error.message),
+    }),
+  ],
+});
+```
+入参为 `finderDeploy` 的全部参数（`dist` 由插件自动推断，无需传入）外加以下钩子：
+| 钩子             | 类型                            | 说明                       |
+| ---------------- | ------------------------------- | -------------------------- |
+| `onBeforeDeploy` | `(distDir: string) => unknown`  | 部署开始前调用             |
+| `onFinished`     | `() => unknown`                 | 部署成功后调用             |
+| `onError`        | `(error: Error) => unknown`     | 部署失败后调用，回传错误   |
+## 忽略规则
+`ignoreFiles` 会与一组预设规则（`node_modules/`、`.git/`、`.vscode/`、`__MACOSX/`、`.DS_Store`、`.gitkeep`）合并后生效。规则只针对相对部署根的路径做匹配，不会被部署目录绝对路径中的祖先目录名干扰：
+- 以 `/` 结尾表示目录规则，匹配路径中的某个目录段（如 `assets/`）。
+- 不以 `/` 结尾表示文件规则，按文件名精确匹配（如 `manifest.json`）。
+- 支持 `*` 通配（如 `*.map`、`temp*/`）。

package/dist/index.js CHANGED Viewed

@@ -1,376 +1,376 @@
-import fs, { readdirSync, lstatSync, existsSync, readFileSync, writeFileSync } from "fs";
-import path, { relative, join, basename, normalize, sep, dirname, resolve } from "path";
+import fs, { existsSync, lstatSync, readFileSync, readdirSync, statSync, writeFileSync } from "fs";
+import path, { basename, dirname, join, normalize, relative, resolve, sep } from "path";
 import open from "open";
-import "colors";
 import { zip } from "compressing";
+import colors from "picocolors";
 import os from "os";
-const presetIgnores = ["node_modules/", ".git/", ".vscode/", "__MACOSX/", ".DS_Store", ".gitkeep"];
+//#region src/compress.ts
+var presetIgnores = [
+	"node_modules/",
+	".git/",
+	".vscode/",
+	"__MACOSX/",
+	".DS_Store",
+	".gitkeep"
+];
+/** 代码压缩 */
 function compressToBuffer(sourceDir, ignoreFiles, debug) {
-  const ignoreFileList = [...presetIgnores, ...ignoreFiles || []];
-  const filesToCompress = getAllFiles(sourceDir, ignoreFileList);
-  const zipStream = new zip.Stream();
-  filesToCompress.forEach((file) => {
-    zipStream.addEntry(file, { relativePath: relative(sourceDir, file) });
-  });
-  if (debug) {
-    console.log({
-      method: "compressToBuffer",
-      sourceDir,
-      ignores: ignoreFileList,
-      filesCount: filesToCompress.length
-    });
-  }
-  const chunks = [];
-  return new Promise(function(resolve2, reject) {
-    zipStream.on("data", (chunk) => chunks.push(chunk)).on("end", () => resolve2(Buffer.concat(chunks))).on("error", reject);
-  });
+	const ignoreFileList = [...presetIgnores, ...ignoreFiles || []];
+	const filesToCompress = getAllFiles(sourceDir, ignoreFileList);
+	const zipStream = new zip.Stream();
+	filesToCompress.forEach((file) => {
+		zipStream.addEntry(file, { relativePath: relative(sourceDir, file) });
+	});
+	if (debug) console.log({
+		method: "compressToBuffer",
+		sourceDir,
+		ignores: ignoreFileList,
+		filesCount: filesToCompress.length
+	});
+	const chunks = [];
+	return new Promise(function(resolve, reject) {
+		zipStream.on("data", (chunk) => chunks.push(chunk)).on("end", () => resolve(Buffer.concat(chunks))).on("error", reject);
+	});
 }
-function getAllFiles(dir, ignores = []) {
-  const list = [];
-  readdirSync(dir).forEach((file) => {
-    const filePath = join(dir, file);
-    const stats = lstatSync(filePath);
-    if (stats.isDirectory()) {
-      list.push(...getAllFiles(filePath, ignores));
-    } else if (!isIgnoreFile(filePath, ignores)) {
-      list.push(filePath);
-    }
-  });
-  return list;
+function getAllFiles(dir, ignores = [], root = dir) {
+	const list = [];
+	readdirSync(dir).forEach((file) => {
+		const filePath = join(dir, file);
+		const stats = lstatSync(filePath);
+		const relativePath = relative(root, filePath);
+		if (stats.isDirectory()) {
+			if (!isIgnoreFile(relativePath, ignores, true)) list.push(...getAllFiles(filePath, ignores, root));
+		} else if (!isIgnoreFile(relativePath, ignores)) list.push(filePath);
+	});
+	return list;
 }
-function isIgnoreFile(filePath, ignores) {
-  const filename = basename(filePath);
-  const dirs = normalize(filePath).split(sep);
-  return ignores.some((pattern) => {
-    if (pattern.endsWith("/")) {
-      return pattern.includes("*") ? dirs.some((dir) => getRegexp(pattern.slice(0, -1)).test(dir)) : dirs.includes(pattern.slice(0, -1));
-    }
-    return pattern.includes("*") ? getRegexp(pattern).test(filename) : filename === pattern;
-  });
+function isIgnoreFile(filePath, ignores, isDir = false) {
+	const filename = basename(filePath);
+	const segments = normalize(filePath).split(sep);
+	const dirSegments = isDir ? segments : segments.slice(0, -1);
+	return ignores.some((pattern) => {
+		if (pattern.endsWith("/")) {
+			const dirPattern = pattern.slice(0, -1);
+			return pattern.includes("*") ? dirSegments.some((dir) => getRegexp(dirPattern).test(dir)) : dirSegments.includes(dirPattern);
+		}
+		if (isDir) return false;
+		return pattern.includes("*") ? getRegexp(pattern).test(filename) : filename === pattern;
+	});
 }
-const pathRegCache = {};
-const getRegexp = function(path2) {
-  if (path2 && pathRegCache[path2]) {
-    return pathRegCache[path2];
-  }
-  const fixRegStr = path2.replace(/([\\(){}\[\]\^\$\+\-\?\.|])/g, "\\$1").replace(/\*{1,}/g, ".*");
-  return pathRegCache[path2] = new RegExp("^" + fixRegStr + "$");
+var pathRegCache = {};
+var getRegexp = function(path) {
+	if (path && pathRegCache[path]) return pathRegCache[path];
+	const fixRegStr = path.replace(/([\\(){}[\]^$+\-?.|])/g, "\\$1").replace(/\*{1,}/g, ".*");
+	return pathRegCache[path] = new RegExp("^" + fixRegStr + "$");
 };
+//#endregion
+//#region src/utils.ts
 function pure(url) {
-  return url.replace(/(?:^https?:\/\/|\/*$)/gi, "");
+	return url.replace(/(?:^https?:\/\/|\/*$)/gi, "");
 }
 function getSystemTempDir() {
-  const dir = path.resolve(os.tmpdir(), "webfinder");
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-  return dir;
+	const dir = path.resolve(os.tmpdir(), "webfinder");
+	if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+	return dir;
 }
-const nodeVersion = +process.version.replace(/\..+/, "").slice(1);
-if (nodeVersion < 20) {
-  process.emitWarning = function() {
-  };
+/** 单次请求默认超时（毫秒），避免 finder 服务器无响应时部署无限挂起 */
+var DEFAULT_REQUEST_TIMEOUT = 12e4;
+async function request({ url, method, headers, data, timeout = DEFAULT_REQUEST_TIMEOUT }) {
+	const hasFileUpload = method === "POST" && data && Object.values(data).some((value) => typeof value === "object" && "buffer" in value);
+	const reqHeaders = new Headers();
+	if (headers) Object.entries(headers).forEach(([key, value]) => {
+		reqHeaders.set(key, value);
+	});
+	const requestInit = {
+		method,
+		headers: reqHeaders,
+		signal: AbortSignal.timeout(timeout)
+	};
+	try {
+		if (data) if (hasFileUpload) {
+			const formData = new FormData();
+			Object.entries(data).forEach(([key, value]) => {
+				if (typeof value === "object" && "buffer" in value) {
+					const { buffer, filename, contentType } = value;
+					const blob = new Blob([new Uint8Array(buffer)], { type: contentType });
+					formData.append(key, blob, filename);
+				} else formData.append(key, String(value));
+			});
+			requestInit.headers = reqHeaders;
+			requestInit.body = formData;
+		} else {
+			reqHeaders.set("content-type", reqHeaders.get("content-type") || "application/json");
+			requestInit.headers = reqHeaders;
+			requestInit.body = JSON.stringify(data);
+		}
+		const response = await fetch(url, requestInit);
+		let responseData;
+		if (response.headers.get("content-type")?.includes("application/json")) responseData = await response.json();
+		else responseData = await response.text();
+		return {
+			status: response.status,
+			message: response.statusText,
+			data: responseData
+		};
+	} catch (err) {
+		return {
+			status: 500,
+			message: err instanceof Error && (err.name === "TimeoutError" || err.name === "AbortError") ? `请求超时（${timeout}ms）：${url}` : err instanceof Error ? err.message : String(err),
+			data: null
+		};
+	}
 }
-async function request({
-  url,
-  method,
-  headers,
-  data
-}) {
-  const hasFileUpload = method === "POST" && data && Object.values(data).some((value) => typeof value === "object" && "buffer" in value);
-  const reqHeaders = new Headers();
-  if (headers) {
-    Object.entries(headers).forEach(([key, value]) => {
-      reqHeaders.set(key, value);
-    });
-  }
-  const requestInit = { method, headers: reqHeaders };
-  try {
-    if (data) {
-      if (hasFileUpload) {
-        const formData = new FormData();
-        Object.entries(data).forEach(([key, value]) => {
-          if (typeof value === "object" && "buffer" in value) {
-            const { buffer, filename, contentType: contentType2 } = value;
-            const blob = new Blob([new Uint8Array(buffer)], { type: contentType2 });
-            formData.append(key, blob, filename);
-          } else {
-            formData.append(key, String(value));
-          }
-        });
-        requestInit.headers = reqHeaders;
-        requestInit.body = formData;
-      } else {
-        reqHeaders.set("content-type", reqHeaders.get("content-type") || "application/json");
-        requestInit.headers = reqHeaders;
-        requestInit.body = JSON.stringify(data);
-      }
-    }
-    const response = await fetch(url, requestInit);
-    let responseData;
-    const contentType = response.headers.get("content-type");
-    if (contentType?.includes("application/json")) {
-      responseData = await response.json();
-    } else {
-      responseData = await response.text();
-    }
-    return {
-      status: response.status,
-      message: response.statusText,
-      data: responseData
-    };
-  } catch (err) {
-    return {
-      status: 500,
-      message: err instanceof Error ? err.message : String(err),
-      data: null
-    };
-  }
-}
-const FinderServers = {
-  "finder.seayoo.io": [],
-  "finder.seayoo.com": [],
-  "finder.seayoo.internal": [],
-  "finder.dev.seayoo.com": [],
-  "finder.dev.seayoo.io": []
+//#endregion
+//#region src/service.ts
+/** finder 服务器列表以及所支持的域名 */
+var FinderServers = {
+	"finder.seayoo.io": [],
+	"finder.seayoo.com": [],
+	"finder.seayoo.internal": [],
+	"finder.dev.seayoo.com": [],
+	"finder.dev.seayoo.io": []
 };
-const FinderApiPaths = {
-  deploy: "/service/deploy",
-  inspect: "/inspect/supported/projects",
-  upload: "/service/upload"
+/** finder 的 api path */
+var FinderApiPaths = {
+	deploy: "/service/deploy",
+	inspect: "/inspect/supported/projects",
+	upload: "/service/upload"
 };
+/** 将指定的 zip buffer 部署到指定目录 */
 async function deploy(option) {
-  const { debug, target, buffer, user, key, payload, ignoreCache } = option;
-  const targetServer = await findTargetServer(target, debug, ignoreCache);
-  if (!targetServer) {
-    throw `finder不支持该域名部署，请检查 ${target}`.bgRed;
-  }
-  if (!user || !key) {
-    throw `部署缺少认证信息(user & key)`.bgRed;
-  }
-  const zipMockName = `${Date.now()}${Math.random().toString(16).slice(-3)}.zip`;
-  const { status, data } = await request({
-    url: `${getFinderServerFullPath(targetServer)}${FinderApiPaths.deploy}?target=${encodeURIComponent(pure(target))}`,
-    method: "POST",
-    headers: { user, key },
-    data: {
-      path: zipMockName,
-      file: { buffer, filename: zipMockName, contentType: "application/octet-stream" },
-      payload: payload ? JSON.stringify(payload) : ""
-    }
-  });
-  if (status !== 200) {
-    throw `部署接口错误，Server: ${targetServer}，Status: ${status}，Response: ${JSON.stringify(data)}`.red;
-  }
-  if (!data || typeof data !== "object" || "err" in data && data.err || !("data" in data) || typeof data.data !== "string") {
-    throw `部署接口响应错误。Server: ${targetServer}，Response: ${JSON.stringify(data)}`.red;
-  }
-  const url = data.data;
-  if (debug) {
-    console.log("部署完毕，接口返回内容", data);
-  }
-  return {
-    previewUrl: url.endsWith("/") ? url.replace(/\/*$/, "/") + "index.html?" + Math.random().toString(16).slice(2) : url.startsWith("http") ? url : ""
-  };
+	const { debug, target, buffer, user, key, payload, ignoreCache } = option;
+	const targetServer = await findTargetServer(target, debug, ignoreCache);
+	if (!targetServer) throw new Error(`finder不支持该域名部署，请检查 ${target}`);
+	if (!user || !key) throw new Error("部署缺少认证信息(user & key)");
+	const zipMockName = `${Date.now()}${Math.random().toString(16).slice(-3)}.zip`;
+	const { status, data } = await request({
+		url: `${getFinderServerFullPath(targetServer)}${FinderApiPaths.deploy}?target=${encodeURIComponent(pure(target))}`,
+		method: "POST",
+		headers: {
+			user,
+			key
+		},
+		data: {
+			path: zipMockName,
+			file: {
+				buffer,
+				filename: zipMockName,
+				contentType: "application/octet-stream"
+			},
+			payload: payload ? JSON.stringify(payload) : ""
+		}
+	});
+	if (status !== 200) throw new Error(`部署接口错误，Server: ${targetServer}，Status: ${status}，Response: ${JSON.stringify(data)}`);
+	if (!data || typeof data !== "object" || "err" in data && data.err || !("data" in data) || typeof data.data !== "string") throw new Error(`部署接口响应错误。Server: ${targetServer}，Response: ${JSON.stringify(data)}`);
+	const url = data.data;
+	if (debug) console.log("部署完毕，接口返回内容", data);
+	return { previewUrl: url.endsWith("/") ? url.replace(/\/*$/, "/") + "index.html?" + Math.random().toString(16).slice(2) : url.startsWith("http") ? url : "" };
 }
+/** 将文件上传到指定位置 */
 async function upload(option) {
-  const { debug, target, buffer, user, key, ignoreCache } = option;
-  const targetServer = await findTargetServer(target, debug, ignoreCache);
-  if (!targetServer) {
-    throw `finder不支持该域名部署，请检查 ${target}`.bgRed;
-  }
-  if (!user || !key) {
-    throw `部署缺少认证信息(user & key)`.bgRed;
-  }
-  const filename = basename(target);
-  const deployTarget = dirname(pure(target));
-  const { status, data } = await request({
-    url: `${getFinderServerFullPath(targetServer)}${FinderApiPaths.upload}?target=${encodeURIComponent(deployTarget)}`,
-    method: "POST",
-    headers: { user, key },
-    data: {
-      path: filename,
-      file: { buffer, filename, contentType: "application/octet-stream" }
-    }
-  });
-  if (status !== 200) {
-    throw `上传接口错误，Server: ${targetServer}，Status: ${status}`.red;
-  }
-  if (!data || typeof data !== "object" || "err" in data && data.err || !("data" in data) || typeof data.data !== "string") {
-    throw `上传接口响应错误，Server: ${targetServer}，Response: ${JSON.stringify(data)}`.red;
-  }
-  return { previewUrl: `https://${pure(target)}` };
+	const { debug, target, buffer, user, key, ignoreCache } = option;
+	const targetServer = await findTargetServer(target, debug, ignoreCache);
+	if (!targetServer) throw new Error(`finder不支持该域名部署，请检查 ${target}`);
+	if (!user || !key) throw new Error("部署缺少认证信息(user & key)");
+	const filename = basename(target);
+	const deployTarget = dirname(pure(target));
+	const { status, data } = await request({
+		url: `${getFinderServerFullPath(targetServer)}${FinderApiPaths.upload}?target=${encodeURIComponent(deployTarget)}`,
+		method: "POST",
+		headers: {
+			user,
+			key
+		},
+		data: {
+			path: filename,
+			file: {
+				buffer,
+				filename,
+				contentType: "application/octet-stream"
+			}
+		}
+	});
+	if (status !== 200) throw new Error(`上传接口错误，Server: ${targetServer}，Status: ${status}`);
+	if (!data || typeof data !== "object" || "err" in data && data.err || !("data" in data) || typeof data.data !== "string") throw new Error(`上传接口响应错误，Server: ${targetServer}，Response: ${JSON.stringify(data)}`);
+	return { previewUrl: `https://${pure(target)}` };
 }
-const getFinderServerFullPath = function(domain) {
-  return (domain.endsWith("internal") ? "http://" : "https://") + domain;
+var getFinderServerFullPath = function(domain) {
+	return (domain.endsWith("internal") ? "http://" : "https://") + domain;
 };
 async function findTargetServer(target, debug, ignoreCache) {
-  const t = pure(target);
-  await updateSupportedProjects(!!ignoreCache, debug);
-  for (const domain in FinderServers) {
-    if (FinderServers[domain].find((url) => t.startsWith(url))) {
-      return domain;
-    }
-  }
-  if (!ignoreCache) {
-    await updateSupportedProjects(true, debug);
-    for (const domain in FinderServers) {
-      if (FinderServers[domain].find((url) => t.startsWith(url))) {
-        return domain;
-      }
-    }
-  }
-  return null;
+	const t = pure(target);
+	await updateSupportedProjects(!!ignoreCache, debug);
+	for (const domain in FinderServers) if (FinderServers[domain].find((url) => url && t.startsWith(url))) return domain;
+	if (!ignoreCache) {
+		await updateSupportedProjects(true, debug);
+		for (const domain in FinderServers) if (FinderServers[domain].find((url) => url && t.startsWith(url))) return domain;
+	}
+	return null;
 }
 async function updateSupportedProjects(force = false, debug) {
-  const domains = Object.keys(FinderServers);
-  for (const domain of domains) {
-    FinderServers[domain] = await getServerSupportedProjects(domain, force, debug) || [];
-  }
+	const domains = Object.keys(FinderServers);
+	await Promise.all(domains.map((domain) => getServerSupportedProjects(domain, force, debug).then((r) => FinderServers[domain] = r, () => FinderServers[domain] = [])));
 }
 async function getServerSupportedProjects(serverDomain, ignoreCache = false, debug) {
-  const cacheFile = resolve(getSystemTempDir(), `${serverDomain}.json`);
-  if (existsSync(cacheFile) && !ignoreCache) {
-    try {
-      const cache = JSON.parse(readFileSync(cacheFile).toString());
-      if (Array.isArray(cache) && cache.every((d) => typeof d === "string")) {
-        if (debug) {
-          console.log({ method: "getServerSupportedProjects", serverDomain, cache });
-        }
-        return cache;
-      }
-    } catch (e) {
-      console.error("ReadFinderCacheError", e);
-    }
-  }
-  const inspectURL = `${getFinderServerFullPath(serverDomain)}${FinderApiPaths.inspect}`;
-  const { status, message, data } = await request({
-    url: inspectURL,
-    method: "GET",
-    headers: { "user-agent": `web finder agent v2` }
-  });
-  if (status !== 200) {
-    if (debug) {
-      console.error(`服务器 ${inspectURL} 检查接口错误`.bgRed, (message || "").red);
-    }
-    return [];
-  }
-  if (!Array.isArray(data) || !data.every((d) => typeof d === "string")) {
-    console.error(`服务器 ${inspectURL} 接口返回内容错误`.bgRed, JSON.stringify(data).red);
-    return [];
-  }
-  if (debug) {
-    console.log({ method: "getServerSupportedProjects", serverDomain, list: data });
-  }
-  const pureList = data.map(pure);
-  writeFileSync(cacheFile, JSON.stringify(pureList));
-  return pureList;
+	const cacheFile = resolve(getSystemTempDir(), `${serverDomain}.json`);
+	if (existsSync(cacheFile) && !ignoreCache) try {
+		const cache = JSON.parse(readFileSync(cacheFile).toString());
+		if (Array.isArray(cache) && cache.every((d) => typeof d === "string")) {
+			if (debug) console.log({
+				method: "getServerSupportedProjects",
+				serverDomain,
+				cache
+			});
+			return cache;
+		}
+	} catch (e) {
+		console.error(colors.bgRed("ReadFinderCacheError"), e);
+	}
+	const inspectURL = `${getFinderServerFullPath(serverDomain)}${FinderApiPaths.inspect}`;
+	const { status, message, data } = await request({
+		url: inspectURL,
+		method: "GET",
+		headers: { "user-agent": `web finder agent v2` }
+	});
+	if (status !== 200) {
+		if (debug) console.error(colors.bgRed(`服务器 ${inspectURL} 检查接口错误`), colors.red(message || ""));
+		return [];
+	}
+	if (!Array.isArray(data) || !data.every((d) => typeof d === "string")) {
+		console.error(colors.bgRed(`服务器 ${inspectURL} 接口返回内容错误`), colors.red(JSON.stringify(data)));
+		return [];
+	}
+	if (debug) console.log({
+		method: "getServerSupportedProjects",
+		serverDomain,
+		list: data
+	});
+	const pureList = data.map(pure).filter(Boolean);
+	writeFileSync(cacheFile, JSON.stringify(pureList));
+	return pureList;
 }
+//#endregion
+//#region src/core.ts
+/** 部署一个目录 */
 async function finderDeploy(option) {
-  const { dist, ignoreFiles, deployTo, user, key, debug, preview, commitLogs, ignoreCache } = option;
-  if (!dist) {
-    throw "部署参数 dist 缺失".bgRed;
-  }
-  if (!existsSync(resolve(dist)) || !lstatSync(resolve(dist)).isDirectory()) {
-    throw "部署参数错误，dist 需要是一个存在的文件目录".bgRed + " " + dist.red;
-  }
-  const payload = commitLogs ? { 更新内容: commitLogs } : void 0;
-  if (debug) {
-    console.log({
-      method: "finderDeploy",
-      dist,
-      deployTo,
-      ignoreFiles,
-      payload,
-      user,
-      preview
-    });
-  }
-  const buffer = await compressToBuffer(dist, ignoreFiles, debug).catch((e) => {
-    throw "部署预处理之压缩代码失败".bgRed + " " + (e instanceof Error ? e.message : String(e));
-  });
-  if (Array.isArray(deployTo)) {
-    const results = await Promise.all(
-      deployTo.map((target) => {
-        return deploy({ debug, target, buffer, user, key, payload, ignoreCache });
-      })
-    );
-    const lastDeployResult = results[results.length - 1];
-    if (lastDeployResult && lastDeployResult.previewUrl) {
-      doPreview(lastDeployResult.previewUrl, preview);
-    }
-    return deployTo.join(",");
-  }
-  const deployResult = await deploy({ debug, target: deployTo, buffer, user, key, payload, ignoreCache });
-  if (deployResult && deployResult.previewUrl) {
-    doPreview(deployResult.previewUrl, preview);
-  }
-  return deployTo;
+	const { dist, ignoreFiles, deployTo, user, key, debug, preview, commitLogs, ignoreCache } = option;
+	if (!dist) throw new Error("部署参数 dist 缺失");
+	if (!existsSync(resolve(dist)) || !lstatSync(resolve(dist)).isDirectory()) throw new Error(`部署参数错误，dist 需要是一个存在的文件目录 ${dist}`);
+	if (!user || !key) throw new Error("部署缺少认证信息(user & key)");
+	const payload = commitLogs ? { 更新内容: commitLogs } : void 0;
+	if (debug) console.log({
+		method: "finderDeploy",
+		dist,
+		deployTo,
+		ignoreFiles,
+		payload,
+		user,
+		preview
+	});
+	const buffer = await compressToBuffer(dist, ignoreFiles, debug).catch((e) => {
+		throw new Error(`部署预处理之压缩代码失败 ${e instanceof Error ? e.message : String(e)}`);
+	});
+	if (Array.isArray(deployTo)) {
+		const results = await Promise.allSettled(deployTo.map((target) => {
+			return deploy({
+				debug,
+				target,
+				buffer,
+				user,
+				key,
+				payload,
+				ignoreCache
+			});
+		}));
+		const succeeded = [];
+		const failed = [];
+		let lastPreviewUrl = "";
+		results.forEach((result, index) => {
+			const target = deployTo[index];
+			if (result.status === "fulfilled") {
+				succeeded.push(target);
+				if (result.value && result.value.previewUrl) lastPreviewUrl = result.value.previewUrl;
+			} else {
+				const reason = result.reason instanceof Error ? result.reason.message : String(result.reason);
+				failed.push(`${target}(${reason})`);
+			}
+		});
+		if (lastPreviewUrl) doPreview(lastPreviewUrl, preview);
+		if (failed.length) throw new Error(`部分目标部署失败：${failed.join("；")}` + (succeeded.length ? `；成功：${succeeded.join(",")}` : ""));
+		return deployTo.join(",");
+	}
+	const deployResult = await deploy({
+		debug,
+		target: deployTo,
+		buffer,
+		user,
+		key,
+		payload,
+		ignoreCache
+	});
+	if (deployResult && deployResult.previewUrl) doPreview(deployResult.previewUrl, preview);
+	return deployTo;
 }
 function doPreview(defaultPreviewUrl, option) {
-  if (!option) {
-    return;
-  }
-  if (option === true) {
-    open(defaultPreviewUrl);
-    return;
-  }
-  const base = defaultPreviewUrl.replace(/index\.html.*$/i, "");
-  const files = Array.isArray(option) ? option : [option];
-  files.forEach((file) => {
-    open(base + file);
-  });
+	if (!option) return;
+	if (option === true) {
+		open(defaultPreviewUrl);
+		return;
+	}
+	const base = defaultPreviewUrl.replace(/index\.html.*$/i, "");
+	(Array.isArray(option) ? option : [option]).forEach((file) => {
+		open(base + file);
+	});
 }
+/** 上传一个文件到 finder */
 async function finderUpload(option) {
-  const { filePath, fileContent, deployTo, user, key, preview, debug, ignoreCache } = option;
-  if (!filePath && !fileContent) {
-    throw `部署缺少参数 filePath(文件全路径) 或 fileContent(文件内容)`.bgRed;
-  }
-  if (filePath && !existsSync(filePath)) {
-    throw `部署文件不存在(请确保传入完整文件路径)`.bgRed + " " + filePath;
-  }
-  if (!deployTo) {
-    throw `部署缺少参数 deployTo(部署目标)`.bgRed;
-  }
-  const content = filePath ? Buffer.from(readFileSync(filePath)) : Buffer.isBuffer(fileContent) ? fileContent : Buffer.from(fileContent || "");
-  const resp = await upload({ debug, target: pure(deployTo), buffer: content, user, key, ignoreCache });
-  if (preview && resp.previewUrl) {
-    open(resp.previewUrl);
-  }
+	const { filePath, fileContent, deployTo, user, key, preview, debug, ignoreCache } = option;
+	if (!filePath && !fileContent) throw new Error("部署缺少参数 filePath(文件全路径) 或 fileContent(文件内容)");
+	if (filePath && (!existsSync(filePath) || !statSync(filePath).isFile())) throw new Error(`部署文件不存在或不是文件(请确保传入完整文件路径) ${filePath}`);
+	if (!deployTo) throw new Error("部署缺少参数 deployTo(部署目标)");
+	if (!user || !key) throw new Error("部署缺少认证信息(user & key)");
+	const content = filePath ? readFileSync(filePath) : Buffer.isBuffer(fileContent) ? fileContent : Buffer.from(fileContent || "");
+	const resp = await upload({
+		debug,
+		target: pure(deployTo),
+		buffer: content,
+		user,
+		key,
+		ignoreCache
+	});
+	if (preview && resp.previewUrl) open(resp.previewUrl);
 }
+//#endregion
+//#region src/plugin.ts
 function viteDeployPlugin(option) {
-  let distDir = null;
-  return {
-    name: "finerDeployAgent",
-    generateBundle({ dir }) {
-      distDir = process.cwd();
-      if (dir) {
-        distDir = resolve(distDir, dir);
-      }
-    },
-    async closeBundle() {
-      if (!distDir) {
-        console.error("没有找到部署资源，请尝试检查 build 是否生成了正确的资源".bgRed);
-        return;
-      }
-      await option.onBeforeDeploy?.(distDir);
-      const result = await finderDeploy({
-        preview: true,
-        ...option,
-        dist: distDir
-      }).catch((e) => e instanceof Error ? e : typeof e === "string" ? new Error(e) : new Error(e + ""));
-      if (result instanceof Error) {
-        option.onError?.();
-        console.log("部署失败".bgRed, result.message);
-      } else {
-        option.onFinished?.();
-        console.log("部署成功".bgGreen, (result || "").green);
-      }
-    }
-  };
+	const { onBeforeDeploy, onFinished, onError, ...deployOption } = option;
+	let distDir = null;
+	return {
+		name: "finderDeployAgent",
+		generateBundle({ dir }) {
+			distDir = process.cwd();
+			if (dir) distDir = resolve(distDir, dir);
+		},
+		async closeBundle() {
+			if (!distDir) {
+				console.error(colors.bgRed("没有找到部署资源，请尝试检查 build 是否生成了正确的资源"));
+				return;
+			}
+			await onBeforeDeploy?.(distDir);
+			const result = await finderDeploy({
+				preview: true,
+				...deployOption,
+				dist: distDir
+			}).catch((e) => e instanceof Error ? e : new Error(String(e)));
+			if (result instanceof Error) {
+				onError?.(result);
+				console.log(colors.bgRed("部署失败"), colors.red(result.message));
+			} else {
+				onFinished?.();
+				console.log(colors.bgGreen("部署成功"), colors.green(result || ""));
+			}
+		}
+	};
 }
-export {
-  finderDeploy,
-  finderUpload,
-  viteDeployPlugin
-};
+//#endregion
+export { finderDeploy, finderUpload, viteDeployPlugin };

package/package.json CHANGED Viewed

@@ -1,34 +1,34 @@
 {
   "name": "@seayoo-web/finder",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "agent for web finder",
-  "type": "module",
+  "license": "MIT",
+  "author": "web@seayoo.com",
   "source": "index.ts",
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./types/index.d.ts",
   "files": [
     "dist",
     "types",
     "README.md"
   ],
-  "engines": {
-    "node": ">=22"
-  },
-  "author": "web@seayoo.com",
-  "license": "MIT",
+  "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./types/index.d.ts",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "colors": "^1.4.0",
     "compressing": "^1.10.1",
-    "open": "^10.1.0"
+    "open": "^10.1.0",
+    "picocolors": "^1.1.1"
   },
   "devDependencies": {
     "@types/node": "^22.13.1",
-    "vitest": "^3.0.5",
-    "@seayoo-web/tsconfig": "^1.0.5"
+    "vitest": "^4.1.4",
+    "@seayoo-web/tsconfig": "^1.0.6"
+  },
+  "engines": {
+    "node": ">=22"
   },
   "scripts": {
     "build": "vite build && tsc --emitDeclarationOnly",

package/types/src/compress.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 /** 代码压缩 */
 export declare function compressToBuffer(sourceDir: string, ignoreFiles?: string[], debug?: boolean): Promise<Buffer>;
-export declare function getAllFiles(dir: string, ignores?: string[]): string[];
-export declare function isIgnoreFile(filePath: string, ignores: string[]): boolean;
+export declare function getAllFiles(dir: string, ignores?: string[], root?: string): string[];
+export declare function isIgnoreFile(filePath: string, ignores: string[], isDir?: boolean): boolean;

package/types/src/core.d.ts CHANGED Viewed

@@ -1,4 +1,3 @@
-import "colors";
 /** 部署一个目录 */
 export declare function finderDeploy(option: {
     /** 需要推送的代码目录 */

package/types/src/plugin.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { finderDeploy } from "./core";
 type FinderDeployVitePluginOption = Omit<Parameters<typeof finderDeploy>[0], "dist"> & {
     onBeforeDeploy?: (distDir: string) => unknown;
     onFinished?: () => unknown;
-    onError?: () => unknown;
+    onError?: (error: Error) => unknown;
 };
 export declare function viteDeployPlugin(option: FinderDeployVitePluginOption): {
     name: string;

package/types/src/utils.d.ts CHANGED Viewed

@@ -5,11 +5,12 @@ type RequestData = Record<string, string | number | {
     contentType: string;
     filename: string;
 }>;
-export declare function request({ url, method, headers, data, }: {
+export declare function request({ url, method, headers, data, timeout, }: {
     url: string;
     method: "GET" | "POST";
     headers?: Record<string, string>;
     data?: RequestData;
+    timeout?: number;
 }): Promise<{
     status: number;
     message?: string;