halo-infinite-api 1.2.2 → 2.0.0

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+import { TokenPersister } from "../token-persister";
+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/spartan-token-fetchers/static-xsts-ticket-token-spartan-token-provider.js

@@ -0,0 +1,26 @@
+import { HaloAuthenticationClient } from "../../authentication/halo-authentication-client";
+/**
+ * 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) {
+        const haloAuthClient = new HaloAuthenticationClient(() => xstsTicketToken, async () => {
+            if (tokenPersister) {
+                return await tokenPersister.load("halo.authToken");
+            }
+            else {
+                return null;
+            }
+        }, async (token) => {
+            if (tokenPersister) {
+                await tokenPersister.save("halo.authToken", token);
+            }
+        });
+        this.getSpartanToken = () => haloAuthClient.getSpartanToken();
+    }
+}
+//# sourceMappingURL=static-xsts-ticket-token-spartan-token-provider.js.map

package/dist/core/spartan-token-fetchers/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/spartan-token-fetchers/static-xsts-ticket-token-spartan-token-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAG3F;;;;;GAKG;AAEH,MAAM,OAAO,yCAAyC;IAGpC,eAAe,CAAwB;IAEvD,YAAY,eAAuB,EAAE,cAA+B;QAClE,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,GAAG,EAAE,CAAC,eAAe,EACrB,KAAK,IAAI,EAAE;YACT,IAAI,cAAc,EAAE;gBAClB,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACpD;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC,EACD,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,IAAI,cAAc,EAAE;gBAClB,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;aACpD;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IAChE,CAAC;CACF"}

package/dist/core/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(clientId: string, redirectUri: string, getAuthCode: (authorizeUrl: string) => Promise<string>, tokenPersister?: TokenPersister);
+}

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

@@ -0,0 +1,32 @@
+import { RelyingParty, XboxAuthenticationClient, } from "../../authentication/xbox-authentication-client";
+import { HaloAuthenticationClient } from "../../authentication/halo-authentication-client";
+/**
+ * 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(clientId, redirectUri, getAuthCode, tokenPersister) {
+        const xboxAuthClient = new XboxAuthenticationClient(clientId, redirectUri, getAuthCode, tokenPersister);
+        const haloAuthClient = new HaloAuthenticationClient(async () => {
+            const accessToken = await xboxAuthClient.getAccessToken();
+            const userToken = await xboxAuthClient.getUserToken(accessToken);
+            const xstsTicket = await xboxAuthClient.getXstsTicket(userToken, RelyingParty.Halo);
+            return xstsTicket.Token;
+        }, async () => {
+            if (tokenPersister) {
+                return await tokenPersister.load("halo.authToken");
+            }
+            else {
+                return null;
+            }
+        }, async (token) => {
+            if (tokenPersister) {
+                await tokenPersister.save("halo.authToken", token);
+            }
+        });
+        this.getSpartanToken = () => haloAuthClient.getSpartanToken();
+    }
+}
+//# sourceMappingURL=auto-xsts-spartan-token-provider.js.map

package/dist/core/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/spartan-token-providers/auto-xsts-spartan-token-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,wBAAwB,GACzB,MAAM,iDAAiD,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAG3F;;;;GAIG;AACH,MAAM,OAAO,4BAA4B;IACvB,eAAe,CAAwB;IAEvD,YACE,QAAgB,EAChB,WAAmB,EACnB,WAAsD,EACtD,cAA+B;QAE/B,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,QAAQ,EACR,WAAW,EACX,WAAW,EACX,cAAc,CACf,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,KAAK,IAAI,EAAE;YACT,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,cAAc,EAAE,CAAC;YAC1D,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACjE,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,aAAa,CACnD,SAAS,EACT,YAAY,CAAC,IAAI,CAClB,CAAC;YACF,OAAO,UAAU,CAAC,KAAK,CAAC;QAC1B,CAAC,EACD,KAAK,IAAI,EAAE;YACT,IAAI,cAAc,EAAE;gBAClB,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACpD;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC,EACD,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,IAAI,cAAc,EAAE;gBAClB,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;aACpD;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IAChE,CAAC;CACF"}

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

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

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

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

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

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

package/dist/core/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/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider.js

@@ -0,0 +1,26 @@
+import { HaloAuthenticationClient } from "../../authentication/halo-authentication-client";
+/**
+ * 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) {
+        const haloAuthClient = new HaloAuthenticationClient(() => xstsTicketToken, async () => {
+            if (tokenPersister) {
+                return await tokenPersister.load("halo.authToken");
+            }
+            else {
+                return null;
+            }
+        }, async (token) => {
+            if (tokenPersister) {
+                await tokenPersister.save("halo.authToken", token);
+            }
+        });
+        this.getSpartanToken = () => haloAuthClient.getSpartanToken();
+    }
+}
+//# sourceMappingURL=static-xsts-ticket-token-spartan-token-provider.js.map

package/dist/core/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/spartan-token-providers/static-xsts-ticket-token-spartan-token-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAG3F;;;;;GAKG;AAEH,MAAM,OAAO,yCAAyC;IAGpC,eAAe,CAAwB;IAEvD,YAAY,eAAuB,EAAE,cAA+B;QAClE,MAAM,cAAc,GAAG,IAAI,wBAAwB,CACjD,GAAG,EAAE,CAAC,eAAe,EACrB,KAAK,IAAI,EAAE;YACT,IAAI,cAAc,EAAE;gBAClB,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aACpD;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;QACH,CAAC,EACD,KAAK,EAAE,KAAK,EAAE,EAAE;YACd,IAAI,cAAc,EAAE;gBAClB,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;aACpD;QACH,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IAChE,CAAC;CACF"}

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

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

package/dist/core/token-persister.js

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+export const localStorageTokenPersister = {
+    load: (tokenName) => {
+        const json = localStorage.getItem(tokenName);
+        if (json) {
+            return JSON.parse(json);
+        }
+        else {
+            return null;
+        }
+    },
+    save: (tokenName, token) => {
+        localStorage.setItem(tokenName, JSON.stringify(token));
+    },
+};
+//# sourceMappingURL=local-storage-token-persister.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"local-storage-token-persister.js","sourceRoot":"","sources":["../../../src/core/token-persisters/local-storage-token-persister.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,0BAA0B,GAAmB;IACxD,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE;QAClB,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,IAAI,EAAE;YACR,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACzB;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IACD,IAAI,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;QACzB,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;CACF,CAAC"}

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

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

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

@@ -0,0 +1,24 @@
+import fs from "fs/promises";
+export const nodeFsTokenPersister = {
+    load: async (tokenName) => {
+        const storageFileName = `./tokens/${tokenName}`;
+        try {
+            const json = await fs.readFile(storageFileName, { encoding: "utf-8" });
+            return JSON.parse(json);
+        }
+        catch (e) {
+            if (e && typeof e === "object" && "code" in e && e.code === "ENOENT") {
+                return null;
+            }
+            else {
+                throw e;
+            }
+        }
+    },
+    save: async (tokenName, token) => {
+        const storageFileName = `./tokens/${tokenName}`;
+        await fs.mkdir(`./tokens/`, { recursive: true });
+        await fs.writeFile(storageFileName, JSON.stringify(token));
+    },
+};
+//# sourceMappingURL=node-fs-token-persister.js.map

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

@@ -0,0 +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"}

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { HaloInfiniteClient, AssetKindTypeMap, } from "./core/halo-infinite-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";
 export { UserInfo } from "./models/halo-infinite/user-info";
@@ -14,3 +15,7 @@ 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 { TokenPersister } from "./core/token-persisters";

package/dist/index.js

@@ -1,6 +1,9 @@
 export { HaloInfiniteClient, } from "./core/halo-infinite-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";
 //# 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;AAKrC,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"}
+{"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"}

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

@@ -0,0 +1,9 @@
+import { DateTime } from "luxon";
+export declare class ExpiryTokenCache<TToken extends {
+    expiresAt: DateTime;
+}, TArgs extends any[]> {
+    private readonly tokenFetcher;
+    private tokenFetchPromise;
+    constructor(tokenFetcher: (...args: TArgs) => Promise<TToken>);
+    getToken(...args: TArgs): Promise<TToken>;
+}

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

@@ -0,0 +1,48 @@
+import { DateTime } from "luxon";
+import { ResolvablePromise } from "./resolvable-promise";
+export class ExpiryTokenCache {
+    tokenFetcher;
+    tokenFetchPromise = undefined;
+    constructor(tokenFetcher) {
+        this.tokenFetcher = tokenFetcher;
+    }
+    // TODO: Compare args and separate cache entries based on input
+    async getToken(...args) {
+        if (this.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 this.tokenFetchPromise;
+            if (currentToken.expiresAt > DateTime.now()) {
+                // Current token is valid, return it
+                return currentToken;
+            }
+            else {
+                // Current token expired, start a new promise
+                this.tokenFetchPromise = new ResolvablePromise();
+                try {
+                    const newToken = await this.tokenFetcher(...args);
+                    this.tokenFetchPromise.resolve(newToken);
+                    return newToken;
+                }
+                catch (e) {
+                    this.tokenFetchPromise.reject(e);
+                    throw e;
+                }
+            }
+        }
+        else {
+            // No one has a token, start a new promise
+            this.tokenFetchPromise = new ResolvablePromise();
+            try {
+                const newToken = await this.tokenFetcher(...args);
+                this.tokenFetchPromise.resolve(newToken);
+                return newToken;
+            }
+            catch (e) {
+                this.tokenFetchPromise.reject(e);
+                throw e;
+            }
+        }
+    }
+}
+//# sourceMappingURL=expiry-token-cache.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"expiry-token-cache.js","sourceRoot":"","sources":["../../src/util/expiry-token-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,OAAO,gBAAgB;IAOR;IAHX,iBAAiB,GAA0C,SAAS,CAAC;IAE7E,YACmB,YAAiD;QAAjD,iBAAY,GAAZ,YAAY,CAAqC;IACjE,CAAC;IAEJ,+DAA+D;IAC/D,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAW;QAC3B,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,yEAAyE;YACzE,mDAAmD;YACnD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAElD,IAAI,YAAY,CAAC,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE;gBAC3C,oCAAoC;gBACpC,OAAO,YAAY,CAAC;aACrB;iBAAM;gBACL,6CAA6C;gBAC7C,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,EAAU,CAAC;gBAEzD,IAAI;oBACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;oBAClD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBACzC,OAAO,QAAQ,CAAC;iBACjB;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACjC,MAAM,CAAC,CAAC;iBACT;aACF;SACF;aAAM;YACL,0CAA0C;YAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,EAAU,CAAC;YAEzD,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;gBAClD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACzC,OAAO,QAAQ,CAAC;aACjB;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;CACF"}

package/dist/util/resolvable-promise.d.ts

@@ -0,0 +1,8 @@
+export declare class ResolvablePromise<TReturn> extends Promise<TReturn> {
+    isCompleted: boolean;
+    readonly resolve: (value: TReturn | PromiseLike<TReturn>) => void;
+    readonly reject: (reason?: unknown) => void;
+    constructor();
+    static get [Symbol.species](): PromiseConstructor;
+    get [Symbol.toStringTag](): string;
+}

package/dist/util/resolvable-promise.js

@@ -0,0 +1,31 @@
+export class ResolvablePromise extends Promise {
+    isCompleted = false;
+    resolve;
+    reject;
+    constructor() {
+        let resolve;
+        let reject;
+        super((res, rej) => {
+            resolve = res;
+            reject = rej;
+        });
+        this.resolve = (v) => {
+            this.isCompleted = true;
+            return resolve(v);
+        };
+        this.reject = (r) => {
+            this.isCompleted = true;
+            return reject(r);
+        };
+    }
+    // you can also use Symbol.species in order to
+    // return a Promise for then/catch/finally
+    static get [Symbol.species]() {
+        return Promise;
+    }
+    // Promise overrides his Symbol.toStringTag
+    get [Symbol.toStringTag]() {
+        return "ResolvablePromise";
+    }
+}
+//# sourceMappingURL=resolvable-promise.js.map

package/dist/util/resolvable-promise.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvable-promise.js","sourceRoot":"","sources":["../../src/util/resolvable-promise.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,iBAA2B,SAAQ,OAAgB;IAC9D,WAAW,GAAG,KAAK,CAAC;IACX,OAAO,CAAkD;IACzD,MAAM,CAA6B;IAC5C;QACE,IAAI,OAAyD,CAAC;QAC9D,IAAI,MAAmC,CAAC;QACxC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACjB,OAAO,GAAG,GAAG,CAAC;YACd,MAAM,GAAG,GAAG,CAAC;QACf,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,EAAE,EAAE;YACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE;YAClB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC;IACJ,CAAC;IAED,8CAA8C;IAC9C,0CAA0C;IAC1C,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;QACzB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,2CAA2C;IAC3C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACtB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;CACF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halo-infinite-api",
   "type": "module",
-  "version": "1.2.2",
+  "version": "2.0.0",
   "description": "An NPM package for accessing the official Halo Infinite API.",
   "main": "dist/index.js",
   "scripts": {
@@ -34,8 +34,9 @@
   },
   "dependencies": {
     "axios": "^1.3.5",
+    "expiry-map": "^2.0.0",
     "luxon": "^3.3.0",
-    "pkce-challenge": "^4.0.1",
+    "pkce-challenge": "^3.1.0",
     "simple-oauth2": "^5.0.0"
   },
   "publishConfig": {

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

@@ -3,6 +3,7 @@ import { DateTime } from "luxon";
 import type { SpartanToken } from "../models/spartan-token";
 import type { SpartanTokenRequest } from "../models/spartan-token-request";
 import { coalesceDateTime } from "../util/date-time";
+import { ExpiryTokenCache } from "../util/expiry-token-cache";
 
 export interface Token {
   token: string;
@@ -10,81 +11,21 @@ export interface Token {
 }
 
 export class HaloAuthenticationClient {
-  private currentTokenPromise: Promise<Token> | undefined = undefined;
+  private spartanTokenCache = new ExpiryTokenCache(async () => {
+    const persistedToken = await this.loadToken();
 
-  constructor(
-    private readonly fetchXstsToken: () => Promise<string>,
-    private readonly loadToken: () => Promise<{
-      token?: string;
-      expiresAt?: unknown;
-    } | null>,
-    private readonly saveToken: (token: Token) => Promise<void>
-  ) {}
-
-  public async getSpartanToken() {
-    if (this.currentTokenPromise) {
-      // 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 this.currentTokenPromise;
-
-      if (currentToken.expiresAt > DateTime.now()) {
-        // Current token is valid, return it
-        return currentToken.token;
-      } else {
-        // Current token expired, start a new promise
-        let promiseResolver!: (token: Token) => void;
-        let promiseRejector!: (error: unknown) => void;
-        this.currentTokenPromise = new Promise<Token>((resolve, reject) => {
-          promiseResolver = resolve;
-          promiseRejector = reject;
-        });
-
-        try {
-          const xstsToken = await this.fetchXstsToken();
-          const newToken = await this.fetchSpartanToken(xstsToken);
-          promiseResolver(newToken);
-          await this.saveToken(newToken);
-          return newToken.token;
-        } catch (e) {
-          promiseRejector(e);
-          throw e;
-        }
-      }
-    } else {
-      // We are the first caller, create a promise to block subsequent callers
-      let promiseResolver!: (token: Token) => void;
-      let promiseRejector!: (error: unknown) => void;
-      this.currentTokenPromise = new Promise<Token>((resolve, reject) => {
-        promiseResolver = resolve;
-        promiseRejector = reject;
-      });
-
-      try {
-        const loadedToken = await this.loadToken();
-        const currentToken = {
-          token: loadedToken?.token ?? "",
-          expiresAt: coalesceDateTime(loadedToken?.expiresAt),
-        };
-
-        if (currentToken.expiresAt && currentToken.expiresAt > DateTime.now()) {
-          // Current token is valid, return it and alert other callers if applicable
-          promiseResolver(currentToken as Token);
-          return currentToken.token;
-        } else {
-          const xstsToken = await this.fetchXstsToken();
-          const newToken = await this.fetchSpartanToken(xstsToken);
-          promiseResolver(newToken);
-          await this.saveToken(newToken);
-          return newToken.token;
-        }
-      } catch (e) {
-        promiseRejector(e);
-        throw e;
+    if (persistedToken?.expiresAt) {
+      const currentToken = {
+        token: persistedToken.token,
+        expiresAt: coalesceDateTime(persistedToken.expiresAt) as DateTime,
+      };
+      if (currentToken.expiresAt && currentToken.expiresAt > DateTime.now()) {
+        return currentToken;
       }
     }
-  }
 
-  private async fetchSpartanToken(xstsToken: string) {
+    const xstsToken = await this.fetchXstsToken();
+
     const tokenRequest: SpartanTokenRequest = {
       Audience: "urn:343:s3:services",
       MinVersion: "4",
@@ -106,9 +47,26 @@ export class HaloAuthenticationClient {
         },
       }
     );
-    return {
+
+    const newToken = {
       token: response.data.SpartanToken,
       expiresAt: DateTime.fromISO(response.data.ExpiresUtc.ISO8601Date),
     };
+    await this.saveToken(newToken);
+    return newToken;
+  });
+
+  constructor(
+    private readonly fetchXstsToken: () => Promise<string> | string,
+    private readonly loadToken: () => Promise<{
+      token: string;
+      expiresAt: unknown;
+    } | null>,
+    private readonly saveToken: (token: Token) => Promise<void>
+  ) {}
+
+  public async getSpartanToken() {
+    const { token } = await this.spartanTokenCache.getToken();
+    return token;
   }
 }