selfnify-host 1.0.1 → 1.0.3

package/host.js

@@ -9,7 +9,7 @@ const https = require('https');
 const crypto = require('crypto');
 const readline = require('readline');
 
-const VERSION = '1.0.1';
+const VERSION = '1.0.2';
 const DEFAULT_URL = 'https://host.lume.dpdns.org';
 const CONFIG_DIR = path.join(os.homedir(), '.selfnify');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'host.json');
@@ -254,7 +254,7 @@ function request(method, apiPath, opts) {
   });
 }
 
-const bp = (name, sub) => '/bots/' + encodeURIComponent(name) + (sub || '');
+const bp = (name, sub) => '/bots/' + encodeURIComponent(String(name).toLowerCase()) + (sub || '');
 
 // ----------------------------------------------------------------- helpers
 
@@ -283,7 +283,7 @@ function parseArgs(argv) {
 
 function requireName(name, usage) {
   if (!name) throw new CliError('which bot? usage: ' + usage);
-  return name;
+  return String(name).toLowerCase();
 }
 
 function parseEnvFile(file) {
@@ -315,14 +315,19 @@ function parseStart(str) {
   let lang = null;
   if (['python', 'python3', 'py'].includes(cmd)) lang = 'python';
   else if (['node', 'nodejs'].includes(cmd)) lang = 'node';
+  else if (['ts', 'typescript', 'tsx', 'ts-node'].includes(cmd)) lang = 'typescript';
   else if (['cargo', 'rust'].includes(cmd)) lang = 'rust';
-  if (!lang) throw new CliError('don\'t know how to run "' + str + '". Use: python, node or cargo');
+  if (!lang && ['npm', 'npx', 'pnpm', 'yarn', 'bun'].includes(cmd)) {
+    throw new CliError('"' + cmd + '" is not a start command here. Use: start node (JavaScript), start ts (TypeScript), start python or start cargo');
+  }
+  if (!lang) throw new CliError('don\'t know how to run "' + str + '". Use: python, node, ts or cargo');
   return { lang, entry: tokens[1] || null };
 }
 
 function detectStart(dir) {
   const has = (f) => fs.existsSync(path.join(dir, f));
   if (has('Cargo.toml')) return 'cargo';
+  if (has('tsconfig.json')) return 'ts';
   if (has('package.json')) return 'node';
   if (has('requirements.txt') || has('main.py') || has('bot.py')) return 'python';
   return null;
@@ -338,7 +343,26 @@ function nodeMain(dir) {
   return 'index.js';
 }
 
-const defaultEntry = (lang) => ({ python: 'main.py', node: 'index.js', rust: '' }[lang]);
+function readPkg(dir) {
+  try {
+    return JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf8'));
+  } catch (e) {
+    return {};
+  }
+}
+
+function hasBuildScript(dir) {
+  const pkg = readPkg(dir);
+  return Boolean(pkg.scripts && pkg.scripts.build);
+}
+
+function tsMain(dir) {
+  const pkg = readPkg(dir);
+  if (pkg.main) return pkg.main;
+  return hasBuildScript(dir) ? 'dist/index.js' : 'src/index.ts';
+}
+
+const defaultEntry = (lang) => ({ python: 'main.py', node: 'index.js', typescript: 'dist/index.js', rust: '' }[lang]);
 const sanitizeName = (s) => s.toLowerCase().replace(/[^a-z0-9_-]/g, '-').replace(/^[-_]+/, '').slice(0, 32);
 
 async function packDir(dir) {
@@ -387,7 +411,7 @@ async function installBot(name, lang, progress) {
       }
       return secs + 's';
     }
-    progress((lang === 'rust' ? 'building, Rust is slow, relax  ' : 'installing  ') + secs + 's');
+    progress((lang === 'rust' ? 'building, Rust is slow, relax  ' : lang === 'typescript' ? 'installing and building  ' : 'installing  ') + secs + 's');
     if (secs > 3600) throw new CliError('install is taking over an hour. Check: host logs ' + name + ' --install');
   }
 }
@@ -617,10 +641,13 @@ async function deploy(opts, flags) {
   if (!startStr) throw new CliError('could not tell the language. Add: start python | node | cargo');
   const parsed = parseStart(startStr);
   const lang = parsed.lang;
-  const main = opts.main || parsed.entry || (lang === 'node' ? nodeMain(dir) : defaultEntry(lang));
-  const name = opts.name || sanitizeName(path.basename(dir));
+  const main = opts.main || parsed.entry || (lang === 'node' ? nodeMain(dir) : lang === 'typescript' ? tsMain(dir) : defaultEntry(lang));
+  const name = String(opts.name || sanitizeName(path.basename(dir))).toLowerCase();
   if (!NAME_RE.test(name)) throw new CliError('bad bot name "' + name + '": use a-z, 0-9, _ or -, max 32 characters');
-  if (lang !== 'rust' && !fs.existsSync(path.join(dir, main))) throw new CliError('main file "' + main + '" not found in ' + dir);
+  const builtOnServer = lang === 'typescript' && !/\.(ts|mts|cts)$/.test(main) && hasBuildScript(dir);
+  if (lang !== 'rust' && !builtOnServer && !fs.existsSync(path.join(dir, main))) {
+    throw new CliError('main file "' + main + '" not found in ' + dir);
+  }
   let mem;
   if (flags.mem !== undefined) {
     mem = parseInt(flags.mem, 10);
@@ -695,7 +722,7 @@ async function deploy(opts, flags) {
 
   await next('Uploading', async ({ progress }) => {
     if (bot.status === 'installing') throw new CliError('an install is already running for this bot, try again in a minute');
-    if (bot.status === 'running') {
+    if (bot.status === 'running' && lang !== 'rust') {
       progress('stopping old version');
       await request('POST', bp(name, '/stop'));
     }
@@ -735,7 +762,8 @@ async function deploy(opts, flags) {
 
   let finalLine = '';
   await next('Starting', async () => {
-    await request('POST', bp(name, '/start'));
+    const swap = bot.status === 'running' && lang === 'rust';
+    await request('POST', bp(name, swap ? '/restart' : '/start'));
     await sleep(4000);
     const now = await request('GET', bp(name));
     if (now.status !== 'running') {
@@ -775,7 +803,8 @@ function printHelp() {
   out('    host <path> start <cmd> main <file> name <bot>');
   out(c.dim('      host ./mybot start node main index.js name mybot'));
   out(c.dim('      host . start python main main.py name musicbot'));
-  out(c.dim('      start = python | node | cargo     main = file to run     name = bot name'));
+  out(c.dim('      start = python | node | ts | cargo     main = file to run     name = bot name'));
+  out(c.dim('      TypeScript: host ./mybot start ts name mybot   (the server runs your "build" script)'));
   out(c.dim('      leave out start/main/name and it guesses from your folder'));
   out();
   h('  Manage');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "selfnify-host",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Deploy and manage bots (Python, Node.js, Rust) on the Selfnify host with one command.",
   "bin": {
     "host": "host.js",