diff --git a/.gitignore b/.gitignore index ab5afb2..ae95c00 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/build + # Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore # Logs diff --git a/src/rs/CommandHandler.rs b/src/rs/CommandHandler.rs deleted file mode 100644 index ac21edc..0000000 --- a/src/rs/CommandHandler.rs +++ /dev/null @@ -1,4 +0,0 @@ -#[no_mangle] -pub extern "C" fn handleCommand(argc: isize, argv: ) { - -} diff --git a/src/rs/cursor.rs b/src/rs/cursor.rs deleted file mode 100644 index e69de29..0000000 diff --git a/src/services/index.ts b/src/services/index.ts index 879601d..55fd069 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -8,7 +8,7 @@ export class ServiceLoader { public static loadServices() { const testAgent = new MPPAgent( - "wss://smnmpp.hri7566.info:8448", + "wss://mppclone.com:8443", env.MPPNET_TOKEN ); diff --git a/src/services/mpp/index.ts b/src/services/mpp/index.ts index 7be22c3..1bda9fb 100644 --- a/src/services/mpp/index.ts +++ b/src/services/mpp/index.ts @@ -1,12 +1,17 @@ import Client from "mpp-client-net"; import { ServiceAgent } from "../ServiceAgent"; +import { ptr } from "bun:ffi"; + +let p; export class MPPAgent extends ServiceAgent { public desiredUser = { - name: "🟇 𝙎𝙪𝙥𝙚𝙧 Cosmic (*help)", + name: "🟇 𝙎𝙪𝙥𝙚𝙧 Cosmic (no commands yet)", color: "#1d0054" }; + public desiredChannel = "nothing"; + constructor(uri: string, token: string) { const cl = new Client(uri, token); super(cl); @@ -14,8 +19,6 @@ export class MPPAgent extends ServiceAgent { public start() { this.client.start(); - // TODO get rid of this gay shit - this.client.setChannel("blackmidi (huge lag)"); } public stop() { @@ -27,23 +30,32 @@ export class MPPAgent extends ServiceAgent { this.client.on("hi", msg => { this.emit("log", msg.u); + this.client.setChannel(this.desiredChannel); + + console.log( + msg.u.name !== this.desiredUser.name || + msg.u.color !== this.desiredUser.color + ); if ( msg.u.name !== this.desiredUser.name || msg.u.color !== this.desiredUser.color ) { + // setTimeout(() => { this.client.sendArray([ { m: "userset", set: this.desiredUser } ]); + // }, 1000); } }); this.client.on("a", msg => { - const argv = msg.a.split(" "); - const argc = argv.length; + p = ptr(new TextEncoder().encode(msg.a).buffer); + // handleCommand(p); + console.log(`${msg.p.name}: ${msg.a}`); }); } }