moons-ta-client 1.1.0 → 1.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.d.ts +2 -2
- package/dist/constants.js +2 -2
- package/dist/index.d.ts +4 -35
- package/dist/index.esm.js +5 -89
- package/dist/models/pushes.d.ts +0 -29
- package/dist/models/pushes.js +1 -65
- package/dist/tournament-assistant-client.d.ts +0 -2
- package/dist/tournament-assistant-client.js +4 -19
- package/package.json +1 -1
package/dist/constants.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const masterAddress = "server.tournamentassistant.net";
|
|
2
2
|
export declare const masterPort = "8676";
|
|
3
|
-
export declare const version = "1.1.
|
|
4
|
-
export declare const versionCode =
|
|
3
|
+
export declare const version = "1.1.1";
|
|
4
|
+
export declare const versionCode = 111;
|
package/dist/constants.js
CHANGED
package/dist/index.d.ts
CHANGED
|
@@ -4118,12 +4118,6 @@ interface Push {
|
|
|
4118
4118
|
* @generated from protobuf field: proto.packets.Push.SongFinished song_finished = 2;
|
|
4119
4119
|
*/
|
|
4120
4120
|
songFinished: Push_SongFinished;
|
|
4121
|
-
} | {
|
|
4122
|
-
oneofKind: "discordAuthorized";
|
|
4123
|
-
/**
|
|
4124
|
-
* @generated from protobuf field: proto.packets.Push.DiscordAuthorized discord_authorized = 3;
|
|
4125
|
-
*/
|
|
4126
|
-
discordAuthorized: Push_DiscordAuthorized;
|
|
4127
4121
|
} | {
|
|
4128
4122
|
oneofKind: undefined;
|
|
4129
4123
|
};
|
|
@@ -4186,30 +4180,7 @@ interface Push_SongFinished {
|
|
|
4186
4180
|
/**
|
|
4187
4181
|
* @generated MessageType for protobuf message proto.packets.Push.SongFinished
|
|
4188
4182
|
*/
|
|
4189
|
-
declare const Push_SongFinished: Push_SongFinished$Type;
|
|
4190
|
-
declare class Push_DiscordAuthorized$Type extends MessageType<Push_DiscordAuthorized> {
|
|
4191
|
-
constructor();
|
|
4192
|
-
create(value?: PartialMessage<Push_DiscordAuthorized>): Push_DiscordAuthorized;
|
|
4193
|
-
internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Push_DiscordAuthorized): Push_DiscordAuthorized;
|
|
4194
|
-
internalBinaryWrite(message: Push_DiscordAuthorized, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
|
|
4195
|
-
}
|
|
4196
|
-
/**
|
|
4197
|
-
* @generated from protobuf message proto.packets.Push.DiscordAuthorized
|
|
4198
|
-
*/
|
|
4199
|
-
interface Push_DiscordAuthorized {
|
|
4200
|
-
/**
|
|
4201
|
-
* @generated from protobuf field: bool success = 1;
|
|
4202
|
-
*/
|
|
4203
|
-
success: boolean;
|
|
4204
|
-
/**
|
|
4205
|
-
* @generated from protobuf field: string token = 2;
|
|
4206
|
-
*/
|
|
4207
|
-
token: string;
|
|
4208
|
-
}
|
|
4209
|
-
/**
|
|
4210
|
-
* @generated MessageType for protobuf message proto.packets.Push.DiscordAuthorized
|
|
4211
|
-
*/
|
|
4212
|
-
declare const Push_DiscordAuthorized: Push_DiscordAuthorized$Type;
|
|
4183
|
+
declare const Push_SongFinished: Push_SongFinished$Type;
|
|
4213
4184
|
|
|
4214
4185
|
declare class Command$Type extends MessageType<Command> {
|
|
4215
4186
|
constructor();
|
|
@@ -4511,8 +4482,6 @@ type TAClientEvents = {
|
|
|
4511
4482
|
failedToConnectToServer: {};
|
|
4512
4483
|
disconnectedFromServer: {};
|
|
4513
4484
|
authorizationRequestedFromServer: string;
|
|
4514
|
-
authorizedWithServer: string;
|
|
4515
|
-
failedToAuthorizeWithServer: {};
|
|
4516
4485
|
loadSongRequested: [string, string, Request_LoadSong];
|
|
4517
4486
|
songFinished: Push_SongFinished;
|
|
4518
4487
|
realtimeScore: RealtimeScore;
|
|
@@ -4610,7 +4579,7 @@ declare class TAClient extends CustomEventEmitter<TAClientEvents> {
|
|
|
4610
4579
|
|
|
4611
4580
|
declare const masterAddress = "server.tournamentassistant.net";
|
|
4612
4581
|
declare const masterPort = "8676";
|
|
4613
|
-
declare const version = "1.1.
|
|
4614
|
-
declare const versionCode =
|
|
4582
|
+
declare const version = "1.1.1";
|
|
4583
|
+
declare const versionCode = 111;
|
|
4615
4584
|
|
|
4616
|
-
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,
|
|
4585
|
+
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
CHANGED
|
@@ -14002,8 +14002,7 @@ var Push$Type = class extends MessageType {
|
|
|
14002
14002
|
constructor() {
|
|
14003
14003
|
super("proto.packets.Push", [
|
|
14004
14004
|
{ no: 1, name: "realtime_score", kind: "message", oneof: "data", T: () => RealtimeScore },
|
|
14005
|
-
{ no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished }
|
|
14006
|
-
{ no: 3, name: "discord_authorized", kind: "message", oneof: "data", T: () => Push_DiscordAuthorized }
|
|
14005
|
+
{ no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished }
|
|
14007
14006
|
]);
|
|
14008
14007
|
}
|
|
14009
14008
|
create(value) {
|
|
@@ -14032,13 +14031,6 @@ var Push$Type = class extends MessageType {
|
|
|
14032
14031
|
songFinished: Push_SongFinished.internalBinaryRead(reader, reader.uint32(), options, message.data.songFinished)
|
|
14033
14032
|
};
|
|
14034
14033
|
break;
|
|
14035
|
-
case /* proto.packets.Push.DiscordAuthorized discord_authorized */
|
|
14036
|
-
3:
|
|
14037
|
-
message.data = {
|
|
14038
|
-
oneofKind: "discordAuthorized",
|
|
14039
|
-
discordAuthorized: Push_DiscordAuthorized.internalBinaryRead(reader, reader.uint32(), options, message.data.discordAuthorized)
|
|
14040
|
-
};
|
|
14041
|
-
break;
|
|
14042
14034
|
default:
|
|
14043
14035
|
let u2 = options.readUnknownField;
|
|
14044
14036
|
if (u2 === "throw")
|
|
@@ -14055,8 +14047,6 @@ var Push$Type = class extends MessageType {
|
|
|
14055
14047
|
RealtimeScore.internalBinaryWrite(message.data.realtimeScore, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
|
|
14056
14048
|
if (message.data.oneofKind === "songFinished")
|
|
14057
14049
|
Push_SongFinished.internalBinaryWrite(message.data.songFinished, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
|
|
14058
|
-
if (message.data.oneofKind === "discordAuthorized")
|
|
14059
|
-
Push_DiscordAuthorized.internalBinaryWrite(message.data.discordAuthorized, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
|
|
14060
14050
|
let u2 = options.writeUnknownFields;
|
|
14061
14051
|
if (u2 !== false)
|
|
14062
14052
|
(u2 == true ? UnknownFieldHandler.onWrite : u2)(this.typeName, message, writer);
|
|
@@ -14212,68 +14202,6 @@ var Push_SongFinished$Type = class extends MessageType {
|
|
|
14212
14202
|
}
|
|
14213
14203
|
};
|
|
14214
14204
|
var Push_SongFinished = new Push_SongFinished$Type();
|
|
14215
|
-
var Push_DiscordAuthorized$Type = class extends MessageType {
|
|
14216
|
-
constructor() {
|
|
14217
|
-
super("proto.packets.Push.DiscordAuthorized", [
|
|
14218
|
-
{
|
|
14219
|
-
no: 1,
|
|
14220
|
-
name: "success",
|
|
14221
|
-
kind: "scalar",
|
|
14222
|
-
T: 8
|
|
14223
|
-
/*ScalarType.BOOL*/
|
|
14224
|
-
},
|
|
14225
|
-
{
|
|
14226
|
-
no: 2,
|
|
14227
|
-
name: "token",
|
|
14228
|
-
kind: "scalar",
|
|
14229
|
-
T: 9
|
|
14230
|
-
/*ScalarType.STRING*/
|
|
14231
|
-
}
|
|
14232
|
-
]);
|
|
14233
|
-
}
|
|
14234
|
-
create(value) {
|
|
14235
|
-
const message = { success: false, token: "" };
|
|
14236
|
-
globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
|
|
14237
|
-
if (value !== void 0)
|
|
14238
|
-
reflectionMergePartial(this, message, value);
|
|
14239
|
-
return message;
|
|
14240
|
-
}
|
|
14241
|
-
internalBinaryRead(reader, length, options, target) {
|
|
14242
|
-
let message = target ?? this.create(), end = reader.pos + length;
|
|
14243
|
-
while (reader.pos < end) {
|
|
14244
|
-
let [fieldNo, wireType] = reader.tag();
|
|
14245
|
-
switch (fieldNo) {
|
|
14246
|
-
case /* bool success */
|
|
14247
|
-
1:
|
|
14248
|
-
message.success = reader.bool();
|
|
14249
|
-
break;
|
|
14250
|
-
case /* string token */
|
|
14251
|
-
2:
|
|
14252
|
-
message.token = reader.string();
|
|
14253
|
-
break;
|
|
14254
|
-
default:
|
|
14255
|
-
let u2 = options.readUnknownField;
|
|
14256
|
-
if (u2 === "throw")
|
|
14257
|
-
throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
|
|
14258
|
-
let d = reader.skip(wireType);
|
|
14259
|
-
if (u2 !== false)
|
|
14260
|
-
(u2 === true ? UnknownFieldHandler.onRead : u2)(this.typeName, message, fieldNo, wireType, d);
|
|
14261
|
-
}
|
|
14262
|
-
}
|
|
14263
|
-
return message;
|
|
14264
|
-
}
|
|
14265
|
-
internalBinaryWrite(message, writer, options) {
|
|
14266
|
-
if (message.success !== false)
|
|
14267
|
-
writer.tag(1, WireType.Varint).bool(message.success);
|
|
14268
|
-
if (message.token !== "")
|
|
14269
|
-
writer.tag(2, WireType.LengthDelimited).string(message.token);
|
|
14270
|
-
let u2 = options.writeUnknownFields;
|
|
14271
|
-
if (u2 !== false)
|
|
14272
|
-
(u2 == true ? UnknownFieldHandler.onWrite : u2)(this.typeName, message, writer);
|
|
14273
|
-
return writer;
|
|
14274
|
-
}
|
|
14275
|
-
};
|
|
14276
|
-
var Push_DiscordAuthorized = new Push_DiscordAuthorized$Type();
|
|
14277
14205
|
|
|
14278
14206
|
// src/models/commands.ts
|
|
14279
14207
|
init_dirname();
|
|
@@ -15184,8 +15112,8 @@ init_buffer2();
|
|
|
15184
15112
|
init_process2();
|
|
15185
15113
|
var masterAddress = "server.tournamentassistant.net";
|
|
15186
15114
|
var masterPort = "8676";
|
|
15187
|
-
var version = "1.1.
|
|
15188
|
-
var versionCode =
|
|
15115
|
+
var version = "1.1.1";
|
|
15116
|
+
var versionCode = 111;
|
|
15189
15117
|
|
|
15190
15118
|
// src/tournament-assistant-client.ts
|
|
15191
15119
|
var import_ws2 = __toESM(require_ws(), 1);
|
|
@@ -15420,7 +15348,6 @@ var TAClient = class extends CustomEventEmitter {
|
|
|
15420
15348
|
const addListeners = () => {
|
|
15421
15349
|
this.on("responseReceived", onResponseReceived);
|
|
15422
15350
|
this.on("authorizationRequestedFromServer", onAuthorizationRequested);
|
|
15423
|
-
this.on("authorizedWithServer", onAuthroizedWithServer);
|
|
15424
15351
|
};
|
|
15425
15352
|
const removeListeners = () => {
|
|
15426
15353
|
this.removeListener("responseReceived", onResponseReceived);
|
|
@@ -15428,7 +15355,6 @@ var TAClient = class extends CustomEventEmitter {
|
|
|
15428
15355
|
"authorizationRequestedFromServer",
|
|
15429
15356
|
onAuthorizationRequested
|
|
15430
15357
|
);
|
|
15431
|
-
this.removeListener("authorizedWithServer", onAuthroizedWithServer);
|
|
15432
15358
|
};
|
|
15433
15359
|
const checkResponses = () => {
|
|
15434
15360
|
const responseUsers = responseDictionary.map((x) => x.userId);
|
|
@@ -15466,10 +15392,7 @@ var TAClient = class extends CustomEventEmitter {
|
|
|
15466
15392
|
const timeout = createTimeout(3e4);
|
|
15467
15393
|
const onAuthorizationRequested = () => {
|
|
15468
15394
|
clearTimeout(timeout);
|
|
15469
|
-
|
|
15470
|
-
};
|
|
15471
|
-
const onAuthroizedWithServer = () => {
|
|
15472
|
-
sendRequest();
|
|
15395
|
+
throw "Authorization token invalid or not provided";
|
|
15473
15396
|
};
|
|
15474
15397
|
addListeners();
|
|
15475
15398
|
});
|
|
@@ -15741,13 +15664,7 @@ var TAClient = class extends CustomEventEmitter {
|
|
|
15741
15664
|
}
|
|
15742
15665
|
} else if (packet.packet.oneofKind === "push") {
|
|
15743
15666
|
const push = packet.packet.push;
|
|
15744
|
-
if (push.data.oneofKind === "
|
|
15745
|
-
if (push.data.discordAuthorized.success) {
|
|
15746
|
-
this.emit("authorizedWithServer", push.data.discordAuthorized.token);
|
|
15747
|
-
} else {
|
|
15748
|
-
this.emit("failedToAuthorizeWithServer", {});
|
|
15749
|
-
}
|
|
15750
|
-
} else if (push.data.oneofKind === "songFinished") {
|
|
15667
|
+
if (push.data.oneofKind === "songFinished") {
|
|
15751
15668
|
this.emit("songFinished", push.data.songFinished);
|
|
15752
15669
|
} else if (push.data.oneofKind === "realtimeScore") {
|
|
15753
15670
|
this.emit("realtimeScore", push.data.realtimeScore);
|
|
@@ -16465,7 +16382,6 @@ export {
|
|
|
16465
16382
|
PlayerSpecificSettings_NoteJumpDurationTypeSettings,
|
|
16466
16383
|
PlayerSpecificSettings_PlayerOptions,
|
|
16467
16384
|
Push,
|
|
16468
|
-
Push_DiscordAuthorized,
|
|
16469
16385
|
Push_SongFinished,
|
|
16470
16386
|
Push_SongFinished_CompletionType,
|
|
16471
16387
|
QualifierEvent,
|
package/dist/models/pushes.d.ts
CHANGED
|
@@ -28,12 +28,6 @@ export interface Push {
|
|
|
28
28
|
* @generated from protobuf field: proto.packets.Push.SongFinished song_finished = 2;
|
|
29
29
|
*/
|
|
30
30
|
songFinished: Push_SongFinished;
|
|
31
|
-
} | {
|
|
32
|
-
oneofKind: "discordAuthorized";
|
|
33
|
-
/**
|
|
34
|
-
* @generated from protobuf field: proto.packets.Push.DiscordAuthorized discord_authorized = 3;
|
|
35
|
-
*/
|
|
36
|
-
discordAuthorized: Push_DiscordAuthorized;
|
|
37
31
|
} | {
|
|
38
32
|
oneofKind: undefined;
|
|
39
33
|
};
|
|
@@ -100,19 +94,6 @@ export declare enum Push_SongFinished_CompletionType {
|
|
|
100
94
|
*/
|
|
101
95
|
Quit = 2
|
|
102
96
|
}
|
|
103
|
-
/**
|
|
104
|
-
* @generated from protobuf message proto.packets.Push.DiscordAuthorized
|
|
105
|
-
*/
|
|
106
|
-
export interface Push_DiscordAuthorized {
|
|
107
|
-
/**
|
|
108
|
-
* @generated from protobuf field: bool success = 1;
|
|
109
|
-
*/
|
|
110
|
-
success: boolean;
|
|
111
|
-
/**
|
|
112
|
-
* @generated from protobuf field: string token = 2;
|
|
113
|
-
*/
|
|
114
|
-
token: string;
|
|
115
|
-
}
|
|
116
97
|
declare class Push$Type extends MessageType<Push> {
|
|
117
98
|
constructor();
|
|
118
99
|
create(value?: PartialMessage<Push>): Push;
|
|
@@ -133,14 +114,4 @@ declare class Push_SongFinished$Type extends MessageType<Push_SongFinished> {
|
|
|
133
114
|
* @generated MessageType for protobuf message proto.packets.Push.SongFinished
|
|
134
115
|
*/
|
|
135
116
|
export declare const Push_SongFinished: Push_SongFinished$Type;
|
|
136
|
-
declare class Push_DiscordAuthorized$Type extends MessageType<Push_DiscordAuthorized> {
|
|
137
|
-
constructor();
|
|
138
|
-
create(value?: PartialMessage<Push_DiscordAuthorized>): Push_DiscordAuthorized;
|
|
139
|
-
internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Push_DiscordAuthorized): Push_DiscordAuthorized;
|
|
140
|
-
internalBinaryWrite(message: Push_DiscordAuthorized, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter;
|
|
141
|
-
}
|
|
142
|
-
/**
|
|
143
|
-
* @generated MessageType for protobuf message proto.packets.Push.DiscordAuthorized
|
|
144
|
-
*/
|
|
145
|
-
export declare const Push_DiscordAuthorized: Push_DiscordAuthorized$Type;
|
|
146
117
|
export {};
|
package/dist/models/pushes.js
CHANGED
|
@@ -29,8 +29,7 @@ class Push$Type extends MessageType {
|
|
|
29
29
|
constructor() {
|
|
30
30
|
super("proto.packets.Push", [
|
|
31
31
|
{ no: 1, name: "realtime_score", kind: "message", oneof: "data", T: () => RealtimeScore },
|
|
32
|
-
{ no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished }
|
|
33
|
-
{ no: 3, name: "discord_authorized", kind: "message", oneof: "data", T: () => Push_DiscordAuthorized }
|
|
32
|
+
{ no: 2, name: "song_finished", kind: "message", oneof: "data", T: () => Push_SongFinished }
|
|
34
33
|
]);
|
|
35
34
|
}
|
|
36
35
|
create(value) {
|
|
@@ -57,12 +56,6 @@ class Push$Type extends MessageType {
|
|
|
57
56
|
songFinished: Push_SongFinished.internalBinaryRead(reader, reader.uint32(), options, message.data.songFinished)
|
|
58
57
|
};
|
|
59
58
|
break;
|
|
60
|
-
case /* proto.packets.Push.DiscordAuthorized discord_authorized */ 3:
|
|
61
|
-
message.data = {
|
|
62
|
-
oneofKind: "discordAuthorized",
|
|
63
|
-
discordAuthorized: Push_DiscordAuthorized.internalBinaryRead(reader, reader.uint32(), options, message.data.discordAuthorized)
|
|
64
|
-
};
|
|
65
|
-
break;
|
|
66
59
|
default:
|
|
67
60
|
let u = options.readUnknownField;
|
|
68
61
|
if (u === "throw")
|
|
@@ -81,9 +74,6 @@ class Push$Type extends MessageType {
|
|
|
81
74
|
/* proto.packets.Push.SongFinished song_finished = 2; */
|
|
82
75
|
if (message.data.oneofKind === "songFinished")
|
|
83
76
|
Push_SongFinished.internalBinaryWrite(message.data.songFinished, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
|
|
84
|
-
/* proto.packets.Push.DiscordAuthorized discord_authorized = 3; */
|
|
85
|
-
if (message.data.oneofKind === "discordAuthorized")
|
|
86
|
-
Push_DiscordAuthorized.internalBinaryWrite(message.data.discordAuthorized, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
|
|
87
77
|
let u = options.writeUnknownFields;
|
|
88
78
|
if (u !== false)
|
|
89
79
|
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
|
|
@@ -204,57 +194,3 @@ class Push_SongFinished$Type extends MessageType {
|
|
|
204
194
|
* @generated MessageType for protobuf message proto.packets.Push.SongFinished
|
|
205
195
|
*/
|
|
206
196
|
export const Push_SongFinished = new Push_SongFinished$Type();
|
|
207
|
-
// @generated message type with reflection information, may provide speed optimized methods
|
|
208
|
-
class Push_DiscordAuthorized$Type extends MessageType {
|
|
209
|
-
constructor() {
|
|
210
|
-
super("proto.packets.Push.DiscordAuthorized", [
|
|
211
|
-
{ no: 1, name: "success", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
|
|
212
|
-
{ no: 2, name: "token", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
|
|
213
|
-
]);
|
|
214
|
-
}
|
|
215
|
-
create(value) {
|
|
216
|
-
const message = { success: false, token: "" };
|
|
217
|
-
globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
|
|
218
|
-
if (value !== undefined)
|
|
219
|
-
reflectionMergePartial(this, message, value);
|
|
220
|
-
return message;
|
|
221
|
-
}
|
|
222
|
-
internalBinaryRead(reader, length, options, target) {
|
|
223
|
-
let message = target ?? this.create(), end = reader.pos + length;
|
|
224
|
-
while (reader.pos < end) {
|
|
225
|
-
let [fieldNo, wireType] = reader.tag();
|
|
226
|
-
switch (fieldNo) {
|
|
227
|
-
case /* bool success */ 1:
|
|
228
|
-
message.success = reader.bool();
|
|
229
|
-
break;
|
|
230
|
-
case /* string token */ 2:
|
|
231
|
-
message.token = reader.string();
|
|
232
|
-
break;
|
|
233
|
-
default:
|
|
234
|
-
let u = options.readUnknownField;
|
|
235
|
-
if (u === "throw")
|
|
236
|
-
throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
|
|
237
|
-
let d = reader.skip(wireType);
|
|
238
|
-
if (u !== false)
|
|
239
|
-
(u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
return message;
|
|
243
|
-
}
|
|
244
|
-
internalBinaryWrite(message, writer, options) {
|
|
245
|
-
/* bool success = 1; */
|
|
246
|
-
if (message.success !== false)
|
|
247
|
-
writer.tag(1, WireType.Varint).bool(message.success);
|
|
248
|
-
/* string token = 2; */
|
|
249
|
-
if (message.token !== "")
|
|
250
|
-
writer.tag(2, WireType.LengthDelimited).string(message.token);
|
|
251
|
-
let u = options.writeUnknownFields;
|
|
252
|
-
if (u !== false)
|
|
253
|
-
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
|
|
254
|
-
return writer;
|
|
255
|
-
}
|
|
256
|
-
}
|
|
257
|
-
/**
|
|
258
|
-
* @generated MessageType for protobuf message proto.packets.Push.DiscordAuthorized
|
|
259
|
-
*/
|
|
260
|
-
export const Push_DiscordAuthorized = new Push_DiscordAuthorized$Type();
|
|
@@ -16,8 +16,6 @@ type TAClientEvents = {
|
|
|
16
16
|
failedToConnectToServer: {};
|
|
17
17
|
disconnectedFromServer: {};
|
|
18
18
|
authorizationRequestedFromServer: string;
|
|
19
|
-
authorizedWithServer: string;
|
|
20
|
-
failedToAuthorizeWithServer: {};
|
|
21
19
|
loadSongRequested: [string, string, Request_LoadSong];
|
|
22
20
|
songFinished: Push_SongFinished;
|
|
23
21
|
realtimeScore: RealtimeScore;
|
|
@@ -142,12 +142,10 @@ export class TAClient extends CustomEventEmitter {
|
|
|
142
142
|
const addListeners = () => {
|
|
143
143
|
this.on("responseReceived", onResponseReceived);
|
|
144
144
|
this.on("authorizationRequestedFromServer", onAuthorizationRequested);
|
|
145
|
-
this.on("authorizedWithServer", onAuthroizedWithServer);
|
|
146
145
|
};
|
|
147
146
|
const removeListeners = () => {
|
|
148
147
|
this.removeListener("responseReceived", onResponseReceived);
|
|
149
148
|
this.removeListener("authorizationRequestedFromServer", onAuthorizationRequested);
|
|
150
|
-
this.removeListener("authorizedWithServer", onAuthroizedWithServer);
|
|
151
149
|
};
|
|
152
150
|
// Check that we got responses from all expected users
|
|
153
151
|
const checkResponses = () => {
|
|
@@ -188,16 +186,11 @@ export class TAClient extends CustomEventEmitter {
|
|
|
188
186
|
}, time);
|
|
189
187
|
};
|
|
190
188
|
const timeout = createTimeout(30000);
|
|
191
|
-
// If authorization is requested, we're assuming an external application
|
|
192
|
-
//
|
|
193
|
-
// if a successful auth is noticed
|
|
189
|
+
// If authorization is requested, we're assuming an external application failed
|
|
190
|
+
// to provide a valid token, so we will combust
|
|
194
191
|
const onAuthorizationRequested = () => {
|
|
195
192
|
clearTimeout(timeout);
|
|
196
|
-
|
|
197
|
-
};
|
|
198
|
-
// Retry on successful authorization
|
|
199
|
-
const onAuthroizedWithServer = () => {
|
|
200
|
-
sendRequest();
|
|
193
|
+
throw "Authorization token invalid or not provided";
|
|
201
194
|
};
|
|
202
195
|
addListeners();
|
|
203
196
|
});
|
|
@@ -488,15 +481,7 @@ export class TAClient extends CustomEventEmitter {
|
|
|
488
481
|
}
|
|
489
482
|
else if (packet.packet.oneofKind === "push") {
|
|
490
483
|
const push = packet.packet.push;
|
|
491
|
-
if (push.data.oneofKind === "
|
|
492
|
-
if (push.data.discordAuthorized.success) {
|
|
493
|
-
this.emit("authorizedWithServer", push.data.discordAuthorized.token);
|
|
494
|
-
}
|
|
495
|
-
else {
|
|
496
|
-
this.emit("failedToAuthorizeWithServer", {});
|
|
497
|
-
}
|
|
498
|
-
}
|
|
499
|
-
else if (push.data.oneofKind === "songFinished") {
|
|
484
|
+
if (push.data.oneofKind === "songFinished") {
|
|
500
485
|
this.emit("songFinished", push.data.songFinished);
|
|
501
486
|
}
|
|
502
487
|
else if (push.data.oneofKind === "realtimeScore") {
|