halo-infinite-api 8.0.7 → 8.0.8
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.
|
@@ -21,39 +21,45 @@ export class ExpiryTokenCache {
|
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
23
|
// Current token expired, start a new promise
|
|
24
|
-
|
|
24
|
+
const newPromise = new ResolvablePromise();
|
|
25
|
+
this.tokenFetchPromise = newPromise;
|
|
25
26
|
try {
|
|
26
27
|
const newToken = await this.generateNewToken(...args);
|
|
27
|
-
|
|
28
|
+
newPromise.resolve(newToken);
|
|
28
29
|
return newToken;
|
|
29
30
|
}
|
|
30
31
|
catch (e) {
|
|
31
|
-
|
|
32
|
-
this.tokenFetchPromise
|
|
32
|
+
newPromise.reject(e);
|
|
33
|
+
if (this.tokenFetchPromise === newPromise) {
|
|
34
|
+
this.tokenFetchPromise = undefined;
|
|
35
|
+
}
|
|
33
36
|
throw e;
|
|
34
37
|
}
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
40
|
else {
|
|
38
41
|
// No one has a token, start a new promise
|
|
39
|
-
|
|
42
|
+
const newPromise = new ResolvablePromise();
|
|
43
|
+
this.tokenFetchPromise = newPromise;
|
|
40
44
|
try {
|
|
41
45
|
const existingToken = await this.getExistingToken();
|
|
42
46
|
if (existingToken?.expiresAt) {
|
|
43
47
|
const expiresAt = coalesceDateTime(existingToken.expiresAt);
|
|
44
48
|
if (expiresAt && expiresAt > DateTime.now()) {
|
|
45
49
|
const newToken = { ...existingToken, expiresAt };
|
|
46
|
-
|
|
50
|
+
newPromise.resolve(newToken);
|
|
47
51
|
return newToken;
|
|
48
52
|
}
|
|
49
53
|
}
|
|
50
54
|
const newToken = await this.generateNewToken(...args);
|
|
51
|
-
|
|
55
|
+
newPromise.resolve(newToken);
|
|
52
56
|
return newToken;
|
|
53
57
|
}
|
|
54
58
|
catch (e) {
|
|
55
|
-
|
|
56
|
-
this.tokenFetchPromise
|
|
59
|
+
newPromise.reject(e);
|
|
60
|
+
if (this.tokenFetchPromise === newPromise) {
|
|
61
|
+
this.tokenFetchPromise = undefined;
|
|
62
|
+
}
|
|
57
63
|
throw e;
|
|
58
64
|
}
|
|
59
65
|
}
|
|
@@ -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;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,CAAC;YAC3B,yEAAyE;YACzE,mDAAmD;YACnD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAElD,IAAI,YAAY,CAAC,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;gBACjE,oCAAoC;gBACpC,OAAO,YAAY,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,6CAA6C;gBAC7C,
|
|
1
|
+
{"version":3,"file":"expiry-token-cache.js","sourceRoot":"","sources":["../../src/util/expiry-token-cache.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -27,21 +27,25 @@ export class ExpiryTokenCache<
|
|
|
27
27
|
return currentToken;
|
|
28
28
|
} else {
|
|
29
29
|
// Current token expired, start a new promise
|
|
30
|
-
|
|
30
|
+
const newPromise = new ResolvablePromise<TToken>();
|
|
31
|
+
this.tokenFetchPromise = newPromise;
|
|
31
32
|
|
|
32
33
|
try {
|
|
33
34
|
const newToken = await this.generateNewToken(...args);
|
|
34
|
-
|
|
35
|
+
newPromise.resolve(newToken);
|
|
35
36
|
return newToken;
|
|
36
37
|
} catch (e) {
|
|
37
|
-
|
|
38
|
-
this.tokenFetchPromise
|
|
38
|
+
newPromise.reject(e);
|
|
39
|
+
if (this.tokenFetchPromise === newPromise) {
|
|
40
|
+
this.tokenFetchPromise = undefined;
|
|
41
|
+
}
|
|
39
42
|
throw e;
|
|
40
43
|
}
|
|
41
44
|
}
|
|
42
45
|
} else {
|
|
43
46
|
// No one has a token, start a new promise
|
|
44
|
-
|
|
47
|
+
const newPromise = new ResolvablePromise<TToken>();
|
|
48
|
+
this.tokenFetchPromise = newPromise;
|
|
45
49
|
|
|
46
50
|
try {
|
|
47
51
|
const existingToken = await this.getExistingToken();
|
|
@@ -50,17 +54,19 @@ export class ExpiryTokenCache<
|
|
|
50
54
|
const expiresAt = coalesceDateTime(existingToken.expiresAt);
|
|
51
55
|
if (expiresAt && expiresAt > DateTime.now()) {
|
|
52
56
|
const newToken = { ...existingToken, expiresAt } as TToken;
|
|
53
|
-
|
|
57
|
+
newPromise.resolve(newToken);
|
|
54
58
|
return newToken;
|
|
55
59
|
}
|
|
56
60
|
}
|
|
57
61
|
|
|
58
62
|
const newToken = await this.generateNewToken(...args);
|
|
59
|
-
|
|
63
|
+
newPromise.resolve(newToken);
|
|
60
64
|
return newToken;
|
|
61
65
|
} catch (e) {
|
|
62
|
-
|
|
63
|
-
this.tokenFetchPromise
|
|
66
|
+
newPromise.reject(e);
|
|
67
|
+
if (this.tokenFetchPromise === newPromise) {
|
|
68
|
+
this.tokenFetchPromise = undefined;
|
|
69
|
+
}
|
|
64
70
|
throw e;
|
|
65
71
|
}
|
|
66
72
|
}
|