@imaentity/selfjs 3.2.0 → 3.3.0-b02

package/changelog.log

@@ -1,13 +1,13 @@
-V2.9.11
+v2.9.11
     Added:
         changelog.log
         
     Changed:
         Client.setStatus now has default params
 
-V2.10.11
+v2.10.11
     Added:
-        Docs link to README.md
+        A docs link to README.md
 
     Changed:
         Structure of docs.md
@@ -15,11 +15,11 @@ V2.10.11
     Removed:
         The default option in the status enum
 
-V3.0.0
+v3.0.0
     Changed:
         Overhaul to the structure of self.js
 
-V3.1.0
+v3.1.0
     Added:
         Webhooks can now send files
         Client.getUserProfile to fetch user profiles
@@ -28,6 +28,10 @@ V3.1.0
     Changed:
         Client.getUser now gets the actual user instead of their profile
 
-V3.2.0
+v3.2.0
     Added:
-        Client.refreshURL to refresh expired urls
+        Client.refreshURL to refresh expired urls
+
+v3.3.0
+    Added:
+        Client websockets now auto-reconnect after a failed heartbeat

package/docs.md

@@ -174,11 +174,11 @@ Welcome To SelfJS Documentation
 
   + ### 👤 getUserProfile
     Gets the profile of a user.
-    >Paramaters: userID (String)
+    >Paramaters: userID (String), mutualGuilds (Boolean | false)
 
     <br>Example:
     ```javascript
-    client.getUserProfile("01234567891011121314");
+    client.getUserProfile("01234567891011121314", true);
     ```
 
   + ### 👤 getUserData

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@imaentity/selfjs",
-    "version": "3.2.0",
+    "version": "3.3.0-b02",
     "description": "Breaking Discord's TOS to bot user accounts.",
     "main": "self.js",
     "repository": {

package/self.js

@@ -2,7 +2,7 @@
  * @name SelfJS
  * @description Breaking Discord's TOS to bot user accounts.
  * @author Эмберс
- * @version 3.2.0
+ * @version 3.3.0-b02
  */
 
 const https = require("https");
@@ -129,6 +129,111 @@ module.exports = {
 			this.latency = null;
 			this.beforeHB = null;
 			this.hearbeatInterval = null;
+			this.receivedLastHB = true;
+
+			// Session, token, sequence
+		}
+
+		async onSockMsg(payload) {
+			payload = JSON.parse(payload.toString());
+
+			if(payload.op == 10) {
+				if(logMsgs) console.log("[MainControlSocket] Hello ACK received");
+
+				if(logMsgs) console.log("[MainControlSocket] Sending heartbeat");
+				this.beforeHB = Date.now();
+				this.socket.send(module.exports.jsonEncode({op: 1, d: this.sequenceID}));
+
+				this.hearbeatInterval = setInterval(function() {
+					if(logMsgs) console.log("[MainControlSocket] Sending heartbeat");
+					this.beforeHB = Date.now();
+					this.socket.send(module.exports.jsonEncode({op: 1, d: this.sequenceID}));
+
+					if(!this.receivedLastHB) {
+						if(logMsgs) console.log("[MainControlSocket] Heartbeat ACK failed, reconnecting");
+
+						this.receivedLastHB = true;
+						this.reconnect(this.resumeURL, this.token, this.sessionID, this.sequenceID);
+
+						return;
+					}
+
+					this.receivedLastHB = false;
+				}.bind(this), payload.d.heartbeat_interval);
+			} else if(payload.op == 11) {
+				if(logMsgs) console.log("[MainControlSocket] Heartbeat ACK received");
+				this.latency = Date.now() - this.beforeHB;
+
+				this.receivedLastHB = true;
+			} else if(payload.op == 0) {
+				this.sequenceID = payload.s;
+
+				if(payload.t == "READY") {
+					this.userID = payload.d.user.id;
+					this.sessionID = payload.d.session_id;
+					this.resumeURL = payload.d.resume_gateway_url;
+
+					if(logMsgs) console.log("[MainControlSocket] Ready message received");
+					resolve();
+				} else if(payload.t == "MESSAGE_CREATE") {
+					const ackData = module.exports.jsonEncode({token: null});
+					const options = {
+						...module.exports.APIBaseOpt,
+						method: "POST",
+						path: `/api/v10/channels/${payload.d.channel_id}/messages/${payload.d.id}/ack`,
+						headers: {
+							"Authorization": this.token,
+							"Content-Type": "application/json",
+							"Content-Length": ackData.length
+						}
+					};
+
+					const req = https.request(options);
+
+					req.write(ackData);
+					req.end();
+
+					try {payload.d.author.self = payload.d.author.id == this.userID;} catch(e) {}
+
+					if(typeof this.onMessageFunction == "function") this.onMessageFunction(payload.d);
+				} else if(payload.t == "MESSAGE_UPDATE") {
+					try {payload.d.author.self = payload.d.author.id == this.userID;} catch(e) {}
+
+					if(typeof this.onEditFunction == "function") this.onEditFunction(payload.d);
+				} else if(payload.t == "PRESENCE_UPDATE") {
+					try {payload.d.author.self = payload.d.author.id == this.userID;} catch(e) {}
+
+					if(typeof this.statusUpdateFunction == "function") this.statusUpdateFunction(payload.d);
+				} else if(payload.t == "MESSAGE_DELETE") {
+					if(typeof this.onDeleteFunction == "function") this.onDeleteFunction(payload.d);
+				}
+			} else if(payload.op == 7) {
+				if(logMsgs) console.log("[MainControlSocket] Reconnect message received");
+
+				this.receivedLastHB = true;
+				this.reconnect(this.resumeURL, this.token, this.sessionID, this.sequenceID);
+			}
+		}
+
+		reconnect(resumeURL, token, sessionID, sequence) {
+			this.socket.terminate();
+			if(this.hearbeatInterval)
+				clearInterval(this.hearbeatInterval);
+
+			this.socket = new ws(resumeURL);
+
+			this.socket.on("open", function() {
+				this.socket.send(module.exports.jsonEncode({
+					op: 6,
+					d: {
+						token: token,
+						session_id: sessionID,
+						seq: sequence
+					}
+				}));
+			}.bind(this));
+
+			this.socket.on("message", onSockMsg);
 		}
 
 		login(token, isMobile = false, logMsgs = false) {
@@ -154,92 +259,7 @@ module.exports = {
 					}));
 				}.bind(this));
 
-				const socketMessageFunction = async function(payload) {
-					payload = JSON.parse(payload.toString());
-
-					if(payload.op == 10) {
-						if(logMsgs) console.log("[MainControlSocket] Hello ACK received");
-
-						if(logMsgs) console.log("[MainControlSocket] Sending heartbeat");
-						this.beforeHB = Date.now();
-						this.socket.send(module.exports.jsonEncode({op: 1, d: this.sequenceID}));
-
-						this.hearbeatInterval = setInterval(function() {
-							if(logMsgs) console.log("[MainControlSocket] Sending heartbeat");
-							this.beforeHB = Date.now();
-							this.socket.send(module.exports.jsonEncode({op: 1, d: this.sequenceID}));
-						}.bind(this), payload.d.heartbeat_interval);
-					} else if(payload.op == 11) {
-						if(logMsgs) console.log("[MainControlSocket] Heartbeat ACK received");
-						this.latency = Date.now() - this.beforeHB;
-					} else if(payload.op == 0) {
-						this.sequenceID = payload.s;
-
-						if(payload.t == "READY") {
-							this.userID = payload.d.user.id;
-							this.sessionID = payload.d.session_id;
-							this.resumeURL = payload.d.resume_gateway_url;
-
-							if(logMsgs) console.log("[MainControlSocket] Ready message received");
-							resolve();
-						} else if(payload.t == "MESSAGE_CREATE") {
-							const ackData = module.exports.jsonEncode({token: null});
-							const options = {
-								...module.exports.APIBaseOpt,
-								method: "POST",
-								path: `/api/v10/channels/${payload.d.channel_id}/messages/${payload.d.id}/ack`,
-								headers: {
-									"Authorization": this.token,
-									"Content-Type": "application/json",
-									"Content-Length": ackData.length
-								}
-							};
-
-							const req = https.request(options);
-
-							req.write(ackData);
-							req.end();
-
-							try {payload.d.author.self = payload.d.author.id == this.userID;} catch(e) {}
-
-							if(typeof this.onMessageFunction == "function") this.onMessageFunction(payload.d);
-						} else if(payload.t == "MESSAGE_UPDATE") {
-							try {payload.d.author.self = payload.d.author.id == this.userID;} catch(e) {}
-
-							if(typeof this.onEditFunction == "function") this.onEditFunction(payload.d);
-						} else if(payload.t == "PRESENCE_UPDATE") {
-							try {payload.d.author.self = payload.d.author.id == this.userID;} catch(e) {}
-
-							if(typeof this.statusUpdateFunction == "function") this.statusUpdateFunction(payload.d);
-						} else if(payload.t == "MESSAGE_DELETE") {
-							if(typeof this.onDeleteFunction == "function") this.onDeleteFunction(payload.d);
-						}
-					} else if(payload.op == 7) {
-						if(logMsgs) console.log("[MainControlSocket] Reconnect message received");
-
-						if(this.hearbeatInterval) clearInterval(this.hearbeatInterval);
-						this.socket.terminate();
-
-						this.socket = new ws("wss://gateway.discord.gg?v=10&encoding=json");
-
-						this.socket.on("open", function() {
-							if(logMsgs) console.log("[MainControlSocket] Resume message sent");
-
-							this.socket.send(module.exports.jsonEncode({
-								op: 6,
-								d: {
-									token: this.token,
-									session_id: this.sessionID,
-									seq: this.sequenceID
-								}
-							}));
-						}.bind(this));
-
-						this.socket.on("message", socketMessageFunction);
-					}
-				}.bind(this);
-
-				this.socket.on("message", socketMessageFunction);
+				this.socket.on("message", onSockMsg);
 			}.bind(this));
 		}
 
@@ -482,10 +502,10 @@ module.exports = {
 			});
 		}
 
-		async getUserProfile(userID) {
+		async getUserProfile(userID, mutualGuilds=false) {
 			return await this.makeRequest({
 				method: "GET",
-				path: `/api/v10/users/${userID}/profile?with_mutual_guilds=false`
+				path: `/api/v10/users/${userID}/profile?with_mutual_guilds=${mutualGuilds}`
 			});
 		}