convert server to typescript

Dockerfile

@@ -1,10 +1,10 @@
 FROM node:20-slim
 RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
-ARG CACHEBUST=3
-RUN curl -L https://github.com/zbrlang/zbr/raw/debug-binary/debug-zbr -o /usr/local/bin/zbr && chmod +x /usr/local/bin/zbr
+RUN curl -L https://github.com/zbrlang/zbr/releases/latest/download/zbr -o /usr/local/bin/zbr && chmod +x /usr/local/bin/zbr
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
 COPY . .
+RUN npm run build
 EXPOSE 7860
-CMD ["npm", "start"]
+CMD ["node", "dist/server.js"]

package.json

@@ -2,17 +2,25 @@
   "name": "zbr-server",
   "version": "1.0.0",
   "description": "",
-  "main": "server.js",
+  "main": "dist/server.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node server.js"
+    "start": "node dist/server.js",
+    "build": "tsc",
+    "dev": "ts-node src/server.ts"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "type": "commonjs",
   "dependencies": {
+    "@types/express": "^4.17.21",
+    "@types/node": "^20.12.7",
     "express": "^4.21.0",
+    "typescript": "^5.4.5",
     "ws": "^8.21.0"
+  },
+  "devDependencies": {
+    "ts-node": "^10.9.2"
   }
 }

server.js → src/server.ts

@@ -1,20 +1,37 @@
-const express = require('express');
-const { spawn, execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const WebSocket = require('ws');
+import express, { Request, Response, NextFunction } from 'express';
+import { spawn, execSync, ChildProcess } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+
+interface BotProcess {
+    child: ChildProcess;
+    tempDir: string;
+}
+
+interface Command {
+    filename: string;
+    content: string;
+}
+
+interface RunRequestBody {
+    botId: string;
+    discordId: string;
+    envFile: string;
+    zbrJson: string;
+    commands: Command[];
+    dbBase64: string;
+}
+
+interface StopRequestBody {
+    botId: string;
+    discordId: string;
+}
 
 const app = express();
 app.use(express.json({ limit: '10mb' }));
 
 const ZBR_SECRET = process.env.ZBR_SECRET;
-const processes = new Map();
-
-// Discord Gateway Connectivity Test
-const ws = new WebSocket('wss://gateway.discord.gg/?v=10&encoding=json');
-ws.on('open', () => console.log('Discord WebSocket: REACHABLE'));
-ws.on('error', (e) => console.log('Discord WebSocket: BLOCKED -', e.message));
-ws.on('close', () => console.log('Discord WebSocket: closed'));
+const processes = new Map<string, BotProcess>();
 
 try {
     const version = execSync('/usr/local/bin/zbr --version').toString();
@@ -23,62 +40,46 @@ try {
     console.error("Failed to execute ZBR binary:", e);
 }
 
-const auth = (req, res, next) => {
+const auth = (req: Request, res: Response, next: NextFunction): void | Response => {
     if (req.path === '/health') return next();
-    if (req.headers['x-zbr-secret'] !== ZBR_SECRET) return res.status(401).send('Unauthorized');
+    if (req.headers['x-zbr-secret'] !== ZBR_SECRET) {
+        return res.status(401).send('Unauthorized');
+    }
     next();
 };
 
 app.use(auth);
 
-app.post('/run', (req, res) => {
-    console.log("Received payload keys:", Object.keys(req.body));
-    console.log("Commands received:", req.body.commands?.length);
-    console.log("Full .env received:", req.body.envFile);
-    
+app.post('/run', (req: Request<{}, any, RunRequestBody>, res: Response) => {
     const { botId, discordId, envFile, zbrJson, commands, dbBase64 } = req.body;
     const key = `${discordId}-${botId}`;
     if (processes.has(key)) return res.status(400).send('Bot already running');
 
     const tempDir = `/tmp/zbr-${discordId}-${botId}`;
     fs.mkdirSync(tempDir, { recursive: true });
-    
-    const envPath = path.join(tempDir, '.env');
-    fs.writeFileSync(envPath, envFile);
-    console.log("Wrote .env to:", envPath, "Size:", fs.statSync(envPath).size);
-
-    const jsonPath = path.join(tempDir, 'zbr.json');
-    fs.writeFileSync(jsonPath, zbrJson);
-    console.log("Wrote zbr.json to:", jsonPath, "Size:", fs.statSync(jsonPath).size);
-    
+
+    fs.writeFileSync(path.join(tempDir, '.env'), envFile);
+    fs.writeFileSync(path.join(tempDir, 'zbr.json'), zbrJson);
+
     const commandsDir = path.join(tempDir, 'commands');
     fs.mkdirSync(commandsDir, { recursive: true });
     commands.forEach(cmd => {
-        const cmdPath = path.join(commandsDir, cmd.filename);
-        fs.writeFileSync(cmdPath, cmd.content);
-        console.log("Wrote command to:", cmdPath, "Size:", fs.statSync(cmdPath).size);
-        console.log("Content of", cmd.filename, ":", cmd.content);
-    });
-    
-    const dbPath = path.join(tempDir, 'zbr.db');
-    fs.writeFileSync(dbPath, Buffer.from(dbBase64, 'base64'));
-    console.log("Wrote zbr.db to:", dbPath, "Size:", fs.statSync(dbPath).size);
-
-    console.log("Directory listing", tempDir, ":", fs.readdirSync(tempDir));
-    console.log("Directory listing", commandsDir, ":", fs.readdirSync(commandsDir));
-
-    const spawnCmd = '/usr/local/bin/zbr';
-    console.log("Spawning process:", spawnCmd, "in", tempDir);
-    const child = spawn(spawnCmd, [], { 
-      cwd: tempDir,
-      stdio: ['ignore', 'pipe', 'pipe']
+        fs.writeFileSync(path.join(commandsDir, cmd.filename), cmd.content);
     });
 
-    const logWithTime = (msg, data) => console.log(`[${new Date().toISOString()}] [${key}] ${msg}`, data);
+    fs.writeFileSync(path.join(tempDir, 'zbr.db'), Buffer.from(dbBase64, 'base64'));
+
+    const child = spawn('/usr/local/bin/zbr', [], {
+        cwd: tempDir,
+        stdio: ['ignore', 'pipe', 'pipe']
+    });
 
-    child.stdout.on('data', (data) => logWithTime('stdout:', data.toString()));
-    child.stderr.on('data', (data) => logWithTime('stderr:', data.toString()));
-    child.on('exit', (code) => logWithTime('exited with code:', code));
+    if (child.stdout) {
+        child.stdout.on('data', (data) => console.log(data.toString()));
+    }
+    if (child.stderr) {
+        child.stderr.on('data', (data) => console.error(data.toString()));
+    }
 
     processes.set(key, { child, tempDir });
 
@@ -89,7 +90,7 @@ app.post('/run', (req, res) => {
     res.json({ success: true, status: 'running' });
 });
 
-function stopBot(key) {
+function stopBot(key: string): boolean {
     const proc = processes.get(key);
     if (!proc) return false;
     proc.child.kill();
@@ -98,17 +99,20 @@ function stopBot(key) {
     return true;
 }
 
-app.post('/stop', (req, res) => {
+app.post('/stop', (req: Request<{}, any, StopRequestBody>, res: Response) => {
     const { botId, discordId } = req.body;
-    if (stopBot(`${discordId}-${botId}`)) res.json({ success: true, status: 'stopped' });
-    else res.status(404).send('Bot not running');
+    if (stopBot(`${discordId}-${botId}`)) {
+        res.json({ success: true, status: 'stopped' });
+    } else {
+        res.status(404).send('Bot not running');
+    }
 });
 
-app.get('/status/:discordId/:botId', (req, res) => {
+app.get('/status/:discordId/:botId', (req: Request, res: Response) => {
     const { discordId, botId } = req.params;
     res.json({ status: processes.has(`${discordId}-${botId}`) ? 'running' : 'stopped' });
 });
 
-app.get('/health', (req, res) => res.json({ ok: true }));
+app.get('/health', (req: Request, res: Response) => res.json({ ok: true }));
 
 app.listen(7860, () => console.log('Server running on port 7860'));

tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["src/**/*"]
+}