halo-infinite-api 4.0.6 → 5.0.0

package/dist/authentication/xbox-authentication-client.d.ts

@@ -1,5 +1,6 @@
 import { DateTime } from "luxon";
 import { TokenPersister } from "../core/token-persisters";
+import { XboxTicket } from "../models/xbox-ticket";
 export declare enum RelyingParty {
     Xbox = "http://xboxlive.com",
     Halo = "https://prod.xsts.halowaypoint.com/"
@@ -15,7 +16,7 @@ export declare class XboxAuthenticationClient {
     private xstsTicketCache;
     private readonly httpClient;
     constructor(tokenPersister?: TokenPersister | undefined);
-    getXstsTicket(getOauth2AccessToken: () => Promise<string>): Promise<{
+    getXstsTicket(getOauth2AccessToken: () => Promise<string>, relyingParty: RelyingParty): Promise<{
         expiresAt: DateTime;
         IssueInstant: string;
         NotAfter: string;
@@ -32,5 +33,5 @@ export declare class XboxAuthenticationClient {
             }];
         };
     }>;
-    getXboxLiveV3Token: (userHash: string, userToken: string) => string;
+    getXboxLiveV3Token: (xboxTicket: XboxTicket) => string;
 }

package/dist/authentication/xbox-authentication-client.js

@@ -1,5 +1,6 @@
 import axios from "axios";
 import { DateTime } from "luxon";
+import { KeyedExpiryTokenCache } from "../util/keyed-expiry-token-cache";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
 export var RelyingParty;
 (function (RelyingParty) {
@@ -31,7 +32,7 @@ export class XboxAuthenticationClient {
         await this.tokenPersister?.save("xbox.userToken", result);
         return result;
     }, async () => (await this.tokenPersister?.load("xbox.userToken")) ?? null);
-    xstsTicketCache = new ExpiryTokenCache(async (userToken, relyingParty) => {
+    xstsTicketCache = new KeyedExpiryTokenCache(async (relyingParty, userToken) => {
         const response = await this.httpClient.post("https://xsts.auth.xboxlive.com/xsts/authorize", {
             RelyingParty: relyingParty,
             TokenType: "JWT",
@@ -50,16 +51,16 @@ export class XboxAuthenticationClient {
             ...response.data,
             expiresAt: DateTime.fromISO(response.data.NotAfter),
         };
-        await this.tokenPersister?.save("xbox.xstsTicket", result);
+        await this.tokenPersister?.save("xbox.xstsTicket." + relyingParty, result);
         return result;
-    }, async () => (await this.tokenPersister?.load("xbox.xstsTicket")) ?? null);
+    }, async (relyingParty) => (await this.tokenPersister?.load("xbox.xstsTicket." + relyingParty)) ?? null);
     httpClient;
     constructor(tokenPersister) {
         this.tokenPersister = tokenPersister;
         this.httpClient = axios.create();
     }
-    async getXstsTicket(getOauth2AccessToken) {
-        let xstsTicket = await this.xstsTicketCache.getExistingToken();
+    async getXstsTicket(getOauth2AccessToken, relyingParty) {
+        let xstsTicket = await this.xstsTicketCache.getExistingToken(relyingParty);
         if (!xstsTicket) {
             let userToken = await this.userTokenCache.getExistingToken();
             if (!userToken) {
@@ -67,10 +68,10 @@ export class XboxAuthenticationClient {
                 // worrying if it is expired.
                 userToken = await this.userTokenCache.getToken(await getOauth2AccessToken());
             }
-            xstsTicket = await this.xstsTicketCache.getToken(userToken.Token, RelyingParty.Halo);
+            xstsTicket = await this.xstsTicketCache.getToken(relyingParty, userToken.Token);
         }
         return xstsTicket;
     }
-    getXboxLiveV3Token = (userHash, userToken) => `XBL3.0 x=${userHash};${userToken}`;
+    getXboxLiveV3Token = (xboxTicket) => `XBL3.0 x=${xboxTicket.DisplayClaims.xui[0].uhs};${xboxTicket.Token}`;
 }
 //# sourceMappingURL=xbox-authentication-client.js.map

package/dist/authentication/xbox-authentication-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"xbox-authentication-client.js","sourceRoot":"","sources":["../../src/authentication/xbox-authentication-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xbox-authentication-client.js","sourceRoot":"","sources":["../../src/authentication/xbox-authentication-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,4CAA4B,CAAA;IAC5B,4DAA4C,CAAA;AAC9C,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB;AAQD,MAAM,OAAO,wBAAwB;IA0EN;IAzErB,cAAc,GAAG,IAAI,gBAAgB,CAC3C,KAAK,EAAE,WAAmB,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACzC,kDAAkD,EAClD;YACE,YAAY,EAAE,0BAA0B;YACxC,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE;gBACV,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,wBAAwB;gBAClC,SAAS,EAAE,KAAK,WAAW,EAAE;aAC9B;SACF,EACD;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,MAAM,EAAE,kBAAkB;gBAC1B,wBAAwB,EAAE,GAAG;aAC9B;SACF,CACF,CAAC;QAEF,MAAM,MAAM,GAAG;YACb,GAAG,QAAQ,CAAC,IAAI;YAChB,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;SACpD,CAAC;QACF,MAAM,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QAC1D,OAAO,MAAM,CAAC;IAChB,CAAC,EACD,KAAK,IAAI,EAAE,CACT,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,IAAI,CAC9B,gBAAgB,CACjB,CAAC,IAAI,IAAI,CACb,CAAC;IACM,eAAe,GAAG,IAAI,qBAAqB,CACjD,KAAK,EAAE,YAA0B,EAAE,SAAiB,EAAE,EAAE;QACtD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACzC,+CAA+C,EAC/C;YACE,YAAY,EAAE,YAAY;YAC1B,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE;gBACV,SAAS,EAAE,QAAQ;gBACnB,UAAU,EAAE,CAAC,SAAS,CAAC;aACxB;SACF,EACD;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,MAAM,EAAE,kBAAkB;gBAC1B,wBAAwB,EAAE,GAAG;aAC9B;SACF,CACF,CAAC;QAEF,MAAM,MAAM,GAAG;YACb,GAAG,QAAQ,CAAC,IAAI;YAChB,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;SACpD,CAAC;QACF,MAAM,IAAI,CAAC,cAAc,EAAE,IAAI,CAC7B,kBAAkB,GAAG,YAAY,EACjC,MAAM,CACP,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC,EACD,KAAK,EAAE,YAAY,EAAE,EAAE,CACrB,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,IAAI,CAC9B,kBAAkB,GAAG,YAAY,CAClC,CAAC,IAAI,IAAI,CACb,CAAC;IAEe,UAAU,CAAgB;IAE3C,YAA6B,cAA+B;QAA/B,mBAAc,GAAd,cAAc,CAAiB;QAC1D,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,oBAA2C,EAC3C,YAA0B;QAE1B,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;YAC7D,IAAI,CAAC,SAAS,EAAE;gBACd,8DAA8D;gBAC9D,6BAA6B;gBAC7B,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAC5C,MAAM,oBAAoB,EAAE,CAC7B,CAAC;aACH;YACD,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAC9C,YAAY,EACZ,SAAS,CAAC,KAAK,CAChB,CAAC;SACH;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,kBAAkB,GAAG,CAAC,UAAsB,EAAE,EAAE,CACrD,YAAY,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;CACzE"}

package/dist/core/halo-infinite-client.d.ts

@@ -8,7 +8,7 @@ import { Playlist } from "../models/halo-infinite/playlist";
 import { PlaylistCsrContainer } from "../models/halo-infinite/playlist-csr-container";
 import { ServiceRecord } from "../models/halo-infinite/service-record";
 import { UserInfo } from "../models/halo-infinite/user-info";
-import { SpartanTokenProvider } from "./spartan-token-providers";
+import { SpartanTokenProvider } from "./token-providers/spartan-token-providers";
 interface ResultContainer<TValue> {
     Id: string;
     ResultCode: 0 | 1;
@@ -47,6 +47,7 @@ export declare class HaloInfiniteClient {
      */
     getPlaylist: (playlistId: string) => Promise<Playlist>;
     getPlayerMatches: (playerXuid: string, type?: MatchType, count?: number, start?: number) => Promise<PlayerMatchHistory[]>;
+    getPlayerServiceRecord(playerXuid: string, type?: MatchType): Promise<ServiceRecord>;
     getMatchStats: (matchId: string) => Promise<MatchStats<import("..").GameVariantCategory>>;
     getMatchSkill: (matchId: string, playerIds: string[]) => Promise<ResultContainer<MatchSkill<0>>[]>;
     /** Gets authoring metadata about a specific asset. */

package/dist/core/halo-infinite-client.js

@@ -9,7 +9,7 @@ const assetKindUrlMap = {
     [AssetKind.Playlist]: "Playlists",
 };
 function wrapPlayerId(playerId) {
-    if (/^\w+(\d+)/) {
+    if (/^\w+\(\d+\)/.test(playerId)) {
         return playerId;
     }
     else {
@@ -92,8 +92,11 @@ export class HaloInfiniteClient {
         if (type !== MatchType.All) {
             params.type = type.toString();
         }
-        return this.executePaginationRequest(count, start, params, `https://${HaloCoreEndpoints.StatsOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/players/xuid(${wrapPlayerId(playerXuid)})/matches`, "get");
+        return this.executePaginationRequest(count, start, params, `https://${HaloCoreEndpoints.StatsOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/players/${wrapPlayerId(playerXuid)}/matches`, "get");
     };
+    getPlayerServiceRecord(playerXuid, type = MatchType.All) {
+        return this.executeRequest(`https://${HaloCoreEndpoints.StatsOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/players/${wrapPlayerId(playerXuid)}/Matchmade/servicerecord`, "get");
+    }
     getMatchStats = (matchId) => this.executeRequest(`https://${HaloCoreEndpoints.StatsOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/matches/${matchId}/stats`, "get");
     getMatchSkill = async (matchId, playerIds) => {
         try {

package/dist/core/halo-infinite-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"halo-infinite-client.js","sourceRoot":"","sources":["../../src/core/halo-infinite-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"halo-infinite-client.js","sourceRoot":"","sources":["../../src/core/halo-infinite-client.ts"],"names":[],"mappings":"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"}

package/dist/core/token-providers/auto-token-provider.d.ts

@@ -0,0 +1,13 @@
+import { TokenPersister } from "../token-persisters";
+import { SpartanTokenProvider } from "./spartan-token-providers";
+import { XboxTokenProvider } from "./xbox-token-provider";
+/**
+ * A SpartanTokenProvider that fetches both the Xbox and Halo tokens in the same
+ * process. This is useful for applications that do not need to contend with
+ * CORS restrictions.
+ */
+export declare class AutoTokenProvider implements SpartanTokenProvider, XboxTokenProvider {
+    readonly getSpartanToken: () => Promise<string>;
+    readonly getXboxLiveV3Token: () => Promise<string>;
+    constructor(getOauth2AccessToken: () => Promise<string>, tokenPersister?: TokenPersister);
+}

package/dist/core/token-providers/auto-token-provider.js

@@ -0,0 +1,34 @@
+import { RelyingParty, XboxAuthenticationClient, } from "../../authentication/xbox-authentication-client";
+import { HaloAuthenticationClient } from "../../authentication/halo-authentication-client";
+import { inMemoryTokenPersister } from "../token-persisters/in-memory-token-persister";
+/**
+ * A SpartanTokenProvider that fetches both the Xbox and Halo tokens in the same
+ * process. This is useful for applications that do not need to contend with
+ * CORS restrictions.
+ */
+export class AutoTokenProvider {
+    getSpartanToken;
+    getXboxLiveV3Token;
+    constructor(getOauth2AccessToken, tokenPersister) {
+        let actualTokenPersister;
+        if (tokenPersister) {
+            actualTokenPersister = tokenPersister;
+        }
+        else {
+            actualTokenPersister = inMemoryTokenPersister;
+        }
+        const xboxAuthClient = new XboxAuthenticationClient(tokenPersister);
+        const haloAuthClient = new HaloAuthenticationClient(async () => {
+            const xstsTicket = await xboxAuthClient.getXstsTicket(getOauth2AccessToken, RelyingParty.Halo);
+            return xstsTicket.Token;
+        }, async () => await actualTokenPersister.load("halo.authToken"), async (token) => {
+            await actualTokenPersister.save("halo.authToken", token);
+        });
+        this.getSpartanToken = () => haloAuthClient.getSpartanToken();
+        this.getXboxLiveV3Token = async () => {
+            const xstsTicket = await xboxAuthClient.getXstsTicket(getOauth2AccessToken, RelyingParty.Xbox);
+            return xboxAuthClient.getXboxLiveV3Token(xstsTicket);
+        };
+    }
+}
+//# sourceMappingURL=auto-token-provider.js.map

package/dist/core/token-providers/auto-token-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-token-provider.js","sourceRoot":"","sources":["../../../src/core/token-providers/auto-token-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,wBAAwB,GACzB,MAAM,iDAAiD,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AAGvF;;;;GAIG;AACH,MAAM,OAAO,iBAAiB;IAGZ,eAAe,CAAwB;IACvC,kBAAkB,CAAwB;IAE1D,YACE,oBAA2C,EAC3C,cAA+B;QAE/B,IAAI,oBAAoC,CAAC;QACzC,IAAI,cAAc,EAAE;YAClB,oBAAoB,GAAG,cAAc,CAAC;SACvC;aAAM;YACL,oBAAoB,GAAG,sBAAsB,CAAC;SAC/C;QACD,MAAM,cAAc,GAAG,IAAI,wBAAwB,CAAC,cAAc,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,KAAK,IAAI,EAAE;YACT,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,aAAa,CACnD,oBAAoB,EACpB,YAAY,CAAC,IAAI,CAClB,CAAC;YACF,OAAO,UAAU,CAAC,KAAK,CAAC;QAC1B,CAAC,EACD,KAAK,IAAI,EAAE,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAC7D,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;QAC9D,IAAI,CAAC,kBAAkB,GAAG,KAAK,IAAI,EAAE;YACnC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,aAAa,CACnD,oBAAoB,EACpB,YAAY,CAAC,IAAI,CAClB,CAAC;YACF,OAAO,cAAc,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;QACvD,CAAC,CAAC;IACJ,CAAC;CACF"}

package/dist/core/token-providers/spartan-token-providers/auto-xsts-spartan-token-provider.d.ts

@@ -0,0 +1,11 @@
+import { TokenPersister } from "../../token-persisters";
+import { SpartanTokenProvider } from ".";
+/**
+ * A SpartanTokenProvider that fetches both the Xbox and Halo tokens in the same
+ * process. This is useful for applications that do not need to contend with
+ * CORS restrictions.
+ */
+export declare class AutoXstsSpartanTokenProvider implements SpartanTokenProvider {
+    readonly getSpartanToken: () => Promise<string>;
+    constructor(getOauth2AccessToken: () => Promise<string>, tokenPersister?: TokenPersister);
+}

package/dist/core/token-providers/spartan-token-providers/auto-xsts-spartan-token-provider.js

@@ -0,0 +1,29 @@
+import { XboxAuthenticationClient, } from "../../../authentication/xbox-authentication-client";
+import { HaloAuthenticationClient } from "../../../authentication/halo-authentication-client";
+import { inMemoryTokenPersister } from "../../token-persisters/in-memory-token-persister";
+/**
+ * A SpartanTokenProvider that fetches both the Xbox and Halo tokens in the same
+ * process. This is useful for applications that do not need to contend with
+ * CORS restrictions.
+ */
+export class AutoXstsSpartanTokenProvider {
+    getSpartanToken;
+    constructor(getOauth2AccessToken, tokenPersister) {
+        let actualTokenPersister;
+        if (tokenPersister) {
+            actualTokenPersister = tokenPersister;
+        }
+        else {
+            actualTokenPersister = inMemoryTokenPersister;
+        }
+        const xboxAuthClient = new XboxAuthenticationClient(tokenPersister);
+        const haloAuthClient = new HaloAuthenticationClient(async () => {
+            const xstsTicket = await xboxAuthClient.getXstsTicket(getOauth2AccessToken);
+            return xstsTicket.Token;
+        }, async () => await actualTokenPersister.load("halo.authToken"), async (token) => {
+            await actualTokenPersister.save("halo.authToken", token);
+        });
+        this.getSpartanToken = () => haloAuthClient.getSpartanToken();
+    }
+}
+//# sourceMappingURL=auto-xsts-spartan-token-provider.js.map

package/dist/core/token-providers/spartan-token-providers/auto-xsts-spartan-token-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-xsts-spartan-token-provider.js","sourceRoot":"","sources":["../../../../src/core/token-providers/spartan-token-providers/auto-xsts-spartan-token-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,wBAAwB,GACzB,MAAM,oDAAoD,CAAC;AAE5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAE1F;;;;GAIG;AACH,MAAM,OAAO,4BAA4B;IACvB,eAAe,CAAwB;IAEvD,YACE,oBAA2C,EAC3C,cAA+B;QAE/B,IAAI,oBAAoC,CAAC;QACzC,IAAI,cAAc,EAAE;YAClB,oBAAoB,GAAG,cAAc,CAAC;SACvC;aAAM;YACL,oBAAoB,GAAG,sBAAsB,CAAC;SAC/C;QACD,MAAM,cAAc,GAAG,IAAI,wBAAwB,CAAC,cAAc,CAAC,CAAC;QACpE,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,KAAK,IAAI,EAAE;YACT,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,aAAa,CACnD,oBAAoB,CACrB,CAAC;YACF,OAAO,UAAU,CAAC,KAAK,CAAC;QAC1B,CAAC,EACD,KAAK,IAAI,EAAE,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAC7D,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IAChE,CAAC;CACF"}

package/dist/core/token-providers/spartan-token-providers/index.d.ts

@@ -0,0 +1,3 @@
+export interface SpartanTokenProvider {
+    getSpartanToken(): Promise<string>;
+}

package/dist/core/token-providers/spartan-token-providers/index.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.js.map

package/dist/core/token-providers/spartan-token-providers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/token-providers/spartan-token-providers/index.ts"],"names":[],"mappings":""}

package/dist/core/token-providers/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider.d.ts

@@ -0,0 +1,12 @@
+import { TokenPersister } from "../../token-persisters";
+import { SpartanTokenProvider } from ".";
+/**
+ * A SpartanTokenProvider that fetches uses a pre-fetched XSTS ticket token.
+ * Since requests to the Halo API are subject to CORS restrictions a
+ * HaloAuthenticationClient can be instantitated with a pre-fetched XSTS ticket
+ * and run on a server (such as one provided by the user).
+ */
+export declare class StaticXstsTicketTokenSpartanTokenProvider implements SpartanTokenProvider {
+    readonly getSpartanToken: () => Promise<string>;
+    constructor(xstsTicketToken: string, tokenPersister?: TokenPersister);
+}

package/dist/core/token-providers/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider.js

@@ -0,0 +1,25 @@
+import { HaloAuthenticationClient } from "../../../authentication/halo-authentication-client";
+import { inMemoryTokenPersister } from "../../token-persisters/in-memory-token-persister";
+/**
+ * A SpartanTokenProvider that fetches uses a pre-fetched XSTS ticket token.
+ * Since requests to the Halo API are subject to CORS restrictions a
+ * HaloAuthenticationClient can be instantitated with a pre-fetched XSTS ticket
+ * and run on a server (such as one provided by the user).
+ */
+export class StaticXstsTicketTokenSpartanTokenProvider {
+    getSpartanToken;
+    constructor(xstsTicketToken, tokenPersister) {
+        let actualTokenPersister;
+        if (tokenPersister) {
+            actualTokenPersister = tokenPersister;
+        }
+        else {
+            actualTokenPersister = inMemoryTokenPersister;
+        }
+        const haloAuthClient = new HaloAuthenticationClient(() => xstsTicketToken, async () => await actualTokenPersister.load("halo.authToken"), async (token) => {
+            await actualTokenPersister.save("halo.authToken", token);
+        });
+        this.getSpartanToken = () => haloAuthClient.getSpartanToken();
+    }
+}
+//# sourceMappingURL=static-xsts-ticket-token-spartan-token-provider.js.map

package/dist/core/token-providers/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"static-xsts-ticket-token-spartan-token-provider.js","sourceRoot":"","sources":["../../../../src/core/token-providers/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAE9F,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAE1F;;;;;GAKG;AACH,MAAM,OAAO,yCAAyC;IAGpC,eAAe,CAAwB;IAEvD,YAAY,eAAuB,EAAE,cAA+B;QAClE,IAAI,oBAAoC,CAAC;QACzC,IAAI,cAAc,EAAE;YAClB,oBAAoB,GAAG,cAAc,CAAC;SACvC;aAAM;YACL,oBAAoB,GAAG,sBAAsB,CAAC;SAC/C;QAED,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,GAAG,EAAE,CAAC,eAAe,EACrB,KAAK,IAAI,EAAE,CAAC,MAAM,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAC7D,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,oBAAoB,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QAC3D,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IAChE,CAAC;CACF"}

package/dist/core/token-providers/xbox-token-provider.d.ts

@@ -0,0 +1,3 @@
+export interface XboxTokenProvider {
+    getXboxLiveV3Token: () => Promise<string>;
+}

package/dist/core/token-providers/xbox-token-provider.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=xbox-token-provider.js.map

package/dist/core/token-providers/xbox-token-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xbox-token-provider.js","sourceRoot":"","sources":["../../../src/core/token-providers/xbox-token-provider.ts"],"names":[],"mappings":""}

package/dist/core/xbox-client.d.ts

@@ -0,0 +1,13 @@
+import { XboxTokenProvider } from "./token-providers/xbox-token-provider";
+export declare class XboxClient {
+    private xboxTokenProvider;
+    constructor(xboxTokenProvider: XboxTokenProvider);
+    private executeRequest;
+    searchUsers(query: string): Promise<{
+        id: string;
+        gamertag: string;
+        displayPicUri: string;
+        score: 0.0;
+    }[]>;
+    recentPlayers(): Promise<unknown>;
+}

package/dist/core/xbox-client.js

@@ -0,0 +1,28 @@
+import axios, { AxiosHeaders } from "axios";
+export class XboxClient {
+    xboxTokenProvider;
+    constructor(xboxTokenProvider) {
+        this.xboxTokenProvider = xboxTokenProvider;
+    }
+    async executeRequest(url, method) {
+        const headers = new AxiosHeaders({
+            Accept: "application/json",
+            Authorization: await this.xboxTokenProvider.getXboxLiveV3Token(),
+            "x-xbl-contract-version": "1",
+        });
+        const response = await axios.request({
+            url,
+            method,
+            headers,
+        });
+        return response.data;
+    }
+    async searchUsers(query) {
+        const { results } = await this.executeRequest(`https://usersearch.xboxlive.com/suggest?q=${encodeURIComponent(query)}`, "GET");
+        return results.map(({ result }) => result);
+    }
+    async recentPlayers() {
+        return await this.executeRequest("https://peoplehub.xboxlive.com/users/me/people/recentplayers", "GET");
+    }
+}
+//# sourceMappingURL=xbox-client.js.map

package/dist/core/xbox-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xbox-client.js","sourceRoot":"","sources":["../../src/core/xbox-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,YAAY,EAAU,MAAM,OAAO,CAAC;AAGpD,MAAM,OAAO,UAAU;IACD;IAApB,YAAoB,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAEpD,KAAK,CAAC,cAAc,CAAI,GAAW,EAAE,MAAc;QACzD,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC;YAC/B,MAAM,EAAE,kBAAkB;YAC1B,aAAa,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE;YAChE,wBAAwB,EAAE,GAAG;SAC9B,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAI;YACtC,GAAG;YACH,MAAM;YACN,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,IAAI,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,KAAa;QACpC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAa3C,6CAA6C,kBAAkB,CAAC,KAAK,CAAC,EAAE,EACxE,KAAK,CACN,CAAC;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,OAAO,MAAM,IAAI,CAAC,cAAc,CAC9B,8DAA8D,EAC9D,KAAK,CACN,CAAC;IACJ,CAAC;CACF"}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { HaloInfiniteClient, AssetKindTypeMap, } from "./core/halo-infinite-client";
+export { XboxClient } from "./core/xbox-client";
 export { XboxAuthenticationClient, RelyingParty, } from "./authentication/xbox-authentication-client";
 export { Playlist } from "./models/halo-infinite/playlist";
 export { PlaylistCsrContainer } from "./models/halo-infinite/playlist-csr-container";
@@ -15,8 +16,8 @@ export { MatchOutcome } from "./models/halo-infinite/match-outcome";
 export { MatchSkill } from "./models/halo-infinite/match-skill";
 export { AssetVersionLink } from "./models/halo-infinite/asset-version-link";
 export { MatchInfo } from "./models/halo-infinite/match-info";
-export { SpartanTokenProvider } from "./core/spartan-token-providers";
-export { AutoXstsSpartanTokenProvider } from "./core/spartan-token-providers/auto-xsts-spartan-token-provider";
-export { StaticXstsTicketTokenSpartanTokenProvider } from "./core/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider";
+export { SpartanTokenProvider } from "./core/token-providers/spartan-token-providers";
+export { AutoTokenProvider, AutoTokenProvider as AutoXstsSpartanTokenProvider, } from "./core/token-providers/auto-token-provider";
+export { StaticXstsTicketTokenSpartanTokenProvider } from "./core/token-providers/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider";
 export { TokenPersister } from "./core/token-persisters";
 export { PlaylistExperience } from "./models/halo-infinite/playlist-experience";

package/dist/index.js

@@ -1,10 +1,11 @@
 export { HaloInfiniteClient, } from "./core/halo-infinite-client";
+export { XboxClient } from "./core/xbox-client";
 export { XboxAuthenticationClient, RelyingParty, } from "./authentication/xbox-authentication-client";
 export { MatchType } from "./models/halo-infinite/match-type";
 export { GameVariantCategory } from "./models/halo-infinite/game-variant-category";
 export { AssetKind } from "./models/halo-infinite/asset-kind";
 export { MatchOutcome } from "./models/halo-infinite/match-outcome";
-export { AutoXstsSpartanTokenProvider } from "./core/spartan-token-providers/auto-xsts-spartan-token-provider";
-export { StaticXstsTicketTokenSpartanTokenProvider } from "./core/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider";
+export { AutoTokenProvider, AutoTokenProvider as AutoXstsSpartanTokenProvider, } from "./core/token-providers/auto-token-provider";
+export { StaticXstsTicketTokenSpartanTokenProvider } from "./core/token-providers/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider";
 export { PlaylistExperience } from "./models/halo-infinite/playlist-experience";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,GAEnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,wBAAwB,EACxB,YAAY,GACb,MAAM,6CAA6C,CAAC;AAKrD,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAKnF,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAKpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,iEAAiE,CAAC;AAC/G,OAAO,EAAE,yCAAyC,EAAE,MAAM,gFAAgF,CAAC;AAE3I,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,GAEnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EACL,wBAAwB,EACxB,YAAY,GACb,MAAM,6CAA6C,CAAC;AAKrD,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAKnF,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAKpE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,IAAI,4BAA4B,GAClD,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,yCAAyC,EAAE,MAAM,gGAAgG,CAAC;AAE3J,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC"}

package/dist/models/halo-infinite/game-variant-category.d.ts

@@ -7,8 +7,10 @@ export declare enum GameVariantCategory {
     MultiplayerTotalControl = 14,
     MultiplayerCtf = 15,
     MultiplayerOddball = 18,
+    MultiplayerStockpile = 19,
     MultiplayerInfection = 22,
     MultiplayerGrifball = 25,
     MultiplayerLandGrab = 39,
-    MultiplayerExtraction = 17
+    MultiplayerExtraction = 17,
+    MultiplayerFirefight = 42
 }

package/dist/models/halo-infinite/game-variant-category.js

@@ -8,9 +8,11 @@ export var GameVariantCategory;
     GameVariantCategory[GameVariantCategory["MultiplayerTotalControl"] = 14] = "MultiplayerTotalControl";
     GameVariantCategory[GameVariantCategory["MultiplayerCtf"] = 15] = "MultiplayerCtf";
     GameVariantCategory[GameVariantCategory["MultiplayerOddball"] = 18] = "MultiplayerOddball";
+    GameVariantCategory[GameVariantCategory["MultiplayerStockpile"] = 19] = "MultiplayerStockpile";
     GameVariantCategory[GameVariantCategory["MultiplayerInfection"] = 22] = "MultiplayerInfection";
     GameVariantCategory[GameVariantCategory["MultiplayerGrifball"] = 25] = "MultiplayerGrifball";
     GameVariantCategory[GameVariantCategory["MultiplayerLandGrab"] = 39] = "MultiplayerLandGrab";
     GameVariantCategory[GameVariantCategory["MultiplayerExtraction"] = 17] = "MultiplayerExtraction";
+    GameVariantCategory[GameVariantCategory["MultiplayerFirefight"] = 42] = "MultiplayerFirefight";
 })(GameVariantCategory || (GameVariantCategory = {}));
 //# sourceMappingURL=game-variant-category.js.map

package/dist/models/halo-infinite/game-variant-category.js.map

@@ -1 +1 @@
-{"version":3,"file":"game-variant-category.js","sourceRoot":"","sources":["../../../src/models/halo-infinite/game-variant-category.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAaX;AAbD,WAAY,mBAAmB;IAC7B,uFAAqB,CAAA;IACrB,6FAAwB,CAAA;IACxB,uFAAqB,CAAA;IACrB,kGAA2B,CAAA;IAC3B,sGAA6B,CAAA;IAC7B,oGAA4B,CAAA;IAC5B,kFAAmB,CAAA;IACnB,0FAAuB,CAAA;IACvB,8FAAyB,CAAA;IACzB,4FAAwB,CAAA;IACxB,4FAAwB,CAAA;IACxB,gGAA0B,CAAA;AAC5B,CAAC,EAbW,mBAAmB,KAAnB,mBAAmB,QAa9B"}
+{"version":3,"file":"game-variant-category.js","sourceRoot":"","sources":["../../../src/models/halo-infinite/game-variant-category.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAeX;AAfD,WAAY,mBAAmB;IAC7B,uFAAqB,CAAA;IACrB,6FAAwB,CAAA;IACxB,uFAAqB,CAAA;IACrB,kGAA2B,CAAA;IAC3B,sGAA6B,CAAA;IAC7B,oGAA4B,CAAA;IAC5B,kFAAmB,CAAA;IACnB,0FAAuB,CAAA;IACvB,8FAAyB,CAAA;IACzB,8FAAyB,CAAA;IACzB,4FAAwB,CAAA;IACxB,4FAAwB,CAAA;IACxB,gGAA0B,CAAA;IAC1B,8FAAyB,CAAA;AAC3B,CAAC,EAfW,mBAAmB,KAAnB,mBAAmB,QAe9B"}

package/dist/models/halo-infinite/stats.d.ts

@@ -1,5 +1,5 @@
 import { GameVariantCategory } from "./game-variant-category";
-interface OddballStats {
+export interface OddballStats {
     KillsAsSkullCarrier: number;
     LongestTimeAsSkullCarrier: string;
     SkullCarriersKilled: number;
@@ -7,7 +7,7 @@ interface OddballStats {
     TimeAsSkullCarrier: string;
     SkullScoringTicks: number;
 }
-interface ZonesStats {
+export interface ZonesStats {
     StrongholdCaptures: number;
     StrongholdDefensiveKills: number;
     StrongholdOffensiveKills: number;
@@ -15,7 +15,7 @@ interface ZonesStats {
     StrongholdOccupationTime: string;
     StrongholdScoringTicks: number;
 }
-interface CaptureTheFlagStats {
+export interface CaptureTheFlagStats {
     FlagCaptureAssists: number;
     FlagCaptures: number;
     FlagCarriersKilled: number;
@@ -28,13 +28,46 @@ interface CaptureTheFlagStats {
     KillsAsFlagReturner: number;
     TimeAsFlagCarrier: string;
 }
-interface ExtractionStats {
+export interface ExtractionStats {
     SuccessfulExtractions: number;
     ExtractionConversionsDenied: number;
     ExtractionConversionsCompleted: number;
     ExtractionInitiationsDenied: number;
     ExtractionInitiationsCompleted: number;
 }
+export interface EliminationStats {
+    AlliesRevived: number;
+    EliminationAssists: number;
+    Eliminations: number;
+    EnemyRevivesDenied: number;
+    Executions: number;
+    KillsAsLastPlayerStanding: number;
+    LastPlayersStandingKilled: number;
+    RoundsSurvived: number;
+    TimesRevivedByAlly: number;
+}
+export interface InfectionStats {
+    AlphasKilled: number;
+    SpartansInfected: number;
+    SpartansInfectedAsAlpha: number;
+    KillsAsLastSpartanStanding: number;
+    LastSpartansStandingInfected: number;
+    RoundsAsAlpha: number;
+    RoundsAsLastSpartanStanding: number;
+    RoundsFinishedAsInfected: number;
+    RoundsSurvivedAsSpartan: number;
+    RoundsSurvivedAsLastSpartanStanding: number;
+    TimeAsLastSpartanStanding: string;
+    InfectedKilled: number;
+}
+export interface StockpileStats {
+    KillsAsPowerSeedCarrier: number;
+    PowerSeedCarriersKilled: number;
+    PowerSeedsDeposited: number;
+    PowerSeedsStolen: number;
+    TimeAsPowerSeedCarrier: string;
+    TimeAsPowerSeedDriver: string;
+}
 type StatsMap = {
     [GameVariantCategory.MultiplayerOddball]: {
         OddballStats: OddballStats;
@@ -51,6 +84,15 @@ type StatsMap = {
     [GameVariantCategory.MultiplayerExtraction]: {
         ExtractionStats: ExtractionStats;
     };
+    [GameVariantCategory.MultiplayerFirefight]: {
+        EliminationStats: EliminationStats;
+    };
+    [GameVariantCategory.MultiplayerInfection]: {
+        InfectionSTats: InfectionStats;
+    };
+    [GameVariantCategory.MultiplayerStockpile]: {
+        StockpileStats: StockpileStats;
+    };
 };
 export type Stats<TCategory extends GameVariantCategory = GameVariantCategory> = {
     CoreStats: {

package/dist/util/keyed-expiry-token-cache.d.ts

@@ -0,0 +1,13 @@
+import { DateTime } from "luxon";
+export declare class KeyedExpiryTokenCache<TToken extends {
+    expiresAt: DateTime;
+}, TKey extends string, TArgs extends any[]> {
+    private readonly generateNewToken;
+    private readonly existingTokenFetcher;
+    private readonly tokenFetchPromiseMap;
+    constructor(generateNewToken: (key: TKey, ...args: TArgs) => Promise<TToken>, existingTokenFetcher: (key: TKey) => Promise<(Omit<TToken, "expiresAt"> & {
+        expiresAt: unknown;
+    }) | null>);
+    getToken(key: TKey, ...args: TArgs): Promise<TToken>;
+    getExistingToken(key: TKey): Promise<TToken | null>;
+}

package/dist/util/keyed-expiry-token-cache.js

@@ -0,0 +1,74 @@
+import { DateTime } from "luxon";
+import { ResolvablePromise } from "./resolvable-promise";
+import { coalesceDateTime } from "./date-time";
+export class KeyedExpiryTokenCache {
+    generateNewToken;
+    existingTokenFetcher;
+    tokenFetchPromiseMap = new Map();
+    constructor(generateNewToken, existingTokenFetcher) {
+        this.generateNewToken = generateNewToken;
+        this.existingTokenFetcher = existingTokenFetcher;
+    }
+    async getToken(key, ...args) {
+        let tokenFetchPromise = this.tokenFetchPromiseMap.get(key);
+        if (tokenFetchPromise) {
+            // Someone either already has a token or is in the process of getting one
+            // Wait for them to finish, then check for validity
+            const currentToken = await tokenFetchPromise;
+            if (currentToken.expiresAt > DateTime.now()) {
+                // Current token is valid, return it
+                return currentToken;
+            }
+            else {
+                // Current token expired, start a new promise
+                tokenFetchPromise = new ResolvablePromise();
+                this.tokenFetchPromiseMap.set(key, tokenFetchPromise);
+                try {
+                    const newToken = await this.generateNewToken(key, ...args);
+                    tokenFetchPromise.resolve(newToken);
+                    return newToken;
+                }
+                catch (e) {
+                    tokenFetchPromise.reject(e);
+                    tokenFetchPromise = undefined;
+                    throw e;
+                }
+            }
+        }
+        else {
+            // No one has a token, start a new promise
+            tokenFetchPromise = new ResolvablePromise();
+            this.tokenFetchPromiseMap.set(key, tokenFetchPromise);
+            try {
+                const existingToken = await this.getExistingToken(key);
+                if (existingToken?.expiresAt) {
+                    const expiresAt = coalesceDateTime(existingToken.expiresAt);
+                    if (expiresAt && expiresAt > DateTime.now()) {
+                        const newToken = { ...existingToken, expiresAt };
+                        tokenFetchPromise.resolve(newToken);
+                        return newToken;
+                    }
+                }
+                const newToken = await this.generateNewToken(key, ...args);
+                tokenFetchPromise.resolve(newToken);
+                return newToken;
+            }
+            catch (e) {
+                tokenFetchPromise.reject(e);
+                tokenFetchPromise = undefined;
+                throw e;
+            }
+        }
+    }
+    async getExistingToken(key) {
+        const existingToken = await this.existingTokenFetcher(key);
+        if (existingToken?.expiresAt) {
+            const expiresAt = coalesceDateTime(existingToken.expiresAt);
+            if (expiresAt && expiresAt > DateTime.now()) {
+                return { ...existingToken, expiresAt };
+            }
+        }
+        return null;
+    }
+}
+//# sourceMappingURL=keyed-expiry-token-cache.js.map

package/dist/util/keyed-expiry-token-cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyed-expiry-token-cache.js","sourceRoot":"","sources":["../../src/util/keyed-expiry-token-cache.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halo-infinite-api",
   "type": "module",
-  "version": "4.0.6",
+  "version": "5.0.0",
   "description": "An NPM package for accessing the official Halo Infinite API.",
   "main": "dist/index.js",
   "scripts": {

package/src/authentication/xbox-authentication-client.ts

@@ -2,7 +2,7 @@ import axios, { AxiosInstance } from "axios";
 import { DateTime } from "luxon";
 import { TokenPersister } from "../core/token-persisters";
 import { XboxTicket } from "../models/xbox-ticket";
-import { coalesceDateTime } from "../util/date-time";
+import { KeyedExpiryTokenCache } from "../util/keyed-expiry-token-cache";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
 
 export enum RelyingParty {
@@ -51,8 +51,8 @@ export class XboxAuthenticationClient {
         "xbox.userToken"
       )) ?? null
   );
-  private xstsTicketCache = new ExpiryTokenCache(
-    async (userToken: string, relyingParty: RelyingParty) => {
+  private xstsTicketCache = new KeyedExpiryTokenCache(
+    async (relyingParty: RelyingParty, userToken: string) => {
       const response = await this.httpClient.post<XboxTicket>(
         "https://xsts.auth.xboxlive.com/xsts/authorize",
         {
@@ -76,12 +76,15 @@ export class XboxAuthenticationClient {
         ...response.data,
         expiresAt: DateTime.fromISO(response.data.NotAfter),
       };
-      await this.tokenPersister?.save("xbox.xstsTicket", result);
+      await this.tokenPersister?.save(
+        "xbox.xstsTicket." + relyingParty,
+        result
+      );
       return result;
     },
-    async () =>
+    async (relyingParty) =>
       (await this.tokenPersister?.load<XboxTicket & { expiresAt: unknown }>(
-        "xbox.xstsTicket"
+        "xbox.xstsTicket." + relyingParty
       )) ?? null
   );
 
@@ -91,8 +94,11 @@ export class XboxAuthenticationClient {
     this.httpClient = axios.create();
   }
 
-  public async getXstsTicket(getOauth2AccessToken: () => Promise<string>) {
-    let xstsTicket = await this.xstsTicketCache.getExistingToken();
+  public async getXstsTicket(
+    getOauth2AccessToken: () => Promise<string>,
+    relyingParty: RelyingParty
+  ) {
+    let xstsTicket = await this.xstsTicketCache.getExistingToken(relyingParty);
     if (!xstsTicket) {
       let userToken = await this.userTokenCache.getExistingToken();
       if (!userToken) {
@@ -103,13 +109,13 @@ export class XboxAuthenticationClient {
         );
       }
       xstsTicket = await this.xstsTicketCache.getToken(
-        userToken.Token,
-        RelyingParty.Halo
+        relyingParty,
+        userToken.Token
       );
     }
     return xstsTicket;
   }
 
-  public getXboxLiveV3Token = (userHash: string, userToken: string) =>
-    `XBL3.0 x=${userHash};${userToken}`;
+  public getXboxLiveV3Token = (xboxTicket: XboxTicket) =>
+    `XBL3.0 x=${xboxTicket.DisplayClaims.xui[0].uhs};${xboxTicket.Token}`;
 }

package/src/core/halo-infinite-client.ts

@@ -15,7 +15,7 @@ import { PlaylistCsrContainer } from "../models/halo-infinite/playlist-csr-conta
 import { ServiceRecord } from "../models/halo-infinite/service-record";
 import { UserInfo } from "../models/halo-infinite/user-info";
 import { GlobalConstants } from "../util/global-contants";
-import { SpartanTokenProvider } from "./spartan-token-providers";
+import { SpartanTokenProvider } from "./token-providers/spartan-token-providers";
 
 interface ResultContainer<TValue> {
   Id: string;
@@ -49,7 +49,7 @@ const assetKindUrlMap = {
 };
 
 function wrapPlayerId(playerId: string) {
-  if (/^\w+(\d+)/) {
+  if (/^\w+\(\d+\)/.test(playerId)) {
     return playerId;
   } else {
     // Assume xuid
@@ -197,11 +197,23 @@ export class HaloInfiniteClient {
       params,
       `https://${HaloCoreEndpoints.StatsOrigin}.${
         HaloCoreEndpoints.ServiceDomain
-      }/hi/players/xuid(${wrapPlayerId(playerXuid)})/matches`,
+      }/hi/players/${wrapPlayerId(playerXuid)}/matches`,
       "get"
     );
   };
 
+  public getPlayerServiceRecord(
+    playerXuid: string,
+    type: MatchType = MatchType.All
+  ) {
+    return this.executeRequest<ServiceRecord>(
+      `https://${HaloCoreEndpoints.StatsOrigin}.${
+        HaloCoreEndpoints.ServiceDomain
+      }/hi/players/${wrapPlayerId(playerXuid)}/Matchmade/servicerecord`,
+      "get"
+    );
+  }
+
   public getMatchStats = (matchId: string) =>
     this.executeRequest<MatchStats>(
       `https://${HaloCoreEndpoints.StatsOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/matches/${matchId}/stats`,

package/src/core/{spartan-token-providers/auto-xsts-spartan-token-provider.ts → token-providers/auto-token-provider.ts}

@@ -4,16 +4,20 @@ import {
 } from "../../authentication/xbox-authentication-client";
 import { TokenPersister } from "../token-persisters";
 import { HaloAuthenticationClient } from "../../authentication/halo-authentication-client";
-import { SpartanTokenProvider } from ".";
+import { SpartanTokenProvider } from "./spartan-token-providers";
 import { inMemoryTokenPersister } from "../token-persisters/in-memory-token-persister";
+import { XboxTokenProvider } from "./xbox-token-provider";
 
 /**
  * A SpartanTokenProvider that fetches both the Xbox and Halo tokens in the same
  * process. This is useful for applications that do not need to contend with
  * CORS restrictions.
  */
-export class AutoXstsSpartanTokenProvider implements SpartanTokenProvider {
+export class AutoTokenProvider
+  implements SpartanTokenProvider, XboxTokenProvider
+{
   public readonly getSpartanToken: () => Promise<string>;
+  public readonly getXboxLiveV3Token: () => Promise<string>;
 
   constructor(
     getOauth2AccessToken: () => Promise<string>,
@@ -29,7 +33,8 @@ export class AutoXstsSpartanTokenProvider implements SpartanTokenProvider {
     const haloAuthClient = new HaloAuthenticationClient(
       async () => {
         const xstsTicket = await xboxAuthClient.getXstsTicket(
-          getOauth2AccessToken
+          getOauth2AccessToken,
+          RelyingParty.Halo
         );
         return xstsTicket.Token;
       },
@@ -40,5 +45,12 @@ export class AutoXstsSpartanTokenProvider implements SpartanTokenProvider {
     );
 
     this.getSpartanToken = () => haloAuthClient.getSpartanToken();
+    this.getXboxLiveV3Token = async () => {
+      const xstsTicket = await xboxAuthClient.getXstsTicket(
+        getOauth2AccessToken,
+        RelyingParty.Xbox
+      );
+      return xboxAuthClient.getXboxLiveV3Token(xstsTicket);
+    };
   }
 }

package/src/core/{spartan-token-providers → token-providers/spartan-token-providers}/static-xsts-ticket-token-spartan-token-provider.ts

@@ -1,7 +1,7 @@
-import { TokenPersister } from "../token-persisters";
-import { HaloAuthenticationClient } from "../../authentication/halo-authentication-client";
+import { TokenPersister } from "../../token-persisters";
+import { HaloAuthenticationClient } from "../../../authentication/halo-authentication-client";
 import { SpartanTokenProvider } from ".";
-import { inMemoryTokenPersister } from "../token-persisters/in-memory-token-persister";
+import { inMemoryTokenPersister } from "../../token-persisters/in-memory-token-persister";
 
 /**
  * A SpartanTokenProvider that fetches uses a pre-fetched XSTS ticket token.

package/src/core/token-providers/xbox-token-provider.ts

@@ -0,0 +1,3 @@
+export interface XboxTokenProvider {
+  getXboxLiveV3Token: () => Promise<string>;
+}

package/src/core/xbox-client.ts

@@ -0,0 +1,48 @@
+import axios, { AxiosHeaders, Method } from "axios";
+import { XboxTokenProvider } from "./token-providers/xbox-token-provider";
+
+export class XboxClient {
+  constructor(private xboxTokenProvider: XboxTokenProvider) {}
+
+  private async executeRequest<T>(url: string, method: Method) {
+    const headers = new AxiosHeaders({
+      Accept: "application/json",
+      Authorization: await this.xboxTokenProvider.getXboxLiveV3Token(),
+      "x-xbl-contract-version": "1",
+    });
+    const response = await axios.request<T>({
+      url,
+      method,
+      headers,
+    });
+
+    return response.data;
+  }
+
+  public async searchUsers(query: string) {
+    const { results } = await this.executeRequest<{
+      results: [
+        {
+          result: {
+            id: string;
+            gamertag: string;
+            displayPicUri: string;
+            score: 0.0;
+          };
+          text: string;
+        }
+      ];
+    }>(
+      `https://usersearch.xboxlive.com/suggest?q=${encodeURIComponent(query)}`,
+      "GET"
+    );
+    return results.map(({ result }) => result);
+  }
+
+  public async recentPlayers() {
+    return await this.executeRequest<unknown>(
+      "https://peoplehub.xboxlive.com/users/me/people/recentplayers",
+      "GET"
+    );
+  }
+}

package/src/index.ts

@@ -2,6 +2,7 @@ export {
   HaloInfiniteClient,
   AssetKindTypeMap,
 } from "./core/halo-infinite-client";
+export { XboxClient } from "./core/xbox-client";
 export {
   XboxAuthenticationClient,
   RelyingParty,
@@ -21,8 +22,11 @@ export { MatchOutcome } from "./models/halo-infinite/match-outcome";
 export { MatchSkill } from "./models/halo-infinite/match-skill";
 export { AssetVersionLink } from "./models/halo-infinite/asset-version-link";
 export { MatchInfo } from "./models/halo-infinite/match-info";
-export { SpartanTokenProvider } from "./core/spartan-token-providers";
-export { AutoXstsSpartanTokenProvider } from "./core/spartan-token-providers/auto-xsts-spartan-token-provider";
-export { StaticXstsTicketTokenSpartanTokenProvider } from "./core/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider";
+export { SpartanTokenProvider } from "./core/token-providers/spartan-token-providers";
+export {
+  AutoTokenProvider,
+  AutoTokenProvider as AutoXstsSpartanTokenProvider,
+} from "./core/token-providers/auto-token-provider";
+export { StaticXstsTicketTokenSpartanTokenProvider } from "./core/token-providers/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider";
 export { TokenPersister } from "./core/token-persisters";
 export { PlaylistExperience } from "./models/halo-infinite/playlist-experience";

package/src/models/halo-infinite/game-variant-category.ts

@@ -7,8 +7,10 @@ export enum GameVariantCategory {
   MultiplayerTotalControl = 14,
   MultiplayerCtf = 15,
   MultiplayerOddball = 18,
+  MultiplayerStockpile = 19,
   MultiplayerInfection = 22,
   MultiplayerGrifball = 25,
   MultiplayerLandGrab = 39,
   MultiplayerExtraction = 17,
+  MultiplayerFirefight = 42,
 }

package/src/models/halo-infinite/stats.ts

@@ -1,6 +1,6 @@
 import { GameVariantCategory } from "./game-variant-category";
 
-interface OddballStats {
+export interface OddballStats {
   KillsAsSkullCarrier: number;
   LongestTimeAsSkullCarrier: string;
   SkullCarriersKilled: number;
@@ -8,7 +8,8 @@ interface OddballStats {
   TimeAsSkullCarrier: string;
   SkullScoringTicks: number;
 }
-interface ZonesStats {
+
+export interface ZonesStats {
   StrongholdCaptures: number;
   StrongholdDefensiveKills: number;
   StrongholdOffensiveKills: number;
@@ -16,7 +17,8 @@ interface ZonesStats {
   StrongholdOccupationTime: string;
   StrongholdScoringTicks: number;
 }
-interface CaptureTheFlagStats {
+
+export interface CaptureTheFlagStats {
   FlagCaptureAssists: number;
   FlagCaptures: number;
   FlagCarriersKilled: number;
@@ -30,7 +32,7 @@ interface CaptureTheFlagStats {
   TimeAsFlagCarrier: string;
 }
 
-interface ExtractionStats {
+export interface ExtractionStats {
   SuccessfulExtractions: number;
   ExtractionConversionsDenied: number;
   ExtractionConversionsCompleted: number;
@@ -38,6 +40,42 @@ interface ExtractionStats {
   ExtractionInitiationsCompleted: number;
 }
 
+export interface EliminationStats {
+  AlliesRevived: number;
+  EliminationAssists: number;
+  Eliminations: number;
+  EnemyRevivesDenied: number;
+  Executions: number;
+  KillsAsLastPlayerStanding: number;
+  LastPlayersStandingKilled: number;
+  RoundsSurvived: number;
+  TimesRevivedByAlly: number;
+}
+
+export interface InfectionStats {
+  AlphasKilled: number;
+  SpartansInfected: number;
+  SpartansInfectedAsAlpha: number;
+  KillsAsLastSpartanStanding: number;
+  LastSpartansStandingInfected: number;
+  RoundsAsAlpha: number;
+  RoundsAsLastSpartanStanding: number;
+  RoundsFinishedAsInfected: number;
+  RoundsSurvivedAsSpartan: number;
+  RoundsSurvivedAsLastSpartanStanding: number;
+  TimeAsLastSpartanStanding: string;
+  InfectedKilled: number;
+}
+
+export interface StockpileStats {
+  KillsAsPowerSeedCarrier: number;
+  PowerSeedCarriersKilled: number;
+  PowerSeedsDeposited: number;
+  PowerSeedsStolen: number;
+  TimeAsPowerSeedCarrier: string;
+  TimeAsPowerSeedDriver: string;
+}
+
 type StatsMap = {
   [GameVariantCategory.MultiplayerOddball]: { OddballStats: OddballStats };
   [GameVariantCategory.MultiplayerStrongholds]: { ZonesStats: ZonesStats };
@@ -48,6 +86,15 @@ type StatsMap = {
   [GameVariantCategory.MultiplayerExtraction]: {
     ExtractionStats: ExtractionStats;
   };
+  [GameVariantCategory.MultiplayerFirefight]: {
+    EliminationStats: EliminationStats;
+  };
+  [GameVariantCategory.MultiplayerInfection]: {
+    InfectionSTats: InfectionStats;
+  };
+  [GameVariantCategory.MultiplayerStockpile]: {
+    StockpileStats: StockpileStats;
+  };
 };
 
 export type Stats<TCategory extends GameVariantCategory = GameVariantCategory> =

package/src/util/keyed-expiry-token-cache.ts

@@ -0,0 +1,90 @@
+import { DateTime } from "luxon";
+import { ResolvablePromise } from "./resolvable-promise";
+import { coalesceDateTime } from "./date-time";
+
+export class KeyedExpiryTokenCache<
+  TToken extends { expiresAt: DateTime },
+  TKey extends string,
+  TArgs extends any[]
+> {
+  private readonly tokenFetchPromiseMap = new Map<
+    TKey,
+    ResolvablePromise<TToken>
+  >();
+
+  constructor(
+    private readonly generateNewToken: (
+      key: TKey,
+      ...args: TArgs
+    ) => Promise<TToken>,
+    private readonly existingTokenFetcher: (
+      key: TKey
+    ) => Promise<(Omit<TToken, "expiresAt"> & { expiresAt: unknown }) | null>
+  ) {}
+
+  async getToken(key: TKey, ...args: TArgs): Promise<TToken> {
+    let tokenFetchPromise = this.tokenFetchPromiseMap.get(key);
+    if (tokenFetchPromise) {
+      // Someone either already has a token or is in the process of getting one
+      // Wait for them to finish, then check for validity
+      const currentToken = await tokenFetchPromise;
+
+      if (currentToken.expiresAt > DateTime.now()) {
+        // Current token is valid, return it
+        return currentToken;
+      } else {
+        // Current token expired, start a new promise
+        tokenFetchPromise = new ResolvablePromise<TToken>();
+        this.tokenFetchPromiseMap.set(key, tokenFetchPromise);
+
+        try {
+          const newToken = await this.generateNewToken(key, ...args);
+          tokenFetchPromise.resolve(newToken);
+          return newToken;
+        } catch (e) {
+          tokenFetchPromise.reject(e);
+          tokenFetchPromise = undefined;
+          throw e;
+        }
+      }
+    } else {
+      // No one has a token, start a new promise
+      tokenFetchPromise = new ResolvablePromise<TToken>();
+      this.tokenFetchPromiseMap.set(key, tokenFetchPromise);
+
+      try {
+        const existingToken = await this.getExistingToken(key);
+
+        if (existingToken?.expiresAt) {
+          const expiresAt = coalesceDateTime(existingToken.expiresAt);
+          if (expiresAt && expiresAt > DateTime.now()) {
+            const newToken = { ...existingToken, expiresAt } as TToken;
+            tokenFetchPromise.resolve(newToken);
+            return newToken;
+          }
+        }
+
+        const newToken = await this.generateNewToken(key, ...args);
+        tokenFetchPromise.resolve(newToken);
+        return newToken;
+      } catch (e) {
+        tokenFetchPromise.reject(e);
+        tokenFetchPromise = undefined;
+        throw e;
+      }
+    }
+  }
+
+  async getExistingToken(key: TKey) {
+    const existingToken = await this.existingTokenFetcher(key);
+
+    if (existingToken?.expiresAt) {
+      const expiresAt = coalesceDateTime(existingToken.expiresAt);
+      if (expiresAt && expiresAt > DateTime.now()) {
+        return { ...existingToken, expiresAt } as TToken;
+      }
+    }
+
+    return null;
+  }
+}