src: Convert .then to async/await.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

Author: andersk

src/api.js

@@ -1,6 +1,6 @@
 const helper = require('./helper');
 
-function api(baseUrl, config, method, params) {
+async function api(baseUrl, config, method, params) {
   const url = new URL(baseUrl);
   const auth = Buffer.from(`${config.username}:${config.apiKey}`).toString(
     'base64'
@@ -21,32 +21,28 @@ function api(baseUrl, config, method, params) {
       url.searchParams.append(key, value);
     });
   }
-  let response = null;
-  return helper
-    .fetch(url.href, options)
-    .then((res) => {
-      response = res;
-      return res.json();
-    })
-    .catch((e) => {
-      if (e instanceof SyntaxError) {
-        // We probably got a non-JSON response from the server.
-        // We should inform the user of the same.
-        let message = 'Server Returned a non-JSON response.';
-        if (response.status === 404) {
-          message += ` Maybe endpoint: ${method} ${response.url.replace(
-            config.apiURL,
-            ''
-          )} doesn't exist.`;
-        } else {
-          message += ' Please check the API documentation.';
-        }
-        const error = new Error(message);
-        error.res = response;
-        throw error;
+  const response = await helper.fetch(url.href, options);
+  try {
+    return response.json();
+  } catch (e) {
+    if (e instanceof SyntaxError) {
+      // We probably got a non-JSON response from the server.
+      // We should inform the user of the same.
+      let message = 'Server Returned a non-JSON response.';
+      if (response.status === 404) {
+        message += ` Maybe endpoint: ${method} ${response.url.replace(
+          config.apiURL,
+          ''
+        )} doesn't exist.`;
+      } else {
+        message += ' Please check the API documentation.';
       }
-      throw e;
-    });
+      const error = new Error(message);
+      error.res = response;
+      throw error;
+    }
+    throw e;
+  }
 }
 
 module.exports = api;

src/index.js

@@ -46,11 +46,9 @@ function resources(config) {
   };
 }
 
-function zulip(initialConfig) {
+async function zulip(initialConfig) {
   if (initialConfig.zuliprc) {
-    return parseConfigFile(initialConfig.zuliprc).then((config) =>
-      resources(config)
-    );
+    return resources(await parseConfigFile(initialConfig.zuliprc));
   }
   const config = initialConfig;
   if (config.realm.endsWith('/api')) {
@@ -60,14 +58,10 @@ function zulip(initialConfig) {
   }
 
   if (!config.apiKey) {
-    return accounts(config)
-      .retrieve()
-      .then((res) => {
-        config.apiKey = res.api_key;
-        return resources(config);
-      });
+    const res = await accounts(config).retrieve();
+    config.apiKey = res.api_key;
   }
-  return Promise.resolve(resources(config));
+  return resources(config);
 }
 
 module.exports = zulip;

src/resources/accounts.js

@@ -2,17 +2,16 @@ const helper = require('../helper');
 
 function accounts(config) {
   return {
-    retrieve: () => {
+    retrieve: async () => {
       const url = `${config.apiURL}/fetch_api_key`;
       const form = new helper.FormData();
       form.append('username', config.username);
       form.append('password', config.password);
-      return helper
-        .fetch(url, {
-          method: 'POST',
-          body: form,
-        })
-        .then((res) => res.json());
+      const res = await helper.fetch(url, {
+        method: 'POST',
+        body: form,
+      });
+      return res.json();
     },
   };
 }

src/zuliprc.js

@@ -1,19 +1,16 @@
 import readFile from 'fs-readfile-promise';
 import { parse } from 'ini';
 
-function parseConfigFile(filename) {
-  return readFile(filename)
-    .then((buf) => buf.toString())
-    .then(parse)
-    .then((parsedConfig) => {
-      const config = {
-        realm: parsedConfig.api.site,
-        username: parsedConfig.api.email,
-        apiKey: parsedConfig.api.key,
-      };
-      config.apiURL = `${parsedConfig.api.site}/api/v1`;
-      return config;
-    });
+async function parseConfigFile(filename) {
+  const buf = await readFile(filename);
+  const parsedConfig = parse(buf.toString());
+  const config = {
+    realm: parsedConfig.api.site,
+    username: parsedConfig.api.email,
+    apiKey: parsedConfig.api.key,
+  };
+  config.apiURL = `${parsedConfig.api.site}/api/v1`;
+  return config;
 }
 
 export default parseConfigFile;