From 3538ef86ad515aa47ac538d14020b60ed5cfcec2 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Sat, 19 Oct 2024 01:35:47 -0400
Subject: [PATCH] 4.75.2

* Changed: Back to work on experimental PubSub things, with a different server strategy this time.
---
 package.json                           | 2 +-
 src/experiments.json                   | 4 ++--
 src/utilities/constants.ts             | 5 +++--
 src/utilities/custom_denoflare_mqtt.js | 5 +++++
 src/utilities/pubsub.js                | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index f4a9f0b9..4d6f5a11 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "frankerfacez",
 	"author": "Dan Salvato LLC",
-	"version": "4.75.1",
+	"version": "4.75.2",
 	"description": "FrankerFaceZ is a Twitch enhancement suite.",
 	"private": true,
 	"license": "Apache-2.0",
diff --git a/src/experiments.json b/src/experiments.json
index 248eb9e8..6b588b2e 100644
--- a/src/experiments.json
+++ b/src/experiments.json
@@ -20,8 +20,8 @@
 		"name": "EMQX MQTT-Based PubSub",
 		"description": "An experimental pubsub system running on an EMQX cluster, to see how that performs.",
 		"groups": [
-			{"value": true, "weight": 0},
-			{"value": false, "weight": 100}
+			{"value": true, "weight": 20},
+			{"value": false, "weight": 80}
 		]
 	},
 	"cf_pubsub": {
diff --git a/src/utilities/constants.ts b/src/utilities/constants.ts
index 2c8b891f..3f10dee5 100644
--- a/src/utilities/constants.ts
+++ b/src/utilities/constants.ts
@@ -317,12 +317,13 @@ export const PUBSUB_CLUSTERS = {
 export const EMQX_SERVERS = [
 	//'catbag.frankerfacez.com',
 	//'pubsub-staging.frankerfacez.com',
-	'ayaya.frankerfacez.com',
+	'biblethump.frankerfacez.com',
+	/*'ayaya.frankerfacez.com',
 	'champ.frankerfacez.com',
 	'lilz.frankerfacez.com',
 	'pog.frankerfacez.com',
 	'yoohoo.frankerfacez.com',
-	'andknuckles.frankerfacez.com'
+	'andknuckles.frankerfacez.com'*/
 ];
 
 
diff --git a/src/utilities/custom_denoflare_mqtt.js b/src/utilities/custom_denoflare_mqtt.js
index 35308515..fabafab7 100644
--- a/src/utilities/custom_denoflare_mqtt.js
+++ b/src/utilities/custom_denoflare_mqtt.js
@@ -295,6 +295,11 @@ var _Bytes = class _Bytes {
 		  if (DEBUG)
 			console.log({ maximumPacketSize });
 		  rt = { ...rt, maximumPacketSize };
+		} else if (propertyId === 33) {
+			const receiveMaximum = reader.readUint16();
+			if (DEBUG)
+				console.log({ receiveMaximum });
+			rt = { ...rt, receiveMaximum };
 		} else if (propertyId === 34) {
 		  const topicAliasMaximum = reader.readUint16();
 		  if (DEBUG)
diff --git a/src/utilities/pubsub.js b/src/utilities/pubsub.js
index a219e121..89cab845 100644
--- a/src/utilities/pubsub.js
+++ b/src/utilities/pubsub.js
@@ -120,7 +120,7 @@ export default class PubSubClient extends EventEmitter {
 
 			data = {
 				require_signing: false,
-				endpoint: `wss://${server}:8084/mqtt`,
+				endpoint: `wss://${server}/mqtt`,
 
 				username: 'anonymous',
 				password: `eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhbm9ueW1vdXMifQ.5DZP1bScMz4-MV_jGZveUKq4pFy9x_PJF9gSzAvj-wA`,