@seayoo-web/finder 2.1.1 → 2.2.1

package/dist/index.js

@@ -109,7 +109,7 @@ async function request({
     const response = await fetch(url, requestInit);
     let responseData;
     const contentType = response.headers.get("content-type");
-    if (contentType == null ? void 0 : contentType.includes("application/json")) {
+    if (contentType?.includes("application/json")) {
       responseData = await response.json();
     } else {
       responseData = await response.text();
@@ -140,8 +140,8 @@ const FinderApiPaths = {
   upload: "/service/upload"
 };
 async function deploy(option) {
-  const { debug, target, buffer, user, key, payload } = option;
-  const targetServer = await findTargetServer(target, debug);
+  const { debug, target, buffer, user, key, payload, ignoreCache } = option;
+  const targetServer = await findTargetServer(target, debug, ignoreCache);
   if (!targetServer) {
     throw `finder不支持该域名部署，请检查 ${target}`.bgRed;
   }
@@ -174,8 +174,8 @@ async function deploy(option) {
   };
 }
 async function upload(option) {
-  const { debug, target, buffer, user, key } = option;
-  const targetServer = await findTargetServer(target, debug);
+  const { debug, target, buffer, user, key, ignoreCache } = option;
+  const targetServer = await findTargetServer(target, debug, ignoreCache);
   if (!targetServer) {
     throw `finder不支持该域名部署，请检查 ${target}`.bgRed;
   }
@@ -204,18 +204,20 @@ async function upload(option) {
 const getFinderServerFullPath = function(domain) {
   return (domain.endsWith("internal") ? "http://" : "https://") + domain;
 };
-async function findTargetServer(target, debug) {
+async function findTargetServer(target, debug, ignoreCache) {
   const t = pure(target);
-  await updateSupportedProjects(false, debug);
+  await updateSupportedProjects(!!ignoreCache, debug);
   for (const domain in FinderServers) {
     if (FinderServers[domain].find((url) => t.startsWith(url))) {
       return domain;
     }
   }
-  await updateSupportedProjects(true, 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;
@@ -265,7 +267,7 @@ async function getServerSupportedProjects(serverDomain, ignoreCache = false, deb
   return pureList;
 }
 async function finderDeploy(option) {
-  const { dist, ignoreFiles, deployTo, user, key, debug, preview, commitLogs } = option;
+  const { dist, ignoreFiles, deployTo, user, key, debug, preview, commitLogs, ignoreCache } = option;
   if (!dist) {
     throw "部署参数 dist 缺失".bgRed;
   }
@@ -290,7 +292,7 @@ async function finderDeploy(option) {
   if (Array.isArray(deployTo)) {
     const results = await Promise.all(
       deployTo.map((target) => {
-        return deploy({ debug, target, buffer, user, key, payload });
+        return deploy({ debug, target, buffer, user, key, payload, ignoreCache });
       })
     );
     const lastDeployResult = results[results.length - 1];
@@ -299,7 +301,7 @@ async function finderDeploy(option) {
     }
     return deployTo.join(",");
   }
-  const deployResult = await deploy({ debug, target: deployTo, buffer, user, key, payload });
+  const deployResult = await deploy({ debug, target: deployTo, buffer, user, key, payload, ignoreCache });
   if (deployResult && deployResult.previewUrl) {
     doPreview(deployResult.previewUrl, preview);
   }
@@ -320,7 +322,7 @@ function doPreview(defaultPreviewUrl, option) {
   });
 }
 async function finderUpload(option) {
-  const { filePath, fileContent, deployTo, user, key, preview, debug } = option;
+  const { filePath, fileContent, deployTo, user, key, preview, debug, ignoreCache } = option;
   if (!filePath && !fileContent) {
     throw `部署缺少参数 filePath(文件全路径) 或 fileContent(文件内容)`.bgRed;
   }
@@ -331,7 +333,7 @@ async function finderUpload(option) {
     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 });
+  const resp = await upload({ debug, target: pure(deployTo), buffer: content, user, key, ignoreCache });
   if (preview && resp.previewUrl) {
     open(resp.previewUrl);
   }
@@ -347,21 +349,21 @@ function viteDeployPlugin(option) {
       }
     },
     async closeBundle() {
-      var _a, _b;
       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) {
-        (_a = option.onError) == null ? void 0 : _a.call(option);
+        option.onError?.();
         console.log("部署失败".bgRed, result.message);
       } else {
-        (_b = option.onFinished) == null ? void 0 : _b.call(option);
+        option.onFinished?.();
         console.log("部署成功".bgGreen, (result || "").green);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/finder",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "description": "agent for web finder",
   "type": "module",
   "source": "index.ts",
@@ -28,10 +28,11 @@
   "devDependencies": {
     "@types/node": "^22.13.1",
     "vitest": "^3.0.5",
-    "@seayoo-web/tsconfig": "^1.0.3"
+    "@seayoo-web/tsconfig": "^1.0.5"
   },
   "scripts": {
     "build": "vite build && tsc --emitDeclarationOnly",
+    "type-check": "tsc --noEmit",
     "test": "vitest",
     "prepublish": "pnpm build"
   }

package/types/src/core.d.ts

@@ -25,12 +25,14 @@ export declare function finderDeploy(option: {
     preview?: boolean | string | string[];
     /** 代码的 commit log 信息，换行用 \n */
     commitLogs?: string;
+    /** 是否忽略本地缓存的服务器更新信息 */
+    ignoreCache?: boolean;
 }): Promise<string>;
 /** 上传一个文件到 finder */
 export declare function finderUpload(option: {
-    /** 需要上传的文件路径 */
+    /** 需要上传的文件路径，与 fileContent 二选一，优先级高于 fileContent */
     filePath?: string;
-    /** 需要上传的文件内容 */
+    /** 需要上传的文件内容，与 filePath 二选一 */
     fileContent?: string | Buffer;
     /** 部署目标全路径，需要包含文件名 */
     deployTo: string;
@@ -38,4 +40,5 @@ export declare function finderUpload(option: {
     key: string;
     debug?: boolean;
     preview?: boolean;
+    ignoreCache?: boolean;
 }): Promise<void>;

package/types/src/plugin.d.ts

@@ -1,12 +1,13 @@
 import { finderDeploy } from "./core";
 type FinderDeployVitePluginOption = Omit<Parameters<typeof finderDeploy>[0], "dist"> & {
+    onBeforeDeploy?: (distDir: string) => unknown;
     onFinished?: () => unknown;
     onError?: () => unknown;
 };
 export declare function viteDeployPlugin(option: FinderDeployVitePluginOption): {
     name: string;
     generateBundle({ dir }: {
-        dir: string;
+        dir?: string;
     }): void;
     closeBundle(): Promise<void>;
 };

package/types/src/service.d.ts

@@ -6,6 +6,7 @@ export declare function deploy(option: {
     user: string;
     key: string;
     payload?: Record<string, string>;
+    ignoreCache?: boolean;
 }): Promise<{
     previewUrl?: string;
 }>;
@@ -16,6 +17,7 @@ export declare function upload(option: {
     buffer: Buffer;
     user: string;
     key: string;
+    ignoreCache?: boolean;
 }): Promise<{
     previewUrl?: string;
 }>;