dsh-provider-proxy 0.4.0 → 0.4.1

package/lib/index.js

@@ -1128,6 +1128,13 @@ function createProxyTable(config) {
       );
       continue;
     }
+    if (route.protocol === "socks5" && route.password.length > 0 && route.username.length === 0) {
+      problems.set(
+        provider,
+        "dsh-provider-proxy: SOCKS5 \u914D\u7F6E\u4E86\u5BC6\u7801\u4F46\u6CA1\u6709\u7528\u6237\u540D\uFF1B\u8BF7\u8865\u5168\u7528\u6237\u540D\u6216\u6E05\u7A7A\u5BC6\u7801"
+      );
+      continue;
+    }
     if (route.protocol !== "socks5" && route.password.length > 0 && route.username.length === 0) {
       problems.set(
         provider,
@@ -1135,6 +1142,13 @@ function createProxyTable(config) {
       );
       continue;
     }
+    if (route.protocol !== "socks5" && route.username.length > 0 && route.password.length === 0) {
+      problems.set(
+        provider,
+        "dsh-provider-proxy: \u914D\u7F6E\u4E86\u4EE3\u7406\u7528\u6237\u540D\u4F46\u6CA1\u6709\u5BC6\u7801\uFF1B\u8BF7\u8865\u5168\u5BC6\u7801\u6216\u6E05\u7A7A\u7528\u6237\u540D"
+      );
+      continue;
+    }
     const url = proxyUrl(route);
     let dispatcher;
     try {
@@ -1181,6 +1195,7 @@ function apply(ctx, config) {
   };
   const DEFAULT_TEST_URL = "https://api.ipify.org?format=json";
   const TEST_TIMEOUT_MS = 1e4;
+  const MAX_REQUEST_BYTES = 8 * 1024;
   const selfChecks = /* @__PURE__ */ new Map();
   const plainTestUrl = () => {
     const raw = config?.testUrl;
@@ -1188,6 +1203,7 @@ function apply(ctx, config) {
     const value = typeof snapshot2 === "function" ? snapshot2.call(raw) : raw;
     return typeof value === "string" && value.trim().length > 0 ? value.trim() : DEFAULT_TEST_URL;
   };
+  const bareMessage = (message) => message.replace(/^dsh-provider-proxy:\s*/, "");
   const causesOf = (error) => {
     const out = [];
     const seen = /* @__PURE__ */ new Set();
@@ -1225,6 +1241,10 @@ function apply(ctx, config) {
   const runSelfCheck = async (provider) => {
     const route = current.get(provider);
     if (route === void 0) {
+      const problem = problems.get(provider);
+      if (problem !== void 0) {
+        return { ok: false, kind: "route-rejected", error: bareMessage(problem) };
+      }
       return { ok: false, kind: "no-route", error: `provider "${provider}" \u672A\u542F\u7528\u4EE3\u7406` };
     }
     const started = performance.now();
@@ -1308,7 +1328,9 @@ function apply(ctx, config) {
           try {
             const text = JSON.stringify({
               ...catalog(),
-              problems: Object.fromEntries(problems),
+              problems: Object.fromEntries(
+                [...problems].map(([id, message]) => [id, bareMessage(message)])
+              ),
               hits: Object.fromEntries(hits)
             });
             res.writeHead(200, {
@@ -1327,7 +1349,10 @@ function apply(ctx, config) {
         kind: "exact",
         path: "/dsh-provider-proxy/test",
         handler: (req, res) => {
+          let replied = false;
           const send = (status, payload) => {
+            if (replied) return;
+            replied = true;
             const text = JSON.stringify(payload);
             res.writeHead(status, {
               "content-type": "application/json; charset=utf-8",
@@ -1344,10 +1369,24 @@ function apply(ctx, config) {
             send(400, { ok: false, kind: "body", error: "\u65E0\u6CD5\u8BFB\u53D6\u8BF7\u6C42\u4F53" });
             return;
           }
+          let bytes = 0;
           const chunks = [];
-          req.on("data", (chunk) => chunks.push(chunk));
+          req.on("data", (chunk) => {
+            if (replied) return;
+            bytes += chunk.length;
+            if (bytes > MAX_REQUEST_BYTES) {
+              send(413, {
+                ok: false,
+                kind: "body",
+                error: `\u8BF7\u6C42\u4F53\u8D85\u8FC7 ${MAX_REQUEST_BYTES} \u5B57\u8282\u4E0A\u9650`
+              });
+              return;
+            }
+            chunks.push(chunk);
+          });
           req.on("error", () => send(400, { ok: false, kind: "body", error: "\u8BFB\u53D6\u8BF7\u6C42\u4F53\u5931\u8D25" }));
           req.on("end", () => {
+            if (replied) return;
             void (async () => {
               let provider;
               try {
@@ -1391,7 +1430,6 @@ function apply(ctx, config) {
       return router.run(
         {
           dispatcher: route.dispatcher,
-          provider: WEB_SEARCH_KEY,
           onHit: () => bump(WEB_SEARCH_KEY),
           decide: route.decide
         },
@@ -1401,7 +1439,7 @@ function apply(ctx, config) {
     web.search = patched;
     const registerEffect = typeof wctx?.effect === "function" ? wctx.effect.bind(wctx) : ctx.effect?.bind(ctx);
     registerEffect?.(() => () => {
-      if (web.search === patched) web.search = original;
+      if (Object.getOwnPropertyDescriptor(web, "search")?.value === patched) delete web.search;
     });
   });
   ctx.effect(() => {
@@ -1415,7 +1453,6 @@ function apply(ctx, config) {
         return router.wrap(
           {
             dispatcher: route.dispatcher,
-            provider,
             onHit: () => bump(provider),
             decide: route.decide
           },