n8n-nodes-amis-v1 0.1.5 → 0.1.7

package/dist/nodes/MisaAmis/MisaAmis.node.js

@@ -132,8 +132,9 @@ class MisaAmis {
         // 1. Load Session
         const credentials = await this.getCredentials('misaAmisUser');
         const userIdentity = credentials.userIdentity;
+        const safeIdentity = userIdentity.replace(/[^a-z0-9]/gi, '_').toLowerCase();
         const n8nDir = process.env.N8N_USER_FOLDER || path.join(os.homedir(), '.n8n');
-        const sessionFilePath = path.join(n8nDir, 'misa_sessions', `${userIdentity}.json`);
+        const sessionFilePath = path.join(n8nDir, 'misa_sessions', `${safeIdentity}.json`);
         if (!fs.existsSync(sessionFilePath)) {
             throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Session file not found for user: ${userIdentity}. Please run Login Node first.`);
         }

package/dist/nodes/MisaAmisLogin/MisaAmisLogin.node.js

@@ -99,19 +99,7 @@ class MisaAmisLogin {
                         },
                     },
                 },
-                {
-                    displayName: 'Request ID',
-                    name: 'requestId',
-                    type: 'string',
-                    default: '',
-                    required: true,
-                    displayOptions: {
-                        show: {
-                            operation: ['checkLogin'],
-                        },
-                    },
-                    description: 'The CDRequestId returned from "Generate QR" step',
-                },
+                // Removed requestId and cookieJar inputs because we use file-based state
             ],
         };
     }
@@ -120,11 +108,20 @@ class MisaAmisLogin {
         const returnData = [];
         const operation = this.getNodeParameter('operation', 0);
         const userIdentity = this.getNodeParameter('userIdentity', 0);
+        const safeIdentity = userIdentity.replace(/[^a-z0-9]/gi, '_').toLowerCase();
         const n8nDir = process.env.N8N_USER_FOLDER || path.join(os.homedir(), '.n8n');
         const storagePath = path.join(n8nDir, 'misa_sessions');
-        if (!fs.existsSync(storagePath)) {
-            fs.mkdirSync(storagePath, { recursive: true });
+        try {
+            if (!fs.existsSync(storagePath)) {
+                fs.mkdirSync(storagePath, { recursive: true });
+            }
+        }
+        catch (error) {
+            throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Failed to create storage directory '${storagePath}': ${error.message}. Please check permissions.`);
         }
+        // File paths
+        const sessionFilePath = path.join(storagePath, `${safeIdentity}.json`);
+        const pendingFilePath = path.join(storagePath, `${safeIdentity}.pending.json`);
         const clientId = '6bcbc4d1-5426-42f7-bc61-69cac2e229f4';
         const headers = {
             'Content-Type': 'application/json',
@@ -155,11 +152,19 @@ class MisaAmisLogin {
                 const cdRequestId = genQrRes.data.CDRequestId;
                 const qrContent = `https://amisapp.misa.vn/shared?app=qrlogin&qrid=${cdRequestId}&domain=amisapp.misa.vn`;
                 const qrBuffer = await qrcode_1.default.toBuffer(qrContent);
+                // SAVE PENDING STATE
+                const serializedJar = await jar.serialize();
+                const pendingState = {
+                    requestId: cdRequestId,
+                    cookieJar: serializedJar,
+                    timestamp: Date.now()
+                };
+                fs.writeFileSync(pendingFilePath, JSON.stringify(pendingState, null, 2));
                 returnData.push({
                     json: {
-                        message: "QR Generated. Scan it and then use 'Check Login' step.",
+                        message: "QR Generated. Please Scan. Pending session saved.",
+                        userIdentity: userIdentity,
                         requestId: cdRequestId,
-                        clientId: clientId,
                         qrContent: qrContent
                     },
                     binary: {
@@ -173,16 +178,31 @@ class MisaAmisLogin {
             }
             else if (operation === 'checkLogin') {
                 // --- Operation: Check Login ---
-                const cdRequestId = this.getNodeParameter('requestId', 0);
-                const sessionFilePath = path.join(storagePath, `${userIdentity}.json`);
+                // READ PENDING STATE
+                if (!fs.existsSync(pendingFilePath)) {
+                    const allFiles = fs.readdirSync(storagePath);
+                    const pendingFiles = allFiles.filter(f => f.endsWith('.pending.json'));
+                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), `No pending login found for user '${userIdentity}'. Path: ${pendingFilePath}. Available pending sessions: ${pendingFiles.join(', ')}`);
+                }
+                const pendingState = JSON.parse(fs.readFileSync(pendingFilePath, 'utf8'));
+                const cdRequestId = pendingState.requestId;
+                // Restore Cookies
+                if (pendingState.cookieJar) {
+                    const deserialized = await tough_cookie_1.CookieJar.deserialize(pendingState.cookieJar);
+                    await jar.removeAllCookies();
+                    for (const cookie of await deserialized.getCookies('https://id.misa.vn')) {
+                        await jar.setCookie(cookie, 'https://id.misa.vn');
+                    }
+                }
                 let pollingSuccess = false;
                 let attempts = 0;
-                const maxAttempts = 60; // 2 minutes (2s interval)
+                const maxAttempts = 60; // 2 minutes
                 while (!pollingSuccess && attempts < maxAttempts) {
                     attempts++;
                     await new Promise(resolve => setTimeout(resolve, 2000));
                     try {
                         const pollUrl = `https://id.misa.vn/api/login-cross-device/v2/polling?cdRequestId=${cdRequestId}&clientId=${clientId}&deviceId=${clientId}`;
+                        console.log(`[MISA Debug] Polling Attempt ${attempts}: ${pollUrl}`);
                         const pollRes = await client.get(pollUrl, { headers });
                         if (JSON.stringify(pollRes.data).includes("Success") || JSON.stringify(pollRes.data).includes("v1/auth/token")) {
                             pollingSuccess = true;
@@ -190,15 +210,19 @@ class MisaAmisLogin {
                     }
                     catch (error) {
                         if (error.response && error.response.status >= 400 && error.response.status < 500) {
-                            // Client Error (400/404) -> Request ID invalid or expired
-                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Polling Error ${error.response.status}: ${JSON.stringify(error.response.data)}. Please Generate QR again.`);
+                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Polling Error: ${JSON.stringify(error.response.data)}. Please Generate QR again.`);
                         }
-                        // Ignore server errors or network glitches (retry)
                     }
                 }
                 if (pollingSuccess) {
+                    // Save FINAL Session
                     const serializedJar = await jar.serialize();
                     fs.writeFileSync(sessionFilePath, JSON.stringify(serializedJar, null, 2));
+                    // Cleanup Pending
+                    try {
+                        fs.unlinkSync(pendingFilePath);
+                    }
+                    catch (e) { }
                     returnData.push({
                         json: {
                             message: "Login Successful",
@@ -208,7 +232,7 @@ class MisaAmisLogin {
                     });
                 }
                 else {
-                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Login timeout or failed. Please scan QR Code again.');
+                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Login timeout. Please scan QR Code again.');
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "n8n-nodes-amis-v1",
-    "version": "0.1.5",
+    "version": "0.1.7",
     "description": "n8n node for AMIS v1",
     "keywords": [
         "n8n-community-node-package"