chat-ma 1.0.0 → 1.0.2

package/README.md

@@ -17,13 +17,58 @@ Cinematic Matrix-style one-time terminal messenger distributed as an npm CLI pac
 npm install
 ```
 
-## Run server
+## Server URL used by CLI
+
+Default CLI server URL is:
+
+`https://api.secondhandcell.com/chat-ma`
+
+Override any time with:
+
+```bash
+export CHAT_MA_SERVER=https://api.secondhandcell.com/chat-ma
+```
+
+## Run server directly
 
 ```bash
 npm run serve
 ```
 
-Server default: `http://localhost:3000`
+Server defaults:
+
+- `PORT=3000`
+- `CHAT_MA_BASE_PATH=/chat-ma`
+
+So API endpoints are served under `/chat-ma/*`.
+
+## Run server with PM2 (always on)
+
+```bash
+npm run pm2:start
+npm run pm2:logs
+```
+
+Restart / stop:
+
+```bash
+npm run pm2:restart
+npm run pm2:stop
+```
+
+Persist across host reboot:
+
+```bash
+npx pm2 save
+npx pm2 startup
+```
+
+## Reverse proxy example
+
+Proxy `https://api.secondhandcell.com/chat-ma` (including websocket upgrades) to your Node process on `127.0.0.1:3000`.
+
+- HTTP: `/chat-ma/register`, `/chat-ma/login`, `/chat-ma/send`, `/chat-ma/verify-password`
+- WS: `/chat-ma/ws`
 
 ## Use CLI
 
@@ -44,7 +89,7 @@ Example:
 
 ```json
 {
-  "serverUrl": "http://localhost:3000",
+  "serverUrl": "https://api.secondhandcell.com/chat-ma",
   "token": "...",
   "username": "alice"
 }

package/bin/chat.js

@@ -3,7 +3,12 @@ import blessed from 'blessed';
 import ora from 'ora';
 import cliProgress from 'cli-progress';
 import { askCredentials, askSendPayload } from '../client/lib/prompts.js';
-import { loadLocalConfig, requireAuthConfig, saveLocalConfig } from '../client/lib/localConfig.js';
+import {
+  getServerCandidates,
+  loadLocalConfig,
+  requireAuthConfig,
+  saveLocalConfig
+} from '../client/lib/localConfig.js';
 import { printBanner } from '../client/lib/ui.js';
 import {
   showAuthorizedBox,
@@ -33,15 +38,41 @@ async function postJson(url, payload, token) {
   return data;
 }
 
+function withPath(baseUrl, path) {
+  return `${baseUrl.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+}
+
+async function postJsonWithFallback(cfg, path, payload, token) {
+  const urls = getServerCandidates(cfg);
+  let lastError;
+
+  for (const baseUrl of urls) {
+    try {
+      const data = await postJson(withPath(baseUrl, path), payload, token);
+      return { data, baseUrl };
+    } catch (err) {
+      lastError = err;
+      if (err?.message !== 'fetch failed') {
+        throw err;
+      }
+    }
+  }
+
+  throw new Error(
+    `${lastError?.message || 'Request failed'} (server unreachable: tried ${urls.join(', ')}). ` +
+      'Start server with: npm run serve, or set CHAT_MA_SERVER=http://host:port/chat-ma'
+  );
+}
+
 async function register() {
   printBanner();
   const cfg = loadLocalConfig();
   const { username, password } = await askCredentials('Register');
   const spinner = ora('Provisioning identity...').start();
   try {
-    const data = await postJson(`${cfg.serverUrl}/register`, { username, password });
+    const { data, baseUrl } = await postJsonWithFallback(cfg, '/register', { username, password });
     spinner.succeed('Identity created');
-    saveLocalConfig({ token: data.token, username: data.username, serverUrl: cfg.serverUrl });
+    saveLocalConfig({ token: data.token, username: data.username, serverUrl: baseUrl });
     showAuthorizedBox();
   } catch (err) {
     spinner.fail(err.message);
@@ -55,9 +86,9 @@ async function login() {
   const { username, password } = await askCredentials('Login');
   const spinner = ora('Authenticating...').start();
   try {
-    const data = await postJson(`${cfg.serverUrl}/login`, { username, password });
+    const { data, baseUrl } = await postJsonWithFallback(cfg, '/login', { username, password });
     spinner.succeed('Session established');
-    saveLocalConfig({ token: data.token, username: data.username, serverUrl: cfg.serverUrl });
+    saveLocalConfig({ token: data.token, username: data.username, serverUrl: baseUrl });
     showAuthorizedBox();
   } catch (err) {
     spinner.fail(err.message);
@@ -80,7 +111,8 @@ async function send() {
   bar.update(85);
 
   try {
-    await postJson(`${cfg.serverUrl}/send`, { to, body }, cfg.token);
+    const { baseUrl } = await postJsonWithFallback(cfg, '/send', { to, body }, cfg.token);
+    saveLocalConfig({ serverUrl: baseUrl });
     bar.update(100);
     bar.stop();
     showMessageSentBox();
@@ -237,7 +269,8 @@ async function openInbox() {
       screen.render();
       const password = await askPasswordInScreen(screen);
       try {
-        await postJson(`${cfg.serverUrl}/verify-password`, { password }, cfg.token);
+        const { baseUrl } = await postJsonWithFallback(cfg, '/verify-password', { password }, cfg.token);
+        saveLocalConfig({ serverUrl: baseUrl });
         ws.send(JSON.stringify({ type: 'VIEW_REQUEST', id: currentIncoming.id }));
       } catch {
         modal.setItems(['', ' ACCESS DENIED ', '', ' [ OK ]']);

package/client/lib/localConfig.js

@@ -5,19 +5,51 @@ import path from 'path';
 const cfgDir = path.join(os.homedir(), '.chat-ma');
 const cfgPath = path.join(cfgDir, 'config.json');
 
+function normalizeServerUrl(url) {
+  if (!url) return url;
+  return url.replace(/\/+$/, '');
+}
+
 export function loadLocalConfig() {
   try {
     return JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
   } catch {
+    const envUrl = process.env.CHAT_MA_SERVER;
+    const defaultHosted = 'https://api.secondhandcell.com/chat-ma';
     return {
-      serverUrl: process.env.CHAT_MA_SERVER || 'http://localhost:3000'
+      serverUrl: normalizeServerUrl(envUrl || defaultHosted)
     };
   }
 }
 
+export function getServerCandidates(cfg) {
+  const preferred = normalizeServerUrl(
+    cfg.serverUrl || process.env.CHAT_MA_SERVER || 'https://api.secondhandcell.com/chat-ma'
+  );
+  const candidates = [preferred];
+
+  if (/localhost:3000\/?$/.test(preferred)) {
+    candidates.push(preferred.replace('localhost:3000', 'localhost:3001'));
+  }
+
+  if (/127\.0\.0\.1:3000\/?$/.test(preferred)) {
+    candidates.push(preferred.replace('127.0.0.1:3000', '127.0.0.1:3001'));
+  }
+
+  if (preferred.endsWith('/chat-ma')) {
+    candidates.push(preferred.replace(/\/chat-ma$/, ''));
+  }
+
+  return [...new Set(candidates.map(normalizeServerUrl).filter(Boolean))];
+}
+
 export function saveLocalConfig(partial) {
   const current = loadLocalConfig();
-  const merged = { ...current, ...partial };
+  const merged = {
+    ...current,
+    ...partial,
+    ...(partial.serverUrl ? { serverUrl: normalizeServerUrl(partial.serverUrl) } : {})
+  };
   fs.mkdirSync(cfgDir, { recursive: true });
   fs.writeFileSync(cfgPath, JSON.stringify(merged, null, 2));
   return merged;

package/client/lib/wsClient.js

@@ -1,7 +1,11 @@
 import WebSocket from 'ws';
 
+function withPath(baseUrl, path) {
+  return `${baseUrl.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+}
+
 export function connectWs(serverHttpUrl, token, handlers) {
-  const wsUrl = serverHttpUrl.replace(/^http/, 'ws') + '/ws';
+  const wsUrl = withPath(serverHttpUrl.replace(/^http/, 'ws'), '/ws');
   const ws = new WebSocket(wsUrl);
 
   ws.on('open', () => {

package/ecosystem.config.cjs

@@ -0,0 +1,18 @@
+module.exports = {
+  apps: [
+    {
+      name: 'chat-ma',
+      script: 'server/server.js',
+      cwd: __dirname,
+      instances: 1,
+      autorestart: true,
+      watch: false,
+      max_memory_restart: '300M',
+      env: {
+        NODE_ENV: 'production',
+        PORT: 3000,
+        CHAT_MA_BASE_PATH: '/chat-ma'
+      }
+    }
+  ]
+};

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "chat-ma",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Cinematic Matrix-style ephemeral terminal messenger",
   "type": "module",
   "bin": {
     "chat-ma": "./bin/chat.js"
   },
   "scripts": {
-    "serve": "node server/server.js"
+    "serve": "node server/server.js",
+    "pm2:start": "npx pm2 start ecosystem.config.cjs --update-env",
+    "pm2:restart": "npx pm2 restart chat-ma --update-env",
+    "pm2:stop": "npx pm2 stop chat-ma",
+    "pm2:logs": "npx pm2 logs chat-ma"
   },
   "dependencies": {
     "bcrypt": "^5.1.1",

package/server/config.js

@@ -1,11 +1,19 @@
 import path from 'path';
 import os from 'os';
 
+function normalizeBasePath(input) {
+  if (!input || input === '/') return '';
+  const trimmed = input.trim();
+  const withLeading = trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
+  return withLeading.replace(/\/+$/, '');
+}
+
 export const config = {
   port: process.env.PORT ? Number(process.env.PORT) : 3000,
   jwtSecret: process.env.JWT_SECRET || 'chat-ma-dev-secret-change-me',
   jwtExpiresIn: '7d',
   messageTtlMs: 5 * 60 * 1000,
+  basePath: normalizeBasePath(process.env.CHAT_MA_BASE_PATH || '/chat-ma'),
   dataDir: path.resolve(process.cwd(), 'server', 'data'),
   userDbPath: path.resolve(process.cwd(), 'server', 'data', 'users.db'),
   clientConfigPath: path.join(os.homedir(), '.chat-ma', 'config.json')

package/server/server.js

@@ -34,8 +34,28 @@ function getBearer(req) {
   }
 }
 
+function getPathname(reqUrl) {
+  const base = reqUrl.startsWith('http') ? undefined : 'http://localhost';
+  return new URL(reqUrl, base).pathname;
+}
+
+function stripBasePath(pathname) {
+  if (!config.basePath) return pathname;
+  if (pathname === config.basePath) return '/';
+  if (pathname.startsWith(`${config.basePath}/`)) {
+    return pathname.slice(config.basePath.length);
+  }
+  return pathname;
+}
+
 const server = http.createServer(async (req, res) => {
-  if (req.method === 'POST' && req.url === '/register') {
+  const pathname = stripBasePath(getPathname(req.url));
+
+  if (req.method === 'GET' && pathname === '/health') {
+    return json(res, 200, { ok: true, basePath: config.basePath || '/' });
+  }
+
+  if (req.method === 'POST' && pathname === '/register') {
     const limit = authLimiter(`register:${getIp(req)}`);
     if (!limit.allowed) return json(res, 429, { error: 'Too many attempts' });
     try {
@@ -50,7 +70,7 @@ const server = http.createServer(async (req, res) => {
     }
   }
 
-  if (req.method === 'POST' && req.url === '/login') {
+  if (req.method === 'POST' && pathname === '/login') {
     const limit = authLimiter(`login:${getIp(req)}`);
     if (!limit.allowed) return json(res, 429, { error: 'Too many attempts' });
     try {
@@ -65,7 +85,7 @@ const server = http.createServer(async (req, res) => {
     }
   }
 
-  if (req.method === 'POST' && req.url === '/send') {
+  if (req.method === 'POST' && pathname === '/send') {
     const auth = getBearer(req);
     if (!auth) return json(res, 401, { error: 'Unauthorized' });
     try {
@@ -83,7 +103,7 @@ const server = http.createServer(async (req, res) => {
     }
   }
 
-  if (req.method === 'POST' && req.url === '/verify-password') {
+  if (req.method === 'POST' && pathname === '/verify-password') {
     const auth = getBearer(req);
     if (!auth) return json(res, 401, { error: 'Unauthorized' });
 
@@ -102,5 +122,7 @@ const server = http.createServer(async (req, res) => {
 attachWsServer(server);
 
 server.listen(config.port, () => {
-  process.stdout.write(`chat-ma server listening on ${config.port}\n`);
+  process.stdout.write(
+    `chat-ma server listening on ${config.port} (basePath: ${config.basePath || '/'})\n`
+  );
 });

package/server/ws.js

@@ -1,4 +1,5 @@
 import { WebSocketServer } from 'ws';
+import { config } from './config.js';
 import { verifyToken } from './auth.js';
 import {
   deleteMessage,
@@ -9,11 +10,20 @@ import {
 
 const sessionsByUser = new Map();
 
+function getPathname(reqUrl) {
+  const base = reqUrl.startsWith('http') ? undefined : 'http://localhost';
+  return new URL(reqUrl, base).pathname;
+}
+
+function wsPath() {
+  return `${config.basePath || ''}/ws`;
+}
+
 export function attachWsServer(httpServer) {
   const wss = new WebSocketServer({ noServer: true });
 
   httpServer.on('upgrade', (req, socket, head) => {
-    if (req.url !== '/ws') {
+    if (getPathname(req.url) !== wsPath()) {
       socket.destroy();
       return;
     }