moons-ta-client 1.1.1 → 1.1.3

package/dist/constants.d.ts

@@ -1,4 +1,4 @@
 export declare const masterAddress = "server.tournamentassistant.net";
 export declare const masterPort = "8676";
-export declare const version = "1.1.1";
-export declare const versionCode = 111;
+export declare const version = "1.1.3";
+export declare const versionCode = 113;

package/dist/constants.js

@@ -1,4 +1,4 @@
 export const masterAddress = "server.tournamentassistant.net";
 export const masterPort = "8676";
-export const version = "1.1.1";
-export const versionCode = 111;
+export const version = "1.1.3";
+export const versionCode = 113;

package/dist/index.d.ts

@@ -3875,6 +3875,10 @@ interface Request_Connect {
      * @generated from protobuf field: int32 client_version = 1;
      */
     clientVersion: number;
+    /**
+     * @generated from protobuf field: int32 ui_version = 2;
+     */
+    uiVersion: number;
 }
 /**
  * @generated MessageType for protobuf message proto.packets.Request.Connect
@@ -4509,11 +4513,12 @@ type TAClientEvents = {
 };
 declare class TAClient extends CustomEventEmitter<TAClientEvents> {
     stateManager: StateManager;
+    private uiVersion;
     private client?;
     private token;
     private shouldHeartbeat;
     private heartbeatInterval;
-    constructor();
+    constructor(uiVersion?: number | undefined);
     get isConnected(): boolean;
     get isConnecting(): boolean;
     connect(serverAddress: string, port: string): Promise<Response>;
@@ -4529,7 +4534,7 @@ declare class TAClient extends CustomEventEmitter<TAClientEvents> {
     delayTestFinished: (userIds: string[]) => void;
     joinTournament: (tournamentId: string) => Promise<Response>;
     getLeaderboard: (tournamentId: string, qualifierId: string, mapId: string) => Promise<Response>;
-    loadSong: (levelId: string, userIds: string[]) => Promise<ResponseFromUser[]>;
+    loadSong: (levelId: string, userIds: string[], timeout?: number) => Promise<ResponseFromUser[]>;
     loadImage: (bitmap: Uint8Array, userIds: string[]) => Promise<ResponseFromUser[]>;
     private handlePacket;
     updateUser: (tournamentId: string, user: User) => Promise<Response>;
@@ -4579,7 +4584,7 @@ declare class TAClient extends CustomEventEmitter<TAClientEvents> {
 
 declare const masterAddress = "server.tournamentassistant.net";
 declare const masterPort = "8676";
-declare const version = "1.1.1";
-declare const versionCode = 111;
+declare const version = "1.1.3";
+declare const versionCode = 113;
 
 export { Acknowledgement, Acknowledgement_AcknowledgementType, Beatmap, Channel, Characteristic, Command, Command_PlaySong, Command_SendBotMessage, CoreServer, CustomEventEmitter, DiscordUser, Event, Event_MatchCreated, Event_MatchDeleted, Event_MatchUpdated, Event_QualifierCreated, Event_QualifierDeleted, Event_QualifierUpdated, Event_ServerAdded, Event_ServerDeleted, Event_TournamentCreated, Event_TournamentDeleted, Event_TournamentUpdated, Event_UserAdded, Event_UserLeft, Event_UserUpdated, ForwardingPacket, GameplayModifiers, GameplayModifiers_GameOptions, GameplayParameters, Guild, LeaderboardEntry, Map, Match, ModalOption, Packet, Permissions, PlayerSpecificSettings, PlayerSpecificSettings_ArcVisibilityType, PlayerSpecificSettings_NoteJumpDurationTypeSettings, PlayerSpecificSettings_PlayerOptions, Push, Push_SongFinished, Push_SongFinished_CompletionType, QualifierEvent, QualifierEvent_EventSettings, QualifierEvent_LeaderboardSort, RealtimeScore, Request, Request_AddAuthorizedUser, Request_AddAuthorizedUserPermission, Request_AddQualifierMaps, Request_AddServer, Request_AddTournamentPool, Request_AddTournamentPoolMaps, Request_AddTournamentTeam, Request_AddUserToMatch, Request_Connect, Request_CreateMatch, Request_CreateQualifierEvent, Request_CreateTournament, Request_DeleteMatch, Request_DeleteQualifierEvent, Request_DeleteTournament, Request_GetAuthorizedUsers, Request_GetDiscordInfo, Request_Join, Request_LoadSong, Request_PreloadImageForStreamSync, Request_QualifierScores, Request_RemainingAttempts, Request_RemoveAuthorizedUser, Request_RemoveAuthorizedUserPermission, Request_RemoveQualifierMap, Request_RemoveTournamentPool, Request_RemoveTournamentPoolMap, Request_RemoveTournamentTeam, Request_RemoveUserFromMatch, Request_SetMatchLeader, Request_SetMatchMap, Request_SetQualifierFlags, Request_SetQualifierImage, Request_SetQualifierInfoChannel, Request_SetQualifierLeaderboardSort, Request_SetQualifierName, Request_SetTournamentAllowUnauthorizedView, Request_SetTournamentBannedMods, Request_SetTournamentEnablePools, Request_SetTournamentEnableTeams, Request_SetTournamentImage, Request_SetTournamentName, Request_SetTournamentPoolName, Request_SetTournamentScoreUpdateFrequency, Request_SetTournamentShowQualifierButton, Request_SetTournamentShowTournamentButton, Request_SetTournamentTeamImage, Request_SetTournamentTeamName, Request_ShowModal, Request_SubmitQualifierScore, Request_UpdateQualifierMap, Request_UpdateTournamentPoolMap, Request_UpdateUser, Response, type ResponseFromUser, Response_AddAuthorizedUser, Response_AddServer, Response_Connect, Response_Connect_ConnectFailReason, Response_CreateMatch, Response_CreateQualifierEvent, Response_CreateTournament, Response_DeleteMatch, Response_DeleteQualifierEvent, Response_DeleteTournament, Response_GetAuthorizedUsers, Response_GetAuthorizedUsers_AuthroizedUser, Response_GetDiscordInfo, Response_Join, Response_Join_JoinFailReason, Response_LeaderboardEntries, Response_LoadSong, Response_PreloadImageForStreamSync, Response_RemainingAttempts, Response_RemoveAuthorizedUser, Response_ResponseType, Response_ShowModal, Response_UpdateAuthorizedUser, Response_UpdateMatch, Response_UpdateQualifierEvent, Response_UpdateTournament, Response_UpdateUser, ScoreTrackerHand, State, TAClient, Tournament, Tournament_TournamentSettings, Tournament_TournamentSettings_Pool, Tournament_TournamentSettings_Team, User, User_ClientTypes, User_DiscordInfo, User_DownloadStates, User_PlayStates, User_Point, getTournaments, masterAddress, masterPort, version, versionCode };

package/dist/index.esm.js

@@ -13433,11 +13433,18 @@ var Request_Connect$Type = class extends MessageType {
         kind: "scalar",
         T: 5
         /*ScalarType.INT32*/
+      },
+      {
+        no: 2,
+        name: "ui_version",
+        kind: "scalar",
+        T: 5
+        /*ScalarType.INT32*/
       }
     ]);
   }
   create(value) {
-    const message = { clientVersion: 0 };
+    const message = { clientVersion: 0, uiVersion: 0 };
     globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
     if (value !== void 0)
       reflectionMergePartial(this, message, value);
@@ -13452,6 +13459,10 @@ var Request_Connect$Type = class extends MessageType {
         1:
           message.clientVersion = reader.int32();
           break;
+        case /* int32 ui_version */
+        2:
+          message.uiVersion = reader.int32();
+          break;
         default:
           let u2 = options.readUnknownField;
           if (u2 === "throw")
@@ -13466,6 +13477,8 @@ var Request_Connect$Type = class extends MessageType {
   internalBinaryWrite(message, writer, options) {
     if (message.clientVersion !== 0)
       writer.tag(1, WireType.Varint).int32(message.clientVersion);
+    if (message.uiVersion !== 0)
+      writer.tag(2, WireType.Varint).int32(message.uiVersion);
     let u2 = options.writeUnknownFields;
     if (u2 !== false)
       (u2 == true ? UnknownFieldHandler.onWrite : u2)(this.typeName, message, writer);
@@ -15112,8 +15125,8 @@ init_buffer2();
 init_process2();
 var masterAddress = "server.tournamentassistant.net";
 var masterPort = "8676";
-var version = "1.1.1";
-var versionCode = 111;
+var version = "1.1.3";
+var versionCode = 113;
 
 // src/tournament-assistant-client.ts
 var import_ws2 = __toESM(require_ws(), 1);
@@ -15209,13 +15222,15 @@ var Scraper = class extends CustomEventEmitter {
 // src/tournament-assistant-client.ts
 var TAClient = class extends CustomEventEmitter {
   stateManager;
+  uiVersion;
   client;
   token = "";
   shouldHeartbeat = false;
   heartbeatInterval;
-  constructor() {
+  constructor(uiVersion = void 0) {
     super();
     this.stateManager = new StateManager();
+    this.uiVersion = uiVersion;
   }
   // --- State helpers --- //
   get isConnected() {
@@ -15249,7 +15264,8 @@ var TAClient = class extends CustomEventEmitter {
           type: {
             oneofKind: "connect",
             connect: {
-              clientVersion: versionCode
+              clientVersion: versionCode,
+              uiVersion: this.uiVersion ?? 0
             }
           }
         });
@@ -15332,7 +15348,7 @@ var TAClient = class extends CustomEventEmitter {
     };
     this.forwardToUsers(packet, to);
   }
-  async sendRequest(request, to) {
+  async sendRequest(request, to, timeout = 3e4) {
     const packet = {
       token: "",
       // Overridden in this.send()
@@ -15356,22 +15372,29 @@ var TAClient = class extends CustomEventEmitter {
           onAuthorizationRequested
         );
       };
-      const checkResponses = () => {
+      const getUnrespondedUsers = () => {
         const responseUsers = responseDictionary.map((x) => x.userId);
         const expectedUsers = to ?? ["00000000-0000-0000-0000-000000000000"];
-        if (responseUsers.length !== expectedUsers.length) {
-          return;
+        if (responseUsers.length === expectedUsers.length) {
+          return [];
         }
         const sortedArr1 = responseUsers.slice().sort();
         const sortedArr2 = expectedUsers.slice().sort();
-        for (let i2 = 0; i2 < sortedArr1.length; i2++) {
-          if (sortedArr1[i2] !== sortedArr2[i2]) {
-            return;
+        let waitingForUsers = [];
+        for (let i2 = 0; i2 < sortedArr2.length; i2++) {
+          if (i2 > sortedArr1.length || sortedArr2[i2] !== sortedArr1[i2]) {
+            waitingForUsers.push(sortedArr2[i2]);
           }
         }
-        removeListeners();
-        clearTimeout(timeout);
-        resolve(responseDictionary);
+        return waitingForUsers;
+      };
+      const checkResponses = () => {
+        const waitingForUsers = getUnrespondedUsers();
+        if (waitingForUsers.length === 0) {
+          removeListeners();
+          clearTimeout(timeoutTimer);
+          resolve(responseDictionary);
+        }
       };
       const onResponseReceived = (response) => {
         const expectedUsers = to ?? ["00000000-0000-0000-0000-000000000000"];
@@ -15385,13 +15408,26 @@ var TAClient = class extends CustomEventEmitter {
       };
       const createTimeout = (time) => {
         return setTimeout(() => {
+          const unrespondedUsers = getUnrespondedUsers();
+          for (let user of unrespondedUsers) {
+            responseDictionary.push({
+              userId: user,
+              response: {
+                type: 0 /* Fail */,
+                respondingToPacketId: packet.id,
+                details: {
+                  oneofKind: void 0
+                }
+              }
+            });
+          }
           removeListeners();
           resolve(responseDictionary);
         }, time);
       };
-      const timeout = createTimeout(3e4);
+      const timeoutTimer = createTimeout(timeout);
       const onAuthorizationRequested = () => {
-        clearTimeout(timeout);
+        clearTimeout(timeoutTimer);
         throw "Authorization token invalid or not provided";
       };
       addListeners();
@@ -15491,7 +15527,7 @@ var TAClient = class extends CustomEventEmitter {
     }
     return response[0].response;
   };
-  loadSong = async (levelId, userIds) => {
+  loadSong = async (levelId, userIds, timeout) => {
     const response = await this.sendRequest({
       type: {
         oneofKind: "loadSong",
@@ -15500,7 +15536,7 @@ var TAClient = class extends CustomEventEmitter {
           customHostUrl: ""
         }
       }
-    }, userIds);
+    }, userIds, timeout);
     if (response.length <= 0) {
       throw new Error("Server timed out, or no users responded");
     }

package/dist/models/requests.d.ts

@@ -1027,6 +1027,10 @@ export interface Request_Connect {
      * @generated from protobuf field: int32 client_version = 1;
      */
     clientVersion: number;
+    /**
+     * @generated from protobuf field: int32 ui_version = 2;
+     */
+    uiVersion: number;
 }
 /**
  * @generated from protobuf message proto.packets.Request.Join

package/dist/models/requests.js

@@ -3148,11 +3148,12 @@ export const Request_AddServer = new Request_AddServer$Type();
 class Request_Connect$Type extends MessageType {
     constructor() {
         super("proto.packets.Request.Connect", [
-            { no: 1, name: "client_version", kind: "scalar", T: 5 /*ScalarType.INT32*/ }
+            { no: 1, name: "client_version", kind: "scalar", T: 5 /*ScalarType.INT32*/ },
+            { no: 2, name: "ui_version", kind: "scalar", T: 5 /*ScalarType.INT32*/ }
         ]);
     }
     create(value) {
-        const message = { clientVersion: 0 };
+        const message = { clientVersion: 0, uiVersion: 0 };
         globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
         if (value !== undefined)
             reflectionMergePartial(this, message, value);
@@ -3166,6 +3167,9 @@ class Request_Connect$Type extends MessageType {
                 case /* int32 client_version */ 1:
                     message.clientVersion = reader.int32();
                     break;
+                case /* int32 ui_version */ 2:
+                    message.uiVersion = reader.int32();
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -3181,6 +3185,9 @@ class Request_Connect$Type extends MessageType {
         /* int32 client_version = 1; */
         if (message.clientVersion !== 0)
             writer.tag(1, WireType.Varint).int32(message.clientVersion);
+        /* int32 ui_version = 2; */
+        if (message.uiVersion !== 0)
+            writer.tag(2, WireType.Varint).int32(message.uiVersion);
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);

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

@@ -43,11 +43,12 @@ type TAClientEvents = {
 };
 export declare class TAClient extends CustomEventEmitter<TAClientEvents> {
     stateManager: StateManager;
+    private uiVersion;
     private client?;
     private token;
     private shouldHeartbeat;
     private heartbeatInterval;
-    constructor();
+    constructor(uiVersion?: number | undefined);
     get isConnected(): boolean;
     get isConnecting(): boolean;
     connect(serverAddress: string, port: string): Promise<Response>;
@@ -63,7 +64,7 @@ export declare class TAClient extends CustomEventEmitter<TAClientEvents> {
     delayTestFinished: (userIds: string[]) => void;
     joinTournament: (tournamentId: string) => Promise<Response>;
     getLeaderboard: (tournamentId: string, qualifierId: string, mapId: string) => Promise<Response>;
-    loadSong: (levelId: string, userIds: string[]) => Promise<ResponseFromUser[]>;
+    loadSong: (levelId: string, userIds: string[], timeout?: number) => Promise<ResponseFromUser[]>;
     loadImage: (bitmap: Uint8Array, userIds: string[]) => Promise<ResponseFromUser[]>;
     private handlePacket;
     updateUser: (tournamentId: string, user: User) => Promise<Response>;

package/dist/tournament-assistant-client.js

@@ -10,13 +10,15 @@ export * from "./scraper.js";
 export * from "./models/models.js";
 export class TAClient extends CustomEventEmitter {
     stateManager;
+    uiVersion;
     client;
     token = "";
     shouldHeartbeat = false;
     heartbeatInterval;
-    constructor() {
+    constructor(uiVersion = undefined) {
         super();
         this.stateManager = new StateManager();
+        this.uiVersion = uiVersion;
     }
     // --- State helpers --- //
     get isConnected() {
@@ -48,6 +50,7 @@ export class TAClient extends CustomEventEmitter {
                         oneofKind: "connect",
                         connect: {
                             clientVersion: versionCode,
+                            uiVersion: this.uiVersion ?? 0
                         },
                     },
                 });
@@ -126,7 +129,7 @@ export class TAClient extends CustomEventEmitter {
         };
         this.forwardToUsers(packet, to);
     }
-    async sendRequest(request, to) {
+    async sendRequest(request, to, timeout = 30000) {
         const packet = {
             token: "",
             from: this.stateManager.getSelfGuid(),
@@ -147,24 +150,31 @@ export class TAClient extends CustomEventEmitter {
                 this.removeListener("responseReceived", onResponseReceived);
                 this.removeListener("authorizationRequestedFromServer", onAuthorizationRequested);
             };
-            // Check that we got responses from all expected users
-            const checkResponses = () => {
+            const getUnrespondedUsers = () => {
                 const responseUsers = responseDictionary.map((x) => x.userId);
                 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
-                if (responseUsers.length !== expectedUsers.length) {
-                    return;
+                if (responseUsers.length === expectedUsers.length) {
+                    return [];
                 }
                 const sortedArr1 = responseUsers.slice().sort();
                 const sortedArr2 = expectedUsers.slice().sort();
-                for (let i = 0; i < sortedArr1.length; i++) {
-                    if (sortedArr1[i] !== sortedArr2[i]) {
-                        return;
+                let waitingForUsers = [];
+                for (let i = 0; i < sortedArr2.length; i++) {
+                    if (i > sortedArr1.length || sortedArr2[i] !== sortedArr1[i]) {
+                        waitingForUsers.push(sortedArr2[i]);
                     }
                 }
-                // All responses are received, clean up and resolve
-                removeListeners();
-                clearTimeout(timeout);
-                resolve(responseDictionary);
+                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) => {
@@ -178,18 +188,31 @@ export class TAClient extends CustomEventEmitter {
                     checkResponses();
                 }
             };
-            // Return what we have after 5 seconds
+            // Return what we have after 30 seconds, inject errors for users that haven't responded yet
             const createTimeout = (time) => {
                 return setTimeout(() => {
+                    const unrespondedUsers = getUnrespondedUsers();
+                    for (let user of unrespondedUsers) {
+                        responseDictionary.push({
+                            userId: user,
+                            response: {
+                                type: Response_ResponseType.Fail,
+                                respondingToPacketId: packet.id,
+                                details: {
+                                    oneofKind: undefined
+                                }
+                            },
+                        });
+                    }
                     removeListeners();
                     resolve(responseDictionary);
                 }, time);
             };
-            const timeout = createTimeout(30000);
+            const timeoutTimer = createTimeout(timeout);
             // If authorization is requested, we're assuming an external application failed
             // to provide a valid token, so we will combust
             const onAuthorizationRequested = () => {
-                clearTimeout(timeout);
+                clearTimeout(timeoutTimer);
                 throw "Authorization token invalid or not provided";
             };
             addListeners();
@@ -290,7 +313,7 @@ export class TAClient extends CustomEventEmitter {
         }
         return response[0].response;
     };
-    loadSong = async (levelId, userIds) => {
+    loadSong = async (levelId, userIds, timeout) => {
         const response = await this.sendRequest({
             type: {
                 oneofKind: "loadSong",
@@ -299,7 +322,7 @@ export class TAClient extends CustomEventEmitter {
                     customHostUrl: ""
                 },
             },
-        }, userIds);
+        }, userIds, timeout);
         if (response.length <= 0) {
             throw new Error("Server timed out, or no users responded");
         }

package/package.json

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