@seayoo-web/finder 2.0.0 → 2.0.1

package/dist/index.cjs

@@ -6,7 +6,7 @@ const open = require("open");
 require("colors");
 const compressing = require("compressing");
 const os = require("os");
-const presetIgnores = ["node_modules/", ".git/", ".vscode/", ".DS_Store"];
+const presetIgnores = ["node_modules/", ".git/", ".vscode/", "__MACOSX/", ".DS_Store"];
 function compressToBuffer(sourceDir, ignoreFiles, debug) {
   const ignoreFileList = [...presetIgnores, ...ignoreFiles || []];
   const filesToCompress = getAllFiles(sourceDir, ignoreFileList);
@@ -24,13 +24,7 @@ function compressToBuffer(sourceDir, ignoreFiles, debug) {
   }
   const chunks = [];
   return new Promise(function(resolve, reject) {
-    zipStream.on("data", (chunk) => chunks.push(chunk)).on("end", () => {
-      const buffer = Buffer.concat(chunks);
-      if (debug) {
-        fs.writeFileSync(path.join(process.cwd(), "_finder_deploy_buffer.zip"), buffer);
-      }
-      resolve(buffer);
-    }).on("error", reject);
+    zipStream.on("data", (chunk) => chunks.push(chunk)).on("end", () => resolve(Buffer.concat(chunks))).on("error", reject);
   });
 }
 function getAllFiles(dir, ignores = []) {
@@ -124,7 +118,8 @@ const FinderServers = {
   "finder.seayoo.io": [],
   "finder.seayoo.com": [],
   "finder.seayoo.internal": [],
-  "finder.dev.seayoo.com": []
+  "finder.dev.seayoo.com": [],
+  "finder.dev.seayoo.io": []
 };
 const FinderApiPaths = {
   deploy: "/service/deploy",
@@ -246,7 +241,9 @@ async function getServerSupportedProjects(serverDomain, ignoreCache = false, deb
     headers: { UserAgent: `web finder agent v2` }
   });
   if (status !== 200) {
-    console.error(`服务器 ${inspectURL} 检查接口错误`.bgRed, (message || "").red);
+    if (!serverDomain.includes(".internal")) {
+      console.error(`服务器 ${inspectURL} 检查接口错误`.bgRed, (message || "").red);
+    }
     return [];
   }
   if (!Array.isArray(data) || !data.every((d) => typeof d === "string")) {
@@ -268,9 +265,6 @@ async function finderDeploy(option) {
   if (!fs.existsSync(path.resolve(dist)) || !fs.lstatSync(path.resolve(dist)).isDirectory()) {
     throw "部署参数错误，dist 需要是一个存在的文件目录".bgRed + " " + dist.red;
   }
-  const buffer = await compressToBuffer(dist, ignoreFiles || [], debug).catch((e) => {
-    throw "部署预处理之压缩代码失败".bgRed + " " + (e instanceof Error ? e.message : String(e));
-  });
   const payload = commitLogs ? { 更新内容: commitLogs } : void 0;
   if (debug) {
     console.log({
@@ -283,6 +277,9 @@ async function finderDeploy(option) {
       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) => {

package/dist/index.js

@@ -1,10 +1,10 @@
-import fs, { writeFileSync, readdirSync, lstatSync, existsSync, readFileSync } from "fs";
+import fs, { readdirSync, lstatSync, existsSync, readFileSync, writeFileSync } from "fs";
 import path, { relative, join, basename, normalize, sep, dirname, resolve, extname } from "path";
 import open from "open";
 import "colors";
 import { zip } from "compressing";
 import os from "os";
-const presetIgnores = ["node_modules/", ".git/", ".vscode/", ".DS_Store"];
+const presetIgnores = ["node_modules/", ".git/", ".vscode/", "__MACOSX/", ".DS_Store"];
 function compressToBuffer(sourceDir, ignoreFiles, debug) {
   const ignoreFileList = [...presetIgnores, ...ignoreFiles || []];
   const filesToCompress = getAllFiles(sourceDir, ignoreFileList);
@@ -22,13 +22,7 @@ function compressToBuffer(sourceDir, ignoreFiles, debug) {
   }
   const chunks = [];
   return new Promise(function(resolve2, reject) {
-    zipStream.on("data", (chunk) => chunks.push(chunk)).on("end", () => {
-      const buffer = Buffer.concat(chunks);
-      if (debug) {
-        writeFileSync(join(process.cwd(), "_finder_deploy_buffer.zip"), buffer);
-      }
-      resolve2(buffer);
-    }).on("error", reject);
+    zipStream.on("data", (chunk) => chunks.push(chunk)).on("end", () => resolve2(Buffer.concat(chunks))).on("error", reject);
   });
 }
 function getAllFiles(dir, ignores = []) {
@@ -122,7 +116,8 @@ const FinderServers = {
   "finder.seayoo.io": [],
   "finder.seayoo.com": [],
   "finder.seayoo.internal": [],
-  "finder.dev.seayoo.com": []
+  "finder.dev.seayoo.com": [],
+  "finder.dev.seayoo.io": []
 };
 const FinderApiPaths = {
   deploy: "/service/deploy",
@@ -244,7 +239,9 @@ async function getServerSupportedProjects(serverDomain, ignoreCache = false, deb
     headers: { UserAgent: `web finder agent v2` }
   });
   if (status !== 200) {
-    console.error(`服务器 ${inspectURL} 检查接口错误`.bgRed, (message || "").red);
+    if (!serverDomain.includes(".internal")) {
+      console.error(`服务器 ${inspectURL} 检查接口错误`.bgRed, (message || "").red);
+    }
     return [];
   }
   if (!Array.isArray(data) || !data.every((d) => typeof d === "string")) {
@@ -266,9 +263,6 @@ async function finderDeploy(option) {
   if (!existsSync(resolve(dist)) || !lstatSync(resolve(dist)).isDirectory()) {
     throw "部署参数错误，dist 需要是一个存在的文件目录".bgRed + " " + dist.red;
   }
-  const buffer = await compressToBuffer(dist, ignoreFiles || [], debug).catch((e) => {
-    throw "部署预处理之压缩代码失败".bgRed + " " + (e instanceof Error ? e.message : String(e));
-  });
   const payload = commitLogs ? { 更新内容: commitLogs } : void 0;
   if (debug) {
     console.log({
@@ -281,6 +275,9 @@ async function finderDeploy(option) {
       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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seayoo-web/finder",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "agent for web finder",
   "type": "module",
   "source": "index.ts",

package/src/compress.ts

@@ -1,10 +1,10 @@
-import { readdirSync, lstatSync, writeFileSync } from "fs";
+import { readdirSync, lstatSync } from "fs";
 import { join, relative, normalize, basename, sep } from "path";
 
 import { zip } from "compressing";
 
 // 部署代码默认的忽略列表
-const presetIgnores = ["node_modules/", ".git/", ".vscode/", ".DS_Store"];
+const presetIgnores = ["node_modules/", ".git/", ".vscode/", "__MACOSX/", ".DS_Store"];
 
 /** 代码压缩 */
 export function compressToBuffer(sourceDir: string, ignoreFiles?: string[], debug?: boolean): Promise<Buffer> {
@@ -28,14 +28,8 @@ export function compressToBuffer(sourceDir: string, ignoreFiles?: string[], debu
   return new Promise(function (resolve, reject) {
     zipStream
       .on("data", (chunk) => chunks.push(chunk as Buffer))
-      .on("end", () => {
-        const buffer = Buffer.concat(chunks);
-        if (debug) {
-          writeFileSync(join(process.cwd(), "_finder_deploy_buffer.zip"), buffer);
-        }
-        resolve(buffer);
-      })
-      .on("error", reject); // 处理错误
+      .on("end", () => resolve(Buffer.concat(chunks)))
+      .on("error", reject);
   });
 }
 

package/src/core.ts

@@ -34,10 +34,6 @@ export async function finderDeploy(option: {
   if (!existsSync(resolve(dist)) || !lstatSync(resolve(dist)).isDirectory()) {
     throw "部署参数错误，dist 需要是一个存在的文件目录".bgRed + " " + dist.red;
   }
-  // 压缩代码准备上传
-  const buffer = await compressToBuffer(dist, ignoreFiles || [], debug).catch((e) => {
-    throw "部署预处理之压缩代码失败".bgRed + " " + (e instanceof Error ? e.message : String(e));
-  });
   const payload = commitLogs ? { 更新内容: commitLogs } : undefined;
   if (debug) {
     console.log({
@@ -50,6 +46,10 @@ export async function finderDeploy(option: {
       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(

package/src/service.ts

@@ -9,6 +9,7 @@ const FinderServers: Record<string, string[]> = {
   "finder.seayoo.com": [],
   "finder.seayoo.internal": [],
   "finder.dev.seayoo.com": [],
+  "finder.dev.seayoo.io": [],
 };
 
 /** finder 的 api path */
@@ -164,7 +165,9 @@ async function getServerSupportedProjects(
     headers: { UserAgent: `web finder agent v2` },
   });
   if (status !== 200) {
-    console.error(`服务器 ${inspectURL} 检查接口错误`.bgRed, (message || "").red);
+    if (!serverDomain.includes(".internal")) {
+      console.error(`服务器 ${inspectURL} 检查接口错误`.bgRed, (message || "").red);
+    }
     return [];
   }
   if (!Array.isArray(data) || !data.every((d) => typeof d === "string")) {