Additional changes for CPU/memory fix

Author: Defxult

Sources/Discord/Discord.swift

@@ -23,6 +23,7 @@ DEALINGS IN THE SOFTWARE.
 */
 
 import Foundation
+import Vapor
 
 /// Represents a Discord bot.
 public class Bot {
@@ -85,13 +86,15 @@ public class Bot {
     var pendingApplicationCommands = [PendingAppCommand]()
     var pendingModals = [String: (Interaction) async -> Void]()
     var guildsCache = [Snowflake: Guild]()
-    var msgCacheLock = NSLock()
     var isConnected = false
     var http: HTTPClient!
-    var gw: Gateway?
-    
+    var gw: Gateway!
     private var onceExecute: (() async -> Void)? = nil
 
+    private let msgCacheLock = NSLock()
+    private let sema = DispatchSemaphore(value: 0)
+    private let app = Vapor.Application()
+    
     /// Initializes the Discord bot.
     /// - Parameters:
     ///   - token: The authentification token for the bot.
@@ -103,7 +106,8 @@ public class Bot {
         self.intents = intents
         self.sharding = sharding
         self.cacheManager = cacheManager
-        http = .init(bot: self, token: token, version: version)
+        gw = Gateway(bot: self, elg: app.eventLoopGroup)
+        http = .init(bot: self, token: token, version: version, app: app)
     }
 
     func cacheGuild(_ guild: Guild) {
@@ -141,16 +145,14 @@ public class Bot {
     ///   - activity: The activity. Can be set to things such as "Listening to {value}", "Watching {value}", etc. Can be `nil` for no activity.
     /// - Note: Certain combinations are ignored by Discord. Some examples are setting the bots `status` to offline or setting a custom status.
     public func updatePresence(status: User.Status, activity: User.ActivityType?) {
-        if let gw {
-            var d: JSON = ["status": status.rawValue, "afk": false]
-            
-            // Requires unix time in milliseconds
-            d["since"] = status == .idle ? Date.now.timeIntervalSince1970 * 1000 : NIL
-            d["activities"] = activity?.convert() ?? []
-            
-            let payload: JSON = ["op": Opcode.presenceUpdate, "d": d]
-            gw.sendFrame(payload)
-        }
+        var d: JSON = ["status": status.rawValue, "afk": false]
+        
+        // Requires unix time in milliseconds
+        d["since"] = status == .idle ? Date.now.timeIntervalSince1970 * 1000 : NIL
+        d["activities"] = activity?.convert() ?? []
+        
+        let payload: JSON = ["op": Opcode.presenceUpdate, "d": d]
+        gw.sendFrame(payload)
     }
 
     /// Retrieve all global application commands. If you need the commands for a specific guild, use ``Guild/applicationCommands()``.
@@ -336,19 +338,16 @@ public class Bot {
     }
 
     /// Connect to Discord.
-    /// - Attention: This method is blocking to maintain the connection to Discord.
-    public func connect() async throws {
-        if gw == nil {
-            gw = Gateway(bot: self)
-            try await gw!.startNewSession()
+    public func connect() {
+        if !isConnected {
+            try! app.eventLoopGroup.any().makeFutureWithTask {
+                try! await self.gw.startNewSession()
+            }.wait()
             isConnected = true
             if let onceExecute {
-                await onceExecute()
+                Task { await onceExecute() }
                 self.onceExecute = nil
             }
-            while isConnected {
-                await sleep(200)
-            }
         }
     }
 
@@ -367,6 +366,13 @@ public class Bot {
         guildsCache.removeAll()
     }
 
+    /// Disconnect from Discord and releases the block from ``run()``.
+    public func close() {
+        disconnect()
+        app.shutdown()
+        sema.signal()
+    }
+    
     /// Create a guild. Your bot must be in less than 10 guilds to use this.
     /// - Parameters:
     ///   - name: Name of the guild.
@@ -404,16 +410,12 @@ public class Bot {
         }
     }
 
-    /// Disconnects the bot from Discord, releases the block from ``connect()`` and clears the cache.
+    /// Disconnect from Discord and clears the cache.
     public func disconnect() {
-        if let gw {
+        if isConnected {
             try! gw.ws.close(code: .normalClosure).wait()
             gw.resetGatewayValues()
             clearCache()
-            try! gw.settings.loop.syncShutdownGracefully()
-            self.gw = nil
-            
-            // Must be last
             isConnected = false
         }
     }
@@ -572,9 +574,15 @@ public class Bot {
         return try await http.getWebhookWithToken(webhookId: webhookId, webhookToken: webhookToken)
     }
 
+    /// Connect to Discord and blocks the app from exiting.
+    public func run() {
+        connect()
+        sema.wait()
+    }
+    
     /// Block further execution until the ``EventListener/onReady(user:)`` event has been dispatched.
     public func waitUntilReady() async {
-        while gw?.initialState?.dispatched != true {
+        while gw.initialState?.dispatched != true {
             await sleep(150)
         }
     }

Sources/Discord/Gateway.swift

@@ -24,7 +24,6 @@ DEALINGS IN THE SOFTWARE.
 
 import Foundation
 import WebSocketKit
-import Vapor
 
 fileprivate struct ResumePayload {
 
@@ -141,25 +140,25 @@ class Gateway {
 
     var ws: WebSocket!
     var heartbeatTask: Task<(), Never>?
-    var initialState: InitialState? = nil
+    var initialState: InitialState?
 
     private var bot: Bot
     private var wsResume: ResumePayload?
     private var gp: GatewayPayload?
     private var shards: Int?
-    
     private var heartbeatInterval = 0
     private var receivedReconnectRequest = false
 
-    let settings = (
+    private let elg: EventLoopGroup
+    private let settings = (
         port: 443,
         query: "v=10&encoding=json",
-        config: WebSocketClient.Configuration(maxFrameSize: 1 << 20),
-        loop: MultiThreadedEventLoopGroup(numberOfThreads: 2)
+        config: WebSocketClient.Configuration(maxFrameSize: 1 << 20)
     )
 
-    init(bot: Bot) {
+    init(bot: Bot, elg: EventLoopGroup) {
         self.bot = bot
+        self.elg = elg
     }
 
     /// Sends the RESUME payload for reconnects.
@@ -177,21 +176,19 @@ class Gateway {
         let resumeUrl = wsResume!.resumeGatewayURL!
         let cmps = extractURLComponents(URLComponents(string: resumeUrl)!)
 
-        let connection = WebSocket.connect(
+        try! await WebSocket.connect(
             scheme: cmps.scheme,
             host: cmps.host,
             port: settings.port,
             query: settings.query,
             configuration: settings.config,
-            on: settings.loop,
+            on: elg,
             onUpgrade: { socket in
                 self.websocketSetup(websocket: socket)
                 Log.message("[Reconnect] connection successful - sending RESUME payload...")
                 self.sendFrame(resumePayload)
             }
-        )
-        
-        try! await connection.get()
+        ).get()
     }
 
     /// Binds all core functions of the websocket connection to the class.
@@ -248,20 +245,18 @@ class Gateway {
         resetGatewayValues()
         shards = results.shards
 
-        let connection = WebSocket.connect(
+        try await WebSocket.connect(
             scheme: cmps.scheme,
             host: cmps.host,
             port: settings.port,
             query: settings.query,
             configuration: settings.config,
-            on: settings.loop,
+            on: elg,
             onUpgrade: { socket in
                 self.websocketSetup(websocket: socket)
                 Log.message("gateway connection established - receiver & onClose set")
             }
-        )
-        
-        try await connection.get()
+        ).get()
     }
 
     /// Handles when the websocket is closed by Discord.

Sources/Discord/Http.swift

@@ -113,14 +113,14 @@ class HTTPClient {
     let token: String
     let baseHeaders: HTTPHeaders
     let request: Request
+    let app: Vapor.Application
 
     var rateLimits = [String: RateLimit]()
 
-    let app = Vapor.Application()
-    
-    init(bot: Bot, token: String, version: Version) {
+    init(bot: Bot, token: String, version: Version, app: Vapor.Application) {
         self.bot = bot
         self.token = token
+        self.app = app
         self.request = Request(application: app, on: app.eventLoopGroup.any())
 
         baseHeaders = [