halo-infinite-api 4.0.0 → 4.0.1

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

@@ -1,22 +1,11 @@
 import axios from "axios";
 import { DateTime } from "luxon";
-import { coalesceDateTime } from "../util/date-time";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
 export class HaloAuthenticationClient {
     fetchXstsToken;
     loadToken;
     saveToken;
     spartanTokenCache = new ExpiryTokenCache(async () => {
-        const persistedToken = await this.loadToken();
-        if (persistedToken?.expiresAt) {
-            const currentToken = {
-                token: persistedToken.token,
-                expiresAt: coalesceDateTime(persistedToken.expiresAt),
-            };
-            if (currentToken.expiresAt && currentToken.expiresAt > DateTime.now()) {
-                return currentToken;
-            }
-        }
         const xstsToken = await this.fetchXstsToken();
         const tokenRequest = {
             Audience: "urn:343:s3:services",
@@ -40,7 +29,7 @@ export class HaloAuthenticationClient {
         };
         await this.saveToken(newToken);
         return newToken;
-    });
+    }, () => this.loadToken());
     constructor(fetchXstsToken, loadToken, saveToken) {
         this.fetchXstsToken = fetchXstsToken;
         this.loadToken = loadToken;

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;AAGjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAO9D,MAAM,OAAO,wBAAwB;IA+ChB;IACA;IAIA;IAnDX,iBAAiB,GAAG,IAAI,gBAAgB,CAAC,KAAK,IAAI,EAAE;QAC1D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAE9C,IAAI,cAAc,EAAE,SAAS,EAAE;YAC7B,MAAM,YAAY,GAAG;gBACnB,KAAK,EAAE,cAAc,CAAC,KAAK;gBAC3B,SAAS,EAAE,gBAAgB,CAAC,cAAc,CAAC,SAAS,CAAa;aAClE,CAAC;YACF,IAAI,YAAY,CAAC,SAAS,IAAI,YAAY,CAAC,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE;gBACrE,OAAO,YAAY,CAAC;aACrB;SACF;QAED,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,CAAC,CAAC;IAEH,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,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"}

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

@@ -15,7 +15,7 @@ export declare class XboxAuthenticationClient {
     private xstsTicketCache;
     private readonly httpClient;
     constructor(tokenPersister?: TokenPersister | undefined);
-    getXstsTicket(getOauth2AccessToken: () => Promise<string>): Promise<{
+    getXstsTicket(getOauth2AccessToken: () => Promise<string>): Promise<Omit<{
         expiresAt: DateTime;
         IssueInstant: string;
         NotAfter: string;
@@ -31,6 +31,8 @@ export declare class XboxAuthenticationClient {
                 prv: string;
             }];
         };
+    }, "expiresAt"> & {
+        expiresAt: unknown;
     }>;
     getXboxLiveV3Token: (userHash: string, userToken: string) => string;
 }

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

@@ -1,6 +1,5 @@
 import axios from "axios";
 import { DateTime } from "luxon";
-import { coalesceDateTime } from "../util/date-time";
 import { ExpiryTokenCache } from "../util/expiry-token-cache";
 export var RelyingParty;
 (function (RelyingParty) {
@@ -10,13 +9,6 @@ export var RelyingParty;
 export class XboxAuthenticationClient {
     tokenPersister;
     userTokenCache = new ExpiryTokenCache(async (accessToken) => {
-        const persistedToken = await this.tokenPersister?.load("xbox.userToken");
-        if (persistedToken?.expiresAt) {
-            const expiresAt = coalesceDateTime(persistedToken.expiresAt);
-            if (expiresAt && expiresAt > DateTime.now()) {
-                return { ...persistedToken, expiresAt };
-            }
-        }
         const response = await this.httpClient.post("https://user.auth.xboxlive.com/user/authenticate", {
             RelyingParty: "http://auth.xboxlive.com",
             TokenType: "JWT",
@@ -38,15 +30,8 @@ export class XboxAuthenticationClient {
         };
         await this.tokenPersister?.save("xbox.userToken", result);
         return result;
-    });
+    }, async () => (await this.tokenPersister?.load("xbox.userToken")) ?? null);
     xstsTicketCache = new ExpiryTokenCache(async (userToken, relyingParty) => {
-        const persistedToken = await this.tokenPersister?.load("xbox.xstsTicket");
-        if (persistedToken?.expiresAt) {
-            const expiresAt = coalesceDateTime(persistedToken.expiresAt);
-            if (expiresAt && expiresAt > DateTime.now()) {
-                return { ...persistedToken, expiresAt };
-            }
-        }
         const response = await this.httpClient.post("https://xsts.auth.xboxlive.com/xsts/authorize", {
             RelyingParty: relyingParty,
             TokenType: "JWT",
@@ -67,16 +52,16 @@ export class XboxAuthenticationClient {
         };
         await this.tokenPersister?.save("xbox.xstsTicket", result);
         return result;
-    });
+    }, async () => (await this.tokenPersister?.load("xbox.xstsTicket")) ?? null);
     httpClient;
     constructor(tokenPersister) {
         this.tokenPersister = tokenPersister;
         this.httpClient = axios.create();
     }
     async getXstsTicket(getOauth2AccessToken) {
-        let xstsTicket = await this.xstsTicketCache.getTokenWithoutFetch();
+        let xstsTicket = await this.xstsTicketCache.getExistingToken();
         if (!xstsTicket) {
-            let userToken = await this.userTokenCache.getTokenWithoutFetch();
+            let userToken = await this.userTokenCache.getExistingToken();
             if (!userToken) {
                 // Ouath2 token depends on nothing, so we can fetch it without
                 // worrying if it is expired.

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

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

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

@@ -2,9 +2,13 @@ import { DateTime } from "luxon";
 export declare class ExpiryTokenCache<TToken extends {
     expiresAt: DateTime;
 }, TArgs extends any[]> {
-    private readonly tokenFetcher;
+    private readonly generateNewToken;
+    readonly getExistingToken: () => Promise<(Omit<TToken, "expiresAt"> & {
+        expiresAt: unknown;
+    }) | null>;
     private tokenFetchPromise;
-    constructor(tokenFetcher: (...args: TArgs) => Promise<TToken>);
+    constructor(generateNewToken: (...args: TArgs) => Promise<TToken>, getExistingToken: () => Promise<(Omit<TToken, "expiresAt"> & {
+        expiresAt: unknown;
+    }) | null>);
     getToken(...args: TArgs): Promise<TToken>;
-    getTokenWithoutFetch(): Promise<TToken | undefined>;
 }

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

@@ -1,10 +1,13 @@
 import { DateTime } from "luxon";
 import { ResolvablePromise } from "./resolvable-promise";
+import { coalesceDateTime } from "./date-time";
 export class ExpiryTokenCache {
-    tokenFetcher;
+    generateNewToken;
+    getExistingToken;
     tokenFetchPromise = undefined;
-    constructor(tokenFetcher) {
-        this.tokenFetcher = tokenFetcher;
+    constructor(generateNewToken, getExistingToken) {
+        this.generateNewToken = generateNewToken;
+        this.getExistingToken = getExistingToken;
     }
     // TODO: Compare args and separate cache entries based on input
     async getToken(...args) {
@@ -20,7 +23,7 @@ export class ExpiryTokenCache {
                 // Current token expired, start a new promise
                 this.tokenFetchPromise = new ResolvablePromise();
                 try {
-                    const newToken = await this.tokenFetcher(...args);
+                    const newToken = await this.generateNewToken(...args);
                     this.tokenFetchPromise.resolve(newToken);
                     return newToken;
                 }
@@ -35,7 +38,16 @@ export class ExpiryTokenCache {
             // No one has a token, start a new promise
             this.tokenFetchPromise = new ResolvablePromise();
             try {
-                const newToken = await this.tokenFetcher(...args);
+                const existingToken = await this.getExistingToken();
+                if (existingToken?.expiresAt) {
+                    const expiresAt = coalesceDateTime(existingToken.expiresAt);
+                    if (expiresAt && expiresAt > DateTime.now()) {
+                        const newToken = { ...existingToken, expiresAt };
+                        this.tokenFetchPromise.resolve(newToken);
+                        return newToken;
+                    }
+                }
+                const newToken = await this.generateNewToken(...args);
                 this.tokenFetchPromise.resolve(newToken);
                 return newToken;
             }
@@ -46,17 +58,5 @@ export class ExpiryTokenCache {
             }
         }
     }
-    async getTokenWithoutFetch() {
-        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;
-            }
-        }
-        return undefined;
-    }
 }
 //# sourceMappingURL=expiry-token-cache.js.map

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

@@ -1 +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,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;oBACnC,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,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;gBACnC,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,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;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
+{"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;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,OAAO,gBAAgB;IAOR;IACD;IAJV,iBAAiB,GAA0C,SAAS,CAAC;IAE7E,YACmB,gBAAqD,EACtD,gBAEf;QAHgB,qBAAgB,GAAhB,gBAAgB,CAAqC;QACtD,qBAAgB,GAAhB,gBAAgB,CAE/B;IACA,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,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;oBACtD,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,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;oBACnC,MAAM,CAAC,CAAC;iBACT;aACF;SACF;aAAM;YACL,0CAA0C;YAC1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,EAAU,CAAC;YAEzD,IAAI;gBACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAEpD,IAAI,aAAa,EAAE,SAAS,EAAE;oBAC5B,MAAM,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;oBAC5D,IAAI,SAAS,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE;wBAC3C,MAAM,QAAQ,GAAG,EAAE,GAAG,aAAa,EAAE,SAAS,EAAY,CAAC;wBAC3D,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;wBACzC,OAAO,QAAQ,CAAC;qBACjB;iBACF;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC,CAAC;gBACtD,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,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;gBACnC,MAAM,CAAC,CAAC;aACT;SACF;IACH,CAAC;CACF"}

package/package.json

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

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

@@ -11,50 +11,41 @@ export interface Token {
 }
 
 export class HaloAuthenticationClient {
-  private spartanTokenCache = new ExpiryTokenCache(async () => {
-    const persistedToken = await this.loadToken();
-
-    if (persistedToken?.expiresAt) {
-      const currentToken = {
-        token: persistedToken.token,
-        expiresAt: coalesceDateTime(persistedToken.expiresAt) as DateTime,
+  private spartanTokenCache = new ExpiryTokenCache(
+    async () => {
+      const xstsToken = await this.fetchXstsToken();
+
+      const tokenRequest: SpartanTokenRequest = {
+        Audience: "urn:343:s3:services",
+        MinVersion: "4",
+        Proof: [
+          {
+            Token: xstsToken,
+            TokenType: "Xbox_XSTSv3",
+          },
+        ],
       };
-      if (currentToken.expiresAt && currentToken.expiresAt > DateTime.now()) {
-        return currentToken;
-      }
-    }
-
-    const xstsToken = await this.fetchXstsToken();
-
-    const tokenRequest: SpartanTokenRequest = {
-      Audience: "urn:343:s3:services",
-      MinVersion: "4",
-      Proof: [
+      const response = await axios.post<SpartanToken>(
+        "https://settings.svc.halowaypoint.com/spartan-token",
+        tokenRequest,
         {
-          Token: xstsToken,
-          TokenType: "Xbox_XSTSv3",
-        },
-      ],
-    };
-    const response = await axios.post<SpartanToken>(
-      "https://settings.svc.halowaypoint.com/spartan-token",
-      tokenRequest,
-      {
-        headers: {
-          "User-Agent":
-            "HaloWaypoint/2021112313511900 CFNetwork/1327.0.4 Darwin/21.2.0",
-          "Content-Type": "application/json; charset=utf-8",
-        },
-      }
-    );
-
-    const newToken = {
-      token: response.data.SpartanToken,
-      expiresAt: DateTime.fromISO(response.data.ExpiresUtc.ISO8601Date),
-    };
-    await this.saveToken(newToken);
-    return newToken;
-  });
+          headers: {
+            "User-Agent":
+              "HaloWaypoint/2021112313511900 CFNetwork/1327.0.4 Darwin/21.2.0",
+            "Content-Type": "application/json; charset=utf-8",
+          },
+        }
+      );
+
+      const newToken = {
+        token: response.data.SpartanToken,
+        expiresAt: DateTime.fromISO(response.data.ExpiresUtc.ISO8601Date),
+      };
+      await this.saveToken(newToken);
+      return newToken;
+    },
+    () => this.loadToken()
+  );
 
   constructor(
     private readonly fetchXstsToken: () => Promise<string> | string,

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

@@ -17,58 +17,42 @@ export interface XboxAuthenticationToken {
 }
 
 export class XboxAuthenticationClient {
-  private userTokenCache = new ExpiryTokenCache(async (accessToken: string) => {
-    const persistedToken = await this.tokenPersister?.load<
-      XboxTicket & { expiresAt?: unknown }
-    >("xbox.userToken");
-
-    if (persistedToken?.expiresAt) {
-      const expiresAt = coalesceDateTime(persistedToken.expiresAt);
-      if (expiresAt && expiresAt > DateTime.now()) {
-        return { ...persistedToken, expiresAt };
-      }
-    }
-
-    const response = await this.httpClient.post<XboxTicket>(
-      "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}`,
-        },
-      },
-      {
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/json",
-          "x-xbl-contract-version": "1",
+  private userTokenCache = new ExpiryTokenCache(
+    async (accessToken: string) => {
+      const response = await this.httpClient.post<XboxTicket>(
+        "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}`,
+          },
         },
-      }
-    );
+        {
+          headers: {
+            "Content-Type": "application/json",
+            Accept: "application/json",
+            "x-xbl-contract-version": "1",
+          },
+        }
+      );
 
-    const result = {
-      ...response.data,
-      expiresAt: DateTime.fromISO(response.data.NotAfter),
-    };
-    await this.tokenPersister?.save("xbox.userToken", result);
-    return result;
-  });
+      const result = {
+        ...response.data,
+        expiresAt: DateTime.fromISO(response.data.NotAfter),
+      };
+      await this.tokenPersister?.save("xbox.userToken", result);
+      return result;
+    },
+    async () =>
+      (await this.tokenPersister?.load<XboxTicket & { expiresAt: unknown }>(
+        "xbox.userToken"
+      )) ?? null
+  );
   private xstsTicketCache = new ExpiryTokenCache(
     async (userToken: string, relyingParty: RelyingParty) => {
-      const persistedToken = await this.tokenPersister?.load<
-        XboxTicket & { expiresAt: DateTime }
-      >("xbox.xstsTicket");
-
-      if (persistedToken?.expiresAt) {
-        const expiresAt = coalesceDateTime(persistedToken.expiresAt);
-        if (expiresAt && expiresAt > DateTime.now()) {
-          return { ...persistedToken, expiresAt };
-        }
-      }
-
       const response = await this.httpClient.post<XboxTicket>(
         "https://xsts.auth.xboxlive.com/xsts/authorize",
         {
@@ -94,7 +78,11 @@ export class XboxAuthenticationClient {
       };
       await this.tokenPersister?.save("xbox.xstsTicket", result);
       return result;
-    }
+    },
+    async () =>
+      (await this.tokenPersister?.load<XboxTicket & { expiresAt: unknown }>(
+        "xbox.xstsTicket"
+      )) ?? null
   );
 
   private readonly httpClient: AxiosInstance;
@@ -104,9 +92,9 @@ export class XboxAuthenticationClient {
   }
 
   public async getXstsTicket(getOauth2AccessToken: () => Promise<string>) {
-    let xstsTicket = await this.xstsTicketCache.getTokenWithoutFetch();
+    let xstsTicket = await this.xstsTicketCache.getExistingToken();
     if (!xstsTicket) {
-      let userToken = await this.userTokenCache.getTokenWithoutFetch();
+      let userToken = await this.userTokenCache.getExistingToken();
       if (!userToken) {
         // Ouath2 token depends on nothing, so we can fetch it without
         // worrying if it is expired.

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

@@ -1,5 +1,6 @@
 import { DateTime } from "luxon";
 import { ResolvablePromise } from "./resolvable-promise";
+import { coalesceDateTime } from "./date-time";
 
 export class ExpiryTokenCache<
   TToken extends { expiresAt: DateTime },
@@ -8,7 +9,10 @@ export class ExpiryTokenCache<
   private tokenFetchPromise: ResolvablePromise<TToken> | undefined = undefined;
 
   constructor(
-    private readonly tokenFetcher: (...args: TArgs) => Promise<TToken>
+    private readonly generateNewToken: (...args: TArgs) => Promise<TToken>,
+    public readonly getExistingToken: () => Promise<
+      (Omit<TToken, "expiresAt"> & { expiresAt: unknown }) | null
+    >
   ) {}
 
   // TODO: Compare args and separate cache entries based on input
@@ -26,7 +30,7 @@ export class ExpiryTokenCache<
         this.tokenFetchPromise = new ResolvablePromise<TToken>();
 
         try {
-          const newToken = await this.tokenFetcher(...args);
+          const newToken = await this.generateNewToken(...args);
           this.tokenFetchPromise.resolve(newToken);
           return newToken;
         } catch (e) {
@@ -40,7 +44,18 @@ export class ExpiryTokenCache<
       this.tokenFetchPromise = new ResolvablePromise<TToken>();
 
       try {
-        const newToken = await this.tokenFetcher(...args);
+        const existingToken = await this.getExistingToken();
+
+        if (existingToken?.expiresAt) {
+          const expiresAt = coalesceDateTime(existingToken.expiresAt);
+          if (expiresAt && expiresAt > DateTime.now()) {
+            const newToken = { ...existingToken, expiresAt } as TToken;
+            this.tokenFetchPromise.resolve(newToken);
+            return newToken;
+          }
+        }
+
+        const newToken = await this.generateNewToken(...args);
         this.tokenFetchPromise.resolve(newToken);
         return newToken;
       } catch (e) {
@@ -50,18 +65,4 @@ export class ExpiryTokenCache<
       }
     }
   }
-
-  async getTokenWithoutFetch(): Promise<TToken | undefined> {
-    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;
-      }
-    }
-    return undefined;
-  }
 }