n8n-nodes-jygse-vw-weconnect 0.2.13 → 0.2.15

package/dist/nodes/VwWeConnect/VwWeConnect.node.js

@@ -32,10 +32,16 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VwWeConnect = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const crypto = __importStar(require("crypto"));
+const axios_1 = __importDefault(require("axios"));
+const axios_cookiejar_support_1 = require("axios-cookiejar-support");
+const tough_cookie_1 = require("tough-cookie");
 class VwWeConnect {
     constructor() {
         this.description = {
@@ -216,6 +222,9 @@ async function vwLogin(context, email, password) {
         const state = generateTraceId(); // Use UUID as state
         const traceId = generateTraceId(); // For weconnect-trace-id header
         const codeVerifier = generateCodeVerifier();
+        // Create cookie jar for session management (like ioBroker)
+        const jar = new tough_cookie_1.CookieJar();
+        const client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({ jar }));
         // Browser-like headers (EXACTLY from ioBroker.vw-connect)
         const browserHeaders = {
             'User-Agent': VW_USER_AGENT,
@@ -238,48 +247,39 @@ async function vwLogin(context, email, password) {
             '&state=' + state +
             '&code_challenge=' + codeChallenge +
             '&code_challenge_method=S256';
-        // Use browser-like headers for initial request
-        // Skip auto redirects so we can handle vwconnect:// redirect manually
-        const authorizeResponse = await context.helpers.httpRequest({
-            method: 'GET',
-            url: authorizeUrl,
+        // Use axios with cookie jar for session management
+        const authorizeResponse = await client.get(authorizeUrl, {
             headers: browserHeaders,
-            encoding: 'text',
-            returnFullResponse: true,
-            ignoreHttpStatusErrors: true,
-            skipAutoFollowRedirects: true,
+            maxRedirects: 0, // Don't follow any redirects
+            validateStatus: () => true, // Accept any status code
+        }).catch(err => {
+            // axios throws on redirect when maxRedirects=0, but we can get the response
+            if (err.response)
+                return err.response;
+            throw err;
         });
-        // Extract response body and check for redirect
+        // Extract response body and check for redirect (axios format)
         let htmlContent;
         let currentUrl = '';
         let stateToken = '';
         let httpStatusCode = 0;
-        if (typeof authorizeResponse === 'string') {
-            htmlContent = authorizeResponse;
-        }
-        else if (authorizeResponse && typeof authorizeResponse === 'object') {
-            const respObj = authorizeResponse;
-            const respHeaders = respObj.headers;
-            httpStatusCode = respObj.statusCode || 0;
-            // Check for redirect in headers (case-insensitive)
-            if (respHeaders) {
-                const locationHeader = respHeaders.location || respHeaders.Location;
-                if (locationHeader) {
-                    currentUrl = locationHeader;
-                }
-            }
-            if (respObj.body && typeof respObj.body === 'string') {
-                htmlContent = respObj.body;
-            }
-            else if (respObj.data && typeof respObj.data === 'string') {
-                htmlContent = respObj.data;
-            }
-            else {
-                htmlContent = JSON.stringify(respObj);
+        // axios response format: { data, status, headers, ... }
+        httpStatusCode = authorizeResponse.status || 0;
+        // Check for redirect in headers
+        if (authorizeResponse.headers) {
+            const locationHeader = authorizeResponse.headers.location || authorizeResponse.headers.Location;
+            if (locationHeader) {
+                currentUrl = locationHeader;
             }
         }
+        if (typeof authorizeResponse.data === 'string') {
+            htmlContent = authorizeResponse.data;
+        }
+        else if (authorizeResponse.data) {
+            htmlContent = JSON.stringify(authorizeResponse.data);
+        }
         else {
-            htmlContent = String(authorizeResponse);
+            htmlContent = '';
         }
         // Debug: If we got an error page (status 400/500 or "Oops" in content), throw with details
         if (httpStatusCode >= 400 || htmlContent.includes('Oops!, something went wrong')) {
@@ -306,38 +306,23 @@ async function vwLogin(context, email, password) {
             if (!currentUrl.startsWith('http') && !currentUrl.startsWith('/')) {
                 break;
             }
-            // Follow the redirect using API headers
+            // Follow the redirect using axios with cookie jar
             const followUrl = currentUrl.startsWith('http') ? currentUrl : `https://identity.vwgroup.io${currentUrl}`;
-            const followResponse = await context.helpers.httpRequest({
-                method: 'GET',
-                url: followUrl,
+            const followResponse = await client.get(followUrl, {
                 headers: browserHeaders,
-                encoding: 'text',
-                returnFullResponse: true,
-                ignoreHttpStatusErrors: true,
-                skipAutoFollowRedirects: true,
-            });
-            if (typeof followResponse === 'string') {
-                htmlContent = followResponse;
-                currentUrl = '';
-            }
-            else if (followResponse && typeof followResponse === 'object') {
-                const respObj = followResponse;
-                const respHeaders = respObj.headers;
-                currentUrl = '';
-                if (respHeaders) {
-                    const locationHeader = respHeaders.location || respHeaders.Location;
-                    if (locationHeader) {
-                        currentUrl = locationHeader;
-                    }
-                }
-                if (respObj.body && typeof respObj.body === 'string') {
-                    htmlContent = respObj.body;
-                }
-                else if (respObj.data && typeof respObj.data === 'string') {
-                    htmlContent = respObj.data;
+                maxRedirects: 0,
+                validateStatus: () => true,
+            }).catch(err => err.response || { data: '', headers: {}, status: 0 });
+            currentUrl = '';
+            if (followResponse.headers) {
+                const locationHeader = followResponse.headers.location || followResponse.headers.Location;
+                if (locationHeader) {
+                    currentUrl = locationHeader;
                 }
             }
+            if (typeof followResponse.data === 'string') {
+                htmlContent = followResponse.data;
+            }
             maxInitialRedirects--;
         }
         // Try to extract state token from the final HTML if not found in URL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-jygse-vw-weconnect",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "n8n community node for VW We Connect - Control your Volkswagen T6.1 and other VW vehicles",
   "keywords": [
     "n8n-community-node-package",
@@ -43,8 +43,14 @@
       "dist/nodes/VwWeConnect/VwWeConnect.node.js"
     ]
   },
+  "dependencies": {
+    "axios": "^1.6.0",
+    "axios-cookiejar-support": "^5.0.0",
+    "tough-cookie": "^4.1.0"
+  },
   "devDependencies": {
     "@types/node": "^20.10.0",
+    "@types/tough-cookie": "^4.0.5",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.56.0",
     "gulp": "^4.0.2",