@tapestry-mud/cli 0.3.0 → 0.3.2

package/bin/tapestry.js

@@ -2,6 +2,7 @@
 'use strict';
 
 const { Command } = require('commander');
+const { version } = require('../package.json');
 const { init } = require('../src/commands/init');
 const { createPack } = require('../src/commands/create-pack');
 const { install } = require('../src/commands/install');
@@ -29,7 +30,7 @@ const program = new Command();
 program
   .name('tapestry')
   .description('Tapestry Package Manager')
-  .version('0.1.0');
+  .version(version);
 
 program
   .command('init')

package/package.json

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

package/src/commands/change-password.js

@@ -2,7 +2,7 @@
 
 const fetch = require('node-fetch');
 const { requireToken } = require('../lib/auth');
-const { DEFAULT_REGISTRY } = require('../lib/registry-client');
+const { DEFAULT_REGISTRY, throwIfError } = require('../lib/registry-client');
 const { createInterface, askPassword } = require('../util/prompt');
 
 async function changePassword({ registryUrl = DEFAULT_REGISTRY } = {}) {
@@ -23,10 +23,7 @@ async function changePassword({ registryUrl = DEFAULT_REGISTRY } = {}) {
       },
       body: JSON.stringify({ currentPassword, newPassword }),
     });
-    if (!res.ok) {
-      const body = await res.json().catch(() => ({}));
-      throw new Error(body.error || `Change password failed (${res.status})`);
-    }
+    await throwIfError(res, 'Change password failed');
     console.log('Password changed.');
   } finally {
     rl.close();

package/src/commands/login.js

@@ -2,7 +2,7 @@
 
 const fetch = require('node-fetch');
 const { saveToken } = require('../lib/auth');
-const { DEFAULT_REGISTRY } = require('../lib/registry-client');
+const { DEFAULT_REGISTRY, throwIfError } = require('../lib/registry-client');
 const { createInterface, ask, askPassword } = require('../util/prompt');
 
 async function promptCredentials() {
@@ -27,10 +27,7 @@ async function login({ email, password } = {}, { registryUrl = DEFAULT_REGISTRY
     body: JSON.stringify({ email, password }),
   });
 
-  if (!res.ok) {
-    const body = await res.json().catch(() => ({}));
-    throw new Error(body.error || `Login failed (${res.status})`);
-  }
+  await throwIfError(res, 'Login failed');
 
   const { token } = await res.json();
   saveToken(token);

package/src/commands/publish.js

@@ -9,7 +9,7 @@ const { readYaml } = require('../util/yaml');
 const { validate } = require('./validate');
 const { buildTarball, computeIntegrity } = require('../lib/tarball-builder');
 const { requireToken } = require('../lib/auth');
-const { DEFAULT_REGISTRY } = require('../lib/registry-client');
+const { DEFAULT_REGISTRY, throwIfError } = require('../lib/registry-client');
 
 async function publish({ cwd = process.cwd(), registryUrl = DEFAULT_REGISTRY } = {}) {
   validate({ cwd });
@@ -45,10 +45,7 @@ async function publish({ cwd = process.cwd(), registryUrl = DEFAULT_REGISTRY } =
       body: form,
     });
 
-    if (!res.ok) {
-      const body = await res.json().catch(() => ({}));
-      throw new Error(body.error || `Publish failed (${res.status})`);
-    }
+    await throwIfError(res, 'Publish failed');
 
     const result = await res.json();
     console.log(`  Published ${result.name}@${result.version}`);

package/src/commands/register.js

@@ -2,7 +2,7 @@
 
 const fetch = require('node-fetch');
 const { saveToken } = require('../lib/auth');
-const { DEFAULT_REGISTRY } = require('../lib/registry-client');
+const { DEFAULT_REGISTRY, throwIfError } = require('../lib/registry-client');
 const { createInterface, ask, askPassword } = require('../util/prompt');
 
 async function promptRegistration() {
@@ -28,10 +28,7 @@ async function register({ handle, email, password } = {}, { registryUrl = DEFAUL
     body: JSON.stringify({ handle, email, password }),
   });
 
-  if (!res.ok) {
-    const body = await res.json().catch(() => ({}));
-    throw new Error(body.error || `Registration failed (${res.status})`);
-  }
+  await throwIfError(res, 'Registration failed');
 
   const { token } = await res.json();
   saveToken(token);

package/src/lib/registry-client.js

@@ -16,6 +16,18 @@ function validatePackageName(name) {
   }
 }
 
+async function throwIfError(res, context) {
+  if (res.status === 429) {
+    const retryAfter = res.headers.get('retry-after');
+    const hint = retryAfter ? ` Try again in ${Math.ceil(Number(retryAfter) / 60)} min.` : '';
+    throw new Error(`Rate limit exceeded.${hint}`);
+  }
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({}));
+    throw new Error(body.error || `${context} (${res.status})`);
+  }
+}
+
 async function fetchPackageMetadata(name, registryUrl = DEFAULT_REGISTRY) {
   validatePackageName(name);
   const url = `${registryUrl}/v1/packages/${name}`;
@@ -43,4 +55,4 @@ async function fetchTarball(url) {
   return res.buffer();
 }
 
-module.exports = { fetchPackageMetadata, fetchTarball, DEFAULT_REGISTRY };
+module.exports = { fetchPackageMetadata, fetchTarball, throwIfError, DEFAULT_REGISTRY };

package/src/util/prompt.js

@@ -14,14 +14,13 @@ function ask(rl, question) {
 
 function askPassword(rl, prompt) {
   return new Promise((resolve) => {
-    process.stdout.write(prompt);
     const orig = rl._writeToOutput.bind(rl);
-    rl._writeToOutput = () => {};
-    rl.question('', (password) => {
+    rl.question(prompt, (password) => {
       rl._writeToOutput = orig;
       process.stdout.write('\n');
       resolve(password);
     });
+    rl._writeToOutput = () => {};
   });
 }