moons-ta-client 1.1.13 → 1.2.0

package/dist/tournament-assistant-client.js

@@ -62,13 +62,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 +99,16 @@ export class TAClient extends CustomEventEmitter {
         this.token = token;
         this.client?.setToken(token);
     }
-    forwardToUsers(packet, to) {
+    sendCommand(command) {
         this.client?.send({
             token: "",
-            from: packet.from,
-            id: packet.id,
-            packet: {
-                oneofKind: "forwardingPacket",
-                forwardingPacket: {
-                    forwardTo: to,
-                    packet,
-                },
-            },
-        });
-    }
-    sendCommand(command, to) {
-        const packet = {
-            token: this.token,
             from: this.stateManager.getSelfGuid(),
             id: uuidv4(),
             packet: {
                 oneofKind: "command",
                 command,
             },
-        };
-        this.forwardToUsers(packet, to);
+        });
     }
     async sendRequest(request, to, timeout = 30000) {
         const packet = {
@@ -213,16 +193,10 @@ export class TAClient extends CustomEventEmitter {
             };
             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 +206,86 @@ 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);
+        });
     };
-    showLoadedImage = (userIds, show = true) => {
+    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 +320,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 +337,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 +355,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,
@@ -854,14 +839,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,
                 },
             },
         });
@@ -1105,6 +1090,68 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
+    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, team) => {
         const response = await this.sendRequest({
             type: {

package/package.json

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