halo-infinite-api 4.0.1 → 4.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -15,7 +15,7 @@ export declare class XboxAuthenticationClient {
|
|
|
15
15
|
private xstsTicketCache;
|
|
16
16
|
private readonly httpClient;
|
|
17
17
|
constructor(tokenPersister?: TokenPersister | undefined);
|
|
18
|
-
getXstsTicket(getOauth2AccessToken: () => Promise<string>): Promise<
|
|
18
|
+
getXstsTicket(getOauth2AccessToken: () => Promise<string>): Promise<{
|
|
19
19
|
expiresAt: DateTime;
|
|
20
20
|
IssueInstant: string;
|
|
21
21
|
NotAfter: string;
|
|
@@ -31,8 +31,6 @@ export declare class XboxAuthenticationClient {
|
|
|
31
31
|
prv: string;
|
|
32
32
|
}];
|
|
33
33
|
};
|
|
34
|
-
}, "expiresAt"> & {
|
|
35
|
-
expiresAt: unknown;
|
|
36
34
|
}>;
|
|
37
35
|
getXboxLiveV3Token: (userHash: string, userToken: string) => string;
|
|
38
36
|
}
|
|
@@ -3,12 +3,11 @@ export declare class ExpiryTokenCache<TToken extends {
|
|
|
3
3
|
expiresAt: DateTime;
|
|
4
4
|
}, TArgs extends any[]> {
|
|
5
5
|
private readonly generateNewToken;
|
|
6
|
-
readonly
|
|
7
|
-
expiresAt: unknown;
|
|
8
|
-
}) | null>;
|
|
6
|
+
private readonly existingTokenFetcher;
|
|
9
7
|
private tokenFetchPromise;
|
|
10
|
-
constructor(generateNewToken: (...args: TArgs) => Promise<TToken>,
|
|
8
|
+
constructor(generateNewToken: (...args: TArgs) => Promise<TToken>, existingTokenFetcher: () => Promise<(Omit<TToken, "expiresAt"> & {
|
|
11
9
|
expiresAt: unknown;
|
|
12
10
|
}) | null>);
|
|
13
11
|
getToken(...args: TArgs): Promise<TToken>;
|
|
12
|
+
getExistingToken(): Promise<TToken | null>;
|
|
14
13
|
}
|
|
@@ -3,11 +3,11 @@ import { ResolvablePromise } from "./resolvable-promise";
|
|
|
3
3
|
import { coalesceDateTime } from "./date-time";
|
|
4
4
|
export class ExpiryTokenCache {
|
|
5
5
|
generateNewToken;
|
|
6
|
-
|
|
6
|
+
existingTokenFetcher;
|
|
7
7
|
tokenFetchPromise = undefined;
|
|
8
|
-
constructor(generateNewToken,
|
|
8
|
+
constructor(generateNewToken, existingTokenFetcher) {
|
|
9
9
|
this.generateNewToken = generateNewToken;
|
|
10
|
-
this.
|
|
10
|
+
this.existingTokenFetcher = existingTokenFetcher;
|
|
11
11
|
}
|
|
12
12
|
// TODO: Compare args and separate cache entries based on input
|
|
13
13
|
async getToken(...args) {
|
|
@@ -58,5 +58,15 @@ export class ExpiryTokenCache {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
+
async getExistingToken() {
|
|
62
|
+
const existingToken = await this.existingTokenFetcher();
|
|
63
|
+
if (existingToken?.expiresAt) {
|
|
64
|
+
const expiresAt = coalesceDateTime(existingToken.expiresAt);
|
|
65
|
+
if (expiresAt && expiresAt > DateTime.now()) {
|
|
66
|
+
return { ...existingToken, expiresAt };
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
61
71
|
}
|
|
62
72
|
//# sourceMappingURL=expiry-token-cache.js.map
|
|
@@ -1 +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;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,OAAO,gBAAgB;IAOR;
|
|
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;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,OAAO,gBAAgB;IAOR;IACA;IAJX,iBAAiB,GAA0C,SAAS,CAAC;IAE7E,YACmB,gBAAqD,EACrD,oBAEhB;QAHgB,qBAAgB,GAAhB,gBAAgB,CAAqC;QACrD,yBAAoB,GAApB,oBAAoB,CAEpC;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;IAED,KAAK,CAAC,gBAAgB;QACpB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAExD,IAAI,aAAa,EAAE,SAAS,EAAE;YAC5B,MAAM,SAAS,GAAG,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC5D,IAAI,SAAS,IAAI,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE;gBAC3C,OAAO,EAAE,GAAG,aAAa,EAAE,SAAS,EAAY,CAAC;aAClD;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@ export class ExpiryTokenCache<
|
|
|
10
10
|
|
|
11
11
|
constructor(
|
|
12
12
|
private readonly generateNewToken: (...args: TArgs) => Promise<TToken>,
|
|
13
|
-
|
|
13
|
+
private readonly existingTokenFetcher: () => Promise<
|
|
14
14
|
(Omit<TToken, "expiresAt"> & { expiresAt: unknown }) | null
|
|
15
15
|
>
|
|
16
16
|
) {}
|
|
@@ -65,4 +65,17 @@ export class ExpiryTokenCache<
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
|
+
|
|
69
|
+
async getExistingToken() {
|
|
70
|
+
const existingToken = await this.existingTokenFetcher();
|
|
71
|
+
|
|
72
|
+
if (existingToken?.expiresAt) {
|
|
73
|
+
const expiresAt = coalesceDateTime(existingToken.expiresAt);
|
|
74
|
+
if (expiresAt && expiresAt > DateTime.now()) {
|
|
75
|
+
return { ...existingToken, expiresAt } as TToken;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
return null;
|
|
80
|
+
}
|
|
68
81
|
}
|