moons-ta-client 1.1.14 → 1.2.1

package/dist/tournament-assistant-client.js

@@ -4,12 +4,13 @@ import { v4 as uuidv4 } from "uuid";
 import { StateManager } from "./state-manager.js";
 import { Response_ResponseType, } from "./models/responses.js";
 import { Command_ModifyGameplay_Modifier } from "./models/commands.js";
-import { versionCode } from "./constants.js";
+import { masterAddress, masterApiPort, versionCode } from "./constants.js";
 import WebSocket from "ws";
 // Created by Moon on 6/12/2022
 export * from "./scraper.js";
 export * from "./models/models.js";
 export class TAClient extends CustomEventEmitter {
+    _imageServer = `https://${masterAddress}:${masterApiPort}`;
     stateManager;
     uiVersion;
     client;
@@ -62,13 +63,8 @@ export class TAClient extends CustomEventEmitter {
                             from: this.stateManager.getSelfGuid(),
                             id: uuidv4(),
                             packet: {
-                                oneofKind: "command",
-                                command: {
-                                    type: {
-                                        oneofKind: "heartbeat",
-                                        heartbeat: true,
-                                    },
-                                },
+                                oneofKind: "heartbeat",
+                                heartbeat: true,
                             },
                         });
                     }, 10000);
@@ -104,31 +100,41 @@ export class TAClient extends CustomEventEmitter {
         this.token = token;
         this.client?.setToken(token);
     }
-    forwardToUsers(packet, to) {
-        this.client?.send({
-            token: "",
-            from: packet.from,
-            id: packet.id,
-            packet: {
-                oneofKind: "forwardingPacket",
-                forwardingPacket: {
-                    forwardTo: to,
-                    packet,
-                },
+    async uploadImage(bytes) {
+        // If the image is one byte, assume we are uploading no image.
+        // This is related to the way I am forced to represent empty Uint8Arrays
+        if (bytes.length < 3) {
+            return "";
+        }
+        const blob = new Blob([bytes], { type: "image/png" });
+        const file = new File([blob], "dummy.png", {
+            type: "image/png",
+        });
+        const formData = new FormData();
+        formData.append("file", file);
+        const response = await fetch(`${this._imageServer}/api/file/upload`, {
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${this.token}`,
             },
+            body: formData,
         });
+        if (!response.ok) {
+            const error = await response.text();
+            throw new Error("Upload failed: " + error);
+        }
+        return await response.text();
     }
-    sendCommand(command, to) {
-        const packet = {
-            token: this.token,
+    sendCommand(command) {
+        this.client?.send({
+            token: "",
             from: this.stateManager.getSelfGuid(),
             id: uuidv4(),
             packet: {
                 oneofKind: "command",
                 command,
             },
-        };
-        this.forwardToUsers(packet, to);
+        });
     }
     async sendRequest(request, to, timeout = 30000) {
         const packet = {
@@ -142,7 +148,7 @@ export class TAClient extends CustomEventEmitter {
         };
         const responseDictionary = [];
         // Create a promise that resolves when all responses are received
-        const responsesPromise = new Promise((resolve) => {
+        const responsesPromise = new Promise((resolve, reject) => {
             const addListeners = () => {
                 this.on("responseReceived", onResponseReceived);
                 this.on("authorizationRequestedFromServer", onAuthorizationRequested);
@@ -209,20 +215,14 @@ export class TAClient extends CustomEventEmitter {
             // to provide a valid token, so we will combust
             const onAuthorizationRequested = () => {
                 clearTimeout(timeoutTimer);
-                throw "Authorization token invalid or not provided";
+                reject("Authorization token invalid or not provided");
             };
             addListeners();
         });
-        // Assume forwardToUsers emits the 'responseReceived' event asynchronously
-        if (to) {
-            this.forwardToUsers(packet, to);
-        }
-        else {
-            this.client?.send(packet, to);
-        }
+        this.client?.send(packet);
         return responsesPromise;
     }
-    async sendResponse(response, to) {
+    async sendResponse(response) {
         const packet = {
             token: this.token,
             from: this.stateManager.getSelfGuid(),
@@ -232,81 +232,110 @@ export class TAClient extends CustomEventEmitter {
                 response,
             },
         };
-        if (to) {
-            this.forwardToUsers(packet, to);
-        }
-        else {
-            this.client?.send(packet, to);
-        }
+        this.client?.send(packet);
     }
     // --- Commands --- //
-    playSong = (gameplayParameters, userIds) => {
+    playSong = (tournamentId, gameplayParameters, userIds) => {
         this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
             type: {
                 oneofKind: "playSong",
                 playSong: {
                     gameplayParameters,
                 },
             },
-        }, userIds);
+        });
     };
-    returnToMenu = (userIds) => {
+    returnToMenu = (tournamentId, userIds) => {
         this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
             type: {
                 oneofKind: "returnToMenu",
                 returnToMenu: true,
             },
-        }, userIds);
+        });
     };
-    flipColors = (userIds) => {
+    flipColors = (tournamentId, userIds) => {
         this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
             type: {
                 oneofKind: "modifyGameplay",
                 modifyGameplay: {
                     modifier: Command_ModifyGameplay_Modifier.InvertColors,
                 },
             },
-        }, userIds);
+        });
     };
-    flipHands = (userIds) => {
+    flipHands = (tournamentId, userIds) => {
         this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
             type: {
                 oneofKind: "modifyGameplay",
                 modifyGameplay: {
                     modifier: Command_ModifyGameplay_Modifier.InvertHandedness,
                 },
             },
-        }, userIds);
+        });
+    };
+    disableBlueNotes = (tournamentId, userIds) => {
+        this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
+            type: {
+                oneofKind: "modifyGameplay",
+                modifyGameplay: {
+                    modifier: Command_ModifyGameplay_Modifier.DisableBlueNotes,
+                },
+            },
+        });
     };
-    showLoadedImage = (userIds, show = true) => {
+    disableRedNotes = (tournamentId, userIds) => {
         this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
+            type: {
+                oneofKind: "modifyGameplay",
+                modifyGameplay: {
+                    modifier: Command_ModifyGameplay_Modifier.DisableRedNotes,
+                },
+            },
+        });
+    };
+    showLoadedImage = (tournamentId, userIds, show = true) => {
+        this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
             type: {
                 oneofKind: "streamSyncShowImage",
                 streamSyncShowImage: show,
             },
-        }, userIds);
+        });
     };
-    showColor = async (color, userIds) => {
-        const response = await this.sendRequest({
+    showColor = (tournamentId, color, userIds) => {
+        this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
             type: {
                 oneofKind: "showColorForStreamSync",
                 showColorForStreamSync: {
                     color,
                 },
             },
-        }, userIds);
-        if (response.length <= 0) {
-            throw new Error("Server timed out, or no users responded");
-        }
-        return response;
+        });
     };
-    delayTestFinished = (userIds) => {
+    delayTestFinished = (tournamentId, userIds) => {
         this.sendCommand({
+            tournamentId,
+            forwardTo: userIds,
             type: {
                 oneofKind: "delayTestFinish",
                 delayTestFinish: true,
             },
-        }, userIds);
+        });
     };
     // --- Requests --- //
     joinTournament = async (tournamentId) => {
@@ -341,11 +370,13 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
-    loadSong = async (levelId, userIds, timeout) => {
+    loadSong = async (tournamentId, levelId, userIds, timeout) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "loadSong",
                 loadSong: {
+                    tournamentId,
+                    forwardTo: userIds,
                     levelId,
                     customHostUrl: "",
                 },
@@ -356,11 +387,13 @@ export class TAClient extends CustomEventEmitter {
         }
         return response;
     };
-    loadImage = async (bitmap, userIds) => {
+    loadImage = async (tournamentId, bitmap, userIds) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "preloadImageForStreamSync",
                 preloadImageForStreamSync: {
+                    tournamentId,
+                    forwardTo: userIds,
                     fileId: uuidv4(),
                     data: bitmap,
                     compressed: false,
@@ -372,11 +405,13 @@ export class TAClient extends CustomEventEmitter {
         }
         return response;
     };
-    showPrompt = async (userIds, titleText, bodyText, canClose, options, timer) => {
+    showPrompt = async (tournamentId, userIds, titleText, bodyText, canClose, options, timer) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "showPrompt",
                 showPrompt: {
+                    tournamentId,
+                    forwardTo: userIds,
                     promptId: uuidv4(),
                     messageTitle: titleText,
                     messageText: bodyText,
@@ -696,13 +731,24 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
-    createQualifierEvent = async (tournamentId, event) => {
+    createQualifierEvent = async (tournamentId, name, infoChannelId, maps, flags, sort, qualifierImage) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "createQualifierEvent",
                 createQualifierEvent: {
                     tournamentId,
-                    event,
+                    event: {
+                        guid: "",
+                        name,
+                        infoChannel: {
+                            id: infoChannelId,
+                            name: "dummy",
+                        },
+                        qualifierMaps: maps,
+                        flags,
+                        sort,
+                        image: await this.uploadImage(qualifierImage),
+                    },
                 },
             },
         });
@@ -734,7 +780,7 @@ export class TAClient extends CustomEventEmitter {
                 setQualifierImage: {
                     tournamentId,
                     qualifierId,
-                    qualifierImage,
+                    qualifierImage: await this.uploadImage(qualifierImage),
                 },
             },
         });
@@ -854,14 +900,14 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
-    addAuthorizedUser = async (tournamentId, discordId, permissionFlags) => {
+    addAuthorizedUser = async (tournamentId, discordId, roleIds) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "addAuthorizedUser",
                 addAuthorizedUser: {
                     tournamentId,
                     discordId,
-                    permissionFlags,
+                    roleIds,
                 },
             },
         });
@@ -956,12 +1002,38 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
-    createTournament = async (tournament) => {
+    createTournament = async (serverAddress, serverName, serverPort, serverWebsocketPort, name, tournamentImage = new Uint8Array([1]), enableTeams = false, enablePools = false, showTournamentButton = true, showQualifierButton = true, roles = [], teams = [], scoreUpdateFrequency = 30, bannedMods = [], pools = [], allowUnauthorizedView = false) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "createTournament",
                 createTournament: {
-                    tournament,
+                    tournament: {
+                        guid: uuidv4(),
+                        users: [],
+                        matches: [],
+                        qualifiers: [],
+                        settings: {
+                            tournamentName: name,
+                            tournamentImage: await this.uploadImage(tournamentImage),
+                            enableTeams,
+                            enablePools,
+                            showTournamentButton,
+                            showQualifierButton,
+                            roles,
+                            teams,
+                            scoreUpdateFrequency,
+                            bannedMods,
+                            pools,
+                            allowUnauthorizedView,
+                            myPermissions: [],
+                        },
+                        server: {
+                            address: serverAddress,
+                            name: serverName,
+                            port: +serverPort,
+                            websocketPort: +serverWebsocketPort,
+                        },
+                    },
                 },
             },
         });
@@ -991,7 +1063,7 @@ export class TAClient extends CustomEventEmitter {
                 oneofKind: "setTournamentImage",
                 setTournamentImage: {
                     tournamentId,
-                    tournamentImage,
+                    tournamentImage: await this.uploadImage(tournamentImage),
                 },
             },
         });
@@ -1105,13 +1177,79 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
-    addTournamentTeam = async (tournamentId, team) => {
+    addTournamentRole = async (tournamentId, role) => {
+        const response = await this.sendRequest({
+            type: {
+                oneofKind: "addTournamentRole",
+                addTournamentRole: {
+                    tournamentId,
+                    role,
+                },
+            },
+        });
+        if (response.length <= 0) {
+            throw new Error("Server timed out");
+        }
+        return response[0].response;
+    };
+    setTournamentRoleName = async (tournamentId, roleId, roleName) => {
+        const response = await this.sendRequest({
+            type: {
+                oneofKind: "setTournamentRoleName",
+                setTournamentRoleName: {
+                    tournamentId,
+                    roleId,
+                    roleName,
+                },
+            },
+        });
+        if (response.length <= 0) {
+            throw new Error("Server timed out");
+        }
+        return response[0].response;
+    };
+    setTournamentRolePermissions = async (tournamentId, roleId, permissions) => {
+        const response = await this.sendRequest({
+            type: {
+                oneofKind: "setTournamentRolePermissions",
+                setTournamentRolePermissions: {
+                    tournamentId,
+                    roleId,
+                    permissions,
+                },
+            },
+        });
+        if (response.length <= 0) {
+            throw new Error("Server timed out");
+        }
+        return response[0].response;
+    };
+    removeTournamentRole = async (tournamentId, roleId) => {
+        const response = await this.sendRequest({
+            type: {
+                oneofKind: "removeTournamentRole",
+                removeTournamentRole: {
+                    tournamentId,
+                    roleId,
+                },
+            },
+        });
+        if (response.length <= 0) {
+            throw new Error("Server timed out");
+        }
+        return response[0].response;
+    };
+    addTournamentTeam = async (tournamentId, name, image) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "addTournamentTeam",
                 addTournamentTeam: {
                     tournamentId,
-                    team,
+                    team: {
+                        guid: uuidv4(),
+                        name,
+                        image: await this.uploadImage(image),
+                    },
                 },
             },
         });
@@ -1143,7 +1281,7 @@ export class TAClient extends CustomEventEmitter {
                 setTournamentTeamImage: {
                     tournamentId,
                     teamId,
-                    teamImage,
+                    teamImage: await this.uploadImage(teamImage),
                 },
             },
         });
@@ -1167,13 +1305,18 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
-    addTournamentPool = async (tournamentId, pool) => {
+    addTournamentPool = async (tournamentId, name, image, maps) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "addTournamentPool",
                 addTournamentPool: {
                     tournamentId,
-                    pool,
+                    pool: {
+                        guid: uuidv4(),
+                        name,
+                        image: await this.uploadImage(image),
+                        maps,
+                    },
                 },
             },
         });
@@ -1198,6 +1341,22 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
+    setTournamentPoolImage = async (tournamentId, poolId, image) => {
+        const response = await this.sendRequest({
+            type: {
+                oneofKind: "setTournamentPoolImage",
+                setTournamentPoolImage: {
+                    tournamentId,
+                    poolId,
+                    poolImage: await this.uploadImage(image),
+                },
+            },
+        });
+        if (response.length <= 0) {
+            throw new Error("Server timed out");
+        }
+        return response[0].response;
+    };
     addTournamentPoolMaps = async (tournamentId, poolId, maps) => {
         const response = await this.sendRequest({
             type: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moons-ta-client",
-  "version": "1.1.14",
+  "version": "1.2.1",
   "type": "module",
   "main": "./dist/index.esm.js",
   "types": "./dist/index.d.ts",