encoding util

src/gateway/index.ts

@@ -18,6 +18,7 @@ import { delay } from '../utils/delay.ts'
 import { VoiceChannel } from '../structures/guildVoiceChannel.ts'
 import { Guild } from '../structures/guild.ts'
 import { HarmonyEventEmitter } from '../utils/events.ts'
+import { decodeText } from '../utils/encoding.ts'
 
 export interface RequestMembersOptions {
   limit?: number
@@ -89,7 +90,7 @@ export class Gateway extends HarmonyEventEmitter<GatewayTypedEvents> {
     }
     if (data instanceof Uint8Array) {
       data = unzlib(data)
-      data = new TextDecoder('utf-8').decode(data)
+      data = decodeText(data)
     }
 
     const { op, d, s, t }: GatewayResponse = JSON.parse(data)
@@ -427,7 +428,11 @@ export class Gateway extends HarmonyEventEmitter<GatewayTypedEvents> {
   }
 
   close(code: number = 1000, reason?: string): void {
-    this.debug(`Closing with code ${code}${reason !== undefined && reason !== '' ? ` and reason ${reason}` : ''}`)
+    this.debug(
+      `Closing with code ${code}${
+        reason !== undefined && reason !== '' ? ` and reason ${reason}` : ''
+      }`
+    )
     return this.websocket?.close(code, reason)
   }
 

src/models/slashClient.ts

@@ -19,7 +19,8 @@ import { RESTManager } from './rest.ts'
 import { SlashModule } from './slashModule.ts'
 import { verify as edverify } from 'https://deno.land/x/ed25519@1.0.1/mod.ts'
 import { User } from '../structures/user.ts'
-import { HarmonyEventEmitter } from "../utils/events.ts"
+import { HarmonyEventEmitter } from '../utils/events.ts'
+import { encodeText, decodeText } from '../utils/encoding.ts'
 
 export class SlashCommand {
   slash: SlashCommandsManager
@@ -378,9 +379,6 @@ export interface SlashOptions {
   publicKey?: string
 }
 
-const encoder = new TextEncoder()
-const decoder = new TextDecoder('utf-8')
-
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type SlashClientEvents = {
   interaction: [Interaction]
@@ -444,8 +442,9 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
           : options.rest
         : options.client.rest
 
-    this.client?.on('interactionCreate', async (interaction) =>
+    this.client?.on(
-      await this._process(interaction)
+      'interactionCreate',
+      async (interaction) => await this._process(interaction)
     )
 
     this.commands = new SlashCommandsManager(this)
@@ -533,7 +532,9 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
     if (cmd === undefined) return
 
     await this.emit('interaction', interaction)
-    try { await cmd.handler(interaction) } catch (e) {
+    try {
+      await cmd.handler(interaction)
+    } catch (e) {
       await this.emit('interactionError', e)
     }
   }
@@ -548,10 +549,8 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
       throw new Error('Public Key is not present')
 
     const fullBody = new Uint8Array([
-      ...(typeof timestamp === 'string'
+      ...(typeof timestamp === 'string' ? encodeText(timestamp) : timestamp),
-        ? encoder.encode(timestamp)
+      ...(typeof rawBody === 'string' ? encodeText(rawBody) : rawBody)
-        : timestamp),
-      ...(typeof rawBody === 'string' ? encoder.encode(rawBody) : rawBody)
     ])
 
     return edverify(signature, fullBody, this.publicKey).catch(() => false)
@@ -561,7 +560,7 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
   async verifyServerRequest(req: {
     headers: Headers
     method: string
-    body: Deno.Reader | Uint8Array,
+    body: Deno.Reader | Uint8Array
     respond: (options: {
       status?: number
       headers?: Headers
@@ -574,12 +573,13 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
     const timestamp = req.headers.get('x-signature-timestamp')
     if (signature === null || timestamp === null) return false
 
-    const rawbody = req.body instanceof Uint8Array ? req.body : await Deno.readAll(req.body)
+    const rawbody =
+      req.body instanceof Uint8Array ? req.body : await Deno.readAll(req.body)
     const verify = await this.verifyKey(rawbody, signature, timestamp)
     if (!verify) return false
 
     try {
-      const payload: InteractionPayload = JSON.parse(decoder.decode(rawbody))
+      const payload: InteractionPayload = JSON.parse(decodeText(rawbody))
 
       // TODO: Maybe fix all this hackery going on here?
       const res = new Interaction(this as any, payload, {
@@ -600,7 +600,8 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
         await req.respond({
           status: 200,
           headers: new Headers({
-            'content-type': d instanceof FormData ? 'multipart/form-data' : 'application/json'
+            'content-type':
+              d instanceof FormData ? 'multipart/form-data' : 'application/json'
           }),
           body: d instanceof FormData ? d : JSON.stringify(d)
         })
@@ -612,7 +613,13 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
   }
 
   /** Verify FetchEvent (for Service Worker usage) and return Interaction if valid */
-  async verifyFetchEvent({ request: req, respondWith }: { respondWith: CallableFunction, request: Request }): Promise<false | Interaction> {
+  async verifyFetchEvent({
+    request: req,
+    respondWith
+  }: {
+    respondWith: CallableFunction
+    request: Request
+  }): Promise<false | Interaction> {
     if (req.bodyUsed === true) throw new Error('Request Body already used')
     if (req.body === null) return false
     const body = (await req.body.getReader().read()).value
@@ -623,11 +630,13 @@ export class SlashClient extends HarmonyEventEmitter<SlashClientEvents> {
       body,
       method: req.method,
       respond: async (options) => {
-        await respondWith(new Response(options.body, {
+        await respondWith(
+          new Response(options.body, {
             headers: options.headers,
-          status: options.status,
+            status: options.status
-        }))
+          })
-      },
+        )
+      }
     })
   }
 

src/structures/message.ts

@@ -21,6 +21,7 @@ import { MessageReactionsManager } from '../managers/messageReactions.ts'
 import { MessageSticker } from './messageSticker.ts'
 import { Emoji } from './emoji.ts'
 import { InteractionType } from '../types/slash.ts'
+import { encodeText } from '../utils/encoding.ts'
 
 type AllMessageOptions = MessageOptions | Embed
 
@@ -217,8 +218,6 @@ export class Message extends SnowflakeBase {
   }
 }
 
-const encoder = new TextEncoder()
-
 /** Message Attachment that can be sent while Creating Message */
 export class MessageAttachment {
   name: string
@@ -228,7 +227,7 @@ export class MessageAttachment {
     this.name = name
     this.blob =
       typeof blob === 'string'
-        ? new Blob([encoder.encode(blob)])
+        ? new Blob([encodeText(blob)])
         : blob instanceof Uint8Array
         ? new Blob([blob])
         : blob

src/utils/encoding.ts

@@ -0,0 +1,10 @@
+const encoder = new TextEncoder()
+const decoder = new TextDecoder('utf-8')
+
+export function encodeText(str: string): Uint8Array {
+  return encoder.encode(str)
+}
+
+export function decodeText(bytes: Uint8Array): string {
+  return decoder.decode(bytes)
+}