unplugin-dingtalk 0.4.2 → 0.5.2

package/dist/webpack.cjs

@@ -4389,15 +4389,15 @@ var require_streams = __commonJS({
     var POOL_SIZE2 = 65536;
     if (!globalThis.ReadableStream) {
       try {
-        const process4 = require("process");
-        const { emitWarning } = process4;
+        const process3 = require("process");
+        const { emitWarning } = process3;
         try {
-          process4.emitWarning = () => {
+          process3.emitWarning = () => {
           };
           Object.assign(globalThis, require("stream/web"));
-          process4.emitWarning = emitWarning;
+          process3.emitWarning = emitWarning;
         } catch (error) {
-          process4.emitWarning = emitWarning;
+          process3.emitWarning = emitWarning;
           throw error;
         }
       } catch (error) {
@@ -5069,6 +5069,7 @@ var init_multipart_parser = __esm({
               state = S.HEADER_FIELD;
               mark("onHeaderField");
               index = 0;
+            // falls through
             case S.HEADER_FIELD:
               if (c3 === CR) {
                 clear("onHeaderField");
@@ -5098,6 +5099,7 @@ var init_multipart_parser = __esm({
               }
               mark("onHeaderValue");
               state = S.HEADER_VALUE;
+            // falls through
             case S.HEADER_VALUE:
               if (c3 === CR) {
                 dataCallback("onHeaderValue", true);
@@ -5121,6 +5123,7 @@ var init_multipart_parser = __esm({
             case S.PART_DATA_START:
               state = S.PART_DATA;
               mark("onPartData");
+            // falls through
             case S.PART_DATA:
               previousIndex = index;
               if (index === 0) {
@@ -5211,8 +5214,6 @@ __export(webpack_exports, {
   default: () => webpack_default
 });
 module.exports = __toCommonJS(webpack_exports);
-var import_node_child_process2 = require("child_process");
-var import_node_process2 = __toESM(require("process"), 1);
 var import_unplugin2 = require("unplugin");
 var import_cookie2 = __toESM(require("cookie"), 1);
 var import_picocolors2 = __toESM(require("picocolors"), 1);
@@ -6512,23 +6513,99 @@ function fixResponseChunkedTransferBadEnding(request, errorCallback) {
 // src/index.ts
 var import_node_child_process = require("child_process");
 var import_node_process = __toESM(require("process"), 1);
+var import_node_http3 = require("http");
+var import_node_net2 = require("net");
 var import_unplugin = require("unplugin");
 var import_picocolors = __toESM(require("picocolors"), 1);
 var import_cookie = __toESM(require("cookie"), 1);
-var import_chii = require("chii");
+var import_z_chii = require("z-chii");
+var import_dns2 = __toESM(require("dns2"), 1);
 var import_get_port_please = require("get-port-please");
+var import_http_proxy = __toESM(require("http-proxy"), 1);
 var cwd = import_node_process.default.cwd();
 var config;
 var colorUrl = (url) => import_picocolors.default.green(url.replace(/:(\d+)\//, (_, port) => `:${import_picocolors.default.bold(port)}/`));
 var resovedInfo = {
   devtoolsInstance: void 0,
+  dnsServerInstence: void 0,
   availablePort: void 0,
   targetURL: void 0
 };
+function startVueDevtools(enable) {
+  if (enable && !resovedInfo.devtoolsInstance) {
+    resovedInfo.devtoolsInstance = (0, import_node_child_process.exec)("npx vue-devtools");
+    console.log(`  ${import_picocolors.default.green("\u279C")}  vue-devtools is running. If the devtools has no data, please refresh the page in dingtalk.`);
+    resovedInfo.devtoolsInstance.on("exit", () => {
+      resovedInfo.devtoolsInstance = void 0;
+    });
+    import_node_process.default.on("exit", () => {
+      if (resovedInfo.devtoolsInstance) {
+        resovedInfo.devtoolsInstance.kill();
+      }
+    });
+  }
+}
+function startDnsServer(options) {
+  function debug(...args) {
+    if (options == null ? void 0 : options.debug) {
+      console.log(`  ${import_picocolors.default.yellow("DEBUG")}  `, ...args);
+    }
+  }
+  if ((options == null ? void 0 : options.enable) && (options == null ? void 0 : options.dns) && !resovedInfo.dnsServerInstence) {
+    const { Packet } = import_dns2.default;
+    resovedInfo.dnsServerInstence = import_dns2.default.createServer({
+      tcp: true,
+      udp: true,
+      handle: (request, send, rinfo) => {
+        var _a4;
+        const response = Packet.createResponseFromRequest(request);
+        const [question] = request.questions;
+        const { name } = question;
+        if (name === options.dns.host) {
+          response.answers.push({
+            name,
+            type: Packet.TYPE.A,
+            class: Packet.CLASS.IN,
+            ttl: 300,
+            address: (_a4 = options.dns) == null ? void 0 : _a4.ip
+          });
+          debug(`dns request from ${rinfo.address}:${rinfo.port} for ${name} => ${options.dns.ip}`);
+        }
+        send(response);
+      }
+    });
+    resovedInfo.dnsServerInstence.listen({
+      udp: { address: "0.0.0.0", port: 53 },
+      tcp: { address: "0.0.0.0", port: 53 }
+    }).then(() => {
+      debug("DNS server is running.");
+      const dns = new import_dns2.default({
+        port: 53,
+        nameServers: ["127.0.0.1", "8.8.8.8"]
+      });
+      dns.resolveA(options.dns.host).then((addresses) => {
+        var _a4;
+        if (((_a4 = addresses.answers[0]) == null ? void 0 : _a4.address) === options.dns.ip) {
+          startDnsServer(options);
+          console.log(`  ${import_picocolors.default.green("\u279C")}  ${import_picocolors.default.bold(`DNS server is started, please modify the DNS of the remote device to ${options.dns.ip}`)}`);
+        } else {
+          debug(addresses.answers[0].address);
+          throw new Error("DNS server started failed");
+        }
+      }).catch((e2) => {
+        throw e2;
+      });
+    }).catch((e2) => {
+      debug(e2);
+      console.log(`  ${import_picocolors.default.red("\u279C")}  ${import_picocolors.default.bold((e2 == null ? void 0 : e2.message) || e2)}`);
+    });
+  }
+}
 var unpluginFactory = (options) => {
   const {
-    chii: enableChii = true
+    chii
   } = options || {};
+  const enableChii = (chii == null ? void 0 : chii.enable) !== false;
   function debug(...args) {
     if (options == null ? void 0 : options.debug) {
       console.log(`  ${import_picocolors.default.yellow("DEBUG")}  `, ...args);
@@ -6544,22 +6621,16 @@ var unpluginFactory = (options) => {
       var _a4, _b, _c;
       if ((options == null ? void 0 : options.enable) && enableChii && !resovedInfo.availablePort) {
         resovedInfo.availablePort = await (0, import_get_port_please.getRandomPort)();
-        debug(`chii server port: ${JSON.stringify({ availablePort: resovedInfo.availablePort })}`);
-        (0, import_chii.start)({
-          host: "0.0.0.0",
+        (0, import_z_chii.start)({
           port: resovedInfo.availablePort
         });
+        debug(`chii server port: ${resovedInfo.availablePort}`);
       }
       if (options == null ? void 0 : options.enable) {
         const codes = [
           "/* eslint-disable */;",
           ((_a4 = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _a4.enable) ? `import { devtools } from '@vue/devtools'
-          devtools.connect(${(_b = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _b.host}, ${(_c = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _c.port});` : "",
-          (options == null ? void 0 : options.enable) && enableChii ? `(() => { 
-          const script = document.createElement('script'); 
-          script.src="http://localhost:${resovedInfo.availablePort}/target.js"; 
-          document.body.appendChild(script); 
-          })()` : "",
+          devtools.connect(${((_b = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _b.host) ? `"${options.vueDevtools.host}"` : void 0}, ${((_c = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _c.port) ? `${options.vueDevtools.port}` : void 0});` : "",
           "/* eslint-enable */",
           `${_source};`
         ];
@@ -6579,6 +6650,22 @@ var unpluginFactory = (options) => {
       configResolved(_config) {
         config = _config;
       },
+      transformIndexHtml(html) {
+        if (enableChii) {
+          return html.replace(
+            "</body>",
+            `</body>
+<script>
+  (() => { 
+    const script = document.createElement('script'); 
+    script.src="./__chii_proxy/target.js"; 
+    document.body.appendChild(script); 
+  })()
+</script>
+`
+          );
+        }
+      },
       async configureServer(server) {
         var _a4, _b;
         if (!(options == null ? void 0 : options.enable)) {
@@ -6614,7 +6701,7 @@ var unpluginFactory = (options) => {
           server.middlewares.use((req, res, next) => {
             const cookies = import_cookie.default.parse(req.headers.cookie || "");
             for (const [name, value] of Object.entries(cookies)) {
-              if (options.debugCookies && options.debugCookies.length > 0 && options.debugCookies.includes(name)) {
+              if (value && options.debugCookies && options.debugCookies.length > 0 && options.debugCookies.includes(name)) {
                 const serializedCookie = import_cookie.default.serialize(name, value, {
                   httpOnly: false
                 });
@@ -6625,6 +6712,51 @@ var unpluginFactory = (options) => {
           });
         }
         if (enableChii) {
+          let createProxyMiddleware2 = function() {
+            let proxy = null;
+            const handleUpgrade = (req, socket, head) => {
+              var _a5;
+              if (proxy && ((_a5 = req.url) == null ? void 0 : _a5.startsWith("/__chii_proxy"))) {
+                debug("WS upgrade:", req.url);
+                req.url = req.url.replace("/__chii_proxy", "");
+                proxy.ws(req, socket, head);
+              }
+            };
+            return (resolvedInfo) => {
+              return (req, res, next) => {
+                var _a5;
+                if (!proxy && resolvedInfo.availablePort) {
+                  proxy = import_http_proxy.default.createProxyServer({
+                    target: `http://localhost:${resolvedInfo.availablePort}`,
+                    ws: true
+                    // changeOrigin: true, // Consider if you need this
+                  });
+                  proxy.on("error", (err, req2, res2) => {
+                    console.error("Proxy error:", err);
+                    if (res2 instanceof import_node_http3.ServerResponse) {
+                      if (!res2.headersSent) {
+                        res2.writeHead(500, { "Content-Type": "text/plain" });
+                      }
+                      res2.end(`Proxy error: ${err.message}`);
+                    } else if (res2 instanceof import_node_net2.Socket) {
+                      res2.destroy();
+                    }
+                  });
+                  if (req.socket.server) {
+                    req.socket.server.on("upgrade", handleUpgrade);
+                  }
+                }
+                if (proxy && ((_a5 = req.url) == null ? void 0 : _a5.startsWith("/__chii_proxy"))) {
+                  debug(req.url);
+                  req.url = req.url.replace("/__chii_proxy", "");
+                  proxy.web(req, res);
+                } else {
+                  next();
+                }
+              };
+            };
+          };
+          var createProxyMiddleware = createProxyMiddleware2;
           server.middlewares.use("/__chrome_devtools", async (_req, res) => {
             try {
               const raw = await fetch(`http://localhost:${resovedInfo.availablePort}/targets`);
@@ -6633,6 +6765,9 @@ var unpluginFactory = (options) => {
                 const devToolsUrl = `http://localhost:${resovedInfo.availablePort}/front_end/chii_app.html?ws=localhost:${resovedInfo.availablePort}/client/${Math.random().toString(20).substring(2, 8)}?target=${data.targets[0].id}&rtc=false`;
                 res.writeHead(302, { Location: devToolsUrl });
                 res.end();
+              } else {
+                res.writeHead(404);
+                res.end();
               }
             } catch (error) {
               debug(`${error}`);
@@ -6640,6 +6775,8 @@ var unpluginFactory = (options) => {
               res.end();
             }
           });
+          const proxyMiddleware = createProxyMiddleware2();
+          server.middlewares.use(proxyMiddleware(resovedInfo));
         }
         server.middlewares.use("/open-dingtalk", (req, res) => {
           var _a5;
@@ -6647,20 +6784,10 @@ var unpluginFactory = (options) => {
           res.writeHead(302, {
             Location: `dingtalk://dingtalkclient/page/link?url=${encodeURIComponent(targetURL.toString())}`
           });
-          if (((_a5 = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _a5.enable) && !resovedInfo.devtoolsInstance) {
-            resovedInfo.devtoolsInstance = (0, import_node_child_process.exec)("npx vue-devtools");
-            console.log(`  ${import_picocolors.default.green("\u279C")}  vue-devtools is running. If the devtools has no data, please refresh the page in dingtalk.`);
-            resovedInfo.devtoolsInstance.on("exit", () => {
-              resovedInfo.devtoolsInstance = void 0;
-            });
-            import_node_process.default.on("exit", () => {
-              if (resovedInfo.devtoolsInstance) {
-                resovedInfo.devtoolsInstance.kill();
-              }
-            });
-          }
+          startVueDevtools((_a5 = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _a5.enable);
           res.end();
         });
+        startDnsServer(options);
       }
     },
     webpack(compiler) {
@@ -6691,6 +6818,7 @@ var unpluginFactory = (options) => {
       if (options == null ? void 0 : options.corpId) {
         resovedInfo.targetURL.searchParams.append("corpId", options.corpId);
       }
+      startDnsServer(options);
     },
     async rspack(compiler) {
       var _a4, _b, _c, _d2, _e;
@@ -6719,6 +6847,7 @@ var unpluginFactory = (options) => {
           "Click to open chrome devtools"
         )}: ${colorUrl(`http://${source}${base}__chrome_devtools`)}`);
       }
+      startDnsServer(options);
     }
   };
   return unpluginDing;
@@ -6732,14 +6861,15 @@ var webpack_default = (options) => {
     }
   }
   const {
-    chii: enableChii = true
+    chii
   } = options || {};
+  const enableChii = (chii == null ? void 0 : chii.enable) !== false;
   const injectSetupMiddlewares = (middlewares, devServer) => {
     if (options.debugCookies && options.debugCookies.length > 0) {
       devServer.app.use((req, res, next) => {
         const cookies = import_cookie2.default.parse(req.headers.cookie || "");
         for (const [name, value] of Object.entries(cookies)) {
-          if (options.debugCookies && options.debugCookies.length > 0 && options.debugCookies.includes(name)) {
+          if (value && options.debugCookies && options.debugCookies.length > 0 && options.debugCookies.includes(name)) {
             const serializedCookie = import_cookie2.default.serialize(name, value, {
               httpOnly: false
             });
@@ -6759,6 +6889,9 @@ var webpack_default = (options) => {
             const devToolsUrl = `http://localhost:${availablePort}/front_end/chii_app.html?ws=localhost:${availablePort}/client/${Math.random().toString(20).substring(2, 8)}?target=${data.targets[0].id}&rtc=false`;
             res.writeHead(302, { Location: devToolsUrl });
             res.end();
+          } else {
+            res.writeHead(404);
+            res.end();
           }
         } catch (error) {
           debug(`${error}`);
@@ -6774,18 +6907,7 @@ var webpack_default = (options) => {
       res.writeHead(302, {
         Location: `dingtalk://dingtalkclient/page/link?url=${encodeURIComponent(targetURL.toString())}`
       });
-      if (((_a4 = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _a4.enable) && !resovedInfo.devtoolsInstance) {
-        resovedInfo.devtoolsInstance = (0, import_node_child_process2.exec)("npx vue-devtools");
-        console.log(`  ${import_picocolors2.default.green("\u279C")}  vue-devtools is running. If the devtools has no data, please refresh the page in dingtalk.`);
-        resovedInfo.devtoolsInstance.on("exit", () => {
-          resovedInfo.devtoolsInstance = void 0;
-        });
-        import_node_process2.default.on("exit", () => {
-          if (resovedInfo.devtoolsInstance) {
-            resovedInfo.devtoolsInstance.kill();
-          }
-        });
-      }
+      startVueDevtools((_a4 = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _a4.enable);
       res.end();
     });
     return middlewares;

package/dist/webpack.js

@@ -1,13 +1,12 @@
 import {
   fetch,
   resovedInfo,
+  startVueDevtools,
   unpluginFactory
-} from "./chunk-RDTWBIQD.js";
-import "./chunk-PMOTCIQR.js";
+} from "./chunk-QU7HLXVD.js";
+import "./chunk-ZEHXGFFH.js";
 
 // src/webpack.ts
-import { exec } from "child_process";
-import process from "process";
 import { createWebpackPlugin } from "unplugin";
 import cookie from "cookie";
 import c from "picocolors";
@@ -18,14 +17,15 @@ var webpack_default = (options) => {
     }
   }
   const {
-    chii: enableChii = true
+    chii
   } = options || {};
+  const enableChii = (chii == null ? void 0 : chii.enable) !== false;
   const injectSetupMiddlewares = (middlewares, devServer) => {
     if (options.debugCookies && options.debugCookies.length > 0) {
       devServer.app.use((req, res, next) => {
         const cookies = cookie.parse(req.headers.cookie || "");
         for (const [name, value] of Object.entries(cookies)) {
-          if (options.debugCookies && options.debugCookies.length > 0 && options.debugCookies.includes(name)) {
+          if (value && options.debugCookies && options.debugCookies.length > 0 && options.debugCookies.includes(name)) {
             const serializedCookie = cookie.serialize(name, value, {
               httpOnly: false
             });
@@ -45,6 +45,9 @@ var webpack_default = (options) => {
             const devToolsUrl = `http://localhost:${availablePort}/front_end/chii_app.html?ws=localhost:${availablePort}/client/${Math.random().toString(20).substring(2, 8)}?target=${data.targets[0].id}&rtc=false`;
             res.writeHead(302, { Location: devToolsUrl });
             res.end();
+          } else {
+            res.writeHead(404);
+            res.end();
           }
         } catch (error) {
           debug(`${error}`);
@@ -60,18 +63,7 @@ var webpack_default = (options) => {
       res.writeHead(302, {
         Location: `dingtalk://dingtalkclient/page/link?url=${encodeURIComponent(targetURL.toString())}`
       });
-      if (((_a = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _a.enable) && !resovedInfo.devtoolsInstance) {
-        resovedInfo.devtoolsInstance = exec("npx vue-devtools");
-        console.log(`  ${c.green("\u279C")}  vue-devtools is running. If the devtools has no data, please refresh the page in dingtalk.`);
-        resovedInfo.devtoolsInstance.on("exit", () => {
-          resovedInfo.devtoolsInstance = void 0;
-        });
-        process.on("exit", () => {
-          if (resovedInfo.devtoolsInstance) {
-            resovedInfo.devtoolsInstance.kill();
-          }
-        });
-      }
+      startVueDevtools((_a = options == null ? void 0 : options.vueDevtools) == null ? void 0 : _a.enable);
       res.end();
     });
     return middlewares;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-dingtalk",
   "type": "module",
-  "version": "0.4.2",
+  "version": "0.5.2",
   "description": "",
   "license": "MIT",
   "homepage": "https://github.com/zcf0508/unplugin-dingtalk#readme",
@@ -123,17 +123,20 @@
   },
   "dependencies": {
     "@antfu/eslint-config": "^2.18.1",
-    "chii": "^1.10.0",
-    "cookie": "^0.6.0",
+    "cookie": "^1.0.2",
+    "dns2": "^2.1.0",
     "eslint-plugin-security": "^3.0.0",
     "get-port-please": "^3.1.2",
+    "http-proxy": "^1.18.1",
     "picocolors": "^1.0.1",
     "unplugin": "^1.5.1",
-    "vite-plugin-vconsole": "^2.1.1"
+    "vite-plugin-vconsole": "^2.1.1",
+    "z-chii": "1.15.5-beta.1"
   },
   "devDependencies": {
     "@nuxt/kit": "^3.8.2",
     "@nuxt/schema": "^3.8.2",
+    "@types/dns2": "^2.0.9",
     "@types/node": "^20.10.3",
     "bumpp": "^9.2.0",
     "chalk": "^5.3.0",
@@ -146,7 +149,7 @@
     "rollup": "^4.6.1",
     "tsup": "^8.0.1",
     "vite": "^5.0.4",
-    "vitest": "^0.34.6",
+    "vitest": "^1.6.0",
     "webpack": "^5.89.0",
     "webpack-dev-server": "^5.0.4"
   },