@royaltics/ui 1.9.7 → 1.9.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.
- package/dist/core/http/http.client.d.ts.map +1 -1
- package/dist/core/http/http.client.js +29 -21
- package/dist/core/http/http.client.js.map +1 -1
- package/dist/core/http/http.refresh.d.ts.map +1 -1
- package/dist/core/http/http.refresh.js +15 -10
- package/dist/core/http/http.refresh.js.map +1 -1
- package/dist/core/http/http.types.d.ts +4 -1
- package/dist/core/http/http.types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.client.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAItE,eAAO,MAAM,SAAS,GAAU,CAAC,EAAG,SAAS,gBAAgB,EAAE,kBAAgB,KAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"http.client.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAItE,eAAO,MAAM,SAAS,GAAU,CAAC,EAAG,SAAS,gBAAgB,EAAE,kBAAgB,KAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CA0D7G,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,CAAC,EACvC,KAAK,MAAM,GAAG,MAAM,EAAE,EACtB,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,UAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,kBAAe,EACf,kBAA2B,EAC3B,SAAQ,MAAM,GAAG,OAAO,GAAG,KAAc,EACzC,YAAY,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,EAC7B,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,EACxC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,kBAwE3C,CAAC"}
|
|
@@ -26,20 +26,24 @@ export const HttpFetch = async (options, _isRetry = false) => {
|
|
|
26
26
|
state.onHttpError?.(err);
|
|
27
27
|
throw err;
|
|
28
28
|
});
|
|
29
|
+
const json = await res.json().catch(() => ({}));
|
|
30
|
+
if (state.debug)
|
|
31
|
+
console.log('Host:', fullUrl, method, data, 'Content Type:', content_type, 'Response:', json);
|
|
29
32
|
const isNetwork401 = res.status === 401;
|
|
30
|
-
let json = null;
|
|
31
|
-
if (!isNetwork401) {
|
|
32
|
-
json = await res.json();
|
|
33
|
-
if (state.debug)
|
|
34
|
-
console.log('Host:', fullUrl, method, data, 'Content Type:', content_type, 'Response:', json);
|
|
35
|
-
}
|
|
36
33
|
const isPayload401 = json?.code === 401 && !api.toString().startsWith('http');
|
|
37
|
-
if (
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
34
|
+
if (isNetwork401 || isPayload401) {
|
|
35
|
+
if (!_isRetry) {
|
|
36
|
+
const refreshed = await handleTokenRefresh(fullUrl);
|
|
37
|
+
if (refreshed)
|
|
38
|
+
return await HttpFetch(options, true);
|
|
39
|
+
}
|
|
40
|
+
const error = new Error(json?.message || 'Auth failed: Unauthorized access or invalid token.');
|
|
41
|
+
error.name = "HttpAuthError";
|
|
42
|
+
error.code = 401;
|
|
43
|
+
state.onHttpError?.(error);
|
|
44
|
+
throw error;
|
|
41
45
|
}
|
|
42
|
-
if (json
|
|
46
|
+
if (res.status >= 500 || json?.code === 500 || json?.success === false) {
|
|
43
47
|
const error = new Error(json.message || 'Request failed');
|
|
44
48
|
state.onHttpError?.(error);
|
|
45
49
|
throw error;
|
|
@@ -84,19 +88,23 @@ export const uploadFileChunks = async (api, data, headers, withAuth = true, chun
|
|
|
84
88
|
state.onHttpError?.(err);
|
|
85
89
|
throw err;
|
|
86
90
|
});
|
|
91
|
+
const json = await res.json().catch(() => ({}));
|
|
87
92
|
const isNetwork401 = res.status === 401;
|
|
88
|
-
if (!res.ok && !isNetwork401)
|
|
89
|
-
throw new Error(`Chunk failed ${res.status}`);
|
|
90
|
-
let json = null;
|
|
91
|
-
if (!isNetwork401) {
|
|
92
|
-
json = await res.json();
|
|
93
|
-
}
|
|
94
93
|
const isPayload401 = json?.code === 401;
|
|
95
|
-
if (
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
94
|
+
if (isNetwork401 || isPayload401) {
|
|
95
|
+
if (!_isRetry) {
|
|
96
|
+
const refreshed = await handleTokenRefresh(url);
|
|
97
|
+
if (refreshed)
|
|
98
|
+
return sendChunk(true);
|
|
99
|
+
}
|
|
100
|
+
const error = new Error(json?.message || 'Auth failed: Unauthorized access');
|
|
101
|
+
error.name = "HttpAuthError";
|
|
102
|
+
error.code = 401;
|
|
103
|
+
state.onHttpError?.(error);
|
|
104
|
+
throw error;
|
|
99
105
|
}
|
|
106
|
+
if (!res.ok)
|
|
107
|
+
throw new Error(`Chunk failed ${res.status}`);
|
|
100
108
|
currentChunk++;
|
|
101
109
|
if (onProgress) {
|
|
102
110
|
const percent = Math.round((currentChunk / totalChunks) * 100);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.client.js","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAM,OAAyB,EAAE,QAAQ,GAAG,KAAK,EAAiC,EAAE;IACjH,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;IACnC,MAAM,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEjH,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7G,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1J,MAAM,MAAM,GAAG,MAAM,KAAK,KAAK,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3H,MAAM,OAAO,GAAG,GAAG,GAAG,GAAG,MAAM,EAAE,CAAC;IAElC,IAAI,CAAC;QACJ,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE;YAChC,MAAM;YACN,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC;YACxD,IAAI;YACJ,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa;SACjD,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAChB,GAAG,CAAC,IAAI,GAAG,gBAAgB,CAAC;YAC5B,GAAG,CAAC,IAAI,GAAG,kBAAkB,CAAC;YAC9B,GAAG,CAAC,OAAO,GAAG,uDAAuD,CAAC;YAEtE,MAAM,SAAS,GAAG,CAAC,OAAO,SAAS,KAAK,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC3G,IAAI,SAAS,EAAE,CAAC;gBACf,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC;YACD,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC;YACzB,MAAM,GAAG,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,MAAM,
|
|
1
|
+
{"version":3,"file":"http.client.js","sourceRoot":"","sources":["../../../src/core/http/http.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.refresh.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"http.refresh.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,OAAO,CAiErE,CAAC"}
|
|
@@ -11,16 +11,18 @@ export const handleTokenRefresh = async (url) => {
|
|
|
11
11
|
}
|
|
12
12
|
return false;
|
|
13
13
|
}
|
|
14
|
-
const { refreshConfig,
|
|
14
|
+
const { refreshConfig, baseUrl } = state;
|
|
15
15
|
const maxAttempts = refreshConfig.maxAttempts || 1;
|
|
16
|
-
if (refreshPromise)
|
|
16
|
+
if (refreshPromise)
|
|
17
17
|
return refreshPromise;
|
|
18
|
-
}
|
|
19
18
|
if (refreshAttempts >= maxAttempts) {
|
|
20
19
|
const isCooldown = Date.now() - lastFailTime < 10000; // 10s cooldown
|
|
21
20
|
if (isCooldown) {
|
|
22
|
-
if (
|
|
23
|
-
|
|
21
|
+
if (refreshConfig?.onFailed) {
|
|
22
|
+
refreshConfig.onFailed(new Error("Max refresh attempts reached within cooldown"));
|
|
23
|
+
}
|
|
24
|
+
else if (typeof window !== 'undefined') {
|
|
25
|
+
window.dispatchEvent(new CustomEvent('on-auth-failed', { detail: new Error("Max refresh attempts reached within cooldown") }));
|
|
24
26
|
}
|
|
25
27
|
return false;
|
|
26
28
|
}
|
|
@@ -38,10 +40,10 @@ export const handleTokenRefresh = async (url) => {
|
|
|
38
40
|
body: refreshConfig.body ? JSON.stringify(refreshConfig.body) : undefined,
|
|
39
41
|
credentials: "include"
|
|
40
42
|
});
|
|
41
|
-
const
|
|
42
|
-
if (res.ok ||
|
|
43
|
+
const { success, data } = await res.json().catch(() => ({}));
|
|
44
|
+
if (res.ok || success) {
|
|
43
45
|
if (refreshConfig.onSuccess) {
|
|
44
|
-
refreshConfig.onSuccess(
|
|
46
|
+
refreshConfig.onSuccess(data);
|
|
45
47
|
}
|
|
46
48
|
refreshAttempts = 0;
|
|
47
49
|
return true;
|
|
@@ -52,8 +54,11 @@ export const handleTokenRefresh = async (url) => {
|
|
|
52
54
|
}
|
|
53
55
|
catch (err) {
|
|
54
56
|
lastFailTime = Date.now();
|
|
55
|
-
if (
|
|
56
|
-
|
|
57
|
+
if (refreshConfig?.onFailed) {
|
|
58
|
+
refreshConfig.onFailed(err);
|
|
59
|
+
}
|
|
60
|
+
else if (typeof window !== 'undefined') {
|
|
61
|
+
window.dispatchEvent(new CustomEvent('on-auth-failed', { detail: err }));
|
|
57
62
|
}
|
|
58
63
|
return false;
|
|
59
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.refresh.js","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,IAAI,cAAc,GAA4B,IAAI,CAAC;AACnD,IAAI,eAAe,GAAG,CAAC,CAAC;AACxB,IAAI,YAAY,GAAG,CAAC,CAAC;AAErB,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,GAAW,EAAoB,EAAE;IACzE,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;IACnC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC1B,IAAI,KAAK,CAAC,SAAS,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"http.refresh.js","sourceRoot":"","sources":["../../../src/core/http/http.refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,10 @@ export interface refreshConfig {
|
|
|
4
4
|
method?: 'POST' | 'GET';
|
|
5
5
|
body?: Record<string, unknown>;
|
|
6
6
|
maxAttempts?: number;
|
|
7
|
-
onSuccess?: (response:
|
|
7
|
+
onSuccess?: <T>(response: T extends {
|
|
8
|
+
access_token?: string;
|
|
9
|
+
} ? T : any) => void;
|
|
10
|
+
onFailed?: (error: any) => void;
|
|
8
11
|
}
|
|
9
12
|
export interface HttpStoreState {
|
|
10
13
|
baseUrl: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.types.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.types.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"http.types.d.ts","sourceRoot":"","sources":["../../../src/core/http/http.types.ts"],"names":[],"mappings":"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"}
|