Merge branch 'main' into pr/26

resources/PowerLevelCurves.ts

@@ -14,7 +14,7 @@ function mapCurveTables<T extends { [k: keyof any]: { Keys: CurveKey[] } }>(stru
 }
 
 export default Object.freeze({
-  homebaseRating: Object.freeze(new CurveTable(HomebaseRatingMapping[0].ExportValue.UIMonsterRating.Keys)),
-  baseItemRating: mapCurveTables(BaseItemRating[0].ExportValue),
-  survivorItemRating: mapCurveTables(SurvivorItemRating[0].ExportValue),
+  homebaseRating: Object.freeze(new CurveTable(HomebaseRatingMapping[0]!.ExportValue.UIMonsterRating.Keys)),
+  baseItemRating: mapCurveTables(BaseItemRating[0]!.ExportValue),
+  survivorItemRating: mapCurveTables(SurvivorItemRating[0]!.ExportValue),
 });

src/Client.ts

@@ -55,13 +55,13 @@ class Client extends EventEmitter {
    * Timeouts set by {@link Client#setTimeout} that are still active
    */
   // eslint-disable-next-line no-undef
-  private timeouts: Set<NodeJS.Timeout>;
+  private timeouts: Set<any>;
 
   /**
    * Intervals set by {@link Client#setInterval} that are still active
    */
   // eslint-disable-next-line no-undef
-  private intervals: Set<NodeJS.Timeout>;
+  private intervals: Set<any>;
 
   /**
    * All client configuration options
@@ -228,15 +228,15 @@ class Client extends EventEmitter {
   }
 
   // Events
-  public on<U extends keyof ClientEvents>(event: U, listener: ClientEvents[U]): this {
+  public override on<U extends keyof ClientEvents>(event: U, listener: ClientEvents[U]): this {
     return super.on(event, listener);
   }
 
-  public once<U extends keyof ClientEvents>(event: U, listener: ClientEvents[U]): this {
+  public override once<U extends keyof ClientEvents>(event: U, listener: ClientEvents[U]): this {
     return super.once(event, listener);
   }
 
-  public emit<U extends keyof ClientEvents>(event: U, ...args: Parameters<ClientEvents[U]>): boolean {
+  public override emit<U extends keyof ClientEvents>(event: U, ...args: Parameters<ClientEvents[U]>): boolean {
     return super.emit(event, ...args);
   }
 
@@ -473,7 +473,7 @@ class Client extends EventEmitter {
   ): Promise<Parameters<ClientEvents[U]>> {
     return new Promise<any>((res, rej) => {
       // eslint-disable-next-line no-undef
-      let rejectionTimeout: NodeJS.Timeout;
+      let rejectionTimeout: any;
 
       const handler = (...data: any) => {
         if (!filter || filter(...data)) {
@@ -514,7 +514,7 @@ class Client extends EventEmitter {
    * @param timeout Timeout to cancel
    */
   // eslint-disable-next-line no-undef
-  public clearTimeout(timeout: NodeJS.Timeout) {
+  public clearTimeout(timeout: any) {
     clearTimeout(timeout);
     this.timeouts.delete(timeout);
   }
@@ -537,7 +537,7 @@ class Client extends EventEmitter {
    * @param interval Interval to cancel
    */
   // eslint-disable-next-line no-undef
-  public clearInterval(interval: NodeJS.Timeout) {
+  public clearInterval(interval: any) {
     clearInterval(interval);
     this.intervals.delete(interval);
   }

src/auth/Auth.ts

@@ -134,7 +134,7 @@ class Auth extends Base {
    * Kills all active auth sessions
    */
   public async revokeAllTokens() {
-    await Promise.all([...this.sessions.filter((s, k) => k !== AuthSessionStoreKey.Launcher).values()].map((s) => s.revoke()));
+    await Promise.all([...this.sessions.filter((_s, k) => k !== AuthSessionStoreKey.Launcher).values()].map((s) => s.revoke()));
   }
 
   /**

src/auth/FortniteAuthSession.ts

@@ -51,7 +51,7 @@ class FortniteAuthSession extends AuthSession<AuthSessionType.Fortnite> {
   /**
    * The refresh timeout
    */
-  public refreshTimeout?: NodeJS.Timeout;
+  public refreshTimeout?: any;
   constructor(client: Client, data: FortniteAuthData, clientSecret: string) {
     super(client, data, clientSecret, AuthSessionType.Fortnite);
 

src/auth/FortniteClientCredentialsAuthSession.ts

@@ -9,7 +9,7 @@ class FortniteClientCredentialsAuthSession extends AuthSession<AuthSessionType.F
   public isInternalClient: boolean;
   public productId: string;
   public applicationId: string;
-  public refreshTimeout?: NodeJS.Timeout;
+  public refreshTimeout?: any;
   constructor(client: Client, data: FortniteClientCredentialsAuthData, clientSecret: string) {
     super(client, data, clientSecret, AuthSessionType.FortniteClientCredentials);
 

src/auth/LauncherAuthSession.ts

@@ -13,7 +13,7 @@ class LauncherAuthSession extends AuthSession<AuthSessionType.Launcher> {
   public scope: string[];
   public refreshToken: string;
   public refreshTokenExpiresAt: Date;
-  public refreshTimeout?: NodeJS.Timeout;
+  public refreshTimeout?: any;
   constructor(client: Client, data: LauncherAuthData, clientSecret: string) {
     super(client, data, clientSecret, AuthSessionType.Launcher);
 

src/exceptions/SendMessageError.ts

@@ -9,7 +9,7 @@ class SendMessageError extends Error {
   /**
    * The message related to this error
    */
-  public message: string;
+  public override message: string;
 
   /**
    * The message's type

src/structures/EventTokens.ts

@@ -54,10 +54,10 @@ class EventTokens extends Base {
             season = 'S9';
           }
 
-          const divisionNumber = parseInt(division.replace('Division', ''), 10);
+          const divisionNumber = parseInt(division!.replace('Division', ''), 10);
 
-          if (!this.arenaDivisionData[season.toLowerCase()] || this.arenaDivisionData[season.toLowerCase()] < divisionNumber) {
-            this.arenaDivisionData[season.toLowerCase()] = divisionNumber;
+          if (!this.arenaDivisionData[season!.toLowerCase()] || this.arenaDivisionData[season!.toLowerCase()]! < divisionNumber) {
+            this.arenaDivisionData[season!.toLowerCase()] = divisionNumber;
           }
         } break;
         case 'GroupIdentity':

src/structures/Image.ts

@@ -54,7 +54,7 @@ class Image extends Base {
     return res;
   }
 
-  public toString() {
+  public override toString() {
     return this.url;
   }
 }

src/structures/Stats.ts

@@ -74,7 +74,7 @@ class Stats extends Base {
           : this.getPlaylistStatsType(playlistId);
 
         if (playlistType !== 'other') {
-          const [parsedKey, parsedValue] = parseStatKey(statKey, data.stats[key]);
+          const [parsedKey, parsedValue] = parseStatKey(statKey, data.stats[key]!);
 
           const inputTypePlaylistStats = this.stats[inputType][playlistType];
           const inputTypeAllStats = this.stats[inputType].overall;
@@ -105,9 +105,9 @@ class Stats extends Base {
           }
         }
       } else if (/^s\d\d?_social_bp_level$/.test(key)) {
-        this.levelData[key.split('_')[0]] = {
-          level: Math.round(data.stats[key] / 100),
-          progress: data.stats[key] % 100,
+        this.levelData[key.split('_')[0]!] = {
+          level: Math.round(data.stats[key]! / 100),
+          progress: data.stats[key]! % 100,
         };
       }
     }

src/structures/friend/BaseFriendMessage.ts

@@ -1,6 +1,8 @@
 import BaseMessage from '../BaseMessage';
 import type ClientUser from '../user/ClientUser';
 import type Friend from './Friend';
+import type Client from '../../Client';
+import type { MessageData } from '../../../resources/structs';
 
 /**
  * Represents a friend whisper message
@@ -9,12 +11,23 @@ class BaseFriendMessage extends BaseMessage {
   /**
    * The message's content
    */
-  public content!: string;
+  public override content: string;
 
   /**
    * The message's author
    */
-  public author!: Friend | ClientUser;
+  public override author: Friend | ClientUser;
+
+  /**
+   * @param client The main client
+   * @param data The message's data
+   */
+  constructor(client: Client, data: MessageData & { author: Friend | ClientUser; }) {
+    super(client, data);
+
+    this.content = data.content;
+    this.author = data.author;
+  }
 
   /**
    * Replies to this whisper message

src/structures/friend/ReceivedFriendMessage.ts

@@ -1,5 +1,7 @@
 import BaseFriendMessage from './BaseFriendMessage';
 import type Friend from './Friend';
+import type Client from '../../Client';
+import type { MessageData } from '../../../resources/structs';
 
 /**
  * Represents a received friend whisper message
@@ -8,14 +10,24 @@ class ReceivedFriendMessage extends BaseFriendMessage {
   /**
    * The message's author
    */
-  public author!: Friend;
+  public override author: Friend;
+
+  /**
+   * @param client The main client
+   * @param data The message's data
+   */
+  constructor(client: Client, data: MessageData & { author: Friend; }) {
+    super(client, data);
+
+    this.author = data.author;
+  }
 
   /**
    * Replies to this whisper message
    * @param content The message that will be sent
    * @throws {FriendNotFoundError} The user is not friends with the client
    */
-  public reply(content: string) {
+  public override reply(content: string) {
     return this.client.friend.sendMessage(this.author.id, content);
   }
 }

src/structures/friend/SentFriendMessage.ts

@@ -1,5 +1,7 @@
 import BaseFriendMessage from './BaseFriendMessage';
 import type ClientUser from '../user/ClientUser';
+import type Client from '../../Client';
+import type { MessageData } from '../../../resources/structs';
 
 /**
  * Represents a sent friend whisper message
@@ -8,7 +10,17 @@ class SentFriendMessage extends BaseFriendMessage {
   /**
    * The message's author
    */
-  public author!: ClientUser;
+  public override author: ClientUser;
+
+  /**
+ * @param client The main client
+ * @param data The message's data
+ */
+  constructor(client: Client, data: MessageData & { author: ClientUser; }) {
+    super(client, data);
+
+    this.author = data.author;
+  }
 }
 
 export default SentFriendMessage;

src/structures/party/ClientParty.ts

@@ -38,7 +38,7 @@ class ClientParty extends Party {
   /**
    * The party's meta
    */
-  public meta: ClientPartyMeta;
+  public override meta: ClientPartyMeta;
 
   /**
    * The hidden member ids
@@ -144,7 +144,7 @@ class ClientParty extends Party {
       }, AuthSessionStoreKey.Fortnite);
     } catch (e) {
       if (e instanceof EpicgamesAPIError && e.code === 'errors.com.epicgames.social.party.stale_revision') {
-        this.revision = parseInt(e.messageVars[1], 10);
+        this.revision = parseInt(e.messageVars[1]!, 10);
         this.patchQueue.shift();
         return this.sendPatch(updated);
       }

src/structures/party/ClientPartyMember.ts

@@ -21,7 +21,7 @@ class ClientPartyMember extends PartyMember {
   /**
    * The member's meta
    */
-  public meta: ClientPartyMemberMeta;
+  public override meta: ClientPartyMemberMeta;
 
   /**
    * @param party The party this member belongs to
@@ -61,7 +61,7 @@ class ClientPartyMember extends PartyMember {
       }, AuthSessionStoreKey.Fortnite);
     } catch (e) {
       if (e instanceof EpicgamesAPIError && e.code === 'errors.com.epicgames.social.party.stale_revision') {
-        this.revision = parseInt(e.messageVars[1], 10);
+        this.revision = parseInt(e.messageVars[1]!, 10);
         this.patchQueue.shift();
         return this.sendPatch(updated);
       }

src/structures/party/ClientPartyMemberMeta.ts

@@ -34,7 +34,7 @@ class ClientPartyMemberMeta extends PartyMemberMeta {
       'Default:CampaignHero_j': JSON.stringify({
         CampaignHero: {
           heroItemInstanceId: '',
-          heroType: `/Game/Athena/Heroes/${defaultCharacter.replace('CID', 'HID')}.${defaultCharacter.replace('CID', 'HID')}`,
+          heroType: `/Game/Athena/Heroes/${defaultCharacter?.replace('CID', 'HID')}.${defaultCharacter?.replace('CID', 'HID')}`,
         },
       }),
       'Default:PlatformData_j': JSON.stringify({

src/structures/party/PartyMember.ts

@@ -234,7 +234,7 @@ class PartyMember extends User {
   /**
    * Converts this party member into an object
    */
-  public toObject(): PartyMemberData {
+  public override toObject(): PartyMemberData {
     return {
       id: this.id,
       account_id: this.id,

src/structures/party/PartyMessage.ts

@@ -11,7 +11,7 @@ class PartyMessage extends BaseMessage {
   /**
    * The message's author
    */
-  public author!: PartyMember;
+  public override author: PartyMember;
 
   /**
    * The message's party
@@ -25,6 +25,7 @@ class PartyMessage extends BaseMessage {
   constructor(client: Client, data: PartyMessageData) {
     super(client, data);
 
+    this.author = data.author;
     this.party = data.party;
   }
 

src/structures/party/ReceivedPartyInvitation.ts

@@ -4,13 +4,30 @@ import BasePartyInvitation from './BasePartyInvitation';
 import { AuthSessionStoreKey } from '../../../resources/enums';
 import type ClientUser from '../user/ClientUser';
 import type Friend from '../friend/Friend';
+import type Client from '../../Client';
+import type Party from './Party';
+import type ClientParty from './ClientParty';
 
 /**
  * Represents a recieved party invitation
  */
 class ReceivedPartyInvitation extends BasePartyInvitation {
-  public sender!: Friend;
-  public receiver!: ClientUser;
+  public override sender: Friend;
+  public override receiver: ClientUser;
+
+  /**
+   * @param client The main client
+   * @param party The party this invitation belongs to
+   * @param sender The friend (or the client user) who sent this invitation
+   * @param receiver The friend (or the client user) who received this invitation
+   * @param data The invitation data
+   */
+  constructor(client: Client, party: Party | ClientParty, sender: Friend, receiver: ClientUser, data: any) {
+    super(client, party, sender, receiver, data);
+
+    this.sender = sender;
+    this.receiver = receiver;
+  }
 
   /**
    * Accepts this invitation

src/structures/party/ReceivedPartyJoinRequest.ts

@@ -1,13 +1,27 @@
 import BasePartyJoinRequest from './BasePartyJoinRequest';
 import type ClientUser from '../user/ClientUser';
 import type Friend from '../friend/Friend';
+import type Client from '../../Client';
 
 /**
  * Represents an incoming party join request
  */
 class ReceivedPartyJoinRequest extends BasePartyJoinRequest {
-  public receiver!: ClientUser;
-  public sender!: Friend;
+  public override receiver: ClientUser;
+  public override sender: Friend;
+
+  /**
+   * @param client The main client
+   * @param sender The user who requested to join the party
+   * @param receiver The user who received the join request
+   * @param data The party confirmation data
+   */
+  constructor(client: Client, sender: Friend, receiver: ClientUser, data: any) {
+    super(client, sender, receiver, data);
+
+    this.sender = sender;
+    this.receiver = receiver;
+  }
 
   /**
    * Accepts the join request. If it expired, a normal invite will be sent