halo-infinite-api 4.1.0 → 5.1.0

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

@@ -7,10 +7,11 @@ export declare class HaloAuthenticationClient {
     private readonly fetchXstsToken;
     private readonly loadToken;
     private readonly saveToken;
+    private readonly fetchFn;
     private spartanTokenCache;
     constructor(fetchXstsToken: () => Promise<string> | string, loadToken: () => Promise<{
         token: string;
         expiresAt: unknown;
-    } | null>, saveToken: (token: Token) => Promise<void>);
+    } | null>, saveToken: (token: Token) => Promise<void>, fetchFn?: typeof fetch);
     getSpartanToken(): Promise<string>;
 }

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

@@ -1,10 +1,10 @@
-import axios from "axios";
 import { DateTime } from "luxon";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
 export class HaloAuthenticationClient {
     fetchXstsToken;
     loadToken;
     saveToken;
+    fetchFn;
     spartanTokenCache = new ExpiryTokenCache(async () => {
         const xstsToken = await this.fetchXstsToken();
         const tokenRequest = {
@@ -17,23 +17,26 @@ export class HaloAuthenticationClient {
                 },
             ],
         };
-        const response = await axios.post("https://settings.svc.halowaypoint.com/spartan-token", tokenRequest, {
+        const response = await this.fetchFn("https://settings.svc.halowaypoint.com/spartan-token", {
+            body: JSON.stringify(tokenRequest),
             headers: {
                 "User-Agent": "HaloWaypoint/2021112313511900 CFNetwork/1327.0.4 Darwin/21.2.0",
                 "Content-Type": "application/json; charset=utf-8",
             },
         });
+        const result = (await response.json());
         const newToken = {
-            token: response.data.SpartanToken,
-            expiresAt: DateTime.fromISO(response.data.ExpiresUtc.ISO8601Date),
+            token: result.SpartanToken,
+            expiresAt: DateTime.fromISO(result.ExpiresUtc.ISO8601Date),
         };
         await this.saveToken(newToken);
         return newToken;
     }, () => this.loadToken());
-    constructor(fetchXstsToken, loadToken, saveToken) {
+    constructor(fetchXstsToken, loadToken, saveToken, fetchFn = fetch) {
         this.fetchXstsToken = fetchXstsToken;
         this.loadToken = loadToken;
         this.saveToken = saveToken;
+        this.fetchFn = fetchFn;
     }
     async getSpartanToken() {
         const { token } = await this.spartanTokenCache.getToken();

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

@@ -1 +1 @@
-{"version":3,"file":"halo-authentication-client.js","sourceRoot":"","sources":["../../src/authentication/halo-authentication-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAO9D,MAAM,OAAO,wBAAwB;IAsChB;IACA;IAIA;IA1CX,iBAAiB,GAAG,IAAI,gBAAgB,CAC9C,KAAK,IAAI,EAAE;QACT,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE9C,MAAM,YAAY,GAAwB;YACxC,QAAQ,EAAE,qBAAqB;YAC/B,UAAU,EAAE,GAAG;YACf,KAAK,EAAE;gBACL;oBACE,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,aAAa;iBACzB;aACF;SACF,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAC/B,qDAAqD,EACrD,YAAY,EACZ;YACE,OAAO,EAAE;gBACP,YAAY,EACV,gEAAgE;gBAClE,cAAc,EAAE,iCAAiC;aAClD;SACF,CACF,CAAC;QAEF,MAAM,QAAQ,GAAG;YACf,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY;YACjC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;SAClE,CAAC;QACF,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CACvB,CAAC;IAEF,YACmB,cAA8C,EAC9C,SAGR,EACQ,SAA0C;QAL1C,mBAAc,GAAd,cAAc,CAAgC;QAC9C,cAAS,GAAT,SAAS,CAGjB;QACQ,cAAS,GAAT,SAAS,CAAiC;IAC1D,CAAC;IAEG,KAAK,CAAC,eAAe;QAC1B,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
+{"version":3,"file":"halo-authentication-client.js","sourceRoot":"","sources":["../../src/authentication/halo-authentication-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAO9D,MAAM,OAAO,wBAAwB;IAwChB;IACA;IAIA;IACA;IA7CX,iBAAiB,GAAG,IAAI,gBAAgB,CAC9C,KAAK,IAAI,EAAE;QACT,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE9C,MAAM,YAAY,GAAwB;YACxC,QAAQ,EAAE,qBAAqB;YAC/B,UAAU,EAAE,GAAG;YACf,KAAK,EAAE;gBACL;oBACE,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,aAAa;iBACzB;aACF;SACF,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CACjC,qDAAqD,EACrD;YACE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;YAClC,OAAO,EAAE;gBACP,YAAY,EACV,gEAAgE;gBAClE,cAAc,EAAE,iCAAiC;aAClD;SACF,CACF,CAAC;QAEF,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAiB,CAAC;QAEvD,MAAM,QAAQ,GAAG;YACf,KAAK,EAAE,MAAM,CAAC,YAAY;YAC1B,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC;SAC3D,CAAC;QACF,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC/B,OAAO,QAAQ,CAAC;IAClB,CAAC,EACD,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CACvB,CAAC;IAEF,YACmB,cAA8C,EAC9C,SAGR,EACQ,SAA0C,EAC1C,UAAwB,KAAK;QAN7B,mBAAc,GAAd,cAAc,CAAgC;QAC9C,cAAS,GAAT,SAAS,CAGjB;QACQ,cAAS,GAAT,SAAS,CAAiC;QAC1C,YAAO,GAAP,OAAO,CAAsB;IAC7C,CAAC;IAEG,KAAK,CAAC,eAAe;QAC1B,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

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/"
@@ -11,11 +12,11 @@ export interface XboxAuthenticationToken {
 }
 export declare class XboxAuthenticationClient {
     private readonly tokenPersister?;
+    private readonly fetchFn;
     private userTokenCache;
     private xstsTicketCache;
-    private readonly httpClient;
-    constructor(tokenPersister?: TokenPersister | undefined);
-    getXstsTicket(getOauth2AccessToken: () => Promise<string>): Promise<{
+    constructor(tokenPersister?: TokenPersister | undefined, fetchFn?: typeof fetch);
+    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,5 @@
-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) {
@@ -8,58 +8,64 @@ export var RelyingParty;
 })(RelyingParty || (RelyingParty = {}));
 export class XboxAuthenticationClient {
     tokenPersister;
+    fetchFn;
     userTokenCache = new ExpiryTokenCache(async (accessToken) => {
-        const response = await this.httpClient.post("https://user.auth.xboxlive.com/user/authenticate", {
-            RelyingParty: "http://auth.xboxlive.com",
-            TokenType: "JWT",
-            Properties: {
-                AuthMethod: "RPS",
-                SiteName: "user.auth.xboxlive.com",
-                RpsTicket: `d=${accessToken}`,
-            },
-        }, {
+        const response = await this.fetchFn("https://user.auth.xboxlive.com/user/authenticate", {
+            method: "POST",
             headers: {
                 "Content-Type": "application/json",
                 Accept: "application/json",
                 "x-xbl-contract-version": "1",
             },
+            body: JSON.stringify({
+                RelyingParty: "http://auth.xboxlive.com",
+                TokenType: "JWT",
+                Properties: {
+                    AuthMethod: "RPS",
+                    SiteName: "user.auth.xboxlive.com",
+                    RpsTicket: `d=${accessToken}`,
+                },
+            }),
         });
-        const result = {
-            ...response.data,
-            expiresAt: DateTime.fromISO(response.data.NotAfter),
+        const result = (await response.json());
+        const token = {
+            ...result,
+            expiresAt: DateTime.fromISO(result.NotAfter),
         };
-        await this.tokenPersister?.save("xbox.userToken", result);
-        return result;
+        await this.tokenPersister?.save("xbox.userToken", token);
+        return token;
     }, async () => (await this.tokenPersister?.load("xbox.userToken")) ?? null);
-    xstsTicketCache = new ExpiryTokenCache(async (userToken, relyingParty) => {
-        const response = await this.httpClient.post("https://xsts.auth.xboxlive.com/xsts/authorize", {
-            RelyingParty: relyingParty,
-            TokenType: "JWT",
-            Properties: {
-                SandboxId: "RETAIL",
-                UserTokens: [userToken],
-            },
-        }, {
+    xstsTicketCache = new KeyedExpiryTokenCache(async (relyingParty, userToken) => {
+        const response = await this.fetchFn("https://xsts.auth.xboxlive.com/xsts/authorize", {
+            method: "POST",
             headers: {
                 "Content-Type": "application/json",
                 Accept: "application/json",
                 "x-xbl-contract-version": "1",
             },
+            body: JSON.stringify({
+                RelyingParty: relyingParty,
+                TokenType: "JWT",
+                Properties: {
+                    SandboxId: "RETAIL",
+                    UserTokens: [userToken],
+                },
+            }),
         });
-        const result = {
-            ...response.data,
-            expiresAt: DateTime.fromISO(response.data.NotAfter),
+        const result = (await response.json());
+        const token = {
+            ...result,
+            expiresAt: DateTime.fromISO(result.NotAfter),
         };
-        await this.tokenPersister?.save("xbox.xstsTicket", result);
-        return result;
-    }, async () => (await this.tokenPersister?.load("xbox.xstsTicket")) ?? null);
-    httpClient;
-    constructor(tokenPersister) {
+        await this.tokenPersister?.save("xbox.xstsTicket." + relyingParty, token);
+        return token;
+    }, async (relyingParty) => (await this.tokenPersister?.load("xbox.xstsTicket." + relyingParty)) ?? null);
+    constructor(tokenPersister, fetchFn = fetch) {
         this.tokenPersister = tokenPersister;
-        this.httpClient = axios.create();
+        this.fetchFn = fetchFn;
     }
-    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 +73,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":"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"}

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;
@@ -21,7 +21,8 @@ export type AssetKindTypeMap = {
 };
 export declare class HaloInfiniteClient {
     private spartanTokenProvider;
-    constructor(spartanTokenProvider: SpartanTokenProvider);
+    private readonly fetchFn;
+    constructor(spartanTokenProvider: SpartanTokenProvider, fetchFn?: typeof fetch);
     private executeRequest;
     private executeResultsRequest;
     private executePaginationRequest;
@@ -47,6 +48,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

@@ -1,4 +1,3 @@
-import axios, { AxiosError, AxiosHeaders } from "axios";
 import { HaloCoreEndpoints } from "../endpoints/halo-core-endpoints";
 import { AssetKind } from "../models/halo-infinite/asset-kind";
 import { MatchType } from "../models/halo-infinite/match-type";
@@ -9,7 +8,7 @@ const assetKindUrlMap = {
     [AssetKind.Playlist]: "Playlists",
 };
 function wrapPlayerId(playerId) {
-    if (/^\w+(\d+)/) {
+    if (/^\w+\(\d+\)/.test(playerId)) {
         return playerId;
     }
     else {
@@ -28,26 +27,29 @@ function unwrapPlayerId(playerId) {
 }
 export class HaloInfiniteClient {
     spartanTokenProvider;
-    constructor(spartanTokenProvider) {
+    fetchFn;
+    constructor(spartanTokenProvider, fetchFn) {
         this.spartanTokenProvider = spartanTokenProvider;
+        this.fetchFn = fetchFn ?? fetch;
     }
     async executeRequest(url, method, useSpartanToken = true, useClearance = false, userAgent = GlobalConstants.HALO_WAYPOINT_USER_AGENT) {
-        const headers = new AxiosHeaders({
+        const headers = {
             "User-Agent": userAgent,
             Accept: "application/json",
-        });
+        };
         if (useSpartanToken) {
-            headers.set("x-343-authorization-spartan", await this.spartanTokenProvider.getSpartanToken());
+            headers["x-343-authorization-spartan"] =
+                await this.spartanTokenProvider.getSpartanToken();
         }
         if (useClearance) {
             throw new Error("TODO: Implement clearance");
         }
-        const response = await axios.request({
-            url,
+        const response = await this.fetchFn(url, {
             method,
             headers,
         });
-        return response.data;
+        const result = (await response.json());
+        return result;
     }
     async executeResultsRequest(...args) {
         const result = await this.executeRequest(...args);
@@ -92,25 +94,16 @@ 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 {
-            return await this.executeResultsRequest(`https://${HaloCoreEndpoints.SkillOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/matches/${matchId}/skill?players=${playerIds
-                .map(wrapPlayerId)
-                .join(",")}`, "get");
-        }
-        catch (e) {
-            if (e instanceof AxiosError &&
-                e.response?.status === 404 &&
-                e.response.data) {
-                return e.response.data.Value;
-            }
-            else {
-                throw e;
-            }
-        }
+        return await this.executeResultsRequest(`https://${HaloCoreEndpoints.SkillOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/matches/${matchId}/skill?players=${playerIds
+            .map(wrapPlayerId)
+            .join(",")}`, "get");
     };
     /** Gets authoring metadata about a specific asset. */
     getAsset = (assetType, assetId) => this.executeRequest(`https://${HaloCoreEndpoints.DiscoveryOrigin}.${HaloCoreEndpoints.ServiceDomain}/hi/${assetKindUrlMap[assetType]}/${assetId}`, "get");

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,14 @@
+import { XboxTokenProvider } from "./token-providers/xbox-token-provider";
+export declare class XboxClient {
+    private xboxTokenProvider;
+    private readonly fetchFn;
+    constructor(xboxTokenProvider: XboxTokenProvider, fetchFn?: typeof fetch);
+    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 @@
+export class XboxClient {
+    xboxTokenProvider;
+    fetchFn;
+    constructor(xboxTokenProvider, fetchFn) {
+        this.xboxTokenProvider = xboxTokenProvider;
+        this.fetchFn = fetchFn ?? fetch;
+    }
+    async executeRequest(url, method) {
+        const response = await this.fetchFn(url, {
+            method,
+            headers: {
+                Accept: "application/json",
+                Authorization: await this.xboxTokenProvider.getXboxLiveV3Token(),
+                "x-xbl-contract-version": "1",
+            },
+        });
+        const result = (await response.json());
+        return result;
+    }
+    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":"AAEA,MAAM,OAAO,UAAU;IAGX;IAFO,OAAO,CAAe;IACvC,YACU,iBAAoC,EAC5C,OAAsB;QADd,sBAAiB,GAAjB,iBAAiB,CAAmB;QAG5C,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,KAAK,CAAC;IAClC,CAAC;IAEO,KAAK,CAAC,cAAc,CAAI,GAAW,EAAE,MAA6B;QACxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YACvC,MAAM;YACN,OAAO,EAAE;gBACP,MAAM,EAAE,kBAAkB;gBAC1B,aAAa,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE;gBAChE,wBAAwB,EAAE,GAAG;aAC9B;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,CAAC;QAE5C,OAAO,MAAM,CAAC;IAChB,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";