:/

maybe it will work

bridges.json

@@ -1,13 +1,13 @@
 [
-	{ "room": "lobby", "channel": "339609383644168195", "uri": "wss://mppclone.com:8443" },
+	{ "room": "lobby", "channel": "1159943041692471488", "uri": "wss://game.multiplayerpiano.com:443" },
-	{ "room": "lobby2", "channel": "350006891948277770", "uri": "wss://mppclone.com:8443" },
+	{ "room": "lobby2", "channel": "1159954805146529823", "uri": "wss://game.multiplayerpiano.com:443" },
-	{ "room": "✧𝓓𝓔𝓥 𝓡𝓸𝓸𝓶✧", "channel": "698736467559710740", "uri": "wss://mppclone.com:8443" },
+	{ "room": "test/awkward", "channel": "1159954847542546513", "uri": "wss://game.multiplayerpiano.com:443" },
-	{ "room": "test/awkward", "channel": "360556775860076544", "uri": "wss://mppclone.com:8443" },
-	{ "room": "test/fishing", "channel": "339613702472859659", "uri": "wss://mppclone.com:8443" },
-	{ "room": "the-dev-channel", "channel": "925129849457233970", "uri": "wss://mppclone.com:8443" },
 	
-	{ "room": "lobby", "channel": "430226348901007360", "uri": "wss://mppws.cf" },
+	{ "room": "lobby", "channel": "339609383644168195", "uri": "wss://backend.multiplayerpiano.net" },
-	{ "room": "lobby", "channel": "339904195719200768", "uri": "wss://piano.ourworldofpixels.com" },
+	{ "room": "lobby2", "channel": "350006891948277770", "uri": "wss://backend.multiplayerpiano.net" },
-	{ "room": "lobby", "channel": "559898407511261219", "uri": "ws://104.237.150.24:8513/" },
+	{ "room": "✧𝓓𝓔𝓥 𝓡𝓸𝓸𝓶✧", "channel": "698736467559710740", "uri": "wss://backend.multiplayerpiano.net" },
-	{ "room": "lobby", "channel": "927720571201028187", "uri": "wss://beta-mpp.cedms.jp" }
+	{ "room": "test/awkward", "channel": "360556775860076544", "uri": "wss://backend.multiplayerpiano.net" },
-]
+	{ "room": "test/fishing", "channel": "339613702472859659", "uri": "wss://backend.multiplayerpiano.net" },
+	
+	{ "room": "lobby", "channel": "339904195719200768", "uri": "wss://piano.ourworldofpixels.com" }
+]

commands.js

@@ -12,10 +12,10 @@ global.commands = [
 ];
 
 
-client.on("interactionCreate", interaction => {
+dClient.on("interactionCreate", interaction => {
 	commands.find(x => x.name == interaction.commandName)?.exec?.(interaction);
 });
 
-client.once("ready", () => {
+dClient.once("ready", () => {
-	client.guilds.resolve(config.guildID)?.commands.set(commands);
+	dClient.guilds.resolve(config.guildID)?.commands.set(commands);
 });

config.js

@@ -1,47 +1,47 @@
 global.testmode = process.env.TEST ? true : false;
 
 module.exports = {
-    
+	
-    "DISCORD_TOKEN": process.env.DISCORD_TOKEN,
+	"DISCORD_TOKEN": process.env.DISCORD_TOKEN,
 
 	"webhooks": {
-        "welcome": process.env.WEBHOOK_WELCOME,
+		"welcome": process.env.WEBHOOK_WELCOME,
-        "error": process.env.WEBHOOK_ERROR,
+		"error": process.env.WEBHOOK_ERROR,
-        "ddp": process.env.WEBHOOK_DDP,
+		"ddp": process.env.WEBHOOK_DDP,
-        "pinboard": process.env.WEBHOOK_PINBOARD
+		"pinboard": process.env.WEBHOOK_PINBOARD
 	},
 	
-    "opID": "707359017252683896",
+	"opID": "330499035419115522",
-    "guildID": testmode ? "467473467634089985" : "321819041348190249",
+	"guildID": testmode ? "467473467634089985" : "321819041348190249",
 
-    "channels": { // includes voice channels & category channels
+	"channels": { // includes voice channels & category channels
-        "main": testmode ? "467473467634089987" : "321819041348190249",
+		"main": testmode ? "467473467634089987" : "321819041348190249",
-        "view_deleted_channels": testmode ? "467473467634089989" : "425060452129701889",
+		"view_deleted_channels": testmode ? "467473467634089989" : "425060452129701889",
-        "name_collection": testmode ? "467481952728121345" : '379738469511069698',
+		"name_collection": testmode ? "467481952728121345" : '379738469511069698',
-        "mpp_bridges": testmode ? "467481904707534850" : '360557444952227851',
+		"mpp_bridges": testmode ? "467481904707534850" : '360557444952227851',
-        "user_channels": testmode ? "467482031157149709" : '399735134061985792',
+		"user_channels": testmode ? "467482031157149709" : '399735134061985792',
-        "deleted_channels": testmode ? "467482085657935872" : '425054198699261953',
+		"deleted_channels": testmode ? "467482085657935872" : '425054198699261953',
-        "deleted_bridges": testmode ? "467482121657778176" : '696954288752164914',
+		"deleted_bridges": testmode ? "467482121657778176" : '696954288752164914',
-        "mpp_screenshot": testmode ? "467482164611514388" : '383773548810076163',
+		"mpp_screenshot": testmode ? "467482164611514388" : '383773548810076163',
-        "owop_screenshot": testmode ? "467482202217906226" : '399079481161023492'
+		"owop_screenshot": testmode ? "467482202217906226" : '399079481161023492'
-    },
+	},
 
-    "roles": {
+	"roles": {
-        "viewing_deleted_channels": testmode ? "467473718353068042" : "425060792455397376",
+		"viewing_deleted_channels": testmode ? "467473718353068042" : "425060792455397376",
-    },
+	},
 
 
-    
+	
-    "mppname": "[discord.gg/k44Eqha]",
+	"mppname": "[discord.gg/k44Eqha]",
-    "disabledRooms": [
+	"disabledRooms": [
-        "RP Room",
+		"RP Room",
-        "Legends of Alorgon {RP Room}",
+		"Legends of Alorgon {RP Room}",
-        "Legends of Alorgon",
+		"Legends of Alorgon",
-        "Breastmilk ♥ 7:45 AM"
+		"Breastmilk ♥ 7:45 AM"
-    ],
+	],
 
-    "owop_captcha_password": process.env.OWOP_CAPTCHA_PASSWORD,
+	"owop_captcha_password": process.env.OWOP_CAPTCHA_PASSWORD,
-    "pr_password": process.env.PR_PASSWORD,
+	"pr_password": process.env.PR_PASSWORD,
-    "mpc_token": process.env.MPC_TOKEN,
+	"mpc_token": process.env.MPC_TOKEN,
 
 }

datacollector.js

@@ -1,42 +0,0 @@
-var os = require('os');
-var zlib = require('zlib');
-
-// WebSocket message data collector. Returns a function for inputting websocket messages.
-// Collects inputted messages to a file and gzips them every time it reaches 8mb,
-// and sends it to the output callback function.
-// For recording websocket data to a discord channel.
-module.exports = function createWSMessageCollector(output) { // output func must be async
-    var filepath = os.tmpdir() + "/" + Math.random().toString(36).substring(2);
-    var size = 0;
-    var startDate = new Date();
-
-    // gzip the data & send to output callback
-    async function save(callback){
-        fs.readFile(filepath, (err, file) => {
-            if (err) return handleError(err);
-            zlib.gzip(file, async function(err, data){
-                if (err) return handleError(err);
-                var thisStartDate = startDate, thisEndDate = new Date();
-                fs.writeFileSync(filepath, '');
-                size = 0;
-                startDate = new Date();
-                await output(data, thisStartDate, thisEndDate);
-                if (callback) callback();
-            });
-        });
-    }
-
-    // save on exit
-    exitHook(callback => {
-        save(()=>callback());
-    });
-
-    return function input(message) { // input for websocket messages
-        message = message.data || message;
-        if (message instanceof ArrayBuffer) message = Buffer.from(message).toString('base64');
-        var line = `${Date.now()} ${message}\n`;
-        size += line.length;
-        fs.appendFileSync(filepath, line);
-        if (size > 8000000) {save(); size = 0;}
-    };
-}

ddpbridge.js

@@ -1,64 +1,64 @@
 var WebSocket = require('ws');
 var Discord = require('discord.js');
-var createWsMessageCollector = require('./datacollector');
+var WebSocketMessageCollector = require('./lib/datacollector');
 
-var webhook = new Discord.WebhookClient({url: config.webhooks.ddp, allowedMentions: {parse: []}});
+var webhook = new Discord.WebhookClient({url: config.webhooks.ddp}, {allowedMentions: {parse: []}});
 
 var ws;
 var wasConnected = false;
 //var myId;
 
-var collectWsMessage = createWsMessageCollector(async function(data, startDate, endDate){
+var wsc = new WebSocketMessageCollector(async function(data, startDate, endDate){
-    await webhook.send({files:[{
+	await webhook.send({files:[{
-        attachment: data,
+		attachment: data,
-        name: `daydun piano main raw data recording from ${startDate.toISOString()} to ${endDate.toISOString()} .txt.gz`
+		name: `daydun piano main raw data recording from ${startDate.toISOString()} to ${endDate.toISOString()} .txt.gz`
-    }]});
+	}]});
 });
 
 (function connect() {
-    ws = new WebSocket("wss://daydun.com:5012/?nick=%5Bdiscord.gg%2Fk44Eqha%5D");
+	ws = new WebSocket("wss://daydun.com:5012/?nick=%5Bdiscord.gg%2Fk44Eqha%5D");
-    ws.on("open", () => {
+	ws.on("open", () => {
-        if (!wasConnected) send2discord("**Connected**");
+		if (!wasConnected) send2discord("**Connected**");
-        wasConnected = true;
+		wasConnected = true;
-    });
+	});
-    ws.on("message", message => {
+	ws.on("message", message => {
-        collectWsMessage(message);
+		wsc.collect(message);
-        if (typeof message != 'string') return;
+		if (typeof message != 'string') return;
-        var transmission = JSON.parse(message);
+		var transmission = JSON.parse(message);
-        if (transmission.type == 'chat') {
+		if (transmission.type == 'chat') {
-            let chatmsg = transmission.message;
+			let chatmsg = transmission.message;
-            if (chatmsg.type == "message") {
+			if (chatmsg.type == "message") {
-                //if (chatmsg.id != myId)
+				//if (chatmsg.id != myId)
-                if (!chatmsg.content.startsWith('\u034f'))
+				if (!chatmsg.content.startsWith('\u034f'))
-                    send2discord(`**${sanitizeName(chatmsg.user.nick)}:** ${chatmsg.content}`);
+					send2discord(`**${sanitizeName(chatmsg.user.nick)}:** ${chatmsg.content}`);
-            } else if (chatmsg.type == "join") {
+			} else if (chatmsg.type == "join") {
-                send2discord(`__***${sanitizeName(chatmsg.nick || chatmsg.id)} joined.***__`);
+				send2discord(`__***${sanitizeName(chatmsg.nick || chatmsg.id)} joined.***__`);
-            } else if (chatmsg.type == "leave") {
+			} else if (chatmsg.type == "leave") {
-                send2discord(`__***${sanitizeName(chatmsg.nick || chatmsg.id)} left.***__`);
+				send2discord(`__***${sanitizeName(chatmsg.nick || chatmsg.id)} left.***__`);
-            }
+			}
-        } /*else if (transmission.type == 'load') {
+		} /*else if (transmission.type == 'load') {
-            myId = transmission.id;
+			myId = transmission.id;
-        }*/
+		}*/
-    });
+	});
-    ws.on("error", error => handleError(error));
+	ws.on("error", error => handleError(error));
-    ws.on("close", () => {
+	ws.on("close", () => {
-        if (wasConnected) send2discord("**Disconnected**");
+		if (wasConnected) send2discord("**Disconnected**");
-        wasConnected = false;
+		wasConnected = false;
-        setTimeout(connect, 5000);
+		setTimeout(connect, 5000);
-    });
+	});
 })();
 
 function send2discord(message) {
-    webhook.send(message.substring(0,2000));
+	webhook.send(message.substring(0,2000));
 }
 
 function send2ddp(message) {
-    if (ws.readyState == WebSocket.OPEN) ws.send(JSON.stringify({type:"chat",message}));
+	if (ws.readyState == WebSocket.OPEN) ws.send(JSON.stringify({type:"chat",message}));
 }
 
 dClient.on("messageCreate", message => {
-    if (message.channel.id != "508890674138054667" || message.author.bot) return;
+	if (message.channel.id != "508890674138054667" || message.author.bot) return;
-    var x = message.cleanContent;
+	var x = message.cleanContent;
-    if (message.attachments.size > 0) x += ' ' + message.attachments.map(a => a.url).join(' ');
+	if (message.attachments.size > 0) x += ' ' + message.attachments.map(a => a.url).join(' ');
-    send2ddp(`\u034f${message.member.displayName}#${message.author.discriminator}: ${x}`);
+	send2ddp(`\u034f${message.member.displayName}#${message.author.discriminator}: ${x}`);
 });

eval-exec.js

@@ -1,5 +1,5 @@
 
-client.on("messageCreate", async function (message) {
+dClient.on("messageCreate", async function (message) {
 	if (message.author.id != config.opID) return;
 	if (message.content.startsWith("!>")) {
 		with (message) {

lib/Client.js

@@ -74,14 +74,13 @@ Client.prototype.connect = function() {
 		return;
 	this.emit("status", "Connecting...");
 	if(typeof module !== "undefined") {
+		let headers = {
+			"origin": `https://${new URL(this.uri).host}`,
+			"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36"
+		};
+		if (this.uri.includes("multiplayerpiano.com")) headers["X-Forwarded-For"] = `${Math.floor(Math.random() * 256)}.${Math.floor(Math.random() * 256)}.${Math.floor(Math.random() * 256)}.${Math.floor(Math.random() * 256)}`;
 		// nodejsicle
-		require('https').get('https://app_legacy.multiplayerpiano.com').on("error", () => {});
+		this.ws = new WebSocket(this.uri, {headers});
-		this.ws = new WebSocket(this.uri, {
-			headers: {
-				"origin": "https://multiplayerpiano.com",
-				"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.75 Safari/537.36"
-			}
-		});
 	} else {
 		// browseroni
 		this.ws = new WebSocket(this.uri);
@@ -106,7 +105,7 @@ Client.prototype.connect = function() {
 		} else {
 			++self.connectionAttempts;
 		}
-		var ms_lut = [50, 2950, 7000, 10000];
+		var ms_lut = [50, 2950, 7000, 10000, 30000, 60000];
 		var idx = self.connectionAttempts;
 		if(idx >= ms_lut.length) idx = ms_lut.length - 1;
 		var ms = ms_lut[idx];

lib/DiscordMessageSender.js

@@ -0,0 +1,39 @@
+module.exports = class DiscordMessageSender {
+	constructor(channel) {
+		this.channel = channel;
+		this.interval = setInterval(this.flush.bind(this), 3000);
+	}
+
+	//async init() {
+	//	var webhooks = await this.channel.fetchWebhooks();
+	//	this.webhook = webhooks.filter(w => w.token).first() || await this.channel.createWebhook("sdfadffg");
+	//	this.interval = setInterval(this.flush.bind(this), 3000);
+	//}
+
+
+	send(text) {
+		this.pp ||= {content: ""};
+		this.pp.content += text + '\n';
+	}
+
+	sendEmbed(embed) {
+		this.pp ||= {};
+		this.pp.embeds = [embed];
+		this.flush();
+	}
+
+	flush() {
+		if (!this.pp) return;
+		var pp = this.pp;
+		delete this.pp;
+		if (pp.content?.length > 2000) {
+			pp.files = [{name: "message.txt", attachment: Buffer.from(pp.content)}];
+			delete pp.content;
+		}
+		//this.webhook.send(pp).catch(error => {
+			//handleError(error, "webhook");
+			this.channel.send(pp);
+		//});
+	}
+
+}

lib/datacollector.js

@@ -0,0 +1,28 @@
+var gzip = require("util").promisify(require("zlib").gzip);
+
+module.exports = class WebSocketMessageCollector {
+	constructor(dispatchFunction) {
+		this.maxSize = 8000000;
+		this.data = "";
+		this.startDate = new Date();
+		this.dispatchFunction = dispatchFunction;
+		exitHook(cb => {
+			this.package().then(cb);
+		});
+	}
+
+	collect(message) {
+		message = message.data || message;
+		if (message instanceof ArrayBuffer) message = Buffer.from(message).toString('base64');
+		var line = `${Date.now()} ${message}\n`;
+		this.data += line;
+		if (this.data.length > this.maxSize) this.package();
+	}
+
+	async package() {
+		var data = this.data, startDate = this.startDate, endDate = new Date();
+		this.data = "", this.startDate = new Date();
+		data = await gzip(data);
+		await this.dispatchFunction(data, startDate, endDate);
+	}
+}

main.js

@@ -13,12 +13,12 @@ global.dClient = new Discord.Client({
 
 // error handling
 {
-	let webhook = new Discord.WebhookClient({url: config.webhooks.error, allowedMentions: {parse: []}});
+	let webhook = new Discord.WebhookClient({url: config.webhooks.error}, {allowedMentions: {parse: []}});
 	global.handleError = function logError(error, title) {
 		let msg = error && (error.stack || error.message || error);
 		console.error(title + ':\n' + msg);
 		try {
-			webhook.send(`${title ? `**${title}:**` : ""}\`\`\`\n${msg}\n\`\`\``).catch(()=>{});
+			//webhook.send(`${title ? `**${title}:**` : ""}\`\`\`\n${msg}\n\`\`\``).catch(()=>{});
 		} catch(e) {}
 	}
 	process.on('unhandledRejection', error => handleError(error, "Unhandled Rejection"));
@@ -39,4 +39,3 @@ require("./commands");
 require('./mppbridger');
 require('./misc');
 require('./ddpbridge');
-require('./prbridge');

misc.js

@@ -1,83 +1,73 @@
 // join/leave
 (async function(){
-    var webhook = new Discord.WebhookClient({url: config.webhooks.welcome, allowedMentions: {parse: []}});
+	var webhook = new Discord.WebhookClient({url: config.webhooks.welcome}, {allowedMentions: {parse: []}});
-    dClient.on('guildMemberAdd', async member => {
+	dClient.on('guildMemberAdd', async member => {
-        if (member.guild.id != config.guildID) return;
+		if (member.guild.id != config.guildID) return;
-        let username = member.user.username.toLowerCase().includes('clyde') ? member.user.username.replace(/C/g,'Q').replace(/c/g,'q') : member.user.username;
+		let username = member.user.username.toLowerCase().includes('clyde') ? member.user.username.replace(/C/g,'Q').replace(/c/g,'q') : member.user.username;
-        webhook.send({content: `${member} joined.`, username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048})});
+		webhook.send({content: `${member} joined.`, username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048})});
-    });
+	});
-    dClient.on('guildMemberRemove', async member => {
+	dClient.on('guildMemberRemove', async member => {
-        if (member.guild.id != config.guildID) return;
+		if (member.guild.id != config.guildID) return;
-        let username = member.user.username.toLowerCase().includes('clyde') ? member.user.username.replace(/C/g,'Q').replace(/c/g,'q') : member.user.username;
+		let username = member.user.username.toLowerCase().includes('clyde') ? member.user.username.replace(/C/g,'Q').replace(/c/g,'q') : member.user.username;
-        webhook.send({content: `${member.user.tag} left.`, username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048})});
+		webhook.send({content: `${member.user.username} left.`, username, avatarURL: member.user.displayAvatarURL({format:'png',size:2048})});
-    });
+	});
 })();
 
 
 // view deleted channels
 (async function(){
-    dClient.on('voiceStateUpdate', async (oldState, newState) => {
+	dClient.on('voiceStateUpdate', async (oldState, newState) => {
-        if (oldState.channelId != config.channels.view_deleted_channels && newState.channelId == config.channels.view_deleted_channels) {
+		if (oldState.channelId != config.channels.view_deleted_channels && newState.channelId == config.channels.view_deleted_channels) {
-            // member joined the channel
+			// member joined the channel
-            newState.member.roles.add(config.roles.viewing_deleted_channels);
+			newState.member.roles.add(config.roles.viewing_deleted_channels);
-        } else if (oldState.channelId == config.channels.view_deleted_channels && newState.channelId != config.channels.view_deleted_channels) {
+		} else if (oldState.channelId == config.channels.view_deleted_channels && newState.channelId != config.channels.view_deleted_channels) {
-            // member left the channel
+			// member left the channel
-            newState.member.roles.remove(config.roles.viewing_deleted_channels);
+			newState.member.roles.remove(config.roles.viewing_deleted_channels);
-        }
+		}
-    });
+	});
 })();
 
 
 // arrange bots at bottom of list
 (async function(){
-    let prefix = "\u17b5";
+	let prefix = "\u17b5";
-    let onNick = async member => {
+	let onNick = async member => {
-        if (member.guild.id != config.guildID) return;
+		if (member.guild.id != config.guildID) return;
-        if (member.user.bot && !member.displayName.startsWith(prefix))
+		if (member.user.bot && !member.displayName.startsWith(prefix))
-            await member.setNickname(`${prefix}${member.displayName}`.substring(0,32));
+			await member.setNickname(`${prefix}${member.displayName}`.substring(0,32));
-    };
+	};
-    dClient.on('guildMemberAdd', onNick);
+	dClient.on('guildMemberAdd', onNick);
-    dClient.on('guildMemberUpdate', async (oldMember, newMember) => {
+	dClient.on('guildMemberUpdate', async (oldMember, newMember) => {
-        if (newMember.displayName != oldMember.displayName) await onNick(newMember);
+		if (newMember.displayName != oldMember.displayName) await onNick(newMember);
-    });
+	});
 })();
 
 
 // persistent emojis
 dClient.on("emojiDelete", async emoji => {
-    console.log("emoji deleted:", emoji.name, emoji.url);
+	console.log("emoji deleted:", emoji.name, emoji.url);
-    if (global.disableEmojiProtection) return;
+	if (global.disableEmojiProtection) return;
-    if (emoji.name.toLowerCase().includes('delete')) return;
+	if (emoji.name.toLowerCase().includes('delete')) return;
-    async function readdEmoji() {
+	async function readdEmoji() {
-        await emoji.guild.emojis.create(emoji.url, emoji.name);
+		await emoji.guild.emojis.create(emoji.url, emoji.name);
-        delete readdEmoji;
+		delete readdEmoji;
-    }
+	}
-    // re-add emoji in 5 to 10 minutes
+	// re-add emoji in 5 to 10 minutes
-    setTimeout(() => {
+	setTimeout(() => {
-        if (readdEmoji) readdEmoji();
+		if (readdEmoji) readdEmoji();
-    }, 300000 + Math.random() * 300000);
+	}, 300000 + Math.random() * 300000);
-    // wouldn't want emoji to be lost if process is stopped before timeout ends
+	// wouldn't want emoji to be lost if process is stopped before timeout ends
-    exitHook(callback => {
+	exitHook(callback => {
-        if (readdEmoji) readdEmoji().then(() => callback());
+		if (readdEmoji) readdEmoji().then(() => callback());
-        else callback();
+		else callback();
-    });
+	});
 });
 
 
 // allow anyone to pin a message via reaction
 // todo need enable partials for it to work on old messages
 dClient.on("messageReactionAdd", async (messageReaction) => {
-    if (messageReaction.guild.id != config.guildID) return;
+	if (messageReaction.guild?.id != config.guildID) return;
-    if (messageReaction.emoji.name == "📌" || messageReaction.emoji.name == "📍")
+	if (messageReaction.emoji.name == "📌" || messageReaction.emoji.name == "📍")
-        await messageReaction.message.pin();
+		await messageReaction.message.pin();
 });
-
-
-
-
-
-
-
-
-
-

mppbridger.js

@@ -1,32 +1,13 @@
 var Client = require('./lib/Client.js');
+var WebSocketMessageCollector = require("./lib/datacollector");
+var DiscordMessageSender = require("./lib/DiscordMessageSender");
 
 global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 	channel = dClient.channels.resolve(channel);
-	var webhooks = await channel.fetchWebhooks();
+	var d = new DiscordMessageSender(channel);
-	var webhook = webhooks.filter(w => w.token).first() || await channel.createWebhook("sdfadffg");	
-
-	//todo figure out new way to buffer
-	function dSend(msg, options = {}) {
-		if (msg) options.content = msg;
-
-		if (options.content?.length > 2000) {
-			options.attachments ||= [];
-			options.attachments.push(new Discord.MessageAttachment(Buffer.from(options.content), "message.txt"));
-			delete options.content;
-		}
-
-		let username = gClient.channel && gClient.channel._id || room;
-		if (username.length > 80) username = username.substr(0,79) + '…';
-
-		webhook.send(Object.assign(options, {username})).catch(error => {
-			handleError(error, `webhook fail in ${channel.id}`);
-			channel.send(options).catch(error => handleError(error, `send fail in ${channel.id} after webhook send fail`));
-		});
-
-	}
 	
 	const gClient = new Client(uri);
-	if (uri == "wss://mppclone.com:8443") gClient.token = config.mpc_token; //todo hmm
+	if (uri == "wss://backend.multiplayerpiano.net") gClient.token = config.mpc_token; //todo hmm
 	gClient.setChannel(room, {visible:false});
 	gClient.start();
 
@@ -41,16 +22,16 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 	let lastError;
 	gClient.on("error", error => {
 		handleError(error, `[${uri}][${room}]`);
-		error = error.toString();
+		error = error.message || JSON.stringify(error);
 		if (lastError != error) {
-			dSend(`**${error.toString()}**`);
+			d.send(`**${error}**`);
 			lastError = error;
 		}
 	});
 	var isConnected = false; // TODO use gClient.isConnected() ?
 	gClient.on('connect', () => {
 		console.log(`[${uri}][${room}] Connected to server`);
-		dSend(`**Connected to server; joining channel…**`);
+		d.send(`**Connected to server; joining channel…**`);
 		isConnected = true;
 		lastError = undefined;
 	});
@@ -64,7 +45,7 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 	gClient.on('disconnect', () => {
 		if (isConnected) {
 			console.log(`[${uri}][${room}] Disconnected from server`);
-			dSend(`**Disconnected from server**`);
+			d.send(`**Disconnected from server**`);
 			isConnected = false;
 		}
 	});
@@ -80,12 +61,12 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 		gClient.on('ch', async msg => {
 			// announce channel join
 			if (!lastCh) {
-				dSend(`**Joined channel \`${msg.ch._id}\`**`);
+				d.send(`**Joined channel \`${msg.ch._id}\`**`);
 				console.log(`[${uri}][${room}] Joined channel ${msg.ch._id}`);
 			}
 			// announce channel change
 			else if (msg.ch._id !== lastCh) {
-				dSend(`**Channel changed from \`${lastCh}\` to \`${msg.ch._id}\`**`);
+				d.send(`**Channel changed from \`${lastCh}\` to \`${msg.ch._id}\`**`);
 				console.log(`[${uri}][${room}] Channel changed from ${lastCh} to ${msg.ch._id}`);
 			}
 			lastCh = msg.ch._id;
@@ -97,12 +78,12 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 
 	// MPP to Discord
 	gClient.on('a', async msg => {
-		if (msg.p._id == gClient.getOwnParticipant()._id) return;
+		if (msg.p._id == gClient.user._id) return;
 		var id = msg.p._id.substr(0,6);
 		var name = sanitizeName(msg.p.name);
 		var content = msg.a;
 		var str = `\`${id}\` **${name}:** ${content}`;
-		dSend(str);
+		d.send(str);
 	});
 
 	// Discord to MPP
@@ -136,33 +117,35 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 
 	// announce join/leave/rename
 	gClient.prependListener("p", async participant => {
-	    if (gClient.ppl[participant.id]) { // is update
+		if (gClient.ppl[participant.id]) { // is update
-	        let oldName = gClient.ppl[participant.id].name, newName = participant.name;
+			let oldName = gClient.ppl[participant.id].name, newName = participant.name;
-	        if (newName != oldName)
+			let isBot = gClient.ppl[participant.id].tag?.text == "BOT";
-	            dSend(`\`${participant._id.substr(0,6)}\` ___**${sanitizeName(oldName)}** changed their name to **${sanitizeName(newName)}**___`);
+			if (newName != oldName && !isBot)
-	    } else { // is join
+				d.send(`\`${participant._id.substr(0,6)}\` ___**${sanitizeName(oldName)}** changed their name to **${sanitizeName(newName)}**___`);
-	        dSend(`\`${participant._id.substr(0,6)}\` ___**${sanitizeName(participant.name)}** entered the room.___`);
+		} else { // is join
-	    }
+			d.send(`\`${participant._id.substr(0,6)}\` ___**${sanitizeName(participant.name)}** entered the room.___`);
+		}
 	});
 	gClient.prependListener("bye", async msg => {
-	    var participant = gClient.ppl[msg.p];
+		var participant = gClient.ppl[msg.p];
-        dSend(`\`${participant._id.substr(0,6)}\` ___**${sanitizeName(participant.name)}** left the room.___`);
+		if (!participant) return;
-    });
+		d.send(`\`${participant._id.substr(0,6)}\` ___**${sanitizeName(participant.name)}** left the room.___`);
+	});
 
 
 
 	// on notifications
 	gClient.on('notification', async msg => {
 		// show notification
-		dSend(undefined, {embeds:[{
+		d.sendEmbed({
 			title: msg.title,
 			description: msg.text || msg.html
-		}]});
+		});
 
 		// handle bans
 		if (msg.text && (msg.text.startsWith('Banned from "'+room+'"') || msg.text.startsWith('Currently banned from "'+room+'"'))) {
-            // Banned from "{room}" for {n} minutes.
+			// Banned from "{room}" for {n} minutes.
-            // Currently banned from "{room}" for {n} minutes.
+			// Currently banned from "{room}" for {n} minutes.
 			let arr = msg.text.split(' ');
 			arr.pop();
 			let minutes = arr.pop();
@@ -172,7 +155,7 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 				gClient.setChannel(room);
 				gClient.start();
 			}, minutes*60*1000+3000);
-			dSend(`**Attempting to rejoin in ${minutes} minutes.**`);
+			d.send(`**Attempting to rejoin in ${minutes} minutes.**`);
 		}
 	});
 
@@ -188,16 +171,17 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 	});
 	
 	
-    
+	
 	// addons
-	{
+	var wsc = new WebSocketMessageCollector(async function(data, startDate, endDate) {
-		// record raw data
+		var attachmentName = `${uri} ${room} raw data recording from ${startDate.toISOString()} to ${endDate.toISOString()} .txt.gz`;
-		let createWSMessageCollector = require("./datacollector")
+		await channel.send({files:[{
-		gClient.on("message", createWSMessageCollector(async function(data, startDate, endDate){
+			attachment: data,
-			var attachmentName = `${uri} ${room} raw data recording from ${startDate.toISOString()} to ${endDate.toISOString()} .txt.gz`;
+			name: attachmentName
-			await channel.send(new Discord.MessageAttachment(data, attachmentName));
+		}]});
-		}));
+	});
-	}
+	gClient.on("message", wsc.collect.bind(wsc));
+	
 
 	return gClient;
 };
@@ -205,7 +189,7 @@ global.createMPPbridge = async function createMPPbridge({room, channel, uri}) {
 
 
 // start
-client.once("ready", async function () {
+dClient.once("ready", async function () {
 	global.bridges = require("./bridges");
 	for (let bridge of bridges) {
 		try {
@@ -214,4 +198,4 @@ client.once("ready", async function () {
 			handleError(error, JSON.stringify(bridge));
 		}
 	}
-});
+});

package.json

@@ -1,9 +1,8 @@
 {
 	"dependencies": {
 		"async-exit-hook": "^2.0.1",
-		"discord.js": "^13.5.0",
+		"discord.js": "^13.17.1",
-		"dotenv": "^8.2.0",
+		"dotenv": "^8.6.0",
-		"socketcluster-client": "^14.2.2",
+		"ws": "^8.18.3"
-		"ws": "^3.3.2"
 	}
 }

prbridge/PRClient.js

@@ -1,48 +0,0 @@
-const socketCluster = require("socketcluster-client")
-const EventEmitter = require("events").EventEmitter;
-class PRClient extends EventEmitter {
-    constructor(credentials, options) {
-        super()
-        EventEmitter.call(this);
-        this.options = options;
-        this.socket;
-        this.channels = {};
-        this.credentials = credentials
-    }
-    connect() {
-        if (!this.options) {
-            this.options = {
-                path: "/socketcluster/",
-                hostname: "www.pianorhythm.me",
-                port: 443,
-                secure: true,
-                autoReconnect: true,
-            }
-        }
-        // Initiate the connection to the server
-        this.socket = socketCluster.connect(this.options);
-        this.socket.connect();
-        this.socket.on("error", (msg) => {
-            handleError(msg, "pr socket");
-        })
-        this.socket.on("connect", () => {
-            console.log("Connected!")
-            this.socket.emit("enableAuthLogin", {
-                enable: true,
-                roomName: this.credentials.roomName
-            });
-            this.socket.emit("enableCursor", {
-                enable: true
-            });
-            this.socket.emit("login", {
-                password: this.credentials.password,
-                roomName: this.credentials.roomName,
-                username: this.credentials.username
-            });
-            this.socket.emit("getPlayerStats", {
-                "username": this.credentials.username
-            })
-        })
-    }
-}
-module.exports = PRClient;

prbridge/index.js

@@ -1,54 +0,0 @@
-const PRClient = require("./PRClient.js");
-
-let client = new PRClient({// account stuff
-	username: "Discord",
-	password: config.pr_password,
-	roomName: 'lobby'
-});
-global.prClient = client;
-client.connect();
-client.socket.on("setRoom", function (data, callback) {
-	client.roomID = data.roomID;
-	try {
-		if (client.channels.chatChannel && client.roomID) {
-			client.socket.destroyChannel(client.roomID);
-		}
-	} catch (err) {}
-	client.channels.chatChannel = client.socket.subscribe(data.roomID);
-	client.channels.chatChannel.watch(messagehandle);
-})
-
-async function messagehandle(data) {
-    if (data && data.type) {
-        switch (data.type) {
-            case "chat":
-                if (data && data.message) {
-                    let name = data.name || "";
-                    let effect = data.effect || "";
-                    let roomName = data.roomName;
-                    let color = data.color;
-                    let id = data.sID || data.socketID || data.id;
-					if (id == client.socket.id) return;
-					let c = dClient.channels.resolve("593943518351982603");
-					let msg;
-				    (!name && (data.message.startsWith("[i]"))) ? msg = `*${data.message.split("[i]")[1]}*` : msg = `**${sanitizeName(name)}:** ${data.message}`;
-                    if (c) c.send(msg);
-                }
-                break;
-        }
-    }
-}
-
-dClient.on("messageCreate", async message => {
-	if (message.channel.id != "593943518351982603" || message.author.id == dClient.user.id) return;
-	if (!client.roomID) return;
-	client.socket.publish(client.roomID, {
-		"type": "chat",
-		"message": `${message.member && message.member.displayName || message.author.username}#${message.author.discriminator}: ${message.cleanContent + (message.attachments.size > 0 && message.attachments.map(x => x.url).join(' ') || '')}`,
-		"value": false,
-		"socketID": "[discord.gg/k44Eqha]",
-		"uuid": "[discord.gg/k44Eqha]",
-		"color": "#8012ed",
-		"name": "[discord.gg/k44Eqha]"
-    });
-});

screenshotter/Dockerfile

@@ -1,5 +0,0 @@
-FROM buildkite/puppeteer
-ADD . /app
-WORKDIR /app
-RUN npm ci
-CMD ["node", "screenshotter.js"]

screenshotter/package.json

@@ -1,7 +0,0 @@
-{
-  "dependencies": {
-    "discord.js": "^12.5.3",
-    "dotenv": "^10.0.0",
-    "puppeteer": "^10.2.0"
-  }
-}

screenshotter/screenshotter.js

@@ -1,72 +0,0 @@
-require("dotenv").config();
-var Discord = require("discord.js");
-var puppeteer = require('puppeteer');
-
-var wh_hmpps = new Discord.WebhookClient(process.env.WH_HMPPS_ID, process.env.WH_HMPPS_TOKEN);
-var wh_hrprs = new Discord.WebhookClient(process.env.WH_HRPRS_ID, process.env.WH_HRPRS_TOKEN);
-var wh_howps = new Discord.WebhookClient(process.env.WH_HOWPS_ID, process.env.WH_HOWPS_TOKEN);
-
-global.screenshotter = {
-	capture: async function () {
-		console.log('Starting screen captures');
-		try {
-			var browser = await puppeteer.launch(/*{ args: ['--no-sandbox'] }*/);
-			var page = await browser.newPage();
-			await page.setViewport({ width: 1440, height: 900 });
-			try {
-				await page.goto('https://www.multiplayerpiano.com/');
-				try {await page.evaluate(function () {
-					document.getElementById('modal').click();
-					//MPP.client.uri = "wss://mpp_proxy.qonq.gq";
-				});} catch(e) {console.error(e.message)}
-				await new Promise(resolve => setTimeout(resolve, 5000));
-				let screenshot = await page.screenshot({ type: 'png' });
-				let filename = `Screenshot of www.multiplayerpiano.com @ ${new Date().toISOString()}.png`;
-				let attachment = new Discord.MessageAttachment(screenshot, filename);
-				await wh_hmpps.send(attachment);
-			} catch (error) {
-				await wh_hmpps.send(`:warning: ${error.stack}`);
-			}
-			try {
-				await page.evaluate(function () {
-					MPP.client.setChannel("✧𝓓𝓔𝓥 𝓡𝓸𝓸𝓶✧");
-				});
-				await new Promise(resolve => setTimeout(resolve, 5000));
-				let screenshot = await page.screenshot({ type: 'png' });
-				let filename = `Screenshot of www.multiplayerpiano.com/✧𝓓𝓔𝓥 𝓡𝓸𝓸𝓶✧ @ ${new Date().toISOString()}.png`;
-				let attachment = new Discord.MessageAttachment(screenshot, filename);
-				await wh_hrprs.send(attachment);
-			} catch(error) {
-				await wh_hrprs.send(`:warning: ${error.stack}`);
-			}
-			try {
-				await page.goto('http://ourworldofpixels.com');
-				await page.evaluate(function (owopcaptcha) {
-					localStorage.owopcaptcha = owopcaptcha;
-					OWOP.camera.zoom = 1;
-				}, process.env.OWOP_CAPTCHA_PASSWORD);
-				await new Promise(resolve => setTimeout(resolve, 2000));
-				await page.evaluate(function () {
-					for (let butt of document.getElementsByTagName('button')) {
-						if (butt.innerText == 'OK') {butt.click();break}
-					}
-				});
-				await new Promise(resolve => setTimeout(resolve, 13000));
-				let screenshot = await page.screenshot({ type: 'png' });
-				let filename = `Screenshot of ourworldofpixels.com/main @ ${new Date().toISOString()}.png`;
-				let attachment = new Discord.MessageAttachment(screenshot, filename);
-				await wh_howps.send(attachment);
-			} catch (error) {
-				await wh_howps.send(`:warning: ${error.stack}`);
-			}
-		} catch(error) {
-			console.error(`Error occured with screen capture:\n${error.stack}`)
-		} finally {
-			if (browser) await browser.close();
-			console.log('Finished screen captures');
-		}
-	},
-	interval: setInterval(() => { screenshotter.capture(); }, 1000 * 60 * 60)
-};
-
-screenshotter.capture();

util.js

@@ -1,11 +1,11 @@
 
 global.random = function (array) {
-    return array[Math.floor(Math.random() * array.length)]
+	return array[Math.floor(Math.random() * array.length)]
 }
 
 global.sanitizeName = function sanitizeName(str){ // for showing names in discord
 	str = str.replace(/[_~*\\]/g,"\\$&"); // formatting
-    str = str.replace(/discord.gg\//g, 'discord.gg\\/'); // invites
+	str = str.replace(/discord.gg\//g, 'discord.gg\\/'); // invites
-    str = str.replace(/(http|https):\/\//g, "$1\\://"); // urls
+	str = str.replace(/(http|https):\/\//g, "$1\\://"); // urls
 	return str;
 }