moons-ta-client 1.1.3 → 1.1.5

package/dist/models/responses.d.ts

@@ -156,11 +156,11 @@ export interface Response {
          */
         preloadImageForStreamSync: Response_PreloadImageForStreamSync;
     } | {
-        oneofKind: "showModal";
+        oneofKind: "showPrompt";
         /**
-         * @generated from protobuf field: proto.packets.Response.ShowModal show_modal = 19;
+         * @generated from protobuf field: proto.packets.Response.ShowPrompt show_prompt = 19;
          */
-        showModal: Response_ShowModal;
+        showPrompt: Response_ShowPrompt;
     } | {
         oneofKind: "remainingAttempts";
         /**
@@ -512,13 +512,13 @@ export interface Response_PreloadImageForStreamSync {
     fileId: string;
 }
 /**
- * @generated from protobuf message proto.packets.Response.ShowModal
+ * @generated from protobuf message proto.packets.Response.ShowPrompt
  */
-export interface Response_ShowModal {
+export interface Response_ShowPrompt {
     /**
-     * @generated from protobuf field: string modal_id = 1;
+     * @generated from protobuf field: string prompt_id = 1;
      */
-    modalId: string;
+    promptId: string;
     /**
      * @generated from protobuf field: string value = 2;
      */
@@ -776,16 +776,16 @@ declare class Response_PreloadImageForStreamSync$Type extends MessageType<Respon
  * @generated MessageType for protobuf message proto.packets.Response.PreloadImageForStreamSync
  */
 export declare const Response_PreloadImageForStreamSync: Response_PreloadImageForStreamSync$Type;
-declare class Response_ShowModal$Type extends MessageType<Response_ShowModal> {
+declare class Response_ShowPrompt$Type extends MessageType<Response_ShowPrompt> {
     constructor();
-    create(value?: PartialMessage<Response_ShowModal>): Response_ShowModal;
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Response_ShowModal): Response_ShowModal;
-    internalBinaryWrite(message: Response_ShowModal, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
+    create(value?: PartialMessage<Response_ShowPrompt>): Response_ShowPrompt;
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Response_ShowPrompt): Response_ShowPrompt;
+    internalBinaryWrite(message: Response_ShowPrompt, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
 }
 /**
- * @generated MessageType for protobuf message proto.packets.Response.ShowModal
+ * @generated MessageType for protobuf message proto.packets.Response.ShowPrompt
  */
-export declare const Response_ShowModal: Response_ShowModal$Type;
+export declare const Response_ShowPrompt: Response_ShowPrompt$Type;
 declare class Response_RemainingAttempts$Type extends MessageType<Response_RemainingAttempts> {
     constructor();
     create(value?: PartialMessage<Response_RemainingAttempts>): Response_RemainingAttempts;

package/dist/models/responses.js

@@ -72,7 +72,7 @@ class Response$Type extends MessageType {
             { no: 16, name: "leaderboard_entries", kind: "message", oneof: "details", T: () => Response_LeaderboardEntries },
             { no: 17, name: "load_song", kind: "message", oneof: "details", T: () => Response_LoadSong },
             { no: 18, name: "preload_image_for_stream_sync", kind: "message", oneof: "details", T: () => Response_PreloadImageForStreamSync },
-            { no: 19, name: "show_modal", kind: "message", oneof: "details", T: () => Response_ShowModal },
+            { no: 19, name: "show_prompt", kind: "message", oneof: "details", T: () => Response_ShowPrompt },
             { no: 20, name: "remaining_attempts", kind: "message", oneof: "details", T: () => Response_RemainingAttempts }
         ]);
     }
@@ -220,10 +220,10 @@ class Response$Type extends MessageType {
                         preloadImageForStreamSync: Response_PreloadImageForStreamSync.internalBinaryRead(reader, reader.uint32(), options, message.details.preloadImageForStreamSync)
                     };
                     break;
-                case /* proto.packets.Response.ShowModal show_modal */ 19:
+                case /* proto.packets.Response.ShowPrompt show_prompt */ 19:
                     message.details = {
-                        oneofKind: "showModal",
-                        showModal: Response_ShowModal.internalBinaryRead(reader, reader.uint32(), options, message.details.showModal)
+                        oneofKind: "showPrompt",
+                        showPrompt: Response_ShowPrompt.internalBinaryRead(reader, reader.uint32(), options, message.details.showPrompt)
                     };
                     break;
                 case /* proto.packets.Response.RemainingAttempts remaining_attempts */ 20:
@@ -313,9 +313,9 @@ class Response$Type extends MessageType {
         /* proto.packets.Response.PreloadImageForStreamSync preload_image_for_stream_sync = 18; */
         if (message.details.oneofKind === "preloadImageForStreamSync")
             Response_PreloadImageForStreamSync.internalBinaryWrite(message.details.preloadImageForStreamSync, writer.tag(18, WireType.LengthDelimited).fork(), options).join();
-        /* proto.packets.Response.ShowModal show_modal = 19; */
-        if (message.details.oneofKind === "showModal")
-            Response_ShowModal.internalBinaryWrite(message.details.showModal, writer.tag(19, WireType.LengthDelimited).fork(), options).join();
+        /* proto.packets.Response.ShowPrompt show_prompt = 19; */
+        if (message.details.oneofKind === "showPrompt")
+            Response_ShowPrompt.internalBinaryWrite(message.details.showPrompt, writer.tag(19, WireType.LengthDelimited).fork(), options).join();
         /* proto.packets.Response.RemainingAttempts remaining_attempts = 20; */
         if (message.details.oneofKind === "remainingAttempts")
             Response_RemainingAttempts.internalBinaryWrite(message.details.remainingAttempts, writer.tag(20, WireType.LengthDelimited).fork(), options).join();
@@ -1574,15 +1574,15 @@ class Response_PreloadImageForStreamSync$Type extends MessageType {
  */
 export const Response_PreloadImageForStreamSync = new Response_PreloadImageForStreamSync$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class Response_ShowModal$Type extends MessageType {
+class Response_ShowPrompt$Type extends MessageType {
     constructor() {
-        super("proto.packets.Response.ShowModal", [
-            { no: 1, name: "modal_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+        super("proto.packets.Response.ShowPrompt", [
+            { no: 1, name: "prompt_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 2, name: "value", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
     create(value) {
-        const message = { modalId: "", value: "" };
+        const message = { promptId: "", value: "" };
         globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
         if (value !== undefined)
             reflectionMergePartial(this, message, value);
@@ -1593,8 +1593,8 @@ class Response_ShowModal$Type extends MessageType {
         while (reader.pos < end) {
             let [fieldNo, wireType] = reader.tag();
             switch (fieldNo) {
-                case /* string modal_id */ 1:
-                    message.modalId = reader.string();
+                case /* string prompt_id */ 1:
+                    message.promptId = reader.string();
                     break;
                 case /* string value */ 2:
                     message.value = reader.string();
@@ -1611,9 +1611,9 @@ class Response_ShowModal$Type extends MessageType {
         return message;
     }
     internalBinaryWrite(message, writer, options) {
-        /* string modal_id = 1; */
-        if (message.modalId !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.modalId);
+        /* string prompt_id = 1; */
+        if (message.promptId !== "")
+            writer.tag(1, WireType.LengthDelimited).string(message.promptId);
         /* string value = 2; */
         if (message.value !== "")
             writer.tag(2, WireType.LengthDelimited).string(message.value);
@@ -1624,9 +1624,9 @@ class Response_ShowModal$Type extends MessageType {
     }
 }
 /**
- * @generated MessageType for protobuf message proto.packets.Response.ShowModal
+ * @generated MessageType for protobuf message proto.packets.Response.ShowPrompt
  */
-export const Response_ShowModal = new Response_ShowModal$Type();
+export const Response_ShowPrompt = new Response_ShowPrompt$Type();
 // @generated message type with reflection information, may provide speed optimized methods
 class Response_RemainingAttempts$Type extends MessageType {
     constructor() {

package/dist/tournament-assistant-client.d.ts

@@ -2,7 +2,7 @@ import { CustomEventEmitter } from "./custom-event-emitter.js";
 import { User, Match, QualifierEvent, CoreServer, Tournament, GameplayParameters, Map, QualifierEvent_EventSettings, QualifierEvent_LeaderboardSort, Tournament_TournamentSettings_Team, Tournament_TournamentSettings_Pool, Permissions, RealtimeScore } from "./models/models.js";
 import { StateManager } from "./state-manager.js";
 import { Response, Response_Connect } from "./models/responses.js";
-import { Request_LoadSong } from "./models/requests.js";
+import { Request_LoadSong, Request_ShowPrompt_PromptOption } from "./models/requests.js";
 import { Channel, Push_SongFinished } from "./models/index.js";
 export * from "./scraper.js";
 export * from "./models/models.js";
@@ -66,6 +66,7 @@ export declare class TAClient extends CustomEventEmitter<TAClientEvents> {
     getLeaderboard: (tournamentId: string, qualifierId: string, mapId: string) => Promise<Response>;
     loadSong: (levelId: string, userIds: string[], timeout?: number) => Promise<ResponseFromUser[]>;
     loadImage: (bitmap: Uint8Array, userIds: string[]) => Promise<ResponseFromUser[]>;
+    showPrompt: (userIds: string[], titleText: string, bodyText: string, canClose: boolean, options: Request_ShowPrompt_PromptOption[], timer?: number) => Promise<ResponseFromUser[]>;
     private handlePacket;
     updateUser: (tournamentId: string, user: User) => Promise<Response>;
     createMatch: (tournamentId: string, match: Match) => Promise<Response>;

package/dist/tournament-assistant-client.js

@@ -166,16 +166,6 @@ export class TAClient extends CustomEventEmitter {
                 }
                 return waitingForUsers;
             };
-            // Check that we got responses from all expected users
-            const checkResponses = () => {
-                const waitingForUsers = getUnrespondedUsers();
-                if (waitingForUsers.length === 0) {
-                    // All responses are received, clean up and resolve
-                    removeListeners();
-                    clearTimeout(timeoutTimer);
-                    resolve(responseDictionary);
-                }
-            };
             // Add to the dictionary when the response is to this packet, and from an expected user
             const onResponseReceived = (response) => {
                 const expectedUsers = to ?? ["00000000-0000-0000-0000-000000000000"]; // If we didn't forward this to any users, we should expect a response from the server
@@ -185,7 +175,12 @@ export class TAClient extends CustomEventEmitter {
                         userId: response.userId,
                         response: response.response,
                     });
-                    checkResponses();
+                    if (getUnrespondedUsers().length === 0) {
+                        // All responses are received, clean up and resolve
+                        removeListeners();
+                        clearTimeout(timeoutTimer);
+                        resolve(responseDictionary);
+                    }
                 }
             };
             // Return what we have after 30 seconds, inject errors for users that haven't responded yet
@@ -218,15 +213,12 @@ export class TAClient extends CustomEventEmitter {
             addListeners();
         });
         // Assume forwardToUsers emits the 'responseReceived' event asynchronously
-        const sendRequest = () => {
-            if (to) {
-                this.forwardToUsers(packet, to);
-            }
-            else {
-                this.client?.send(packet, to);
-            }
-        };
-        sendRequest();
+        if (to) {
+            this.forwardToUsers(packet, to);
+        }
+        else {
+            this.client?.send(packet, to);
+        }
         return responsesPromise;
     }
     async sendResponse(response, to) {
@@ -344,6 +336,26 @@ export class TAClient extends CustomEventEmitter {
         }
         return response;
     };
+    showPrompt = async (userIds, titleText, bodyText, canClose, options, timer) => {
+        const response = await this.sendRequest({
+            type: {
+                oneofKind: "showPrompt",
+                showPrompt: {
+                    promptId: uuidv4(),
+                    messageTitle: titleText,
+                    messageText: bodyText,
+                    showTimer: !!timer,
+                    timeout: timer ?? 0,
+                    canClose: canClose,
+                    options
+                },
+            },
+        }, userIds, timer ? timer * 1000 : timer);
+        if (response.length <= 0) {
+            throw new Error("Server timed out, or no users responded");
+        }
+        return response;
+    };
     // --- Packet Handler --- //
     handlePacket = (packet) => {
         this.stateManager.handlePacket(packet);

package/package.json

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