halo-infinite-api 5.1.1 → 5.2.0

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "javascript.preferences.importModuleSpecifier": "relative"
+}

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

@@ -1,4 +1,5 @@
 import { DateTime } from "luxon";
+import { FetchFunction } from "../util/fetch-function";
 export interface Token {
     token: string;
     expiresAt: DateTime;
@@ -12,6 +13,6 @@ export declare class HaloAuthenticationClient {
     constructor(fetchXstsToken: () => Promise<string> | string, loadToken: () => Promise<{
         token: string;
         expiresAt: unknown;
-    } | null>, saveToken: (token: Token) => Promise<void>, fetchFn?: typeof fetch);
+    } | null>, saveToken: (token: Token) => Promise<void>, fetchFn?: FetchFunction);
     getSpartanToken(): Promise<string>;
 }

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

@@ -1,5 +1,6 @@
 import { DateTime } from "luxon";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
+import { defaultFetch } from "../util/fetch-function";
 export class HaloAuthenticationClient {
     fetchXstsToken;
     loadToken;
@@ -17,7 +18,7 @@ export class HaloAuthenticationClient {
                 },
             ],
         };
-        const response = await this.fetchFn("https://settings.svc.halowaypoint.com/spartan-token", {
+        const result = await this.fetchFn("https://settings.svc.halowaypoint.com/spartan-token", {
             method: "POST",
             body: JSON.stringify(tokenRequest),
             headers: {
@@ -25,7 +26,6 @@ export class HaloAuthenticationClient {
                 "Content-Type": "application/json; charset=utf-8",
             },
         });
-        const result = (await response.json());
         const newToken = {
             token: result.SpartanToken,
             expiresAt: DateTime.fromISO(result.ExpiresUtc.ISO8601Date),
@@ -33,7 +33,7 @@ export class HaloAuthenticationClient {
         await this.saveToken(newToken);
         return newToken;
     }, () => this.loadToken());
-    constructor(fetchXstsToken, loadToken, saveToken, fetchFn = fetch) {
+    constructor(fetchXstsToken, loadToken, saveToken, fetchFn = defaultFetch) {
         this.fetchXstsToken = fetchXstsToken;
         this.loadToken = loadToken;
         this.saveToken = saveToken;

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,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAO9D,MAAM,OAAO,wBAAwB;IAyChB;IACA;IAIA;IACA;IA9CX,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,MAAM,EAAE,MAAM;YACd,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"}
+{"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;AAC9D,OAAO,EAAiB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAOrE,MAAM,OAAO,wBAAwB;IAuChB;IACA;IAIA;IACA;IA5CX,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,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAC/B,qDAAqD,EACrD;YACE,MAAM,EAAE,MAAM;YACd,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,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,UAAyB,YAAY;QANrC,mBAAc,GAAd,cAAc,CAAgC;QAC9C,cAAS,GAAT,SAAS,CAGjB;QACQ,cAAS,GAAT,SAAS,CAAiC;QAC1C,YAAO,GAAP,OAAO,CAA8B;IACrD,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,6 +1,7 @@
 import { DateTime } from "luxon";
 import { TokenPersister } from "../core/token-persisters";
 import { XboxTicket } from "../models/xbox-ticket";
+import { FetchFunction } from "../util/fetch-function";
 export declare enum RelyingParty {
     Xbox = "http://xboxlive.com",
     Halo = "https://prod.xsts.halowaypoint.com/"
@@ -11,11 +12,11 @@ export interface XboxAuthenticationToken {
     refreshToken: string;
 }
 export declare class XboxAuthenticationClient {
-    private readonly tokenPersister?;
+    private readonly tokenPersisterOrPromise?;
     private readonly fetchFn;
     private userTokenCache;
     private xstsTicketCache;
-    constructor(tokenPersister?: TokenPersister | undefined, fetchFn?: typeof fetch);
+    constructor(tokenPersisterOrPromise?: TokenPersister | Promise<TokenPersister> | undefined, fetchFn?: FetchFunction);
     getXstsTicket(getOauth2AccessToken: () => Promise<string>, relyingParty: RelyingParty): Promise<{
         expiresAt: DateTime;
         IssueInstant: string;

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

@@ -1,16 +1,17 @@
 import { DateTime } from "luxon";
 import { KeyedExpiryTokenCache } from "../util/keyed-expiry-token-cache";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
+import { defaultFetch } from "../util/fetch-function";
 export var RelyingParty;
 (function (RelyingParty) {
     RelyingParty["Xbox"] = "http://xboxlive.com";
     RelyingParty["Halo"] = "https://prod.xsts.halowaypoint.com/";
 })(RelyingParty || (RelyingParty = {}));
 export class XboxAuthenticationClient {
-    tokenPersister;
+    tokenPersisterOrPromise;
     fetchFn;
     userTokenCache = new ExpiryTokenCache(async (accessToken) => {
-        const response = await this.fetchFn("https://user.auth.xboxlive.com/user/authenticate", {
+        const result = await this.fetchFn("https://user.auth.xboxlive.com/user/authenticate", {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
@@ -27,16 +28,18 @@ export class XboxAuthenticationClient {
                 },
             }),
         });
-        const result = (await response.json());
         const token = {
             ...result,
             expiresAt: DateTime.fromISO(result.NotAfter),
         };
-        await this.tokenPersister?.save("xbox.userToken", token);
+        await (await this.tokenPersisterOrPromise)?.save("xbox.userToken", token);
         return token;
-    }, async () => (await this.tokenPersister?.load("xbox.userToken")) ?? null);
+    }, async () => {
+        const tokenPersister = await this.tokenPersisterOrPromise;
+        return ((await tokenPersister?.load("xbox.userToken")) ?? null);
+    });
     xstsTicketCache = new KeyedExpiryTokenCache(async (relyingParty, userToken) => {
-        const response = await this.fetchFn("https://xsts.auth.xboxlive.com/xsts/authorize", {
+        const result = await this.fetchFn("https://xsts.auth.xboxlive.com/xsts/authorize", {
             method: "POST",
             headers: {
                 "Content-Type": "application/json",
@@ -52,16 +55,15 @@ export class XboxAuthenticationClient {
                 },
             }),
         });
-        const result = (await response.json());
         const token = {
             ...result,
             expiresAt: DateTime.fromISO(result.NotAfter),
         };
-        await this.tokenPersister?.save("xbox.xstsTicket." + relyingParty, token);
+        await (await this.tokenPersisterOrPromise)?.save("xbox.xstsTicket." + relyingParty, token);
         return token;
-    }, async (relyingParty) => (await this.tokenPersister?.load("xbox.xstsTicket." + relyingParty)) ?? null);
-    constructor(tokenPersister, fetchFn = fetch) {
-        this.tokenPersister = tokenPersister;
+    }, async (relyingParty) => (await (await this.tokenPersisterOrPromise)?.load("xbox.xstsTicket." + relyingParty)) ?? null);
+    constructor(tokenPersisterOrPromise, fetchFn = defaultFetch) {
+        this.tokenPersisterOrPromise = tokenPersisterOrPromise;
         this.fetchFn = fetchFn;
     }
     async getXstsTicket(getOauth2AccessToken, relyingParty) {

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

@@ -1,3 +1,4 @@
+import { FetchFunction } from "../util/fetch-function";
 import { MapAsset, PlaylistAsset, UgcGameVariantAsset } from "../models/halo-infinite/asset";
 import { AssetKind } from "../models/halo-infinite/asset-kind";
 import { MatchSkill } from "../models/halo-infinite/match-skill";
@@ -20,9 +21,9 @@ export type AssetKindTypeMap = {
     [AssetKind.Playlist]: PlaylistAsset;
 };
 export declare class HaloInfiniteClient {
-    private spartanTokenProvider;
+    private readonly spartanTokenProvider;
     private readonly fetchFn;
-    constructor(spartanTokenProvider: SpartanTokenProvider, fetchFn?: typeof fetch);
+    constructor(spartanTokenProvider: SpartanTokenProvider, fetchFn?: FetchFunction);
     private executeRequest;
     private executeResultsRequest;
     private executePaginationRequest;

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

@@ -1,3 +1,4 @@
+import { defaultFetch } from "../util/fetch-function";
 import { HaloCoreEndpoints } from "../endpoints/halo-core-endpoints";
 import { AssetKind } from "../models/halo-infinite/asset-kind";
 import { MatchType } from "../models/halo-infinite/match-type";
@@ -28,9 +29,9 @@ function unwrapPlayerId(playerId) {
 export class HaloInfiniteClient {
     spartanTokenProvider;
     fetchFn;
-    constructor(spartanTokenProvider, fetchFn) {
+    constructor(spartanTokenProvider, fetchFn = defaultFetch) {
         this.spartanTokenProvider = spartanTokenProvider;
-        this.fetchFn = fetchFn ?? fetch;
+        this.fetchFn = fetchFn;
     }
     async executeRequest(url, method, useSpartanToken = true, useClearance = false, userAgent = GlobalConstants.HALO_WAYPOINT_USER_AGENT) {
         const headers = {
@@ -44,11 +45,10 @@ export class HaloInfiniteClient {
         if (useClearance) {
             throw new Error("TODO: Implement clearance");
         }
-        const response = await this.fetchFn(url, {
+        const result = await this.fetchFn(url, {
             method,
             headers,
         });
-        const result = (await response.json());
         return result;
     }
     async executeResultsRequest(...args) {

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-persisters/index.d.ts

@@ -1,4 +1,4 @@
-export interface TokenPersister {
-    load: <T>(tokenName: string) => Promise<T | null> | T | null;
-    save: (tokenName: string, token: unknown) => Promise<void> | void;
-}
+export { TokenPersister } from "./token-persister";
+export { localStorageTokenPersister } from "./local-storage-token-persister";
+export { nodeFsTokenPersister } from "./node-fs-token-persister";
+export { inMemoryTokenPersister } from "./in-memory-token-persister";

package/dist/core/token-persisters/index.js

@@ -1,2 +1,4 @@
-export {};
+export { localStorageTokenPersister } from "./local-storage-token-persister";
+export { nodeFsTokenPersister } from "./node-fs-token-persister";
+export { inMemoryTokenPersister } from "./in-memory-token-persister";
 //# sourceMappingURL=index.js.map

package/dist/core/token-persisters/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/token-persisters/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/token-persisters/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC"}

package/dist/core/token-persisters/node-fs-token-persister.d.ts

@@ -1,2 +1,2 @@
-import { TokenPersister } from ".";
+import type { TokenPersister } from ".";
 export declare const nodeFsTokenPersister: TokenPersister;

package/dist/core/token-persisters/node-fs-token-persister.js

@@ -1,9 +1,11 @@
-import fs from "fs/promises";
 export const nodeFsTokenPersister = {
     load: async (tokenName) => {
-        const storageFileName = `./tokens/${tokenName}`;
+        const tokenDir = process.env.TOKEN_ROOT ||
+            (await import("path")).join(__dirname, "./tokens");
         try {
-            const json = await fs.readFile(storageFileName, { encoding: "utf-8" });
+            const json = await (await import("fs/promises")).readFile(`${tokenDir}/${tokenName}`, {
+                encoding: "utf-8",
+            });
             return JSON.parse(json);
         }
         catch (e) {
@@ -16,9 +18,10 @@ export const nodeFsTokenPersister = {
         }
     },
     save: async (tokenName, token) => {
-        const storageFileName = `./tokens/${tokenName}`;
-        await fs.mkdir(`./tokens/`, { recursive: true });
-        await fs.writeFile(storageFileName, JSON.stringify(token));
+        const tokenDir = process.env.TOKEN_ROOT ||
+            (await import("path")).join(__dirname, "./tokens");
+        await (await import("fs/promises")).mkdir(tokenDir, { recursive: true });
+        await (await import("fs/promises")).writeFile(`${tokenDir}/${tokenName}`, JSON.stringify(token));
     },
 };
 //# sourceMappingURL=node-fs-token-persister.js.map

package/dist/core/token-persisters/node-fs-token-persister.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-fs-token-persister.js","sourceRoot":"","sources":["../../../src/core/token-persisters/node-fs-token-persister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAG7B,MAAM,CAAC,MAAM,oBAAoB,GAAmB;IAClD,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QACxB,MAAM,eAAe,GAAG,YAAY,SAAS,EAAE,CAAC;QAChD,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACzB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACpE,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IACD,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;QAC/B,MAAM,eAAe,GAAG,YAAY,SAAS,EAAE,CAAC;QAChD,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF,CAAC"}
+{"version":3,"file":"node-fs-token-persister.js","sourceRoot":"","sources":["../../../src/core/token-persisters/node-fs-token-persister.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,oBAAoB,GAAmB;IAClD,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QACxB,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,CAAC,UAAU;YACtB,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACrD,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,CACjB,MAAM,MAAM,CAAC,aAAa,CAAC,CAC5B,CAAC,QAAQ,CAAC,GAAG,QAAQ,IAAI,SAAS,EAAE,EAAE;gBACrC,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACzB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACpE,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IACD,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE;QAC/B,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,CAAC,UAAU;YACtB,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzE,MAAM,CACJ,MAAM,MAAM,CAAC,aAAa,CAAC,CAC5B,CAAC,SAAS,CAAC,GAAG,QAAQ,IAAI,SAAS,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;CACF,CAAC"}

package/dist/core/token-persisters/token-persister.d.ts

@@ -0,0 +1,4 @@
+export interface TokenPersister {
+    load: <T>(tokenName: string) => Promise<T | null> | T | null;
+    save: (tokenName: string, token: unknown) => Promise<void> | void;
+}

package/dist/core/token-persisters/token-persister.js

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

package/dist/core/token-persisters/token-persister.js.map

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

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

@@ -1,6 +1,7 @@
 import { TokenPersister } from "../token-persisters";
 import { SpartanTokenProvider } from "./spartan-token-providers";
 import { XboxTokenProvider } from "./xbox-token-provider";
+import { FetchFunction } from "src/util/fetch-function";
 /**
  * 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
@@ -9,5 +10,5 @@ import { XboxTokenProvider } from "./xbox-token-provider";
 export declare class AutoTokenProvider implements SpartanTokenProvider, XboxTokenProvider {
     readonly getSpartanToken: () => Promise<string>;
     readonly getXboxLiveV3Token: () => Promise<string>;
-    constructor(getOauth2AccessToken: () => Promise<string>, tokenPersister?: TokenPersister);
+    constructor(getOauth2AccessToken: () => Promise<string>, tokenPersister?: TokenPersister | Promise<TokenPersister>, fetchFn?: FetchFunction);
 }

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

@@ -9,21 +9,25 @@ import { inMemoryTokenPersister } from "../token-persisters/in-memory-token-pers
 export class AutoTokenProvider {
     getSpartanToken;
     getXboxLiveV3Token;
-    constructor(getOauth2AccessToken, tokenPersister) {
-        let actualTokenPersister;
+    constructor(getOauth2AccessToken, tokenPersister, fetchFn) {
+        let tokenPeristerOrPromise;
         if (tokenPersister) {
-            actualTokenPersister = tokenPersister;
+            tokenPeristerOrPromise = tokenPersister;
         }
         else {
-            actualTokenPersister = inMemoryTokenPersister;
+            tokenPeristerOrPromise = inMemoryTokenPersister;
         }
-        const xboxAuthClient = new XboxAuthenticationClient(tokenPersister);
+        const xboxAuthClient = new XboxAuthenticationClient(tokenPersister, fetchFn);
         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);
-        });
+        }, async () => {
+            const tokenPersister = await tokenPeristerOrPromise;
+            return await tokenPersister.load("halo.authToken");
+        }, async (token) => {
+            const tokenPersister = await tokenPeristerOrPromise;
+            await tokenPersister.save("halo.authToken", token);
+        }, fetchFn);
         this.getSpartanToken = () => haloAuthClient.getSpartanToken();
         this.getXboxLiveV3Token = async () => {
             const xstsTicket = await xboxAuthClient.getXstsTicket(getOauth2AccessToken, RelyingParty.Xbox);

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

@@ -1 +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"}
+{"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;AAIvF;;;;GAIG;AACH,MAAM,OAAO,iBAAiB;IAGZ,eAAe,CAAwB;IACvC,kBAAkB,CAAwB;IAE1D,YACE,oBAA2C,EAC3C,cAAyD,EACzD,OAAuB;QAEvB,IAAI,sBAAgE,CAAC;QACrE,IAAI,cAAc,EAAE;YAClB,sBAAsB,GAAG,cAAc,CAAC;SACzC;aAAM;YACL,sBAAsB,GAAG,sBAAsB,CAAC;SACjD;QACD,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,cAAc,EACd,OAAO,CACR,CAAC;QACF,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;YACT,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC;YACpD,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACrD,CAAC,EACD,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,cAAc,GAAG,MAAM,sBAAsB,CAAC;YACpD,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACrD,CAAC,EACD,OAAO,CACR,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/static-xsts-ticket-token-spartan-token-provider.d.ts

@@ -8,5 +8,5 @@ import { SpartanTokenProvider } from ".";
  */
 export declare class StaticXstsTicketTokenSpartanTokenProvider implements SpartanTokenProvider {
     readonly getSpartanToken: () => Promise<string>;
-    constructor(xstsTicketToken: string, tokenPersister?: TokenPersister);
+    constructor(xstsTicketToken: string, tokenPersister?: TokenPersister | Promise<TokenPersister>);
 }

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

@@ -16,8 +16,8 @@ export class StaticXstsTicketTokenSpartanTokenProvider {
         else {
             actualTokenPersister = inMemoryTokenPersister;
         }
-        const haloAuthClient = new HaloAuthenticationClient(() => xstsTicketToken, async () => await actualTokenPersister.load("halo.authToken"), async (token) => {
-            await actualTokenPersister.save("halo.authToken", token);
+        const haloAuthClient = new HaloAuthenticationClient(() => xstsTicketToken, async () => (await (await actualTokenPersister).load("halo.authToken")) ?? null, async (token) => {
+            await (await actualTokenPersister).save("halo.authToken", token);
         });
         this.getSpartanToken = () => haloAuthClient.getSpartanToken();
     }

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

@@ -1 +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"}
+{"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,YACE,eAAuB,EACvB,cAAyD;QAEzD,IAAI,oBAA8D,CAAC;QACnE,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,CACT,CAAC,MAAM,CAAC,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,IAAI,EACrE,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,MAAM,CAAC,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACnE,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IAChE,CAAC;CACF"}

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

@@ -1,14 +1,15 @@
+import { FetchFunction } from "../util/fetch-function";
 import { XboxTokenProvider } from "./token-providers/xbox-token-provider";
 export declare class XboxClient {
-    private xboxTokenProvider;
+    private readonly xboxTokenProvider;
     private readonly fetchFn;
-    constructor(xboxTokenProvider: XboxTokenProvider, fetchFn?: typeof fetch);
+    constructor(xboxTokenProvider: XboxTokenProvider, fetchFn?: FetchFunction);
     private executeRequest;
     searchUsers(query: string): Promise<{
         id: string;
         gamertag: string;
         displayPicUri: string;
-        score: 0.0;
+        score: number;
     }[]>;
     recentPlayers(): Promise<unknown>;
 }

package/dist/core/xbox-client.js

@@ -1,12 +1,13 @@
+import { defaultFetch } from "../util/fetch-function";
 export class XboxClient {
     xboxTokenProvider;
     fetchFn;
-    constructor(xboxTokenProvider, fetchFn) {
+    constructor(xboxTokenProvider, fetchFn = defaultFetch) {
         this.xboxTokenProvider = xboxTokenProvider;
-        this.fetchFn = fetchFn ?? fetch;
+        this.fetchFn = fetchFn;
     }
     async executeRequest(url, method) {
-        const response = await this.fetchFn(url, {
+        const result = await this.fetchFn(url, {
             method,
             headers: {
                 Accept: "application/json",
@@ -14,7 +15,6 @@ export class XboxClient {
                 "x-xbl-contract-version": "1",
             },
         });
-        const result = (await response.json());
         return result;
     }
     async searchUsers(query) {

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

@@ -1 +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"}
+{"version":3,"file":"xbox-client.js","sourceRoot":"","sources":["../../src/core/xbox-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGrE,MAAM,OAAO,UAAU;IAEF;IACA;IAFnB,YACmB,iBAAoC,EACpC,UAAyB,YAAY;QADrC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,YAAO,GAAP,OAAO,CAA8B;IACrD,CAAC;IAEI,KAAK,CAAC,cAAc,CAAI,GAAW,EAAE,MAA6B;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAI,GAAG,EAAE;YACxC,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,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

@@ -19,5 +19,6 @@ export { MatchInfo } from "./models/halo-infinite/match-info";
 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 { TokenPersister } from "./core/token-persisters/token-persister";
 export { PlaylistExperience } from "./models/halo-infinite/playlist-experience";
+export { FetchFunction } from "./util/fetch-function";

package/dist/util/fetch-function.d.ts

@@ -0,0 +1,2 @@
+export type FetchFunction = <TResponse = unknown>(input: RequestInfo | URL, init?: RequestInit) => Promise<TResponse>;
+export declare const defaultFetch: <TResponse>(input: RequestInfo | URL, init?: RequestInit) => Promise<TResponse>;

package/dist/util/fetch-function.js

@@ -0,0 +1,5 @@
+export const defaultFetch = async (input, init) => {
+    const response = await fetch(input, init);
+    return response.json();
+};
+//# sourceMappingURL=fetch-function.js.map

package/dist/util/fetch-function.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch-function.js","sourceRoot":"","sources":["../../src/util/fetch-function.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,KAAwB,EACxB,IAAkB,EACE,EAAE;IACtB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC1C,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC"}

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "halo-infinite-api",
   "type": "module",
-  "version": "5.1.1",
+  "version": "5.2.0",
   "description": "An NPM package for accessing the official Halo Infinite API.",
   "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./token-persisters": "./dist/core/token-persisters/index.js"
+  },
   "scripts": {
     "prepack": "tsc --project tsconfig.app.json"
   },
@@ -34,6 +38,7 @@
   },
   "dependencies": {
     "@azure/msal-node": "^2.2.0",
+    "axios": "^1.6.2",
     "expiry-map": "^2.0.0",
     "luxon": "^3.3.0",
     "pkce-challenge": "^3.1.0",

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

@@ -2,6 +2,7 @@ import { DateTime } from "luxon";
 import type { SpartanToken } from "../models/spartan-token";
 import type { SpartanTokenRequest } from "../models/spartan-token-request";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
+import { FetchFunction, defaultFetch } from "../util/fetch-function";
 
 export interface Token {
   token: string;
@@ -23,7 +24,7 @@ export class HaloAuthenticationClient {
           },
         ],
       };
-      const response = await this.fetchFn(
+      const result = await this.fetchFn<SpartanToken>(
         "https://settings.svc.halowaypoint.com/spartan-token",
         {
           method: "POST",
@@ -36,8 +37,6 @@ export class HaloAuthenticationClient {
         }
       );
 
-      const result = (await response.json()) as SpartanToken;
-
       const newToken = {
         token: result.SpartanToken,
         expiresAt: DateTime.fromISO(result.ExpiresUtc.ISO8601Date),
@@ -55,7 +54,7 @@ export class HaloAuthenticationClient {
       expiresAt: unknown;
     } | null>,
     private readonly saveToken: (token: Token) => Promise<void>,
-    private readonly fetchFn: typeof fetch = fetch
+    private readonly fetchFn: FetchFunction = defaultFetch
   ) {}
 
   public async getSpartanToken() {

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

@@ -3,6 +3,7 @@ import { TokenPersister } from "../core/token-persisters";
 import { XboxTicket } from "../models/xbox-ticket";
 import { KeyedExpiryTokenCache } from "../util/keyed-expiry-token-cache";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
+import { FetchFunction, defaultFetch } from "../util/fetch-function";
 
 export enum RelyingParty {
   Xbox = "http://xboxlive.com",
@@ -18,7 +19,7 @@ export interface XboxAuthenticationToken {
 export class XboxAuthenticationClient {
   private userTokenCache = new ExpiryTokenCache(
     async (accessToken: string) => {
-      const response = await this.fetchFn(
+      const result = await this.fetchFn<XboxTicket>(
         "https://user.auth.xboxlive.com/user/authenticate",
         {
           method: "POST",
@@ -39,23 +40,25 @@ export class XboxAuthenticationClient {
         }
       );
 
-      const result = (await response.json()) as XboxTicket;
-
       const token = {
         ...result,
         expiresAt: DateTime.fromISO(result.NotAfter),
       };
-      await this.tokenPersister?.save("xbox.userToken", token);
+      await (await this.tokenPersisterOrPromise)?.save("xbox.userToken", token);
       return token;
     },
-    async () =>
-      (await this.tokenPersister?.load<XboxTicket & { expiresAt: unknown }>(
-        "xbox.userToken"
-      )) ?? null
+    async () => {
+      const tokenPersister = await this.tokenPersisterOrPromise;
+      return (
+        (await tokenPersister?.load<XboxTicket & { expiresAt: unknown }>(
+          "xbox.userToken"
+        )) ?? null
+      );
+    }
   );
   private xstsTicketCache = new KeyedExpiryTokenCache(
     async (relyingParty: RelyingParty, userToken: string) => {
-      const response = await this.fetchFn(
+      const result = await this.fetchFn<XboxTicket>(
         "https://xsts.auth.xboxlive.com/xsts/authorize",
         {
           method: "POST",
@@ -74,24 +77,29 @@ export class XboxAuthenticationClient {
           }),
         }
       );
-      const result = (await response.json()) as XboxTicket;
 
       const token = {
         ...result,
         expiresAt: DateTime.fromISO(result.NotAfter),
       };
-      await this.tokenPersister?.save("xbox.xstsTicket." + relyingParty, token);
+      await (
+        await this.tokenPersisterOrPromise
+      )?.save("xbox.xstsTicket." + relyingParty, token);
       return token;
     },
     async (relyingParty) =>
-      (await this.tokenPersister?.load<XboxTicket & { expiresAt: unknown }>(
+      (await (
+        await this.tokenPersisterOrPromise
+      )?.load<XboxTicket & { expiresAt: unknown }>(
         "xbox.xstsTicket." + relyingParty
       )) ?? null
   );
 
   constructor(
-    private readonly tokenPersister?: TokenPersister,
-    private readonly fetchFn: typeof fetch = fetch
+    private readonly tokenPersisterOrPromise?:
+      | TokenPersister
+      | Promise<TokenPersister>,
+    private readonly fetchFn: FetchFunction = defaultFetch
   ) {}
 
   public async getXstsTicket(

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

@@ -1,3 +1,4 @@
+import { FetchFunction, defaultFetch } from "../util/fetch-function";
 import { HaloCoreEndpoints } from "../endpoints/halo-core-endpoints";
 import {
   MapAsset,
@@ -66,13 +67,10 @@ function unwrapPlayerId(playerId: string) {
 }
 
 export class HaloInfiniteClient {
-  private readonly fetchFn: typeof fetch;
   constructor(
-    private spartanTokenProvider: SpartanTokenProvider,
-    fetchFn?: typeof fetch
-  ) {
-    this.fetchFn = fetchFn ?? fetch;
-  }
+    private readonly spartanTokenProvider: SpartanTokenProvider,
+    private readonly fetchFn: FetchFunction = defaultFetch
+  ) {}
 
   private async executeRequest<T>(
     url: string,
@@ -95,13 +93,11 @@ export class HaloInfiniteClient {
       throw new Error("TODO: Implement clearance");
     }
 
-    const response = await this.fetchFn(url, {
+    const result = await this.fetchFn<T>(url, {
       method,
       headers,
     });
 
-    const result = (await response.json()) as T;
-
     return result;
   }
 

package/src/core/token-persisters/index.ts

@@ -1,4 +1,4 @@
-export interface TokenPersister {
-  load: <T>(tokenName: string) => Promise<T | null> | T | null;
-  save: (tokenName: string, token: unknown) => Promise<void> | void;
-}
+export { TokenPersister } from "./token-persister";
+export { localStorageTokenPersister } from "./local-storage-token-persister";
+export { nodeFsTokenPersister } from "./node-fs-token-persister";
+export { inMemoryTokenPersister } from "./in-memory-token-persister";

package/src/core/token-persisters/node-fs-token-persister.ts

@@ -1,11 +1,16 @@
-import fs from "fs/promises";
-import { TokenPersister } from ".";
+import type { TokenPersister } from ".";
 
 export const nodeFsTokenPersister: TokenPersister = {
   load: async (tokenName) => {
-    const storageFileName = `./tokens/${tokenName}`;
+    const tokenDir =
+      process.env.TOKEN_ROOT ||
+      (await import("path")).join(__dirname, "./tokens");
     try {
-      const json = await fs.readFile(storageFileName, { encoding: "utf-8" });
+      const json = await (
+        await import("fs/promises")
+      ).readFile(`${tokenDir}/${tokenName}`, {
+        encoding: "utf-8",
+      });
       return JSON.parse(json);
     } catch (e) {
       if (e && typeof e === "object" && "code" in e && e.code === "ENOENT") {
@@ -16,8 +21,12 @@ export const nodeFsTokenPersister: TokenPersister = {
     }
   },
   save: async (tokenName, token) => {
-    const storageFileName = `./tokens/${tokenName}`;
-    await fs.mkdir(`./tokens/`, { recursive: true });
-    await fs.writeFile(storageFileName, JSON.stringify(token));
+    const tokenDir =
+      process.env.TOKEN_ROOT ||
+      (await import("path")).join(__dirname, "./tokens");
+    await (await import("fs/promises")).mkdir(tokenDir, { recursive: true });
+    await (
+      await import("fs/promises")
+    ).writeFile(`${tokenDir}/${tokenName}`, JSON.stringify(token));
   },
 };

package/src/core/token-persisters/token-persister.ts

@@ -0,0 +1,4 @@
+export interface TokenPersister {
+  load: <T>(tokenName: string) => Promise<T | null> | T | null;
+  save: (tokenName: string, token: unknown) => Promise<void> | void;
+}

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

@@ -7,6 +7,7 @@ import { HaloAuthenticationClient } from "../../authentication/halo-authenticati
 import { SpartanTokenProvider } from "./spartan-token-providers";
 import { inMemoryTokenPersister } from "../token-persisters/in-memory-token-persister";
 import { XboxTokenProvider } from "./xbox-token-provider";
+import { FetchFunction } from "src/util/fetch-function";
 
 /**
  * A SpartanTokenProvider that fetches both the Xbox and Halo tokens in the same
@@ -21,15 +22,19 @@ export class AutoTokenProvider
 
   constructor(
     getOauth2AccessToken: () => Promise<string>,
-    tokenPersister?: TokenPersister
+    tokenPersister?: TokenPersister | Promise<TokenPersister>,
+    fetchFn?: FetchFunction
   ) {
-    let actualTokenPersister: TokenPersister;
+    let tokenPeristerOrPromise: TokenPersister | Promise<TokenPersister>;
     if (tokenPersister) {
-      actualTokenPersister = tokenPersister;
+      tokenPeristerOrPromise = tokenPersister;
     } else {
-      actualTokenPersister = inMemoryTokenPersister;
+      tokenPeristerOrPromise = inMemoryTokenPersister;
     }
-    const xboxAuthClient = new XboxAuthenticationClient(tokenPersister);
+    const xboxAuthClient = new XboxAuthenticationClient(
+      tokenPersister,
+      fetchFn
+    );
     const haloAuthClient = new HaloAuthenticationClient(
       async () => {
         const xstsTicket = await xboxAuthClient.getXstsTicket(
@@ -38,10 +43,15 @@ export class AutoTokenProvider
         );
         return xstsTicket.Token;
       },
-      async () => await actualTokenPersister.load("halo.authToken"),
+      async () => {
+        const tokenPersister = await tokenPeristerOrPromise;
+        return await tokenPersister.load("halo.authToken");
+      },
       async (token) => {
-        await actualTokenPersister.save("halo.authToken", token);
-      }
+        const tokenPersister = await tokenPeristerOrPromise;
+        await tokenPersister.save("halo.authToken", token);
+      },
+      fetchFn
     );
 
     this.getSpartanToken = () => haloAuthClient.getSpartanToken();

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

@@ -14,8 +14,11 @@ export class StaticXstsTicketTokenSpartanTokenProvider
 {
   public readonly getSpartanToken: () => Promise<string>;
 
-  constructor(xstsTicketToken: string, tokenPersister?: TokenPersister) {
-    let actualTokenPersister: TokenPersister;
+  constructor(
+    xstsTicketToken: string,
+    tokenPersister?: TokenPersister | Promise<TokenPersister>
+  ) {
+    let actualTokenPersister: TokenPersister | Promise<TokenPersister>;
     if (tokenPersister) {
       actualTokenPersister = tokenPersister;
     } else {
@@ -24,9 +27,10 @@ export class StaticXstsTicketTokenSpartanTokenProvider
 
     const haloAuthClient = new HaloAuthenticationClient(
       () => xstsTicketToken,
-      async () => await actualTokenPersister.load("halo.authToken"),
+      async () =>
+        (await (await actualTokenPersister).load("halo.authToken")) ?? null,
       async (token) => {
-        await actualTokenPersister.save("halo.authToken", token);
+        await (await actualTokenPersister).save("halo.authToken", token);
       }
     );
 

package/src/core/xbox-client.ts

@@ -1,16 +1,14 @@
+import { FetchFunction, defaultFetch } from "../util/fetch-function";
 import { XboxTokenProvider } from "./token-providers/xbox-token-provider";
 
 export class XboxClient {
-  private readonly fetchFn: typeof fetch;
   constructor(
-    private xboxTokenProvider: XboxTokenProvider,
-    fetchFn?: typeof fetch
-  ) {
-    this.fetchFn = fetchFn ?? fetch;
-  }
+    private readonly xboxTokenProvider: XboxTokenProvider,
+    private readonly fetchFn: FetchFunction = defaultFetch
+  ) {}
 
   private async executeRequest<T>(url: string, method: RequestInit["method"]) {
-    const response = await this.fetchFn(url, {
+    const result = await this.fetchFn<T>(url, {
       method,
       headers: {
         Accept: "application/json",
@@ -19,8 +17,6 @@ export class XboxClient {
       },
     });
 
-    const result = (await response.json()) as T;
-
     return result;
   }
 
@@ -32,7 +28,7 @@ export class XboxClient {
             id: string;
             gamertag: string;
             displayPicUri: string;
-            score: 0.0;
+            score: number;
           };
           text: string;
         }

package/src/index.ts

@@ -28,5 +28,6 @@ export {
   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 { TokenPersister } from "./core/token-persisters/token-persister";
 export { PlaylistExperience } from "./models/halo-infinite/playlist-experience";
+export { FetchFunction } from "./util/fetch-function";

package/src/util/fetch-function.ts

@@ -0,0 +1,12 @@
+export type FetchFunction = <TResponse = unknown>(
+  input: RequestInfo | URL,
+  init?: RequestInit
+) => Promise<TResponse>;
+
+export const defaultFetch = async <TResponse>(
+  input: RequestInfo | URL,
+  init?: RequestInit
+): Promise<TResponse> => {
+  const response = await fetch(input, init);
+  return response.json();
+};