handy-remote-server 1.0.0 → 1.1.0

package/dist/index.js

@@ -10,42 +10,115 @@ const child_process_1 = require("child_process");
 const crypto_1 = __importDefault(require("crypto"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
 const dotenv_1 = __importDefault(require("dotenv"));
 dotenv_1.default.config();
 const app = (0, express_1.default)();
 const port = process.env.PORT || 3000;
-// Set up API KEY
-let API_KEY = process.env.API_KEY;
-if (!API_KEY) {
-    API_KEY = crypto_1.default.randomBytes(32).toString('hex');
+// ── Persistent API Key ────────────────────────────────────────────────
+const handyDir = path_1.default.join(os_1.default.homedir(), '.handy');
+const keyFilePath = path_1.default.join(handyDir, 'api_key');
+function loadOrCreateApiKey() {
+    // 1. Env var takes priority
+    if (process.env.API_KEY) {
+        return process.env.API_KEY;
+    }
+    // 2. Try to load from cached file
+    if (fs_1.default.existsSync(keyFilePath)) {
+        const cached = fs_1.default.readFileSync(keyFilePath, 'utf-8').trim();
+        if (cached.length > 0) {
+            console.log(`\n======================================================`);
+            console.log(`Loaded API KEY from ${keyFilePath}`);
+            console.log(`Your API KEY is: ${cached}`);
+            console.log(`======================================================\n`);
+            return cached;
+        }
+    }
+    // 3. Generate a new one and persist it
+    const newKey = crypto_1.default.randomBytes(32).toString('hex');
+    fs_1.default.mkdirSync(handyDir, { recursive: true });
+    fs_1.default.writeFileSync(keyFilePath, newKey + '\n', { mode: 0o600 });
     console.log(`\n======================================================`);
-    console.log(`Server started without API_KEY in environment variables.`);
-    console.log(`Generated a new token for this session.`);
-    console.log(`Your API KEY is: ${API_KEY}`);
+    console.log(`Generated a new API KEY (saved to ${keyFilePath})`);
+    console.log(`Your API KEY is: ${newKey}`);
     console.log(`======================================================\n`);
+    return newKey;
+}
+const API_KEY = loadOrCreateApiKey();
+// ── Logging helpers ───────────────────────────────────────────────────
+function timestamp() {
+    return new Date().toISOString();
+}
+function formatBytes(bytes) {
+    if (bytes < 1024)
+        return `${bytes} B`;
+    if (bytes < 1024 * 1024)
+        return `${(bytes / 1024).toFixed(1)} KB`;
+    return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
 }
-// Ensure models directory exists
+function formatDuration(ms) {
+    if (ms < 1000)
+        return `${ms}ms`;
+    return `${(ms / 1000).toFixed(2)}s`;
+}
+// ── Ensure directories ────────────────────────────────────────────────
 const modelsDir = path_1.default.join(__dirname, '..', 'models');
 if (!fs_1.default.existsSync(modelsDir)) {
     fs_1.default.mkdirSync(modelsDir, { recursive: true });
 }
-// Authentication middleware
+const uploadDir = path_1.default.join(__dirname, '..', 'uploads');
+if (!fs_1.default.existsSync(uploadDir)) {
+    fs_1.default.mkdirSync(uploadDir, { recursive: true });
+}
+// ── Request logging middleware ────────────────────────────────────────
+let requestCounter = 0;
+app.use((req, res, next) => {
+    const reqId = ++requestCounter;
+    const start = Date.now();
+    const ip = req.headers['x-forwarded-for'] || req.socket.remoteAddress || 'unknown';
+    console.log(`\n[${timestamp()}] ── REQUEST #${reqId} ──────────────────────`);
+    console.log(`  Method:  ${req.method} ${req.path}`);
+    console.log(`  From:    ${ip}`);
+    console.log(`  Headers: Content-Type=${req.headers['content-type'] || 'N/A'}, Content-Length=${req.headers['content-length'] || 'N/A'}`);
+    // Store metadata on request for later use
+    req._reqId = reqId;
+    req._startTime = start;
+    req._ip = ip;
+    const originalJson = res.json.bind(res);
+    res.json = function (body) {
+        const duration = Date.now() - start;
+        const status = res.statusCode;
+        console.log(`[${timestamp()}] ── RESPONSE #${reqId} ─────────────────────`);
+        console.log(`  Status:   ${status}`);
+        console.log(`  Duration: ${formatDuration(duration)}`);
+        if (body?.text) {
+            const preview = body.text.length > 100 ? body.text.substring(0, 100) + '...' : body.text;
+            console.log(`  Result:   "${preview}"`);
+        }
+        else if (body?.error) {
+            console.log(`  Error:    ${body.error}`);
+        }
+        console.log(`  ────────────────────────────────────────────────`);
+        return originalJson(body);
+    };
+    next();
+});
+// ── Authentication middleware ─────────────────────────────────────────
 app.use((req, res, next) => {
     const authHeader = req.headers.authorization;
     if (!authHeader || !authHeader.startsWith('Bearer ')) {
+        console.log(`  Auth:     REJECTED (missing/invalid Authorization header)`);
         return res.status(401).json({ error: 'Missing or invalid Authorization header' });
     }
     const token = authHeader.split(' ')[1];
     if (token !== API_KEY) {
+        console.log(`  Auth:     REJECTED (invalid key)`);
         return res.status(403).json({ error: 'Invalid API Key' });
     }
+    console.log(`  Auth:     OK`);
     next();
 });
-// Configure multer to store uploaded files in a temp directory
-const uploadDir = path_1.default.join(__dirname, '..', 'uploads');
-if (!fs_1.default.existsSync(uploadDir)) {
-    fs_1.default.mkdirSync(uploadDir, { recursive: true });
-}
+// ── Multer storage ────────────────────────────────────────────────────
 const storage = multer_1.default.diskStorage({
     destination: function (req, file, cb) {
         cb(null, uploadDir);
@@ -56,7 +129,7 @@ const storage = multer_1.default.diskStorage({
     }
 });
 const upload = (0, multer_1.default)({ storage: storage });
-// Model download logic
+// ── Model download ───────────────────────────────────────────────────
 const GIGAAM_MODEL_URL = 'https://blob.handy.computer/giga-am-v3.int8.onnx';
 const gigaamModelPath = path_1.default.join(modelsDir, 'gigaam.onnx');
 async function downloadFile(url, dest) {
@@ -78,7 +151,6 @@ let inferProcess = null;
 let isReady = false;
 let resolvers = {};
 ensureModels().then(() => {
-    // Spawn the rust background process
     let inferProcessPath = process.env.INFER_CLI_PATH || path_1.default.join(__dirname, '..', 'rust-infer', 'target', 'release', 'rust-infer');
     if (!fs_1.default.existsSync(inferProcessPath)) {
         inferProcessPath = path_1.default.join(__dirname, '..', 'rust-infer', 'target', 'debug', 'rust-infer');
@@ -114,7 +186,7 @@ ensureModels().then(() => {
     console.error('Failed to download models:', e);
     process.exit(1);
 });
-// Queue for pending transcriptions to send them sequentially to the single worker
+// ── Request queue ─────────────────────────────────────────────────────
 const requestQueue = [];
 let isProcessing = false;
 function processQueue() {
@@ -122,38 +194,42 @@ function processQueue() {
         return;
     isProcessing = true;
     const req = requestQueue.shift();
-    // Register resolver
+    console.log(`  [Queue]   Processing request #${req.reqId} (queue length: ${requestQueue.length})`);
     resolvers[req.file] = (result) => {
         delete resolvers[req.file];
         isProcessing = false;
-        // Clean up temp file
         if (fs_1.default.existsSync(req.file)) {
             fs_1.default.unlinkSync(req.file);
         }
         req.resolve(result);
-        // Process next
         process.nextTick(processQueue);
     };
-    // Send path to worker via stdin
     inferProcess.stdin.write(req.file + '\n');
 }
-// The route
+// ── Transcription endpoint ────────────────────────────────────────────
 app.post('/transcribe', express_1.default.raw({ type: 'audio/wav', limit: '50mb' }), async (req, res) => {
+    const reqId = req._reqId || 0;
     if (!isReady) {
+        console.log(`  [#${reqId}]  Rejected: models still loading`);
         return res.status(503).json({ error: 'Models are still loading' });
     }
-    // If using express.raw, the body is a Buffer
     if (!req.body || !Buffer.isBuffer(req.body)) {
+        console.log(`  [#${reqId}]  Rejected: invalid audio body`);
         return res.status(400).json({ error: 'Invalid audio body. Send raw WAV bytes with Content-Type: audio/wav' });
     }
+    const audioSize = req.body.length;
+    console.log(`  [#${reqId}]  Audio received: ${formatBytes(audioSize)}`);
     const tempFilePath = path_1.default.join(uploadDir, `upload-${Date.now()}-${Math.random().toString(36).substring(7)}.wav`);
     fs_1.default.writeFileSync(tempFilePath, req.body);
+    console.log(`  [#${reqId}]  Queued for inference (queue length: ${requestQueue.length})`);
     const result = await new Promise((resolve) => {
-        requestQueue.push({ file: tempFilePath, resolve });
+        requestQueue.push({ file: tempFilePath, resolve, reqId });
         processQueue();
     });
     res.json(result);
 });
+// ── Start server ──────────────────────────────────────────────────────
 app.listen(port, () => {
-    console.log(`Handy Remote Server is running on port ${port}`);
+    console.log(`\nHandy Remote Server is running on port ${port}`);
+    console.log(`Waiting for requests...\n`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handy-remote-server",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Remote Transcription Server for Handy",
   "main": "dist/index.js",
   "bin": {