@tapestry-mud/cli 0.3.10 → 0.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapestry-mud/cli",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "CLI for the Tapestry MUD engine",
   "bin": {
     "tapestry": "./bin/tapestry.js"

package/src/commands/init.js

@@ -28,7 +28,7 @@ function buildManifest(name, deps, engineVersion, engineChannel) {
   ].join('\n');
 }
 
-function buildServerYaml({ serverName, adminHandle, adminPassword, telemetry }) {
+function buildServerYaml({ serverName, adminHandle, adminEmail, adminPassword, telemetry }) {
   const telemetryBlock = telemetry
     ? [
         `telemetry:`,
@@ -59,6 +59,7 @@ function buildServerYaml({ serverName, adminHandle, adminPassword, telemetry })
     ``,
     `admin:`,
     `  handle: ${adminHandle}`,
+    `  email: ${adminEmail}`,
     `  password: ${adminPassword}`,
     ``,
     `# --- Telemetry (OpenTelemetry) ---`,
@@ -105,6 +106,15 @@ function buildServerYaml({ serverName, adminHandle, adminPassword, telemetry })
     `# pre_auth:`,
     `#   enabled: false`,
     `#   token_expiry_seconds: 60`,
+    ``,
+    `# --- Accounts ---`,
+    `# accounts:`,
+    `#   max_concurrent_characters: 1`,
+    ``,
+    `# --- Link-Dead (player disconnect grace period) ---`,
+    `# link_dead:`,
+    `#   enabled: true`,
+    `#   timeout_seconds: 120`,
   ].join('\n');
 }
 
@@ -157,6 +167,7 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
     answers = {
       gameName: dirName,
       adminHandle: 'admin',
+      adminEmail: 'admin@localhost',
       adminPassword: 'changeme',
       telemetry: false,
     };
@@ -177,6 +188,17 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
         message: 'Admin handle:',
         validate: (v) => (v.trim().length > 0 && !/\s/.test(v)) || 'Required, no spaces',
       },
+      {
+        type: 'input',
+        name: 'adminEmail',
+        message: 'Admin email:',
+        validate: (v) => {
+          v = v.trim();
+          if (!v) { return 'Required'; }
+          if (!v.includes('@') || !v.includes('.')) { return 'Must be a valid email'; }
+          return true;
+        },
+      },
       {
         type: 'password',
         name: 'adminPassword',
@@ -208,6 +230,7 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
     buildServerYaml({
       serverName: answers.gameName,
       adminHandle: answers.adminHandle,
+      adminEmail: answers.adminEmail,
       adminPassword: answers.adminPassword,
       telemetry: answers.telemetry,
     })

package/src/commands/install.js

@@ -5,7 +5,7 @@ const os = require('os');
 const path = require('path');
 const { readYaml, writeYaml } = require('../util/yaml');
 const { resolve } = require('../lib/semver-resolver');
-const { readLock, writeLock } = require('../lib/lock-file');
+const { readLock, writeLock, hashDeps } = require('../lib/lock-file');
 const { fetchTarball, DEFAULT_REGISTRY } = require('../lib/registry-client');
 const { verifyIntegrity, saveTarball, extractTarball } = require('../lib/tarball');
 const { addPackageToBoot } = require('../lib/boot');
@@ -25,6 +25,9 @@ function parsePackageArg(arg) {
 }
 
 function isLockCurrent(manifestDeps, lock) {
+  if (!lock.deps_hash || lock.deps_hash !== hashDeps(manifestDeps)) {
+    return false;
+  }
   const lockResolved = lock.resolved || {};
   return Object.keys(manifestDeps).every((name) => lockResolved[name]);
 }
@@ -34,8 +37,18 @@ async function installResolved(cwd, resolved, token) {
     const destDir = packInstallPath(cwd, packageName);
 
     if (fs.existsSync(destDir)) {
-      console.log(`  already installed ${packageName}@${info.version}`);
-      continue;
+      const installedManifestPath = path.join(destDir, 'tapestry.yaml');
+      if (fs.existsSync(installedManifestPath)) {
+        const installed = readYaml(installedManifestPath);
+        if (installed.version === info.version) {
+          console.log(`  already installed ${packageName}@${info.version}`);
+          continue;
+        }
+        console.log(`  upgrading ${packageName} ${installed.version} -> ${info.version}`);
+      } else {
+        console.log(`  reinstalling ${packageName}@${info.version} (missing manifest)`);
+      }
+      fs.rmSync(destDir, { recursive: true });
     }
 
     console.log(`  installing ${packageName}@${info.version}`);
@@ -95,7 +108,8 @@ async function install(packageArg, { cwd = process.cwd(), registryUrl = DEFAULT_
   }
 
   await installResolved(cwd, resolved, token);
-  writeLock(cwd, { lockfile_version: 1, resolved });
+  const deps = manifest.dependencies || {};
+  writeLock(cwd, { lockfile_version: 1, deps_hash: hashDeps(deps), resolved });
   console.log('Done.');
 }
 

package/src/lib/lock-file.js

@@ -1,11 +1,17 @@
 'use strict';
 
+const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
 const { readYaml, writeYaml } = require('../util/yaml');
 
 const LOCK_FILE = 'tapestry-lock.yaml';
 
+function hashDeps(deps) {
+  const sorted = Object.keys(deps).sort().map((k) => `${k}@${deps[k]}`).join('\n');
+  return crypto.createHash('sha256').update(sorted).digest('hex');
+}
+
 function readLock(cwd) {
   const lockPath = path.join(cwd, LOCK_FILE);
   if (!fs.existsSync(lockPath)) {
@@ -18,4 +24,4 @@ function writeLock(cwd, lock) {
   writeYaml(path.join(cwd, LOCK_FILE), lock);
 }
 
-module.exports = { readLock, writeLock };
+module.exports = { readLock, writeLock, hashDeps };