n8n-nodes-amis-v1 0.1.3 → 0.1.4

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

@@ -66,14 +66,51 @@ class MisaAmisLogin {
                 },
             ],
             properties: [
+                {
+                    displayName: 'Operation',
+                    name: 'operation',
+                    type: 'options',
+                    noDataExpression: true,
+                    options: [
+                        {
+                            name: 'Generate QR',
+                            value: 'generateQr',
+                            description: 'Generate a QR code for login',
+                        },
+                        {
+                            name: 'Check Login',
+                            value: 'checkLogin',
+                            description: 'Check status of QR scan',
+                        },
+                    ],
+                    default: 'generateQr',
+                },
                 {
                     displayName: 'User Identity (Email/ID)',
                     name: 'userIdentity',
                     type: 'string',
                     default: '',
                     placeholder: 'hiennv',
-                    description: 'Unique identifier for this session. The session will be saved automatically.',
+                    description: 'Unique identifier for sessions.',
+                    required: true,
+                    displayOptions: {
+                        show: {
+                            operation: ['checkLogin', 'generateQr'],
+                        },
+                    },
+                },
+                {
+                    displayName: 'Request ID',
+                    name: 'requestId',
+                    type: 'string',
+                    default: '',
                     required: true,
+                    displayOptions: {
+                        show: {
+                            operation: ['checkLogin'],
+                        },
+                    },
+                    description: 'The CDRequestId returned from "Generate QR" step',
                 },
             ],
         };
@@ -81,100 +118,95 @@ class MisaAmisLogin {
     async execute() {
         const items = this.getInputData();
         const returnData = [];
+        const operation = this.getNodeParameter('operation', 0);
         const userIdentity = this.getNodeParameter('userIdentity', 0);
-        const credentials = await this.getCredentials('misaAmisApp');
         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 });
         }
-        const sessionFilePath = path.join(storagePath, `${userIdentity}.json`);
         const clientId = '6bcbc4d1-5426-42f7-bc61-69cac2e229f4';
-        const jar = new tough_cookie_1.CookieJar();
-        const client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({ jar }));
         const headers = {
             'Content-Type': 'application/json',
             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36',
             'Origin': 'https://amisapp.misa.vn',
             'Referer': 'https://amisapp.misa.vn/',
         };
+        const jar = new tough_cookie_1.CookieJar();
+        const client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({ jar }));
         try {
-            const genQrPayload = {
-                clientId: clientId,
-                deviceId: clientId,
-                userAgent: headers['User-Agent'],
-                deviceName: "Desktop",
-                deviceType: "Desktop",
-                osName: "Windows",
-                osVersion: "10",
-                browser: "Google Chrome",
-                browserVersion: "143.0"
-            };
-            const genQrRes = await client.post('https://id.misa.vn/api/login-cross-device/gen-qrcode', genQrPayload, { headers });
-            if (!genQrRes.data || !genQrRes.data.CDRequestId) {
-                throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Failed to generate QR Code Request ID');
+            if (operation === 'generateQr') {
+                // --- Operation: Generate QR ---
+                const genQrPayload = {
+                    clientId: clientId,
+                    deviceId: clientId,
+                    userAgent: headers['User-Agent'],
+                    deviceName: "Desktop",
+                    deviceType: "Desktop",
+                    osName: "Windows",
+                    osVersion: "10",
+                    browser: "Google Chrome",
+                    browserVersion: "143.0"
+                };
+                const genQrRes = await client.post('https://id.misa.vn/api/login-cross-device/gen-qrcode', genQrPayload, { headers });
+                if (!genQrRes.data || !genQrRes.data.CDRequestId) {
+                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Failed to generate QR Code Request ID');
+                }
+                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);
+                returnData.push({
+                    json: {
+                        message: "QR Generated. Scan it and then use 'Check Login' step.",
+                        requestId: cdRequestId,
+                        clientId: clientId,
+                        qrContent: qrContent
+                    },
+                    binary: {
+                        qr: {
+                            data: qrBuffer.toString('base64'),
+                            mimeType: 'image/png',
+                            fileName: 'qr.png',
+                        }
+                    }
+                });
             }
-            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);
-            // Log QR URL for manual scanning if needed (Fallback)
-            console.log('Scan this QR Code URL:', qrContent);
-            // Step 3: Polling
-            let pollingSuccess = false;
-            let attempts = 0;
-            const maxAttempts = 60;
-            let lastPollData = null;
-            // NOTE: This waits (Blocks) until user scans.
-            // User must view the QR (which is not yet returned) elsewhere?
-            // BUT: We will output the Binary Image *after* it finishes.
-            // The only way user can see it IS if they assume the node outputs it.
-            // Wait, if node is running, output is not visible.
-            // Unless they use a "Wait for Webhook" approach, but MISA doesn't webhook us.
-            // We MUST Poll.
-            // The user said: "trả về dạng ảnh binary để tôi view lên và quét thôi"
-            // MAYBE they mean: View it in n8n -> Scan -> Node Finishes??
-            // Impossible if node is synchronous.
-            // Maybe they mean: The node returns the QR image. THEN I scan it. THEN I run another node?
-            // But the node is "MISA AMIS Login". It implies it does the logging in.
-            // If it outputs QR and finishes, it loses context (CookieJar).
-            // Unless we save the Jar *Pending* state?
-            // Complexity++
-            // I will keep the polling.
-            // I suspect the user might be using a sophisticated viewer or just wants the property there.
-            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}`;
-                    const pollRes = await client.get(pollUrl, { headers });
-                    lastPollData = pollRes.data;
-                    if (JSON.stringify(pollRes.data).includes("Success") || JSON.stringify(pollRes.data).includes("v1/auth/token")) {
-                        pollingSuccess = true;
+            else if (operation === 'checkLogin') {
+                // --- Operation: Check Login ---
+                const cdRequestId = this.getNodeParameter('requestId', 0);
+                const sessionFilePath = path.join(storagePath, `${userIdentity}.json`);
+                let pollingSuccess = false;
+                let attempts = 0;
+                const maxAttempts = 60; // 2 minutes (2s interval)
+                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}`;
+                        const pollRes = await client.get(pollUrl, { headers });
+                        if (JSON.stringify(pollRes.data).includes("Success") || JSON.stringify(pollRes.data).includes("v1/auth/token")) {
+                            pollingSuccess = true;
+                        }
+                    }
+                    catch (error) {
+                        // Ignore poling errors
                     }
                 }
-                catch (error) {
-                    // Ignore
+                if (pollingSuccess) {
+                    const serializedJar = await jar.serialize();
+                    fs.writeFileSync(sessionFilePath, JSON.stringify(serializedJar, null, 2));
+                    returnData.push({
+                        json: {
+                            message: "Login Successful",
+                            userIdentity: userIdentity,
+                            sessionFile: sessionFilePath
+                        }
+                    });
                 }
-            }
-            if (pollingSuccess) {
-                const serializedJar = await jar.serialize();
-                fs.writeFileSync(sessionFilePath, JSON.stringify(serializedJar, null, 2));
-            }
-            returnData.push({
-                json: {
-                    message: pollingSuccess ? "Login Successful" : "Timed out",
-                    userIdentity: userIdentity,
-                    sessionFile: sessionFilePath,
-                    qrContent: qrContent
-                },
-                binary: {
-                    qr: {
-                        data: qrBuffer.toString('base64'),
-                        mimeType: 'image/png',
-                        fileName: 'qr.png',
-                    }
+                else {
+                    throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Login timeout or failed. Please scan QR Code again.');
                 }
-            });
+            }
         }
         catch (error) {
             if (this.continueOnFail()) {

package/package.json

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