@tapestry-mud/cli 0.3.8 → 0.3.9

package/package.json

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

package/src/commands/init.js

@@ -4,6 +4,10 @@ const fs = require('fs');
 const path = require('path');
 const { fetchPreset, fetchPresetList, DEFAULT_REGISTRY } = require('../lib/registry-client');
 
+function slugify(str) {
+  return str.trim().toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9_.-]/g, '');
+}
+
 function buildManifest(name, deps, engineVersion, engineChannel) {
   const depLines = Object.entries(deps)
     .map(([pkg, range]) => `  '${pkg}': '${range}'`)
@@ -154,7 +158,6 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
       gameName: dirName,
       adminHandle: 'admin',
       adminPassword: 'changeme',
-      serverName: dirName,
       telemetry: false,
     };
     console.warn('Default admin credentials -- change in server.yaml before production use.');
@@ -166,7 +169,7 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
         name: 'gameName',
         message: 'Game name:',
         default: dirName,
-        validate: (v) => (v.trim().length > 0 && /^[a-zA-Z0-9_.-]+$/.test(v.trim())) || 'Must be non-empty and filesystem-safe',
+        validate: (v) => v.trim().length > 0 || 'Required',
       },
       {
         type: 'input',
@@ -188,13 +191,6 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
         mask: '*',
         validate: (v, a) => v === a.adminPassword || 'Passwords do not match',
       },
-      {
-        type: 'input',
-        name: 'serverName',
-        message: 'Server name:',
-        default: (a) => a.gameName,
-        validate: (v) => v.trim().length > 0 || 'Required',
-      },
       {
         type: 'confirm',
         name: 'telemetry',
@@ -204,13 +200,13 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
     ]);
   }
 
-  const name = answers.gameName;
+  const name = slugify(answers.gameName);
 
   fs.writeFileSync(manifestPath, buildManifest(name, deps, preset.version, preset.engine_channel));
   fs.writeFileSync(
     path.join(cwd, 'server.yaml'),
     buildServerYaml({
-      serverName: answers.serverName,
+      serverName: answers.gameName,
       adminHandle: answers.adminHandle,
       adminPassword: answers.adminPassword,
       telemetry: answers.telemetry,
@@ -247,4 +243,4 @@ async function init(cwd, { registryUrl = DEFAULT_REGISTRY, yes = false, prompter
   }
 }
 
-module.exports = { init, buildManifest, buildServerYaml };
+module.exports = { init, buildManifest, buildServerYaml, slugify };

package/src/lib/engine-manager.js

@@ -65,11 +65,11 @@ function dockerEnsureImage(image, version) {
   }
 }
 
-function dockerStart(projectName, image, version, packsDir, serverYamlPath, dataDir) {
+function dockerStart(projectName, image, version, packsDir, serverYamlPath, dataDir, network) {
   const containerName = `tapestry-${projectName}`;
   dockerEnsureImage(image, version);
   spawnSync('docker', ['rm', '-f', containerName], { stdio: 'ignore' });
-  const result = spawnSync('docker', [
+  const args = [
     'run', '--detach',
     '--name', containerName,
     '-p', '4000:4000',
@@ -77,8 +77,12 @@ function dockerStart(projectName, image, version, packsDir, serverYamlPath, data
     '-v', `${packsDir}:/app/packs`,
     '-v', `${serverYamlPath}:/app/server.yaml`,
     '-v', `${dataDir}:/app/data`,
-    `${image}:${version}`,
-  ], { stdio: 'inherit' });
+  ];
+  if (network) {
+    args.push('--network', network);
+  }
+  args.push(`${image}:${version}`);
+  const result = spawnSync('docker', args, { stdio: 'inherit' });
   if (result.status !== 0) {
     throw new Error(
       `docker run failed. Ensure the image exists and no container named '${containerName}' is already running.`
@@ -261,6 +265,7 @@ function readEngineConfig(cwd) {
     version: engine.version,
     mode: engine.mode,
     image: engine.image || DEFAULT_IMAGE,
+    network: engine.network || null,
     installDir: path.join(cwd, '.tapestry-engine'),
     projectName: (manifest.name || 'tapestry').toLowerCase().replace(/[^a-z0-9-]+/g, '-'),
   };
@@ -317,7 +322,7 @@ async function startEngine(cwd) {
   fs.mkdirSync(dataDir, { recursive: true });
   if (config.mode === 'docker') {
     const tag = await resolveDockerTag(config);
-    dockerStart(config.projectName, config.image, tag, packsDir, serverYamlPath, dataDir);
+    dockerStart(config.projectName, config.image, tag, packsDir, serverYamlPath, dataDir, config.network);
   } else if (config.mode === 'binary') {
     binaryStart(config.version, config.installDir, packsDir, serverYamlPath, cwd);
   } else {