refactor!: organize directories and files (#268)

* refactor!: organize directory structure

* fix: avoid stack overflow err

* chore: swtch back to std/encoding for base64

* style: format source files

deps.ts

@@ -1,8 +1 @@
-export { delay } from "https://deno.land/std@0.81.0/async/delay.ts";
 export { encode } from "https://deno.land/std@0.81.0/encoding/base64.ts";
-export {
-  assert,
-  assertArrayIncludes,
-  assertEquals,
-} from "https://deno.land/std@0.81.0/testing/asserts.ts";
-export { decompress_with as inflate } from "https://unpkg.com/@evan/wasm@0.0.25/target/zlib/deno.js";

src/api/controllers/bans.ts

@@ -1,5 +1,5 @@
-import { eventHandlers } from "../module/client.ts";
+import { eventHandlers } from "../../bot.ts";
-import { DiscordPayload, GuildBanPayload } from "../types/types.ts";
+import { DiscordPayload, GuildBanPayload } from "../../types/types.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalGuildBanAdd(data: DiscordPayload) {

src/api/controllers/cache.ts

@@ -1,7 +1,7 @@
 import { Channel, Guild, Member, Message } from "../structures/structures.ts";
-import { PresenceUpdatePayload } from "../types/types.ts";
+import { PresenceUpdatePayload } from "../../types/types.ts";
-import { cache } from "../utils/cache.ts";
+import { cache } from "../../util/cache.ts";
-import { Collection } from "../utils/collection.ts";
+import { Collection } from "../../util/collection.ts";
 
 export type TableName =
   | "guilds"

src/api/controllers/channels.ts

@@ -1,10 +1,10 @@
-import { eventHandlers } from "../module/client.ts";
+import { eventHandlers } from "../../bot.ts";
 import { structures } from "../structures/structures.ts";
 import {
   ChannelCreatePayload,
   ChannelTypes,
   DiscordPayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalChannelCreate(data: DiscordPayload) {

src/api/controllers/guilds.ts

@@ -1,4 +1,4 @@
-import { eventHandlers } from "../module/client.ts";
+import { eventHandlers } from "../../bot.ts";
 import { structures } from "../structures/structures.ts";
 import {
   CreateGuildPayload,
@@ -7,8 +7,8 @@ import {
   GuildEmojisUpdatePayload,
   GuildUpdateChange,
   UpdateGuildPayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { cache } from "../utils/cache.ts";
+import { cache } from "../../util/cache.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalGuildCreate(

src/api/controllers/members.ts

@@ -1,4 +1,4 @@
-import { eventHandlers } from "../module/client.ts";
+import { eventHandlers } from "../../bot.ts";
 import { structures } from "../structures/structures.ts";
 import {
   DiscordPayload,
@@ -6,8 +6,8 @@ import {
   GuildMemberAddPayload,
   GuildMemberChunkPayload,
   GuildMemberUpdatePayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { cache } from "../utils/cache.ts";
+import { cache } from "../../util/cache.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalGuildMemberAdd(data: DiscordPayload) {

src/api/controllers/messages.ts

@@ -1,11 +1,11 @@
-import { eventHandlers } from "../module/client.ts";
+import { eventHandlers } from "../../bot.ts";
 import { structures } from "../structures/structures.ts";
 import {
   DiscordPayload,
   MessageCreateOptions,
   MessageDeleteBulkPayload,
   MessageDeletePayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalMessageCreate(data: DiscordPayload) {

src/api/controllers/misc.ts

@@ -1,8 +1,9 @@
-import { delay } from "../../deps.ts";
+import {
-import { initialMemberLoadQueue } from "../../mod.ts";
+  initialMemberLoadQueue,
-import { eventHandlers, setBotID } from "../module/client.ts";
+  structures,
-import { allowNextShard } from "../module/shardingManager.ts";
+} from "../structures/structures.ts";
-import { structures } from "../structures/structures.ts";
+import { eventHandlers, setBotID } from "../../bot.ts";
+import { allowNextShard } from "../../ws/shard_manager.ts";
 import {
   DiscordPayload,
   PresenceUpdatePayload,
@@ -11,8 +12,9 @@ import {
   UserPayload,
   VoiceStateUpdatePayload,
   WebhookUpdatePayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { cache } from "../utils/cache.ts";
+import { cache } from "../../util/cache.ts";
+import { delay } from "../../util/utils.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalReady(

src/api/controllers/reactions.ts

@@ -1,11 +1,11 @@
-import { botID, eventHandlers } from "../module/client.ts";
+import { botID, eventHandlers } from "../../bot.ts";
 import { structures } from "../structures/structures.ts";
 import {
   BaseMessageReactionPayload,
   DiscordPayload,
   MessageReactionPayload,
   MessageReactionRemoveEmojiPayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalMessageReactionAdd(data: DiscordPayload) {

src/api/controllers/roles.ts

@@ -1,10 +1,10 @@
-import { eventHandlers } from "../module/client.ts";
+import { eventHandlers } from "../../bot.ts";
 import { structures } from "../structures/structures.ts";
 import {
   DiscordPayload,
   GuildRoleDeletePayload,
   GuildRolePayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
 import { cacheHandlers } from "./cache.ts";
 
 export async function handleInternalGuildRoleCreate(data: DiscordPayload) {

src/api/handlers/channel.ts

@@ -1,5 +1,5 @@
 import { cacheHandlers } from "../controllers/cache.ts";
-import { RequestManager } from "../module/requestManager.ts";
+import { RequestManager } from "../../rest/mod.ts";
 import { structures } from "../structures/structures.ts";
 import {
   ChannelEditOptions,
@@ -17,12 +17,12 @@ import {
   Permissions,
   RawOverwrite,
   WebhookPayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { endpoints } from "../utils/constants.ts";
+import { endpoints } from "../../util/constants.ts";
 import {
   botHasChannelPermissions,
   calculateBits,
-} from "../utils/permissions.ts";
+} from "../../util/permissions.ts";
 
 /** Checks if a channel overwrite for a user id or a role id has permission in this channel */
 export function channelOverwriteHasPermission(

src/api/handlers/guild.ts

@@ -1,7 +1,7 @@
 import { cacheHandlers } from "../controllers/cache.ts";
-import { identifyPayload } from "../module/client.ts";
+import { identifyPayload } from "../../bot.ts";
-import { RequestManager } from "../module/requestManager.ts";
+import { RequestManager } from "../../rest/mod.ts";
-import { requestAllMembers } from "../module/shardingManager.ts";
+import { requestAllMembers } from "../../ws/shard_manager.ts";
 import {
   Guild,
   Member,
@@ -39,12 +39,12 @@ import {
   RoleData,
   UpdateGuildPayload,
   UserPayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { formatImageURL } from "../utils/cdn.ts";
+import { formatImageURL } from "../../util/cdn.ts";
-import { Collection } from "../utils/collection.ts";
+import { Collection } from "../../util/collection.ts";
-import { endpoints } from "../utils/constants.ts";
+import { endpoints } from "../../util/constants.ts";
-import { botHasPermission, calculateBits } from "../utils/permissions.ts";
+import { botHasPermission, calculateBits } from "../../util/permissions.ts";
-import { urlToBase64 } from "../utils/utils.ts";
+import { urlToBase64 } from "../../util/utils.ts";
 
 /** Create a new guild. Returns a guild object on success. Fires a Guild Create Gateway event. This endpoint can be used only by bots in less than 10 guilds. */
 export async function createServer(options: CreateServerOptions) {

src/api/handlers/member.ts

@@ -1,6 +1,6 @@
 import { cacheHandlers } from "../controllers/cache.ts";
-import { botID } from "../module/client.ts";
+import { botID } from "../../bot.ts";
-import { RequestManager } from "../module/requestManager.ts";
+import { RequestManager } from "../../rest/mod.ts";
 import { Member, structures } from "../structures/structures.ts";
 import {
   DMChannelCreatePayload,
@@ -9,15 +9,15 @@ import {
   ImageFormats,
   ImageSize,
   MessageContent,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { formatImageURL } from "../utils/cdn.ts";
+import { formatImageURL } from "../../util/cdn.ts";
-import { endpoints } from "../utils/constants.ts";
+import { endpoints } from "../../util/constants.ts";
 import {
   botHasPermission,
   higherRolePosition,
   highestRole,
-} from "../utils/permissions.ts";
+} from "../../util/permissions.ts";
-import { urlToBase64 } from "../utils/utils.ts";
+import { urlToBase64 } from "../../util/utils.ts";
 import { sendMessage } from "./channel.ts";
 
 /** The users custom avatar or the default avatar if you don't have a member object. */

src/api/handlers/message.ts

@@ -1,16 +1,16 @@
-import { delay } from "../../deps.ts";
 import { cacheHandlers } from "../controllers/cache.ts";
-import { botID } from "../module/client.ts";
+import { botID } from "../../bot.ts";
-import { RequestManager } from "../module/requestManager.ts";
+import { RequestManager } from "../../rest/mod.ts";
 import { Message, structures } from "../structures/structures.ts";
 import {
   Errors,
   MessageContent,
   MessageCreateOptions,
   UserPayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { endpoints } from "../utils/constants.ts";
+import { endpoints } from "../../util/constants.ts";
-import { botHasChannelPermissions } from "../utils/permissions.ts";
+import { botHasChannelPermissions } from "../../util/permissions.ts";
+import { delay } from "../../util/utils.ts";
 
 /** Delete a message with the channel id and message id only. */
 export async function deleteMessageByID(

src/api/handlers/webhook.ts

@@ -1,4 +1,4 @@
-import { RequestManager } from "../module/requestManager.ts";
+import { RequestManager } from "../../rest/mod.ts";
 import { structures } from "../structures/structures.ts";
 import {
   EditWebhookMessageOptions,
@@ -7,10 +7,10 @@ import {
   MessageCreateOptions,
   WebhookCreateOptions,
   WebhookPayload,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { endpoints } from "../utils/constants.ts";
+import { endpoints } from "../../util/constants.ts";
-import { botHasChannelPermissions } from "../utils/permissions.ts";
+import { botHasChannelPermissions } from "../../util/permissions.ts";
-import { urlToBase64 } from "../utils/utils.ts";
+import { urlToBase64 } from "../../util/utils.ts";
 
 /** Create a new webhook. Requires the MANAGE_WEBHOOKS permission. Returns a webhook object on success. Webhook names follow our naming restrictions that can be found in our Usernames and Nicknames documentation, with the following additional stipulations:
 *

src/api/structures/channel.ts

@@ -1,5 +1,5 @@
 import { cacheHandlers } from "../controllers/cache.ts";
-import { ChannelCreatePayload, Unpromise } from "../types/types.ts";
+import { ChannelCreatePayload, Unpromise } from "../../types/types.ts";
 
 export async function createChannel(
   data: ChannelCreatePayload,

src/api/structures/guild.ts

@@ -2,8 +2,8 @@ import {
   CreateGuildPayload,
   MemberCreatePayload,
   Unpromise,
-} from "../types/types.ts";
+} from "../../types/types.ts";
-import { Collection } from "../utils/collection.ts";
+import { Collection } from "../../util/collection.ts";
 import { structures } from "./mod.ts";
 
 export const initialMemberLoadQueue = new Map<string, MemberCreatePayload[]>();

src/api/structures/member.ts

@@ -1,6 +1,10 @@
 import { cacheHandlers } from "../controllers/cache.ts";
-import { GuildMember, MemberCreatePayload, Unpromise } from "../types/types.ts";
+import {
-import { Collection } from "../utils/collection.ts";
+  GuildMember,
+  MemberCreatePayload,
+  Unpromise,
+} from "../../types/types.ts";
+import { Collection } from "../../util/collection.ts";
 
 export async function createMember(data: MemberCreatePayload, guildID: string) {
   const {

src/api/structures/message.ts

@@ -1,4 +1,4 @@
-import { MessageCreateOptions, Unpromise } from "../types/types.ts";
+import { MessageCreateOptions, Unpromise } from "../../types/types.ts";
 
 export async function createMessage(data: MessageCreateOptions) {
   const {

src/api/structures/role.ts

@@ -1,4 +1,4 @@
-import { RoleData, Unpromise } from "../types/types.ts";
+import { RoleData, Unpromise } from "../../types/types.ts";
 
 export async function createRole(data: RoleData) {
   const { tags, ...rest } = data;

src/api/structures/template.ts

@@ -1,4 +1,4 @@
-import { GuildTemplate } from "../types/types.ts";
+import { GuildTemplate } from "../../types/types.ts";
 
 export function createTemplate(
   data: GuildTemplate,

src/bot.ts

@@ -2,10 +2,10 @@ import {
   ClientOptions,
   DiscordBotGatewayData,
   EventHandlers,
-} from "../types/types.ts";
+} from "./types/types.ts";
-import { baseEndpoints, endpoints } from "../utils/constants.ts";
+import { baseEndpoints, endpoints } from "./util/constants.ts";
-import { RequestManager } from "./requestManager.ts";
+import { RequestManager } from "./rest/mod.ts";
-import { spawnShards } from "./shardingManager.ts";
+import { spawnShards } from "./ws/shard_manager.ts";
 
 export let authorization = "";
 export let botID = "";

src/rest/mod.ts

@@ -1,7 +1,7 @@
-import { delay } from "../../deps.ts";
 import { Errors, HttpResponseCode, RequestMethods } from "../types/types.ts";
-import { baseEndpoints, discordAPIURLS } from "../utils/constants.ts";
+import { baseEndpoints, discordAPIURLS } from "../util/constants.ts";
-import { authorization, eventHandlers } from "./client.ts";
+import { delay } from "../util/utils.ts";
+import { authorization, eventHandlers } from "../bot.ts";
 
 const pathQueues: { [key: string]: QueuedRequest[] } = {};
 const ratelimitedPaths = new Map<string, RateLimitedPath>();

src/types/guild.ts

@@ -1,4 +1,4 @@
-import { Guild } from "../structures/structures.ts";
+import { Guild } from "../api/structures/structures.ts";
 import { ChannelCreatePayload, ChannelTypes } from "./channel.ts";
 import { Emoji, StatusType } from "./discord.ts";
 import { MemberCreatePayload } from "./member.ts";

src/types/message.ts

@@ -1,4 +1,4 @@
-import { Channel } from "../structures/structures.ts";
+import { Channel } from "../api/structures/structures.ts";
 import { ChannelType } from "./channel.ts";
 import { UserPayload } from "./guild.ts";
 import { MemberCreatePayload } from "./member.ts";

src/types/options.ts

@@ -4,7 +4,7 @@ import {
   Member,
   Message,
   Role,
-} from "../structures/structures.ts";
+} from "../api/structures/structures.ts";
 import {
   DiscordPayload,
   Emoji,

src/util/cache.ts

@@ -1,4 +1,9 @@
-import { Channel, Guild, Member, Message } from "../structures/structures.ts";
+import {
+  Channel,
+  Guild,
+  Member,
+  Message,
+} from "../api/structures/structures.ts";
 import { PresenceUpdatePayload } from "../types/types.ts";
 import { Collection } from "./collection.ts";
 

src/util/permissions.ts

@@ -1,6 +1,6 @@
-import { cacheHandlers } from "../controllers/cache.ts";
+import { cacheHandlers } from "../api/controllers/cache.ts";
-import { botID } from "../module/client.ts";
+import { botID } from "../bot.ts";
-import { Guild, Role } from "../structures/structures.ts";
+import { Guild, Role } from "../api/structures/structures.ts";
 import { Permission, Permissions, RawOverwrite } from "../types/types.ts";
 
 /** Checks if the member has this permission. If the member is an owner or has admin perms it will always be true. */

src/util/utils.ts

@@ -1,6 +1,6 @@
-import { encode } from "../../deps.ts";
+import { sendGatewayCommand } from "../ws/shard_manager.ts";
-import { sendGatewayCommand } from "../module/shardingManager.ts";
 import { ActivityType, StatusType } from "../types/types.ts";
+import { encode } from "../../deps.ts";
 
 export const sleep = (timeout: number) => {
   return new Promise((resolve) => setTimeout(resolve, timeout));
@@ -32,3 +32,11 @@ export async function urlToBase64(url: string) {
   const type = url.substring(url.lastIndexOf(".") + 1);
   return `data:image/${type};base64,${imageStr}`;
 }
+
+export function delay(ms: number): Promise<void> {
+  return new Promise((res): number =>
+    setTimeout((): void => {
+      res();
+    }, ms)
+  );
+}

src/ws/deps.ts

@@ -0,0 +1 @@
+export { decompress_with as decompressWith } from "https://unpkg.com/@evan/wasm@0.0.22/target/zlib/deno.js";

src/ws/mod.ts

@@ -1,5 +1,4 @@
-import { delay, inflate } from "../../deps.ts";
+import { botGatewayData, eventHandlers } from "../bot.ts";
-import { eventHandlers } from "../../mod.ts";
 import {
   DiscordBotGatewayData,
   DiscordHeartbeatPayload,
@@ -7,9 +6,10 @@ import {
   GatewayOpcode,
   ReadyPayload,
 } from "../types/types.ts";
-import { BotStatusRequest } from "../utils/utils.ts";
+import { BotStatusRequest, delay } from "../util/utils.ts";
-import { botGatewayData, IdentifyPayload, proxyWSURL } from "./client.ts";
+import { IdentifyPayload, proxyWSURL } from "../bot.ts";
-import { handleDiscordPayload } from "./shardingManager.ts";
+import { handleDiscordPayload } from "./shard_manager.ts";
+import { decompressWith } from "./deps.ts";
 
 const basicShards = new Map<number, BasicShard>();
 const heartbeating = new Map<number, boolean>();
@@ -73,7 +73,7 @@ export async function createShard(
     }
 
     if (message instanceof Uint8Array) {
-      message = inflate(
+      message = decompressWith(
         message,
         0,
         (slice: Uint8Array) => utf8decoder.decode(slice),

src/ws/shard_manager.ts

@@ -1,20 +1,19 @@
-import { delay } from "../../deps.ts";
+import { controllers } from "../api/controllers/mod.ts";
-import { controllers } from "../controllers/mod.ts";
+import { Guild } from "../api/structures/structures.ts";
-import { Guild } from "../structures/structures.ts";
 import {
   DiscordBotGatewayData,
   DiscordPayload,
   FetchMembersOptions,
   GatewayOpcode,
 } from "../types/types.ts";
-import { cache } from "../utils/cache.ts";
+import { cache } from "../util/cache.ts";
-import { BotStatusRequest } from "../utils/utils.ts";
+import { BotStatusRequest, delay } from "../util/utils.ts";
 import {
   botGatewayStatusRequest,
   createShard,
   requestGuildMembers,
-} from "./shard.ts";
+} from "./mod.ts";
-import { eventHandlers, IdentifyPayload } from "./client.ts";
+import { eventHandlers, IdentifyPayload } from "../bot.ts";
 
 let createNextShard = true;
 

tests/deps.ts

@@ -0,0 +1,5 @@
+export {
+  assert,
+  assertArrayIncludes,
+  assertEquals,
+} from "https://deno.land/std@0.81.0/testing/asserts.ts";