refactor: improve request patching logic in cloudflare-proxy and force IPv4 for Telegram configuration

cloudflare-proxy.js

@@ -64,38 +64,39 @@ if (PROXY_URL) {
     };
 
     const patch = (original, originalModuleName) => {
-      return function patchedRequest(options, callback) {
-        let hostname = "";
-        let path = "";
-        let headers = {};
-
-        if (typeof options === "string") {
-          try {
-            const parsed = new URL(options);
-            hostname = parsed.hostname;
-            path = parsed.pathname + parsed.search;
-          } catch (e) {
-             hostname = options.split('/')[0];
-             path = '/' + options.split('/').slice(1).join('/');
+      return function patchedRequest(arg1, arg2, arg3) {
+        let options = {};
+        let callback;
+
+        if (typeof arg1 === "string" || arg1 instanceof URL) {
+          const url = typeof arg1 === "string" ? new URL(arg1) : arg1;
+          options = {
+            protocol: url.protocol,
+            hostname: url.hostname,
+            port: url.port,
+            path: url.pathname + url.search,
+          };
+          if (typeof arg2 === "object" && arg2 !== null) {
+            options = { ...options, ...arg2 };
+            callback = arg3;
+          } else {
+            callback = arg2;
           }
-        } else if (options instanceof URL) {
-          hostname = options.hostname;
-          path = options.pathname + options.search;
-          headers = options.headers || {};
-        } else if (options && typeof options === "object") {
-          hostname =
-            options.hostname ||
-            (options.host ? String(options.host).split(":")[0] : "");
-          path = options.path || "/";
-          headers = options.headers || {};
+        } else {
+          options = { ...arg1 };
+          callback = arg2;
         }
 
+        const hostname =
+          options.hostname ||
+          (options.host ? String(options.host).split(":")[0] : "");
+        const path = options.path || "/";
+        const headers = options.headers || {};
+
         const shouldProxy = shouldProxyHost(hostname);
-        const alreadyProxied =
-          options && typeof options === "object" && options._proxied;
+        const alreadyProxied = options._proxied;
         const hasTargetHeader =
-          headers &&
-          (headers["x-target-host"] || headers["X-Target-Host"]);
+          headers["x-target-host"] || headers["X-Target-Host"];
 
         if (shouldProxy && !alreadyProxied && !hasTargetHeader) {
           if (DEBUG) {
@@ -104,11 +105,7 @@ if (PROXY_URL) {
             );
           }
 
-          const newOptions =
-            typeof options === "string" || options instanceof URL
-              ? { protocol: "https:", path }
-              : { ...options };
-
+          const newOptions = { ...options };
           newOptions._proxied = true;
           newOptions.protocol = "https:";
           newOptions.hostname = proxy.hostname;
@@ -118,7 +115,7 @@ if (PROXY_URL) {
           delete newOptions.agent;
 
           newOptions.headers = {
-            ...(newOptions.headers || {}),
+            ...(options.headers || {}),
             host: proxy.host,
             "x-target-host": hostname,
           };
@@ -130,7 +127,7 @@ if (PROXY_URL) {
           return originalHttpsRequest.call(https, newOptions, callback);
         }
 
-        return original.call(this, options, callback);
+        return original.call(this, arg1, arg2, arg3);
       };
     };
 

start.sh

@@ -354,17 +354,18 @@ fi
 # Telegram (supports multiple user IDs, comma-separated)
 if [ -n "${TELEGRAM_BOT_TOKEN:-}" ]; then
   CONFIG_JSON=$(echo "$CONFIG_JSON" | jq '.plugins.entries.telegram = {"enabled": true}')
-  export TELEGRAM_BOT_TOKEN="$TELEGRAM_BOT_TOKEN"
+  export TELEGRAM_BOT_TOKEN="${TELEGRAM_BOT_TOKEN//[[:space:]]/}"
   export OPENCLAW_TELEGRAM_DISABLE_AUTO_SELECT_FAMILY=1
   export OPENCLAW_TELEGRAM_DNS_RESULT_ORDER=ipv4first
-  CONFIG_JSON=$(echo "$CONFIG_JSON" | jq --arg token "$TELEGRAM_BOT_TOKEN" --arg proxy_url "${CLOUDFLARE_PROXY_URL:-}" '
+  # Force ipv4 for Telegram specifically as HF IPv6 often times out
+  export NODE_OPTIONS="${NODE_OPTIONS:+$NODE_OPTIONS }--dns-result-order=ipv4first"
+  
+  CONFIG_JSON=$(echo "$CONFIG_JSON" | jq --arg token "$TELEGRAM_BOT_TOKEN" '
     .channels.telegram.enabled = true
     | .channels.telegram.botToken = $token
     | .channels.telegram.commands.native = false
     | .channels.telegram.timeoutSeconds = 60
-    | (if $proxy_url != "" then .channels.telegram.apiRoot = $proxy_url else . end)
-    # | .channels.telegram.network.autoSelectFamily = false
-    # | .channels.telegram.network.dnsResultOrder = "ipv4first"
+    | .channels.telegram.apiRoot = "https://api.telegram.org"
     | .channels.telegram.retry = {
         "attempts": 5,
         "minDelayMs": 800,