Report errors from backend when a request fails (attempt 2)

src/develop.js

@@ -47,7 +47,7 @@ cmd-shift-o to run the package out of the newly cloned repository.\
         url: `${config.getAtomPackagesUrl()}/${packageName}`,
         json: true
       };
-      const response = await request.get(requestSettings).catch(error => Promise.reject(`Request for package information failed: ${error.message}`));
+      const response = await request.get(requestSettings).catch(error => Promise.reject(`Request for package information failed: ${request.getErrorMessage(null, error)}`));
       const body = response.body ?? {};
 
       if (response.statusCode === 200) {
@@ -59,7 +59,7 @@ cmd-shift-o to run the package out of the newly cloned repository.\
         throw `No repository URL found for package: ${packageName}`;
       }
 
-      const message = request.getErrorMessage(body, error);
+      const message = request.getErrorMessage(body, null);
       throw `Request for package information failed: ${message}`;
     }
 
@@ -110,7 +110,7 @@ cmd-shift-o to run the package out of the newly cloned repository.\
 
       try {
         const repoUrl = await this.getRepositoryUrl(packageName);
-        
+
         await this.cloneRepository(repoUrl, packageDirectory, options);
         await this.installDependencies(packageDirectory, options);
         await this.linkPackage(packageDirectory, options);

src/install.js

@@ -223,7 +223,7 @@ Run ppm -v after installing Git to see what version has been detected.\
         retries: 4
       };
       const response = await request.get(requestSettings).catch(error => {
-        let message = `Request for package information failed: ${error.message}`;
+        let message = `Request for package information failed: ${request.getErrorMessage(null, error)}`;
         if (error.status) { message += ` (${error.status})`; }
         throw message;
       });

src/request.js

@@ -15,7 +15,7 @@ function loadNpm() {
     userconfig: config.getUserConfigPath(),
     globalconfig: config.getGlobalConfigPath()
   };
-  return new Promise((resolve, reject) => 
+  return new Promise((resolve, reject) =>
     void npm.load(npmOptions, (error, value) => void(error != null ? reject(error) : resolve(value)))
   );
 };
@@ -114,7 +114,13 @@ module.exports = {
     if (err?.status === 503) {
       return `${err.response.req.host} is temporarily unavailable, please try again later.`;
     } else {
-      return err?.response?.body ?? err?.response?.error ?? err ?? body.message ?? body.error ?? body;
+      let msg = err?.response?.body?.message ?? err?.response?.body ?? err?.response?.error ?? err ?? body.message ?? body.error ?? body;
+      if (typeof msg === "object") {
+        // If we found a message that's still an object lets make sure it'll
+        // still be readable for users
+        msg = JSON.stringify(msg);
+      }
+      return msg;
     }
   },
 

src/star.js

@@ -44,15 +44,15 @@ Run \`ppm stars\` to see all your starred packages.\
         }
       };
 
-      const response = await request.post(requestSettings).catch(error => { this.logFailure(); throw error; });
+      const response = await request.post(requestSettings).catch(error => { this.logFailure(); throw request.getErrorMessage(null, error); });
       const body = response.body ?? {};
       if ((response.statusCode === 404) && ignoreUnpublishedPackages) {
         process.stdout.write('skipped (not published)\n'.yellow);
         return Promise.reject();
       }
       if (response.statusCode !== 200) {
         this.logFailure();
-        const message = request.getErrorMessage(body, error);
+        const message = request.getErrorMessage(body, null);
         throw `Starring package failed: ${message}`;
       }
 

src/unpublish.js

@@ -49,18 +49,18 @@ name is specified.\
 
         if (packageVersion) { options.url += `/versions/${packageVersion}`; }
 
-        const response = await request.del(options).catch(error => { this.logFailure(); throw error; }); //it's not clear why we are calling logFailure in two layers (here and in the usual try-catch around it)
+        const response = await request.del(options).catch(error => { this.logFailure(); throw request.getErrorMessage(null, error); }); //it's not clear why we are calling logFailure in two layers (here and in the usual try-catch around it)
         const body = response.body ?? {};
         if (response.statusCode !== 204) {
           this.logFailure();
-          const message = body.message ?? body.error ?? body;
+          const message = request.getErrorMessage(body, null);
           throw `Unpublishing failed: ${message}`;
         }
 
         this.logSuccess();
       } catch (error) {
-          this.logFailure();
-          throw error;
+        this.logFailure();
+        throw error;
       }
     }
 

src/view.js

@@ -73,11 +73,11 @@ View information about a package/theme.\
         url: `${config.getAtomPackagesUrl()}/${packageName}`,
         json: true
       };
-        
+
       const response = await request.get(requestSettings);
       const body = response.body ?? {};
       if (response.statusCode !== 200) {
-        const message = body.message ?? body.error ?? body;
+        const message = request.getErrorMessage(body, null);
         throw `Requesting package failed: ${message}`;
       }