@nerimity/nerimity.js 1.19.0 → 1.20.0

package/src/classes/Channel.ts

@@ -1,3 +1,4 @@
+import { AsyncFunctionQueue } from "../AsyncFunctionQueue";
 import { ChannelType, RawChannel } from "../RawData";
 import {
   deleteMessage as requestMessageDelete,
@@ -11,6 +12,8 @@ export class Channel {
   client: Client;
   id: string;
 
+  messageSendQueue = new AsyncFunctionQueue();
+
   type: ChannelType;
   createdAt?: number;
   lastMessagedAt?: number;
@@ -26,19 +29,21 @@ export class Channel {
   }
 
   async send(content: string, opts?: MessageOpts) {
-    const RawMessage = await postMessage({
-      client: this.client,
-      channelId: this.id,
-      content: content,
-      silent: opts?.silent,
-      nerimityCdnFileId: opts?.nerimityCdnFileId,
-      htmlEmbed: opts?.htmlEmbed,
-      buttons: opts?.buttons,
-      replyToMessageIds: opts?.replyToMessageIds,
-      mentionReplies: opts?.mentionReplies,
+    return this.messageSendQueue.add(async () => {
+      const RawMessage = await postMessage({
+        client: this.client,
+        channelId: this.id,
+        content: content,
+        silent: opts?.silent,
+        nerimityCdnFileId: opts?.nerimityCdnFileId,
+        htmlEmbed: opts?.htmlEmbed,
+        buttons: opts?.buttons,
+        replyToMessageIds: opts?.replyToMessageIds,
+        mentionReplies: opts?.mentionReplies,
+      });
+      const message = new Message(this.client, RawMessage);
+      return message;
     });
-    const message = new Message(this.client, RawMessage);
-    return message;
   }
   toString() {
     return `[#:${this.id}]`;

package/src/classes/Message.ts

@@ -59,6 +59,7 @@ export interface MessageOpts {
 }
 interface EditMessageOpts {
   htmlEmbed?: string;
+  buttons?: RawMessageButton[];
 }
 export class Message {
   client: Client;
@@ -136,6 +137,7 @@ export class Message {
       messageId: this.id,
       content: content,
       htmlEmbed: opts?.htmlEmbed,
+      buttons: opts?.buttons,
     });
     const message = new Message(this.client, RawMessage);
     return message;

package/src/classes/Webhooks.ts

@@ -116,6 +116,9 @@ export class WebhookBuilder {
    * @throws If the request fails, is unauthorized, or returns invalid JSON.
    */
   public async send(content: string): Promise<any> {
+    const error = new Error();
+    Error.captureStackTrace(error, this.send);
+
     const url = `https://nerimity.com/api/webhooks/${this.channelId}/${this.token}`;
 
     try {
@@ -138,7 +141,11 @@ export class WebhookBuilder {
 
       return json;
     } catch (err: any) {
-      throw new Error(`Failed to send webhook: ${err.message}`);
+      const message = err.message || err;
+      error.message = `Failed to send webhook: ${message}`;
+      (error as any).raw = message;
+
+      throw error;
     }
   }
 }

package/src/services/MessageService.ts

@@ -1,7 +1,6 @@
 import { Client } from "../classes/Client";
 import { RawMessage, RawMessageButton } from "../RawData";
 import { ServiceEndpoints } from "./serviceEndpoints";
-import fetch from "node-fetch";
 
 interface FetchMessageOpts {
   client: Client;
@@ -16,12 +15,6 @@ export async function fetchMessage(opts: FetchMessageOpts) {
     method: "GET",
 
     useToken: true,
-  }).catch((err) => {
-    const error = new Error(
-      `Failed to get message. ${JSON.stringify(err.message)}`
-    );
-    (error as unknown as { raw: string }).raw = err.message;
-    throw error;
   });
 }
 
@@ -52,12 +45,6 @@ export async function postMessage(opts: PostMessageOpts) {
       replyToMessageIds: opts.replyToMessageIds,
     },
     useToken: true,
-  }).catch((err) => {
-    const error = new Error(
-      `Failed to send message. ${JSON.stringify(err.message)}`
-    );
-    (error as unknown as { raw: string }).raw = err.message;
-    throw error;
   });
 }
 
@@ -67,6 +54,7 @@ interface EditMessageOpts {
   messageId: string;
   content: string;
   htmlEmbed?: string;
+  buttons?: RawMessageButton[];
 }
 
 export function editMessage(opts: EditMessageOpts) {
@@ -74,10 +62,12 @@ export function editMessage(opts: EditMessageOpts) {
     client: opts.client,
     url: ServiceEndpoints.EditMessage(opts.channelId, opts.messageId),
     method: "PATCH",
-    body: { content: opts.content, htmlEmbed: opts.htmlEmbed },
+    body: {
+      content: opts.content,
+      htmlEmbed: opts.htmlEmbed,
+      buttons: opts.buttons,
+    },
     useToken: true,
-  }).catch((err) => {
-    throw err.message;
   });
 }
 
@@ -92,8 +82,6 @@ export function deleteMessage(opts: DeleteMessageOpts) {
     url: ServiceEndpoints.EditMessage(opts.channelId, opts.messageId),
     method: "DELETE",
     useToken: true,
-  }).catch((err) => {
-    throw err.message;
   });
 }
 
@@ -168,8 +156,6 @@ export function buttonClickCallback(opts: ButtonClickCallbackOpts) {
       userId: opts.userId,
     },
     useToken: true,
-  }).catch((err) => {
-    throw err.message;
   });
 }
 
@@ -184,6 +170,9 @@ interface RequestOpts {
 }
 
 export async function request<T>(opts: RequestOpts): Promise<T> {
+  const stackCapture: any = {};
+  Error.captureStackTrace(stackCapture, request);
+
   const url = new URL(opts.url);
   url.search = new URLSearchParams(opts.params || {}).toString();
 
@@ -195,7 +184,7 @@ export async function request<T>(opts: RequestOpts): Promise<T> {
       Authorization: opts.useToken ? opts.client.token! : "",
     },
   }).catch((err) => {
-    throw { message: "Could not connect to server. " + err.message };
+    throw new Error("Could not connect to server. " + err.message);
   });
 
   const text = await response.text();
@@ -204,10 +193,16 @@ export async function request<T>(opts: RequestOpts): Promise<T> {
   try {
     const json = JSON.parse(text);
     if (!response.ok) {
-      return Promise.reject(json);
+      throw new Error(JSON.stringify(json));
     }
     return json;
-  } catch {
-    throw { message: text };
+  } catch (err) {
+    if (err instanceof Error) {
+      // Remove the first line of the captured stack ("Error")
+      // and append the rest to the real error
+      const originalStack = stackCapture.stack?.split("\n").slice(1).join("\n");
+      err.stack += "\n    -- caused by --\n" + originalStack;
+    }
+    throw err;
   }
 }

package/src/services/PostsService.ts

@@ -30,8 +30,6 @@ export async function getPosts(client: Client) {
     url: ServiceEndpoints.GetPosts(),
     method: "GET",
     useToken: true,
-  }).catch((err) => {
-    throw new Error(`Failed to get posts. ${err.message}`);
   });
 }
 
@@ -46,8 +44,6 @@ export async function postPost(opts: PostPostOpts) {
       poll: opts.poll,
     },
     useToken: true,
-  }).catch((err) => {
-    throw new Error(`Failed to send post. ${err.message}`);
   });
 }
 
@@ -58,8 +54,6 @@ export async function editPost(opts: EditPostOpts) {
     method: "PATCH",
     body: { content: opts.content },
     useToken: true,
-  }).catch((err) => {
-    throw new Error(`Failed to edit post. ${err.message}`);
   });
 }
 
@@ -69,7 +63,5 @@ export async function deletePost(opts: DeletePostOpts) {
     url: ServiceEndpoints.DeletePost(opts.postId),
     method: "DELETE",
     useToken: true,
-  }).catch((err) => {
-    throw new Error(`Failed to delete post. ${err.message}`);
   });
 }

package/src/services/ServerService.ts

@@ -14,8 +14,6 @@ export async function banServerMember(
     method: "POST",
     useToken: true,
     body: { reason },
-  }).catch((err) => {
-    throw new Error(`Failed to ban server member. ${err.message}`);
   });
 }
 
@@ -29,8 +27,6 @@ export async function unbanServerMember(
     url: ServiceEndpoints.serverMemberBan(serverId, userId),
     method: "DELETE",
     useToken: true,
-  }).catch((err) => {
-    throw new Error(`Failed to unban server member. ${err.message}`);
   });
 }
 export async function kickServerMember(
@@ -43,7 +39,5 @@ export async function kickServerMember(
     url: ServiceEndpoints.serverMemberKick(serverId, userId),
     method: "DELETE",
     useToken: true,
-  }).catch((err) => {
-    throw new Error(`Failed to kick server member. ${err.message}`);
   });
 }