selfnify-host 1.0.0 → 1.0.2

package/host.js

@@ -9,7 +9,7 @@ const https = require('https');
 const crypto = require('crypto');
 const readline = require('readline');
 
-const VERSION = '1.0.0';
+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');
@@ -27,6 +27,7 @@ const BOOL_FLAGS = {
   '--autostart': 'autostart',
   '--no-autostart': 'no-autostart',
   '--no-install': 'no-install',
+  '--no-env': 'no-env',
   '--dry-run': 'dry-run',
   '-v': 'verbose',
   '--verbose': 'verbose',
@@ -627,7 +628,11 @@ async function deploy(opts, flags) {
   }
 
   const dry = Boolean(flags['dry-run']);
-  const total = dry ? 2 : 5 + (flags.env ? 1 : 0) + (flags['no-install'] ? 0 : 1);
+  const localEnv = path.join(dir, '.env');
+  let envMode = null; // 'explicit' = --env given (no question), 'ask' = .env found, ask first
+  if (flags.env) envMode = 'explicit';
+  else if (!flags['no-env'] && fs.existsSync(localEnv)) envMode = 'ask';
+  const total = dry ? 2 : 5 + (envMode ? 1 : 0) + (flags['no-install'] ? 0 : 1);
   let n = 0;
   const next = (label, fn) => step(++n, total, label, fn);
 
@@ -684,9 +689,13 @@ async function deploy(opts, flags) {
     return 'found, updating';
   });
 
+  const saved = loadConfig();
+  saved.bots = Object.assign({}, saved.bots, { [name]: { path: dir, start: startStr, main: opts.main || null } });
+  saveConfig(saved);
+
   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'));
     }
@@ -695,11 +704,27 @@ async function deploy(opts, flags) {
     return r.extracted_mb + ' MB on the server';
   });
 
-  if (flags.env) {
+  if (envMode) {
+    const envPath = envMode === 'explicit' ? flags.env : localEnv;
+    let send = envMode === 'explicit';
+    let pairs = null;
+    if (envMode === 'ask') {
+      pairs = parseEnvFile(envPath);
+      const keys = Object.keys(pairs);
+      if (keys.length && process.stdin.isTTY) {
+        const onServer = new Set(bot.env_keys || []);
+        const already = keys.filter((k) => onServer.has(k)).length;
+        out('  ' + c.yellow('Found .env') + ' with ' + keys.length + ' variables (' + already + ' already on the server)');
+        out(c.dim('  ' + keys.join(', ')));
+        const answer = (await ask('  Send it to the server as environment variables? [y/N] ')).toLowerCase();
+        send = answer === 'y' || answer === 'yes';
+      }
+    }
     await next('Sending env vars', async () => {
-      const pairs = parseEnvFile(flags.env);
-      if (!Object.keys(pairs).length) throw new CliError('no variables found in ' + flags.env);
-      const r = await request('POST', bp(name, '/env'), { body: pairs });
+      if (!send) return 'skipped (send later: host env ' + name + ' push)';
+      const toSend = pairs || parseEnvFile(envPath);
+      if (!Object.keys(toSend).length) throw new CliError('no variables found in ' + envPath);
+      const r = await request('POST', bp(name, '/env'), { body: toSend });
       return r.env_keys.length + ' on the server';
     });
   }
@@ -710,7 +735,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') {
@@ -723,10 +749,6 @@ async function deploy(opts, flags) {
     return finalLine;
   });
 
-  const fresh = loadConfig();
-  fresh.bots = Object.assign({}, fresh.bots, { [name]: { path: dir, start: startStr, main: opts.main || null } });
-  saveConfig(fresh);
-
   out();
   out('  ' + c.green('Done') + c.dim(' in ' + Math.round((Date.now() - t0) / 1000) + 's'));
   out(c.dim('  logs: host logs ' + name + ' -f    stop: host stop ' + name + '    redeploy: host deploy ' + name));
@@ -770,7 +792,8 @@ function printHelp() {
   out('    host login    host logout    host pin    host help    host version');
   out();
   h('  Flags');
-  out('    --mem MB   --autostart   --no-install   --env <file>   --dry-run');
+  out('    --mem MB   --autostart   --no-install   --env <file>   --no-env   --dry-run');
+  out(c.dim('    (a .env in your bot folder is never uploaded with the code, it asks before sending it as env vars)'));
   out('    -f/--follow   -n <lines>   --install   --server <url>   -v/--verbose   --no-color');
   out();
   out(c.dim('  Also works as: selfnify <same commands>'));

package/package.json

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