Update index.js

index.js

@@ -1,82 +1,128 @@
-import axios from 'axios';
-import { request } from 'undici';
-import dotenv from 'dotenv';
-
-dotenv.config();
-
-// Simple DoH resolver using Cloudflare
-async function resolveDNS(hostname) {
-  try {
-    const dohUrl = `https://cloudflare-dns.com/dns-query?name=${hostname}&type=A`;
-    const response = await request(dohUrl, {
-      method: 'GET',
-      headers: { 'Accept': 'application/dns-json' }
-    });
-    const data = await response.body.json();
-    if (data.Answer && data.Answer.length > 0) {
-      const aRecord = data.Answer.find(r => r.type === 1);
-      if (aRecord) return aRecord.data;
-    }
-    return hostname;
-  } catch (e) {
-    console.warn('DoH failed:', e.message || e);
-    return hostname;
-  }
-}
-
-const apiClient = axios.create({ timeout: 15000 });
-const fallbackClient = axios.create({ timeout: 15000 });
-
-apiClient.interceptors.request.use(async (config) => {
-  if (!config.url) return config;
-  try {
-    const url = new URL(config.url);
-    const hostname = url.hostname;
-    if (hostname && !hostname.match(/^(\d+\.){3}\d+$/) && hostname !== 'localhost') {
-      const ip = await resolveDNS(hostname);
-      if (ip !== hostname) {
-        url.hostname = ip;
-        config.url = url.toString();
-        config.headers = config.headers || {};
-        config.headers['Host'] = hostname;
-        console.log(`DoH: ${hostname} -> ${ip}`);
-      }
-    }
-  } catch (e) {
-    console.warn('DoH resolver error', e.message || e);
-  }
-  return config;
-});
-
-async function testTelegramApi(botToken) {
-  const url = `https://api.telegram.org/bot${botToken}/getMe`;
-
-  console.log('\n=== Testing apiClient (DoH) ===');
-  try {
-    const res = await apiClient.get(url, { timeout: 15000 });
-    console.log('apiClient response status:', res.status);
-    console.log('apiClient data:', res.data);
-  } catch (e) {
-    console.error('apiClient error:', e && e.response ? { status: e.response.status, data: e.response.data } : e.message || e);
-  }
-
-  console.log('\n=== Testing fallbackClient (normal DNS) ===');
-  try {
-    const res2 = await fallbackClient.get(url, { timeout: 15000 });
-    console.log('fallbackClient response status:', res2.status);
-    console.log('fallbackClient data:', res2.data);
-  } catch (e) {
-    console.error('fallbackClient error:', e && e.response ? { status: e.response.status, data: e.response.data } : e.message || e);
-  }
-}
-
-async function main() {
-  const botToken = process.env.TEST_BOT_TOKEN;
-  if (!botToken) {
-    console.error('Set TEST_BOT_TOKEN in .env');
-    process.exit(1);
-  }
-  await testTelegramApi(botToken);
-}
-
-main().catch(e => { console.error('Fatal:', e); process.exit(1); });
+import axios from 'axios';
+import { request } from 'undici';
+import dotenv from 'dotenv';
+import https from 'https';
+import net from 'net';
+
+dotenv.config();
+
+// Simple DoH resolver using Cloudflare
+async function resolveDNS(hostname) {
+  try {
+    const dohUrl = `https://cloudflare-dns.com/dns-query?name=${hostname}&type=A`;
+    const response = await request(dohUrl, {
+      method: 'GET',
+      headers: { 'Accept': 'application/dns-json' }
+    });
+    const data = await response.body.json();
+    if (data.Answer && data.Answer.length > 0) {
+      const aRecord = data.Answer.find(r => r.type === 1);
+      if (aRecord) return aRecord.data;
+    }
+    return hostname;
+  } catch (e) {
+    console.warn('DoH failed:', e.message || e);
+    return hostname;
+  }
+}
+
+const apiClient = axios.create({ timeout: 15000 });
+const fallbackClient = axios.create({ timeout: 15000 });
+
+apiClient.interceptors.request.use(async (config) => {
+  if (!config.url) return config;
+  try {
+    const url = new URL(config.url);
+    const hostname = url.hostname;
+    if (hostname && !hostname.match(/^(\d+\.){3}\d+$/) && hostname !== 'localhost') {
+      const ip = await resolveDNS(hostname);
+      if (ip !== hostname) {
+        url.hostname = ip;
+        config.url = url.toString();
+        config.headers = config.headers || {};
+        config.headers['Host'] = hostname;
+        console.log(`DoH: ${hostname} -> ${ip}`);
+      }
+    }
+  } catch (e) {
+    console.warn('DoH resolver error', e.message || e);
+  }
+  return config;
+});
+
+async function testTelegramApi(botToken) {
+  const url = `https://api.telegram.org/bot${botToken}/getMe`;
+
+  console.log('\n=== Testing apiClient (DoH) ===');
+  try {
+    const res = await apiClient.get(url, { timeout: 15000 });
+    console.log('apiClient response status:', res.status);
+    console.log('apiClient data:', res.data);
+  } catch (e) {
+    console.error('apiClient error:', e && e.response ? { status: e.response.status, data: e.response.data } : e.message || e);
+  }
+
+  console.log('\n=== Testing fallbackClient (normal DNS) ===');
+  try {
+    const res2 = await fallbackClient.get(url, { timeout: 15000 });
+    console.log('fallbackClient response status:', res2.status);
+    console.log('fallbackClient data:', res2.data);
+  } catch (e) {
+    console.error('fallbackClient error:', e && e.response ? { status: e.response.status, data: e.response.data } : e.message || e);
+  }
+
+  // Additional diagnostics: resolve DNS, test TCP connect to IP, and HTTPS to IP with SNI
+  try {
+    const hostname = new URL(url).hostname;
+    console.log('\n=== Additional diagnostics ===');
+    const resolved = await resolveDNS(hostname);
+    console.log('Resolved hostname via DoH (or fallback):', resolved);
+
+    // If resolved is not the hostname, attempt TCP connect to port 443
+    if (resolved && resolved !== hostname) {
+      console.log(`Attempting TCP connect to ${resolved}:443`);
+      const tcpResult = await new Promise((resolve) => {
+        const socket = new net.Socket();
+        let settled = false;
+        socket.setTimeout(5000);
+        socket.on('connect', () => { if (!settled) { settled = true; socket.destroy(); resolve({ connected: true }); } });
+        socket.on('timeout', () => { if (!settled) { settled = true; socket.destroy(); resolve({ connected: false, error: 'timeout' }); } });
+        socket.on('error', (err) => { if (!settled) { settled = true; resolve({ connected: false, error: err.message }); } });
+        socket.connect(443, resolved);
+      });
+
+      console.log('TCP connect result:', tcpResult);
+
+      // Attempt HTTPS request directly to the IP while setting SNI (servername)
+      try {
+        console.log(`Attempting HTTPS request to https://${resolved} with SNI=${hostname} (rejectUnauthorized=false for test)`);
+        const httpsAgent = new https.Agent({ servername: hostname, rejectUnauthorized: false });
+        const ipUrl = url.replace(hostname, resolved);
+        const resp = await axios.get(ipUrl, {
+          timeout: 15000,
+          headers: { Host: hostname },
+          httpsAgent
+        });
+        console.log('HTTPS-over-IP response status:', resp.status);
+        console.log('HTTPS-over-IP data:', resp.data);
+      } catch (err) {
+        console.error('HTTPS-over-IP error:', err && err.response ? { status: err.response.status, data: err.response.data } : err.message || err);
+      }
+    } else {
+      console.log('No IP resolved (or hostname returned) — skipping TCP/HTTPS-over-IP tests');
+    }
+  } catch (diagErr) {
+    console.error('Diagnostics failed:', diagErr instanceof Error ? diagErr.message : diagErr);
+  }
+}
+
+async function main() {
+  const botToken = process.env.TEST_BOT_TOKEN;
+  if (!botToken) {
+    console.error('Set TEST_BOT_TOKEN in .env');
+    process.exit(1);
+  }
+  await testTelegramApi(botToken);
+}
+
+main().catch(e => { console.error('Fatal:', e); process.exit(1); });