n8n-nodes-supermachine 0.3.2 → 0.4.0

package/dist/nodes/Supermachine/Supermachine.node.js

@@ -301,61 +301,85 @@ class Supermachine {
                 // ACCOUNT OPERATIONS
                 // ══════════════════════════════════════════════════════
                 if (resource === 'account') {
-                    let requestOptions = {
-                        method: 'GET',
-                        url: '',
-                        json: true,
-                    };
-                    if (operation === 'getProfile') {
-                        requestOptions.url = 'https://dev.supermachine.art/v1/user';
-                    }
-                    else if (operation === 'listModels') {
-                        requestOptions.url = 'https://dev.supermachine.art/v1/models';
-                        if (!this.getNodeParameter('returnAll', i, false)) {
-                            requestOptions.qs = {
-                                perPage: this.getNodeParameter('limit', i, 20),
-                                page: 1,
-                            };
-                        }
-                    }
-                    else if (operation === 'getModelDetail') {
-                        const modelTitle = this.getNodeParameter('modelId', i);
-                        const modelsResponse = await this.helpers.requestWithAuthentication.call(this, 'supermachineApi', { method: 'GET', url: 'https://dev.supermachine.art/v1/models', json: true });
-                        const models = modelsResponse.items;
-                        const model = models.find((m) => m.title === modelTitle);
-                        if (!model) {
-                            throw new Error(`Model "${modelTitle}" not found`);
-                        }
-                        requestOptions.url = `https://dev.supermachine.art/v1/models/gems/id/${model.id}`;
-                    }
-                    else if (operation === 'listModelCategories') {
-                        requestOptions.url = 'https://dev.supermachine.art/v1/models/categories';
-                    }
-                    else if (operation === 'listLoras') {
-                        const modelTitle = this.getNodeParameter('modelId', i);
-                        const modelsResponse = await this.helpers.requestWithAuthentication.call(this, 'supermachineApi', { method: 'GET', url: 'https://dev.supermachine.art/v1/models', json: true });
-                        const models = modelsResponse.items;
-                        const model = models.find((m) => m.title === modelTitle);
-                        if (!model) {
-                            throw new Error(`Model "${modelTitle}" not found`);
-                        }
-                        requestOptions.url = `https://dev.supermachine.art/v1/loras?modelId=${model.id}`;
-                    }
-                    else if (operation === 'listLoraCategories') {
-                        requestOptions.url = 'https://dev.supermachine.art/v1/loras/categories';
-                    }
-                    else if (operation === 'listCharacterCategories') {
-                        requestOptions.url = 'https://dev.supermachine.art/v1/characters/categories';
-                    }
-                    const responseData = await this.helpers.requestWithAuthentication.call(this, 'supermachineApi', requestOptions);
-                    let jsonData;
-                    if (operation === 'listModels' || operation === 'listLoras') {
-                        jsonData = responseData;
+                    if (operation === 'getToken') {
+                        const email = this.getNodeParameter('email', i);
+                        const password = this.getNodeParameter('password', i);
+                        const responseData = await this.helpers.httpRequest({
+                            method: 'POST',
+                            url: 'https://x21u-twbn-azx4.n7c.xano.io/api:0dlVn2Lk/auth/login',
+                            headers: {
+                                'accept': 'application/json, text/plain, */*',
+                                'accept-language': 'en-US,en;q=0.9',
+                                'content-type': 'application/json',
+                                'origin': 'https://supermachine.art',
+                                'referer': 'https://supermachine.art/',
+                                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/145.0.0.0 Safari/537.36',
+                            },
+                            json: true,
+                            body: {
+                                email,
+                                password,
+                            },
+                        });
+                        returnData.push({ json: responseData });
                     }
                     else {
-                        jsonData = responseData.items || responseData;
+                        let requestOptions = {
+                            method: 'GET',
+                            url: '',
+                            json: true,
+                        };
+                        if (operation === 'getProfile') {
+                            requestOptions.url = 'https://dev.supermachine.art/v1/user';
+                        }
+                        else if (operation === 'listModels') {
+                            requestOptions.url = 'https://dev.supermachine.art/v1/models';
+                            if (!this.getNodeParameter('returnAll', i, false)) {
+                                requestOptions.qs = {
+                                    perPage: this.getNodeParameter('limit', i, 20),
+                                    page: 1,
+                                };
+                            }
+                        }
+                        else if (operation === 'getModelDetail') {
+                            const modelTitle = this.getNodeParameter('modelId', i);
+                            const modelsResponse = await this.helpers.requestWithAuthentication.call(this, 'supermachineApi', { method: 'GET', url: 'https://dev.supermachine.art/v1/models', json: true });
+                            const models = modelsResponse.items;
+                            const model = models.find((m) => m.title === modelTitle);
+                            if (!model) {
+                                throw new Error(`Model "${modelTitle}" not found`);
+                            }
+                            requestOptions.url = `https://dev.supermachine.art/v1/models/gems/id/${model.id}`;
+                        }
+                        else if (operation === 'listModelCategories') {
+                            requestOptions.url = 'https://dev.supermachine.art/v1/models/categories';
+                        }
+                        else if (operation === 'listLoras') {
+                            const modelTitle = this.getNodeParameter('modelId', i);
+                            const modelsResponse = await this.helpers.requestWithAuthentication.call(this, 'supermachineApi', { method: 'GET', url: 'https://dev.supermachine.art/v1/models', json: true });
+                            const models = modelsResponse.items;
+                            const model = models.find((m) => m.title === modelTitle);
+                            if (!model) {
+                                throw new Error(`Model "${modelTitle}" not found`);
+                            }
+                            requestOptions.url = `https://dev.supermachine.art/v1/loras?modelId=${model.id}`;
+                        }
+                        else if (operation === 'listLoraCategories') {
+                            requestOptions.url = 'https://dev.supermachine.art/v1/loras/categories';
+                        }
+                        else if (operation === 'listCharacterCategories') {
+                            requestOptions.url = 'https://dev.supermachine.art/v1/characters/categories';
+                        }
+                        const responseData = await this.helpers.requestWithAuthentication.call(this, 'supermachineApi', requestOptions);
+                        let jsonData;
+                        if (operation === 'listModels' || operation === 'listLoras') {
+                            jsonData = responseData;
+                        }
+                        else {
+                            jsonData = responseData.items || responseData;
+                        }
+                        returnData.push({ json: jsonData });
                     }
-                    returnData.push({ json: jsonData });
                 }
                 // ══════════════════════════════════════════════════════
                 // CHARACTER OPERATIONS
@@ -477,7 +501,100 @@ class Supermachine {
                 // IMAGE OPERATIONS
                 // ══════════════════════════════════════════════════════
                 else if (resource === 'image') {
-                    if (operation === 'generate') {
+                    if (operation === 'generateV3') {
+                        const authToken = this.getNodeParameter('authToken', i);
+                        const additionalFieldsV3 = this.getNodeParameter('additionalFieldsV3', i, {});
+                        const body = {
+                            prompt: this.getNodeParameter('promptV3', i),
+                            modelName: this.getNodeParameter('modelNameV3', i),
+                            width: this.getNodeParameter('widthV3', i, 576),
+                            height: this.getNodeParameter('heightV3', i, 1024),
+                            steps: additionalFieldsV3.steps || 20,
+                            imageNumber: additionalFieldsV3.imageNumber || 1,
+                            generationMode: 'GENERATE',
+                            negativePrompt: additionalFieldsV3.negativePrompt || '',
+                            randomSeed: additionalFieldsV3.randomSeed !== undefined ? additionalFieldsV3.randomSeed : true,
+                            guidance: additionalFieldsV3.guidance || 7,
+                            tiling: additionalFieldsV3.tiling || false,
+                            faceEnhance: additionalFieldsV3.faceEnhance || false,
+                            imageStrength: additionalFieldsV3.imageStrength || null,
+                            initImage: additionalFieldsV3.initImage || '',
+                            folderId: additionalFieldsV3.folderId || 0,
+                            homeUrl: 'https://supermachine.art',
+                            refImage: '',
+                            controlMode: 0,
+                            controlType: '',
+                            faceswapImage: '',
+                            controlnetmodule_id: '0',
+                            preset: null,
+                            toolType: '',
+                            sampler: additionalFieldsV3.sampler || 'Euler a',
+                            upscaleFactor: null,
+                            promptEnhance: additionalFieldsV3.promptEnhance || false,
+                        };
+                        const generateResponse = await this.helpers.httpRequest({
+                            method: 'POST',
+                            url: 'https://x21u-twbn-azx4.n7c.xano.io/api:0dlVn2Lk/generate/v3',
+                            headers: {
+                                'accept': 'application/json, text/plain, */*',
+                                'accept-language': 'en-US,en;q=0.9',
+                                'authorization': `Bearer ${authToken}`,
+                                'content-type': 'application/json',
+                                'origin': 'https://supermachine.art',
+                                'referer': 'https://supermachine.art/',
+                                'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/145.0.0.0 Safari/537.36',
+                            },
+                            json: true,
+                            body,
+                        });
+                        const batchID = generateResponse.batchID;
+                        if (!batchID) {
+                            throw new Error('No batchID returned from generate API v3');
+                        }
+                        const pollingInterval = additionalFieldsV3.pollingInterval || 2;
+                        const maxPollingTime = additionalFieldsV3.maxPollingTime || 120;
+                        const startTime = Date.now();
+                        let completedImage = null;
+                        while (!completedImage) {
+                            if ((Date.now() - startTime) / 1000 > maxPollingTime) {
+                                throw new Error(`Image generation timed out after ${maxPollingTime} seconds. BatchID: ${batchID}`);
+                            }
+                            await new Promise((resolve) => setTimeout(resolve, pollingInterval * 1000));
+                            const credentials = await this.getCredentials('supermachineApi');
+                            const apiKey = credentials.apiKey;
+                            const pollResponse = await this.helpers.httpRequest({
+                                method: 'GET',
+                                url: `https://dev.supermachine.art/v1/images?batchId=${batchID}`,
+                                headers: {
+                                    'Authorization': `Bearer ${apiKey}`,
+                                    'Content-Type': 'application/json',
+                                },
+                                json: true,
+                            });
+                            const pollItems = pollResponse.items;
+                            if (Array.isArray(pollItems) && pollItems.length > 0) {
+                                const firstItem = pollItems[0];
+                                const status = firstItem.status;
+                                if (status === 'completed') {
+                                    completedImage = firstItem;
+                                    break;
+                                }
+                                else if (status === 'failed') {
+                                    throw new Error(`Image generation failed. BatchID: ${batchID}. Error: ${firstItem.error || 'Unknown error'}`);
+                                }
+                            }
+                        }
+                        returnData.push({
+                            json: {
+                                batchID,
+                                method: generateResponse.method,
+                                type: generateResponse.type,
+                                finalPrompt: body.prompt,
+                                ...completedImage,
+                            }
+                        });
+                    }
+                    else if (operation === 'generate') {
                         const additionalFields = this.getNodeParameter('additionalFields', i, {});
                         let prompt = this.getNodeParameter('prompt', i);
                         if (additionalFields.characterId) {

package/dist/nodes/Supermachine/descriptions/AccountDescription.js

@@ -16,27 +16,95 @@ exports.getAccountOperations = [
             {
                 name: 'Get Profile',
                 value: 'getProfile',
-                description: 'Lấy thông tin tài khoản và credit còn lại',
+                description: 'Get your account information',
                 action: 'Get account profile',
             },
+            {
+                name: 'Get Token (Login)',
+                value: 'getToken',
+                description: 'Get authentication token using email and password',
+                action: 'Get auth token',
+            },
             {
                 name: 'List Models',
                 value: 'listModels',
-                description: 'Liệt kê tất cả models có sẵn',
-                action: 'List available models',
+                description: 'List all available AI models',
+                action: 'List all models',
             },
             {
-                name: 'Get Model Categories',
+                name: 'Get Model Detail',
+                value: 'getModelDetail',
+                description: 'Get detailed information about a specific model',
+                action: 'Get model details',
+            },
+            {
+                name: 'List Model Categories',
                 value: 'listModelCategories',
-                description: 'Lấy danh mục models',
+                description: 'List all model categories',
                 action: 'List model categories',
             },
+            {
+                name: 'List LoRAs',
+                value: 'listLoras',
+                description: 'List LoRAs for a specific model',
+                action: 'List loras for model',
+            },
+            {
+                name: 'List LoRA Categories',
+                value: 'listLoraCategories',
+                description: 'List all LoRA categories',
+                action: 'List lora categories',
+            },
+            {
+                name: 'List Character Categories',
+                value: 'listCharacterCategories',
+                description: 'List all character categories',
+                action: 'List character categories',
+            },
         ],
         default: 'getProfile',
     },
 ];
 exports.getAccountFields = [
-    // Get Profile - không cần fields
+    // ═══════════════════════════════════════════════════════════
+    // GET TOKEN (LOGIN)
+    // ═══════════════════════════════════════════════════════════
+    {
+        displayName: 'Email',
+        name: 'email',
+        type: 'string',
+        displayOptions: {
+            show: {
+                resource: ['account'],
+                operation: ['getToken'],
+            },
+        },
+        default: '',
+        required: true,
+        placeholder: 'your-email@example.com',
+        description: 'Your Supermachine account email',
+    },
+    {
+        displayName: 'Password',
+        name: 'password',
+        type: 'string',
+        typeOptions: {
+            password: true,
+        },
+        displayOptions: {
+            show: {
+                resource: ['account'],
+                operation: ['getToken'],
+            },
+        },
+        default: '',
+        required: true,
+        placeholder: 'Your password',
+        description: 'Your Supermachine account password',
+    },
+    // ═══════════════════════════════════════════════════════════
+    // LIST MODELS
+    // ═══════════════════════════════════════════════════════════
     {
         displayName: 'Return All',
         name: 'returnAll',
@@ -44,28 +112,45 @@ exports.getAccountFields = [
         displayOptions: {
             show: {
                 resource: ['account'],
-                operation: ['listModels', 'listModelCategories'],
+                operation: ['listModels'],
             },
         },
         default: false,
-        description: 'Trả về tất cả kết quả hay chỉ giới hạn',
+        description: 'Whether to return all results or only up to a given limit',
     },
     {
         displayName: 'Limit',
         name: 'limit',
         type: 'number',
-        typeOptions: {
-            minValue: 1,
-            maxValue: 100,
-        },
+        typeOptions: { minValue: 1, maxValue: 100 },
         displayOptions: {
             show: {
                 resource: ['account'],
-                operation: ['listModels', 'listModelCategories'],
+                operation: ['listModels'],
                 returnAll: [false],
             },
         },
         default: 20,
-        description: 'Số lượng items trả về mỗi trang',
+        description: 'Max number of results to return',
+    },
+    // ═══════════════════════════════════════════════════════════
+    // GET MODEL DETAIL & LIST LORAS
+    // ═══════════════════════════════════════════════════════════
+    {
+        displayName: 'Model Name or ID',
+        name: 'modelId',
+        type: 'options',
+        typeOptions: {
+            loadOptionsMethod: 'getModels',
+        },
+        displayOptions: {
+            show: {
+                resource: ['account'],
+                operation: ['getModelDetail', 'listLoras'],
+            },
+        },
+        default: '',
+        required: true,
+        description: 'Select model. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
     },
 ];

package/dist/nodes/Supermachine/descriptions/ImageDescription.js

@@ -16,9 +16,15 @@ exports.getImageOperations = [
             {
                 name: 'Generate an Image',
                 value: 'generate',
-                description: 'Tạo ảnh mới từ text prompt (tự động chờ hoàn tất)',
+                description: 'Generate image using API v1 (requires API Key)',
                 action: 'Generate an image',
             },
+            {
+                name: 'Generate an Image v3',
+                value: 'generateV3',
+                description: 'Generate image using API v3 (requires Auth Token)',
+                action: 'Generate an image v3',
+            },
             {
                 name: 'List Images',
                 value: 'listImages',
@@ -49,7 +55,7 @@ exports.getImageOperations = [
 ];
 exports.getImageFields = [
     // ═══════════════════════════════════════════════════════════
-    // GENERATE OPERATION (giữ nguyên code cũ)
+    // GENERATE V1 (existing fields - giữ nguyên)
     // ═══════════════════════════════════════════════════════════
     {
         displayName: 'Model Name or ID',
@@ -321,7 +327,223 @@ exports.getImageFields = [
         ],
     },
     // ═══════════════════════════════════════════════════════════
-    // LIST IMAGES
+    // GENERATE V3 (NEW)
+    // ═══════════════════════════════════════════════════════════
+    {
+        displayName: 'Auth Token',
+        name: 'authToken',
+        type: 'string',
+        displayOptions: {
+            show: {
+                resource: ['image'],
+                operation: ['generateV3'],
+            },
+        },
+        default: '',
+        required: true,
+        placeholder: 'eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIi...',
+        description: 'Authentication token from Get Token operation',
+    },
+    {
+        displayName: 'Model Name',
+        name: 'modelNameV3',
+        type: 'string',
+        displayOptions: {
+            show: {
+                resource: ['image'],
+                operation: ['generateV3'],
+            },
+        },
+        default: 'Supermachine NextGen',
+        required: true,
+        placeholder: 'Supermachine NextGen',
+        description: 'Model name (e.g. "Supermachine NextGen", "Supermachine Reality")',
+    },
+    {
+        displayName: 'Prompt',
+        name: 'promptV3',
+        type: 'string',
+        typeOptions: {
+            rows: 4,
+        },
+        displayOptions: {
+            show: {
+                resource: ['image'],
+                operation: ['generateV3'],
+            },
+        },
+        default: '',
+        placeholder: 'A beautiful sunset over mountains, photorealistic, 8k',
+        description: 'Image description',
+        required: true,
+    },
+    {
+        displayName: 'Width',
+        name: 'widthV3',
+        type: 'number',
+        typeOptions: {
+            minValue: 256,
+            maxValue: 2048,
+        },
+        displayOptions: {
+            show: {
+                resource: ['image'],
+                operation: ['generateV3'],
+            },
+        },
+        default: 576,
+        description: 'Image width (pixels)',
+    },
+    {
+        displayName: 'Height',
+        name: 'heightV3',
+        type: 'number',
+        typeOptions: {
+            minValue: 256,
+            maxValue: 2048,
+        },
+        displayOptions: {
+            show: {
+                resource: ['image'],
+                operation: ['generateV3'],
+            },
+        },
+        default: 1024,
+        description: 'Image height (pixels)',
+    },
+    {
+        displayName: 'Additional Fields V3',
+        name: 'additionalFieldsV3',
+        type: 'collection',
+        placeholder: 'Add Field',
+        default: {},
+        displayOptions: {
+            show: {
+                resource: ['image'],
+                operation: ['generateV3'],
+            },
+        },
+        options: [
+            {
+                displayName: 'Negative Prompt',
+                name: 'negativePrompt',
+                type: 'string',
+                typeOptions: { rows: 2 },
+                default: '',
+                placeholder: 'blurry, low quality, distorted',
+                description: 'What NOT to include in image',
+            },
+            {
+                displayName: 'Steps',
+                name: 'steps',
+                type: 'number',
+                typeOptions: { minValue: 1, maxValue: 80 },
+                default: 20,
+                description: 'Number of inference steps',
+            },
+            {
+                displayName: 'Guidance',
+                name: 'guidance',
+                type: 'number',
+                typeOptions: {
+                    minValue: 1,
+                    maxValue: 20,
+                    numberPrecision: 1,
+                },
+                default: 7,
+                description: 'CFG Scale (guidance strength)',
+            },
+            {
+                displayName: 'Image Number',
+                name: 'imageNumber',
+                type: 'number',
+                typeOptions: { minValue: 1, maxValue: 4 },
+                default: 1,
+                description: 'Number of images to generate (1-4)',
+            },
+            {
+                displayName: 'Random Seed',
+                name: 'randomSeed',
+                type: 'boolean',
+                default: true,
+                description: 'Whether to use random seed',
+            },
+            {
+                displayName: 'Sampler',
+                name: 'sampler',
+                type: 'string',
+                default: 'Euler a',
+                placeholder: 'Euler a',
+                description: 'Sampling method',
+            },
+            {
+                displayName: 'Folder ID',
+                name: 'folderId',
+                type: 'number',
+                default: 0,
+                description: 'Folder ID to save image (0 = root)',
+            },
+            {
+                displayName: 'Face Enhance',
+                name: 'faceEnhance',
+                type: 'boolean',
+                default: false,
+                description: 'Whether to enhance faces',
+            },
+            {
+                displayName: 'Tiling',
+                name: 'tiling',
+                type: 'boolean',
+                default: false,
+                description: 'Whether to enable tiling',
+            },
+            {
+                displayName: 'Prompt Enhance',
+                name: 'promptEnhance',
+                type: 'boolean',
+                default: false,
+                description: 'Whether to enhance prompt automatically',
+            },
+            {
+                displayName: 'Init Image URL',
+                name: 'initImage',
+                type: 'string',
+                default: '',
+                placeholder: 'https://example.com/image.png',
+                description: 'Initial image URL for img2img',
+            },
+            {
+                displayName: 'Image Strength',
+                name: 'imageStrength',
+                type: 'number',
+                typeOptions: {
+                    minValue: 0,
+                    maxValue: 1,
+                    numberPrecision: 2,
+                },
+                default: 0.75,
+                description: 'Image strength for img2img (0-1)',
+            },
+            {
+                displayName: 'Polling Interval (seconds)',
+                name: 'pollingInterval',
+                type: 'number',
+                typeOptions: { minValue: 1, maxValue: 10 },
+                default: 2,
+                description: 'Time between polling checks',
+            },
+            {
+                displayName: 'Max Polling Time (seconds)',
+                name: 'maxPollingTime',
+                type: 'number',
+                typeOptions: { minValue: 10, maxValue: 300 },
+                default: 120,
+                description: 'Maximum time to wait for completion',
+            },
+        ],
+    },
+    // ═══════════════════════════════════════════════════════════
+    // REST OF IMAGE OPERATIONS (giữ nguyên existing fields)
     // ═══════════════════════════════════════════════════════════
     {
         displayName: 'Return All',
@@ -394,9 +616,6 @@ exports.getImageFields = [
             },
         ],
     },
-    // ═══════════════════════════════════════════════════════════
-    // GET IMAGE
-    // ═══════════════════════════════════════════════════════════
     {
         displayName: 'Image ID',
         name: 'imageId',
@@ -412,9 +631,6 @@ exports.getImageFields = [
         placeholder: '8870379',
         description: 'ID của ảnh',
     },
-    // ═══════════════════════════════════════════════════════════
-    // MOVE IMAGE
-    // ═══════════════════════════════════════════════════════════
     {
         displayName: 'Target Folder Name or ID',
         name: 'targetFolderId',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-supermachine",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "n8n community node for Supermachine AI Image API — Generate images, manage models, LoRAs, and characters",
   "keywords": [
     "n8n-community-node-package",