Node version up and use async await (#139)

* Drop Node.js 6 and add support for Node 12

Please refer to the Node.js LTS schedule.

https://nodejs.org/en/about/releases/

* Use async-await

Resolve #126.

* Use async-await in tests

* Do not compile async-await into ES2015

* Upgrade npm version for Travis jobs

To support Node.js 12.

Author: Jun

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 node_js:
-  - 6
   - 8
   - 10
+  - 12
 before_install:
-  - npm i -g npm@6.4.1
+  - npm i -g npm@6.9.0
 install:
   - npm ci

README.md

@@ -33,7 +33,7 @@ reading them beforehand.
 
 ## Requirements
 
-* **Node.js** 6 or higher
+* **Node.js** 8 or higher
 
 ## Contributing
 

lib/client.ts

@@ -7,7 +7,7 @@ function toArray<T>(maybeArr: T | T[]): T[] {
   return Array.isArray(maybeArr) ? maybeArr : [maybeArr];
 }
 
-function checkJSON<T>(raw: T): T {
+function ensureJSON<T>(raw: T): T {
   if (typeof raw === "object") {
     return raw;
   } else {
@@ -35,7 +35,7 @@ export default class Client {
     );
   }
 
-  public pushMessage(
+  public async pushMessage(
     to: string,
     messages: Types.Message | Types.Message[],
   ): Promise<any> {
@@ -45,7 +45,7 @@ export default class Client {
     });
   }
 
-  public replyMessage(
+  public async replyMessage(
     replyToken: string,
     messages: Types.Message | Types.Message[],
   ): Promise<any> {
@@ -55,7 +55,7 @@ export default class Client {
     });
   }
 
-  public multicast(
+  public async multicast(
     to: string[],
     messages: Types.Message | Types.Message[],
   ): Promise<any> {
@@ -65,111 +65,115 @@ export default class Client {
     });
   }
 
-  public getProfile(userId: string): Promise<Types.Profile> {
-    return this.http.get<Types.Profile>(`/profile/${userId}`).then(checkJSON);
+  public async getProfile(userId: string): Promise<Types.Profile> {
+    const profile = await this.http.get<Types.Profile>(`/profile/${userId}`);
+    return ensureJSON(profile);
   }
 
-  private getChatMemberProfile(
+  private async getChatMemberProfile(
     chatType: ChatType,
     chatId: string,
     userId: string,
   ): Promise<Types.Profile> {
-    return this.http
-      .get<Types.Profile>(`/${chatType}/${chatId}/member/${userId}`)
-      .then(checkJSON);
+    const profile = await this.http.get<Types.Profile>(
+      `/${chatType}/${chatId}/member/${userId}`,
+    );
+    return ensureJSON(profile);
   }
 
-  public getGroupMemberProfile(
+  public async getGroupMemberProfile(
     groupId: string,
     userId: string,
   ): Promise<Types.Profile> {
     return this.getChatMemberProfile("group", groupId, userId);
   }
 
-  public getRoomMemberProfile(
+  public async getRoomMemberProfile(
     roomId: string,
     userId: string,
   ): Promise<Types.Profile> {
     return this.getChatMemberProfile("room", roomId, userId);
   }
 
-  private getChatMemberIds(
+  private async getChatMemberIds(
     chatType: ChatType,
     chatId: string,
   ): Promise<string[]> {
-    const load = (start?: string): Promise<string[]> =>
-      this.http
-        .get(`/${chatType}/${chatId}/members/ids`, start ? { start } : null)
-        .then(checkJSON)
-        .then((res: { memberIds: string[]; next?: string }) => {
-          if (!res.next) {
-            return res.memberIds;
-          }
-
-          return load(res.next).then(extraIds =>
-            res.memberIds.concat(extraIds),
-          );
-        });
-    return load();
-  }
-
-  public getGroupMemberIds(groupId: string): Promise<string[]> {
+    let memberIds: string[] = [];
+
+    let start: string;
+    do {
+      const res = await this.http.get<{ memberIds: string[]; next?: string }>(
+        `/${chatType}/${chatId}/members/ids`,
+        start ? { start } : null,
+      );
+      ensureJSON(res);
+      memberIds = memberIds.concat(res.memberIds);
+      start = res.next;
+    } while (start);
+
+    return memberIds;
+  }
+
+  public async getGroupMemberIds(groupId: string): Promise<string[]> {
     return this.getChatMemberIds("group", groupId);
   }
 
-  public getRoomMemberIds(roomId: string): Promise<string[]> {
+  public async getRoomMemberIds(roomId: string): Promise<string[]> {
     return this.getChatMemberIds("room", roomId);
   }
 
-  public getMessageContent(messageId: string): Promise<Readable> {
+  public async getMessageContent(messageId: string): Promise<Readable> {
     return this.http.getStream(`/message/${messageId}/content`);
   }
 
   private leaveChat(chatType: ChatType, chatId: string): Promise<any> {
     return this.http.post(`/${chatType}/${chatId}/leave`);
   }
 
-  public leaveGroup(groupId: string): Promise<any> {
+  public async leaveGroup(groupId: string): Promise<any> {
     return this.leaveChat("group", groupId);
   }
 
-  public leaveRoom(roomId: string): Promise<any> {
+  public async leaveRoom(roomId: string): Promise<any> {
     return this.leaveChat("room", roomId);
   }
 
-  public getRichMenu(richMenuId: string): Promise<Types.RichMenuResponse> {
-    return this.http
-      .get<Types.RichMenuResponse>(`/richmenu/${richMenuId}`)
-      .then(checkJSON);
+  public async getRichMenu(
+    richMenuId: string,
+  ): Promise<Types.RichMenuResponse> {
+    const res = await this.http.get<Types.RichMenuResponse>(
+      `/richmenu/${richMenuId}`,
+    );
+    return ensureJSON(res);
   }
 
-  public createRichMenu(richMenu: Types.RichMenu): Promise<string> {
-    return this.http
-      .post<any>("/richmenu", richMenu)
-      .then(checkJSON)
-      .then(res => res.richMenuId);
+  public async createRichMenu(richMenu: Types.RichMenu): Promise<string> {
+    const res = await this.http.post<any>("/richmenu", richMenu);
+    return ensureJSON(res).richMenuId;
   }
 
-  public deleteRichMenu(richMenuId: string): Promise<any> {
+  public async deleteRichMenu(richMenuId: string): Promise<any> {
     return this.http.delete(`/richmenu/${richMenuId}`);
   }
 
-  public getRichMenuIdOfUser(userId: string): Promise<string> {
-    return this.http
-      .get<any>(`/user/${userId}/richmenu`)
-      .then(checkJSON)
-      .then(res => res.richMenuId);
+  public async getRichMenuIdOfUser(userId: string): Promise<string> {
+    const res = await this.http.get<any>(`/user/${userId}/richmenu`);
+    return ensureJSON(res).richMenuId;
   }
 
-  public linkRichMenuToUser(userId: string, richMenuId: string): Promise<any> {
+  public async linkRichMenuToUser(
+    userId: string,
+    richMenuId: string,
+  ): Promise<any> {
     return this.http.post(`/user/${userId}/richmenu/${richMenuId}`);
   }
 
-  public unlinkRichMenuFromUser(userId: string): Promise<any> {
+  public async unlinkRichMenuFromUser(userId: string): Promise<any> {
     return this.http.delete(`/user/${userId}/richmenu`);
   }
 
-  public linkRichMenuToMultipleUsers(
+  public async linkRichMenuToMultipleUsers(
     richMenuId: string,
     userIds: string[],
   ): Promise<any> {
@@ -179,17 +183,19 @@ export default class Client {
     });
   }
 
-  public unlinkRichMenusFromMultipleUsers(userIds: string[]): Promise<any> {
+  public async unlinkRichMenusFromMultipleUsers(
+    userIds: string[],
+  ): Promise<any> {
     return this.http.post("/richmenu/bulk/unlink", {
       userIds,
     });
   }
 
-  public getRichMenuImage(richMenuId: string): Promise<Readable> {
+  public async getRichMenuImage(richMenuId: string): Promise<Readable> {
     return this.http.getStream(`/richmenu/${richMenuId}/content`);
   }
 
-  public setRichMenuImage(
+  public async setRichMenuImage(
     richMenuId: string,
     data: Buffer | Readable,
     contentType?: string,
@@ -201,62 +207,53 @@ export default class Client {
     );
   }
 
-  public getRichMenuList(): Promise<Array<Types.RichMenuResponse>> {
-    return this.http
-      .get<any>(`/richmenu/list`)
-      .then(checkJSON)
-      .then(res => res.richmenus);
+  public async getRichMenuList(): Promise<Array<Types.RichMenuResponse>> {
+    const res = await this.http.get<any>(`/richmenu/list`);
+    return ensureJSON(res).richmenus;
   }
 
-  public setDefaultRichMenu(richMenuId: string): Promise<{}> {
+  public async setDefaultRichMenu(richMenuId: string): Promise<{}> {
     return this.http.post(`/user/all/richmenu/${richMenuId}`);
   }
 
-  public getDefaultRichMenuId(): Promise<string> {
-    return this.http
-      .get<any>("/user/all/richmenu")
-      .then(checkJSON)
-      .then(res => res.richMenuId);
+  public async getDefaultRichMenuId(): Promise<string> {
+    const res = await this.http.get<any>("/user/all/richmenu");
+    return ensureJSON(res).richMenuId;
   }
 
-  public deleteDefaultRichMenu(): Promise<{}> {
+  public async deleteDefaultRichMenu(): Promise<{}> {
     return this.http.delete("/user/all/richmenu");
   }
 
-  public getLinkToken(userId: string): Promise<string> {
-    return this.http
-      .post<any>(`/user/${userId}/linkToken`)
-      .then(checkJSON)
-      .then(res => res.linkToken);
+  public async getLinkToken(userId: string): Promise<string> {
+    const res = await this.http.post<any>(`/user/${userId}/linkToken`);
+    return ensureJSON(res).linkToken;
   }
 
-  public getNumberOfSentReplyMessages(
+  public async getNumberOfSentReplyMessages(
     date: string,
   ): Promise<Types.NumberOfMessagesSentResponse> {
-    return this.http
-      .get<Types.NumberOfMessagesSentResponse>(
-        `/message/delivery/reply?date=${date}`,
-      )
-      .then(checkJSON);
+    const res = await this.http.get<Types.NumberOfMessagesSentResponse>(
+      `/message/delivery/reply?date=${date}`,
+    );
+    return ensureJSON(res);
   }
 
-  public getNumberOfSentPushMessages(
+  public async getNumberOfSentPushMessages(
     date: string,
   ): Promise<Types.NumberOfMessagesSentResponse> {
-    return this.http
-      .get<Types.NumberOfMessagesSentResponse>(
-        `/message/delivery/push?date=${date}`,
-      )
-      .then(checkJSON);
+    const res = await this.http.get<Types.NumberOfMessagesSentResponse>(
+      `/message/delivery/push?date=${date}`,
+    );
+    return ensureJSON(res);
   }
 
-  public getNumberOfSentMulticastMessages(
+  public async getNumberOfSentMulticastMessages(
     date: string,
   ): Promise<Types.NumberOfMessagesSentResponse> {
-    return this.http
-      .get<Types.NumberOfMessagesSentResponse>(
-        `/message/delivery/multicast?date=${date}`,
-      )
-      .then(checkJSON);
+    const res = await this.http.get<Types.NumberOfMessagesSentResponse>(
+      `/message/delivery/multicast?date=${date}`,
+    );
+    return ensureJSON(res);
   }
 }