moons-ta-client 1.1.0 → 1.1.2

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.0";
-export declare const versionCode = 110;
+export declare const version = "1.1.2";
+export declare const versionCode = 112;

package/dist/constants.js

@@ -1,4 +1,4 @@
 export const masterAddress = "server.tournamentassistant.net";
 export const masterPort = "8676";
-export const version = "1.1.0";
-export const versionCode = 110;
+export const version = "1.1.2";
+export const versionCode = 112;

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
@@ -4118,12 +4122,6 @@ interface Push {
          * @generated from protobuf field: proto.packets.Push.SongFinished song_finished = 2;
          */
         songFinished: Push_SongFinished;
-    } | {
-        oneofKind: "discordAuthorized";
-        /**
-         * @generated from protobuf field: proto.packets.Push.DiscordAuthorized discord_authorized = 3;
-         */
-        discordAuthorized: Push_DiscordAuthorized;
     } | {
         oneofKind: undefined;
     };
@@ -4186,30 +4184,7 @@ interface Push_SongFinished {
 /**
  * @generated MessageType for protobuf message proto.packets.Push.SongFinished
  */
-declare const Push_SongFinished: Push_SongFinished$Type;
-declare class Push_DiscordAuthorized$Type extends MessageType<Push_DiscordAuthorized> {
-    constructor();
-    create(value?: PartialMessage<Push_DiscordAuthorized>): Push_DiscordAuthorized;
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Push_DiscordAuthorized): Push_DiscordAuthorized;
-    internalBinaryWrite(message: Push_DiscordAuthorized, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
-}
-/**
- * @generated from protobuf message proto.packets.Push.DiscordAuthorized
- */
-interface Push_DiscordAuthorized {
-    /**
-     * @generated from protobuf field: bool success = 1;
-     */
-    success: boolean;
-    /**
-     * @generated from protobuf field: string token = 2;
-     */
-    token: string;
-}
-/**
- * @generated MessageType for protobuf message proto.packets.Push.DiscordAuthorized
- */
-declare const Push_DiscordAuthorized: Push_DiscordAuthorized$Type;
+declare const Push_SongFinished: Push_SongFinished$Type;
 
 declare class Command$Type extends MessageType<Command> {
     constructor();
@@ -4511,8 +4486,6 @@ type TAClientEvents = {
     failedToConnectToServer: {};
     disconnectedFromServer: {};
     authorizationRequestedFromServer: string;
-    authorizedWithServer: string;
-    failedToAuthorizeWithServer: {};
     loadSongRequested: [string, string, Request_LoadSong];
     songFinished: Push_SongFinished;
     realtimeScore: RealtimeScore;
@@ -4540,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>;
@@ -4610,7 +4584,7 @@ declare class TAClient extends CustomEventEmitter<TAClientEvents> {
 
 declare const masterAddress = "server.tournamentassistant.net";
 declare const masterPort = "8676";
-declare const version = "1.1.0";
-declare const versionCode = 110;
+declare const version = "1.1.2";
+declare const versionCode = 112;
 
-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_DiscordAuthorized, 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 };
+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);
@@ -14002,8 +14015,7 @@ var Push$Type = class extends MessageType {
   constructor() {
     super("proto.packets.Push", [
       { no: 1, name: "realtime_score", kind: "message", oneof: "data", T: () => RealtimeScore },
-      { no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished },
-      { no: 3, name: "discord_authorized", kind: "message", oneof: "data", T: () => Push_DiscordAuthorized }
+      { no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished }
     ]);
   }
   create(value) {
@@ -14032,13 +14044,6 @@ var Push$Type = class extends MessageType {
             songFinished: Push_SongFinished.internalBinaryRead(reader, reader.uint32(), options, message.data.songFinished)
           };
           break;
-        case /* proto.packets.Push.DiscordAuthorized discord_authorized */
-        3:
-          message.data = {
-            oneofKind: "discordAuthorized",
-            discordAuthorized: Push_DiscordAuthorized.internalBinaryRead(reader, reader.uint32(), options, message.data.discordAuthorized)
-          };
-          break;
         default:
           let u2 = options.readUnknownField;
           if (u2 === "throw")
@@ -14055,8 +14060,6 @@ var Push$Type = class extends MessageType {
       RealtimeScore.internalBinaryWrite(message.data.realtimeScore, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
     if (message.data.oneofKind === "songFinished")
       Push_SongFinished.internalBinaryWrite(message.data.songFinished, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-    if (message.data.oneofKind === "discordAuthorized")
-      Push_DiscordAuthorized.internalBinaryWrite(message.data.discordAuthorized, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
     let u2 = options.writeUnknownFields;
     if (u2 !== false)
       (u2 == true ? UnknownFieldHandler.onWrite : u2)(this.typeName, message, writer);
@@ -14212,68 +14215,6 @@ var Push_SongFinished$Type = class extends MessageType {
   }
 };
 var Push_SongFinished = new Push_SongFinished$Type();
-var Push_DiscordAuthorized$Type = class extends MessageType {
-  constructor() {
-    super("proto.packets.Push.DiscordAuthorized", [
-      {
-        no: 1,
-        name: "success",
-        kind: "scalar",
-        T: 8
-        /*ScalarType.BOOL*/
-      },
-      {
-        no: 2,
-        name: "token",
-        kind: "scalar",
-        T: 9
-        /*ScalarType.STRING*/
-      }
-    ]);
-  }
-  create(value) {
-    const message = { success: false, token: "" };
-    globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-    if (value !== void 0)
-      reflectionMergePartial(this, message, value);
-    return message;
-  }
-  internalBinaryRead(reader, length, options, target) {
-    let message = target ?? this.create(), end = reader.pos + length;
-    while (reader.pos < end) {
-      let [fieldNo, wireType] = reader.tag();
-      switch (fieldNo) {
-        case /* bool success */
-        1:
-          message.success = reader.bool();
-          break;
-        case /* string token */
-        2:
-          message.token = reader.string();
-          break;
-        default:
-          let u2 = options.readUnknownField;
-          if (u2 === "throw")
-            throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-          let d = reader.skip(wireType);
-          if (u2 !== false)
-            (u2 === true ? UnknownFieldHandler.onRead : u2)(this.typeName, message, fieldNo, wireType, d);
-      }
-    }
-    return message;
-  }
-  internalBinaryWrite(message, writer, options) {
-    if (message.success !== false)
-      writer.tag(1, WireType.Varint).bool(message.success);
-    if (message.token !== "")
-      writer.tag(2, WireType.LengthDelimited).string(message.token);
-    let u2 = options.writeUnknownFields;
-    if (u2 !== false)
-      (u2 == true ? UnknownFieldHandler.onWrite : u2)(this.typeName, message, writer);
-    return writer;
-  }
-};
-var Push_DiscordAuthorized = new Push_DiscordAuthorized$Type();
 
 // src/models/commands.ts
 init_dirname();
@@ -15184,8 +15125,8 @@ init_buffer2();
 init_process2();
 var masterAddress = "server.tournamentassistant.net";
 var masterPort = "8676";
-var version = "1.1.0";
-var versionCode = 110;
+var version = "1.1.2";
+var versionCode = 112;
 
 // src/tournament-assistant-client.ts
 var import_ws2 = __toESM(require_ws(), 1);
@@ -15281,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() {
@@ -15321,7 +15264,8 @@ var TAClient = class extends CustomEventEmitter {
           type: {
             oneofKind: "connect",
             connect: {
-              clientVersion: versionCode
+              clientVersion: versionCode,
+              uiVersion: this.uiVersion ?? 0
             }
           }
         });
@@ -15420,7 +15364,6 @@ var TAClient = class extends CustomEventEmitter {
       const addListeners = () => {
         this.on("responseReceived", onResponseReceived);
         this.on("authorizationRequestedFromServer", onAuthorizationRequested);
-        this.on("authorizedWithServer", onAuthroizedWithServer);
       };
       const removeListeners = () => {
         this.removeListener("responseReceived", onResponseReceived);
@@ -15428,7 +15371,6 @@ var TAClient = class extends CustomEventEmitter {
           "authorizationRequestedFromServer",
           onAuthorizationRequested
         );
-        this.removeListener("authorizedWithServer", onAuthroizedWithServer);
       };
       const checkResponses = () => {
         const responseUsers = responseDictionary.map((x) => x.userId);
@@ -15466,10 +15408,7 @@ var TAClient = class extends CustomEventEmitter {
       const timeout = createTimeout(3e4);
       const onAuthorizationRequested = () => {
         clearTimeout(timeout);
-        createTimeout(3e4);
-      };
-      const onAuthroizedWithServer = () => {
-        sendRequest();
+        throw "Authorization token invalid or not provided";
       };
       addListeners();
     });
@@ -15741,13 +15680,7 @@ var TAClient = class extends CustomEventEmitter {
       }
     } else if (packet.packet.oneofKind === "push") {
       const push = packet.packet.push;
-      if (push.data.oneofKind === "discordAuthorized") {
-        if (push.data.discordAuthorized.success) {
-          this.emit("authorizedWithServer", push.data.discordAuthorized.token);
-        } else {
-          this.emit("failedToAuthorizeWithServer", {});
-        }
-      } else if (push.data.oneofKind === "songFinished") {
+      if (push.data.oneofKind === "songFinished") {
         this.emit("songFinished", push.data.songFinished);
       } else if (push.data.oneofKind === "realtimeScore") {
         this.emit("realtimeScore", push.data.realtimeScore);
@@ -16465,7 +16398,6 @@ export {
   PlayerSpecificSettings_NoteJumpDurationTypeSettings,
   PlayerSpecificSettings_PlayerOptions,
   Push,
-  Push_DiscordAuthorized,
   Push_SongFinished,
   Push_SongFinished_CompletionType,
   QualifierEvent,

package/dist/models/pushes.d.ts

@@ -28,12 +28,6 @@ export interface Push {
          * @generated from protobuf field: proto.packets.Push.SongFinished song_finished = 2;
          */
         songFinished: Push_SongFinished;
-    } | {
-        oneofKind: "discordAuthorized";
-        /**
-         * @generated from protobuf field: proto.packets.Push.DiscordAuthorized discord_authorized = 3;
-         */
-        discordAuthorized: Push_DiscordAuthorized;
     } | {
         oneofKind: undefined;
     };
@@ -100,19 +94,6 @@ export declare enum Push_SongFinished_CompletionType {
      */
     Quit = 2
 }
-/**
- * @generated from protobuf message proto.packets.Push.DiscordAuthorized
- */
-export interface Push_DiscordAuthorized {
-    /**
-     * @generated from protobuf field: bool success = 1;
-     */
-    success: boolean;
-    /**
-     * @generated from protobuf field: string token = 2;
-     */
-    token: string;
-}
 declare class Push$Type extends MessageType<Push> {
     constructor();
     create(value?: PartialMessage<Push>): Push;
@@ -133,14 +114,4 @@ declare class Push_SongFinished$Type extends MessageType<Push_SongFinished> {
  * @generated MessageType for protobuf message proto.packets.Push.SongFinished
  */
 export declare const Push_SongFinished: Push_SongFinished$Type;
-declare class Push_DiscordAuthorized$Type extends MessageType<Push_DiscordAuthorized> {
-    constructor();
-    create(value?: PartialMessage<Push_DiscordAuthorized>): Push_DiscordAuthorized;
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Push_DiscordAuthorized): Push_DiscordAuthorized;
-    internalBinaryWrite(message: Push_DiscordAuthorized, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
-}
-/**
- * @generated MessageType for protobuf message proto.packets.Push.DiscordAuthorized
- */
-export declare const Push_DiscordAuthorized: Push_DiscordAuthorized$Type;
 export {};

package/dist/models/pushes.js

@@ -29,8 +29,7 @@ class Push$Type extends MessageType {
     constructor() {
         super("proto.packets.Push", [
             { no: 1, name: "realtime_score", kind: "message", oneof: "data", T: () => RealtimeScore },
-            { no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished },
-            { no: 3, name: "discord_authorized", kind: "message", oneof: "data", T: () => Push_DiscordAuthorized }
+            { no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished }
         ]);
     }
     create(value) {
@@ -57,12 +56,6 @@ class Push$Type extends MessageType {
                         songFinished: Push_SongFinished.internalBinaryRead(reader, reader.uint32(), options, message.data.songFinished)
                     };
                     break;
-                case /* proto.packets.Push.DiscordAuthorized discord_authorized */ 3:
-                    message.data = {
-                        oneofKind: "discordAuthorized",
-                        discordAuthorized: Push_DiscordAuthorized.internalBinaryRead(reader, reader.uint32(), options, message.data.discordAuthorized)
-                    };
-                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -81,9 +74,6 @@ class Push$Type extends MessageType {
         /* proto.packets.Push.SongFinished song_finished = 2; */
         if (message.data.oneofKind === "songFinished")
             Push_SongFinished.internalBinaryWrite(message.data.songFinished, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
-        /* proto.packets.Push.DiscordAuthorized discord_authorized = 3; */
-        if (message.data.oneofKind === "discordAuthorized")
-            Push_DiscordAuthorized.internalBinaryWrite(message.data.discordAuthorized, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -204,57 +194,3 @@ class Push_SongFinished$Type extends MessageType {
  * @generated MessageType for protobuf message proto.packets.Push.SongFinished
  */
 export const Push_SongFinished = new Push_SongFinished$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class Push_DiscordAuthorized$Type extends MessageType {
-    constructor() {
-        super("proto.packets.Push.DiscordAuthorized", [
-            { no: 1, name: "success", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "token", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value) {
-        const message = { success: false, token: "" };
-        globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-        if (value !== undefined)
-            reflectionMergePartial(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader, length, options, target) {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* bool success */ 1:
-                    message.success = reader.bool();
-                    break;
-                case /* string token */ 2:
-                    message.token = reader.string();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message, writer, options) {
-        /* bool success = 1; */
-        if (message.success !== false)
-            writer.tag(1, WireType.Varint).bool(message.success);
-        /* string token = 2; */
-        if (message.token !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.token);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message proto.packets.Push.DiscordAuthorized
- */
-export const Push_DiscordAuthorized = new Push_DiscordAuthorized$Type();

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

@@ -16,8 +16,6 @@ type TAClientEvents = {
     failedToConnectToServer: {};
     disconnectedFromServer: {};
     authorizationRequestedFromServer: string;
-    authorizedWithServer: string;
-    failedToAuthorizeWithServer: {};
     loadSongRequested: [string, string, Request_LoadSong];
     songFinished: Push_SongFinished;
     realtimeScore: RealtimeScore;
@@ -45,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>;

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
                         },
                     },
                 });
@@ -142,12 +145,10 @@ export class TAClient extends CustomEventEmitter {
             const addListeners = () => {
                 this.on("responseReceived", onResponseReceived);
                 this.on("authorizationRequestedFromServer", onAuthorizationRequested);
-                this.on("authorizedWithServer", onAuthroizedWithServer);
             };
             const removeListeners = () => {
                 this.removeListener("responseReceived", onResponseReceived);
                 this.removeListener("authorizationRequestedFromServer", onAuthorizationRequested);
-                this.removeListener("authorizedWithServer", onAuthroizedWithServer);
             };
             // Check that we got responses from all expected users
             const checkResponses = () => {
@@ -188,16 +189,11 @@ export class TAClient extends CustomEventEmitter {
                 }, time);
             };
             const timeout = createTimeout(30000);
-            // If authorization is requested, we're assuming an external application will handle
-            // resetting the auth token, so we'll extend the timeout by 30 seconds and try again
-            // if a successful auth is noticed
+            // If authorization is requested, we're assuming an external application failed
+            // to provide a valid token, so we will combust
             const onAuthorizationRequested = () => {
                 clearTimeout(timeout);
-                createTimeout(30000);
-            };
-            // Retry on successful authorization
-            const onAuthroizedWithServer = () => {
-                sendRequest();
+                throw "Authorization token invalid or not provided";
             };
             addListeners();
         });
@@ -488,15 +484,7 @@ export class TAClient extends CustomEventEmitter {
         }
         else if (packet.packet.oneofKind === "push") {
             const push = packet.packet.push;
-            if (push.data.oneofKind === "discordAuthorized") {
-                if (push.data.discordAuthorized.success) {
-                    this.emit("authorizedWithServer", push.data.discordAuthorized.token);
-                }
-                else {
-                    this.emit("failedToAuthorizeWithServer", {});
-                }
-            }
-            else if (push.data.oneofKind === "songFinished") {
+            if (push.data.oneofKind === "songFinished") {
                 this.emit("songFinished", push.data.songFinished);
             }
             else if (push.data.oneofKind === "realtimeScore") {

package/package.json

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