@pmtuan0206/n8n-nodes-netproxy-cur 0.1.0 → 0.1.1

package/dist/nodes/NetProxy/NetProxy.node.js

@@ -56,29 +56,41 @@ function selectProxy(proxies, strategy, staticData) {
         return proxies[0];
     }
 }
-function createProxyAgent(proxy) {
+function createProxyAgent(proxy, targetUrl) {
     const proxyUrl = proxy.auth
         ? `${proxy.protocol}://${proxy.auth.username}:${proxy.auth.password}@${proxy.host}:${proxy.port}`
         : `${proxy.protocol}://${proxy.host}:${proxy.port}`;
+    // Determine if target URL is HTTPS
+    const isHttpsTarget = targetUrl ? targetUrl.startsWith('https://') : true;
     if (proxy.protocol === 'socks5') {
         return new socks_proxy_agent_1.SocksProxyAgent(proxyUrl);
     }
     else if (proxy.protocol === 'https') {
+        // HTTPS proxy - use HttpsProxyAgent from hpagent
         return new hpagent_1.HttpsProxyAgent({
             proxy: proxyUrl,
         });
     }
     else {
         // HTTP proxy
-        return new hpagent_1.HttpProxyAgent({
-            proxy: proxyUrl,
-        });
+        if (isHttpsTarget) {
+            // For HTTPS target through HTTP proxy, use HttpsProxyAgent to tunnel HTTPS
+            return new hpagent_1.HttpsProxyAgent({
+                proxy: proxyUrl,
+            });
+        }
+        else {
+            // For HTTP target through HTTP proxy
+            return new hpagent_1.HttpProxyAgent({
+                proxy: proxyUrl,
+            });
+        }
     }
 }
 async function testConnection(proxies, rotationStrategy, staticData) {
     const selectedProxy = selectProxy(proxies, rotationStrategy, staticData);
-    const agent = createProxyAgent(selectedProxy);
     const testUrl = 'https://api.ipify.org?format=json';
+    const agent = createProxyAgent(selectedProxy, testUrl);
     try {
         const response = await axios_1.default.get(testUrl, {
             httpsAgent: agent,
@@ -96,7 +108,7 @@ async function testConnection(proxies, rotationStrategy, staticData) {
         if (rotationStrategy === 'failover' && proxies.length > 1) {
             // Try next proxy
             const nextProxy = selectProxy(proxies, 'roundRobin', staticData);
-            const nextAgent = createProxyAgent(nextProxy);
+            const nextAgent = createProxyAgent(nextProxy, testUrl);
             try {
                 const response = await axios_1.default.get(testUrl, {
                     httpsAgent: nextAgent,
@@ -169,11 +181,18 @@ async function makeRequest(executeFunctions, itemIndex, proxies, rotationStrateg
             config.data = formData;
         }
     }
-    // Select proxy and create agent
+    // Select proxy and create agent based on target URL protocol
     let selectedProxy = selectProxy(proxies, rotationStrategy, staticData);
-    let agent = createProxyAgent(selectedProxy);
-    config.httpsAgent = agent;
-    config.httpAgent = agent;
+    let agent = createProxyAgent(selectedProxy, url);
+    // Set agents based on URL protocol
+    if (url.startsWith('https://')) {
+        config.httpsAgent = agent;
+        config.httpAgent = agent; // Also set for potential redirects
+    }
+    else {
+        config.httpAgent = agent;
+        config.httpsAgent = agent; // Also set for potential redirects
+    }
     // Make request with failover logic
     const maxRetries = rotationStrategy === 'failover' ? proxies.length : 1;
     let lastError = null;
@@ -200,9 +219,15 @@ async function makeRequest(executeFunctions, itemIndex, proxies, rotationStrateg
                     if (rotationStrategy === 'failover' && attempt < maxRetries - 1) {
                         // Try next proxy
                         selectedProxy = selectProxy(proxies, 'roundRobin', staticData);
-                        agent = createProxyAgent(selectedProxy);
-                        config.httpsAgent = agent;
-                        config.httpAgent = agent;
+                        agent = createProxyAgent(selectedProxy, url);
+                        if (url.startsWith('https://')) {
+                            config.httpsAgent = agent;
+                            config.httpAgent = agent;
+                        }
+                        else {
+                            config.httpAgent = agent;
+                            config.httpsAgent = agent;
+                        }
                         continue;
                     }
                     else if (rotationStrategy === 'stopOnDead') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmtuan0206/n8n-nodes-netproxy-cur",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Route HTTP requests through NetProxy.io residential proxies with auto-rotation and failover",
   "keywords": [
     "n8n-community-node",
@@ -56,4 +56,3 @@
     "socks-proxy-agent": "^8.0.2"
   }
 }
-