@oxyhq/services 5.13.24 → 5.13.26
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/lib/commonjs/core/HttpService.js +481 -0
- package/lib/commonjs/core/HttpService.js.map +1 -0
- package/lib/commonjs/core/OxyServices.base.js +29 -26
- package/lib/commonjs/core/OxyServices.base.js.map +1 -1
- package/lib/commonjs/core/OxyServices.js +1 -2
- package/lib/commonjs/core/OxyServices.js.map +1 -1
- package/lib/commonjs/core/mixins/OxyServices.assets.js +3 -2
- package/lib/commonjs/core/mixins/OxyServices.assets.js.map +1 -1
- package/lib/commonjs/core/mixins/OxyServices.user.js +9 -5
- package/lib/commonjs/core/mixins/OxyServices.user.js.map +1 -1
- package/lib/commonjs/core/mixins/OxyServices.utility.js +1 -0
- package/lib/commonjs/core/mixins/OxyServices.utility.js.map +1 -1
- package/lib/commonjs/ui/components/FollowButton.js +0 -53
- package/lib/commonjs/ui/components/FollowButton.js.map +1 -1
- package/lib/commonjs/utils/asyncUtils.js +23 -3
- package/lib/commonjs/utils/asyncUtils.js.map +1 -1
- package/lib/commonjs/utils/errorUtils.js +48 -33
- package/lib/commonjs/utils/errorUtils.js.map +1 -1
- package/lib/commonjs/utils/validationUtils.js +15 -0
- package/lib/commonjs/utils/validationUtils.js.map +1 -1
- package/lib/module/core/HttpService.js +476 -0
- package/lib/module/core/HttpService.js.map +1 -0
- package/lib/module/core/OxyServices.base.js +29 -26
- package/lib/module/core/OxyServices.base.js.map +1 -1
- package/lib/module/core/OxyServices.js +1 -2
- package/lib/module/core/OxyServices.js.map +1 -1
- package/lib/module/core/mixins/OxyServices.assets.js +3 -2
- package/lib/module/core/mixins/OxyServices.assets.js.map +1 -1
- package/lib/module/core/mixins/OxyServices.user.js +9 -5
- package/lib/module/core/mixins/OxyServices.user.js.map +1 -1
- package/lib/module/core/mixins/OxyServices.utility.js +1 -0
- package/lib/module/core/mixins/OxyServices.utility.js.map +1 -1
- package/lib/module/ui/components/FollowButton.js +1 -54
- package/lib/module/ui/components/FollowButton.js.map +1 -1
- package/lib/module/utils/asyncUtils.js +24 -3
- package/lib/module/utils/asyncUtils.js.map +1 -1
- package/lib/module/utils/errorUtils.js +43 -33
- package/lib/module/utils/errorUtils.js.map +1 -1
- package/lib/module/utils/validationUtils.js +14 -0
- package/lib/module/utils/validationUtils.js.map +1 -1
- package/lib/typescript/core/HttpService.d.ts +111 -0
- package/lib/typescript/core/HttpService.d.ts.map +1 -0
- package/lib/typescript/core/OxyServices.base.d.ts +6 -8
- package/lib/typescript/core/OxyServices.base.d.ts.map +1 -1
- package/lib/typescript/core/OxyServices.d.ts +1 -2
- package/lib/typescript/core/OxyServices.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.analytics.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.analytics.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.assets.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.assets.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.auth.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.auth.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.developer.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.developer.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.devices.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.devices.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.karma.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.karma.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.language.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.language.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.location.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.location.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.payment.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.payment.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.privacy.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.privacy.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.totp.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.totp.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.user.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.user.d.ts.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.utility.d.ts +4 -5
- package/lib/typescript/core/mixins/OxyServices.utility.d.ts.map +1 -1
- package/lib/typescript/core/mixins/index.d.ts +52 -65
- package/lib/typescript/core/mixins/index.d.ts.map +1 -1
- package/lib/typescript/ui/components/FollowButton.d.ts.map +1 -1
- package/lib/typescript/utils/asyncUtils.d.ts +4 -0
- package/lib/typescript/utils/asyncUtils.d.ts.map +1 -1
- package/lib/typescript/utils/errorUtils.d.ts +9 -1
- package/lib/typescript/utils/errorUtils.d.ts.map +1 -1
- package/lib/typescript/utils/validationUtils.d.ts +6 -0
- package/lib/typescript/utils/validationUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/core/HttpService.ts +523 -0
- package/src/core/OxyServices.base.ts +36 -34
- package/src/core/OxyServices.ts +1 -2
- package/src/core/mixins/OxyServices.assets.ts +2 -1
- package/src/core/mixins/OxyServices.user.ts +7 -6
- package/src/core/mixins/OxyServices.utility.ts +1 -0
- package/src/ui/components/FollowButton.tsx +0 -53
- package/src/utils/asyncUtils.ts +23 -3
- package/src/utils/errorUtils.ts +72 -45
- package/src/utils/validationUtils.ts +14 -0
- package/lib/commonjs/core/HttpClient.js +0 -317
- package/lib/commonjs/core/HttpClient.js.map +0 -1
- package/lib/commonjs/core/RequestManager.js +0 -199
- package/lib/commonjs/core/RequestManager.js.map +0 -1
- package/lib/module/core/HttpClient.js +0 -311
- package/lib/module/core/HttpClient.js.map +0 -1
- package/lib/module/core/RequestManager.js +0 -194
- package/lib/module/core/RequestManager.js.map +0 -1
- package/lib/typescript/core/HttpClient.d.ts +0 -110
- package/lib/typescript/core/HttpClient.d.ts.map +0 -1
- package/lib/typescript/core/RequestManager.d.ts +0 -67
- package/lib/typescript/core/RequestManager.d.ts.map +0 -1
- package/src/core/HttpClient.ts +0 -346
- package/src/core/RequestManager.ts +0 -240
|
@@ -7,8 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { jwtDecode } from 'jwt-decode';
|
|
9
9
|
import { handleHttpError } from '../utils/errorUtils';
|
|
10
|
-
import {
|
|
11
|
-
import { RequestManager } from './RequestManager';
|
|
10
|
+
import { HttpService } from './HttpService';
|
|
12
11
|
import { OxyAuthenticationError, OxyAuthenticationTimeoutError } from './OxyServices.errors';
|
|
13
12
|
/**
|
|
14
13
|
* Base class for OxyServices with core infrastructure
|
|
@@ -22,16 +21,13 @@ export class OxyServicesBase {
|
|
|
22
21
|
this.config = config;
|
|
23
22
|
this.cloudURL = config.cloudURL || 'https://cloud.oxy.so';
|
|
24
23
|
|
|
25
|
-
// Initialize HTTP
|
|
26
|
-
this.
|
|
27
|
-
|
|
28
|
-
// Initialize request manager (handles caching, deduplication, queuing, retry)
|
|
29
|
-
this.requestManager = new RequestManager(this.httpClient, config);
|
|
24
|
+
// Initialize unified HTTP service (handles auth, caching, deduplication, queuing, retry)
|
|
25
|
+
this.httpService = new HttpService(config);
|
|
30
26
|
}
|
|
31
27
|
|
|
32
28
|
// Test-only utility to reset global tokens between jest tests
|
|
33
29
|
static __resetTokensForTests() {
|
|
34
|
-
|
|
30
|
+
HttpService.__resetTokensForTests();
|
|
35
31
|
}
|
|
36
32
|
|
|
37
33
|
/**
|
|
@@ -39,7 +35,13 @@ export class OxyServicesBase {
|
|
|
39
35
|
* This is the main method for all API calls - ensures authentication and performance features
|
|
40
36
|
*/
|
|
41
37
|
async makeRequest(method, url, data, options = {}) {
|
|
42
|
-
return this.
|
|
38
|
+
return this.httpService.request({
|
|
39
|
+
method,
|
|
40
|
+
url,
|
|
41
|
+
data: method !== 'GET' ? data : undefined,
|
|
42
|
+
params: method === 'GET' ? data : undefined,
|
|
43
|
+
...options
|
|
44
|
+
});
|
|
43
45
|
}
|
|
44
46
|
|
|
45
47
|
// ============================================================================
|
|
@@ -50,43 +52,43 @@ export class OxyServicesBase {
|
|
|
50
52
|
* Get the configured Oxy API base URL
|
|
51
53
|
*/
|
|
52
54
|
getBaseURL() {
|
|
53
|
-
return this.
|
|
55
|
+
return this.httpService.getBaseURL();
|
|
54
56
|
}
|
|
55
57
|
|
|
56
58
|
/**
|
|
57
|
-
* Get the HTTP
|
|
58
|
-
* Useful for advanced use cases where direct access to the HTTP
|
|
59
|
+
* Get the HTTP service instance
|
|
60
|
+
* Useful for advanced use cases where direct access to the HTTP service is needed
|
|
59
61
|
*/
|
|
60
62
|
getClient() {
|
|
61
|
-
return this.
|
|
63
|
+
return this.httpService;
|
|
62
64
|
}
|
|
63
65
|
|
|
64
66
|
/**
|
|
65
67
|
* Get performance metrics
|
|
66
68
|
*/
|
|
67
69
|
getMetrics() {
|
|
68
|
-
return this.
|
|
70
|
+
return this.httpService.getMetrics();
|
|
69
71
|
}
|
|
70
72
|
|
|
71
73
|
/**
|
|
72
74
|
* Clear request cache
|
|
73
75
|
*/
|
|
74
76
|
clearCache() {
|
|
75
|
-
this.
|
|
77
|
+
this.httpService.clearCache();
|
|
76
78
|
}
|
|
77
79
|
|
|
78
80
|
/**
|
|
79
81
|
* Clear specific cache entry
|
|
80
82
|
*/
|
|
81
83
|
clearCacheEntry(key) {
|
|
82
|
-
this.
|
|
84
|
+
this.httpService.clearCacheEntry(key);
|
|
83
85
|
}
|
|
84
86
|
|
|
85
87
|
/**
|
|
86
88
|
* Get cache statistics
|
|
87
89
|
*/
|
|
88
90
|
getCacheStats() {
|
|
89
|
-
return this.
|
|
91
|
+
return this.httpService.getCacheStats();
|
|
90
92
|
}
|
|
91
93
|
|
|
92
94
|
/**
|
|
@@ -100,21 +102,21 @@ export class OxyServicesBase {
|
|
|
100
102
|
* Set authentication tokens
|
|
101
103
|
*/
|
|
102
104
|
setTokens(accessToken, refreshToken = '') {
|
|
103
|
-
this.
|
|
105
|
+
this.httpService.setTokens(accessToken, refreshToken);
|
|
104
106
|
}
|
|
105
107
|
|
|
106
108
|
/**
|
|
107
109
|
* Clear stored authentication tokens
|
|
108
110
|
*/
|
|
109
111
|
clearTokens() {
|
|
110
|
-
this.
|
|
112
|
+
this.httpService.clearTokens();
|
|
111
113
|
}
|
|
112
114
|
|
|
113
115
|
/**
|
|
114
116
|
* Get the current user ID from the access token
|
|
115
117
|
*/
|
|
116
118
|
getCurrentUserId() {
|
|
117
|
-
const accessToken = this.
|
|
119
|
+
const accessToken = this.httpService.getAccessToken();
|
|
118
120
|
if (!accessToken) {
|
|
119
121
|
return null;
|
|
120
122
|
}
|
|
@@ -130,14 +132,14 @@ export class OxyServicesBase {
|
|
|
130
132
|
* Check if the client has a valid access token (public method)
|
|
131
133
|
*/
|
|
132
134
|
hasValidToken() {
|
|
133
|
-
return this.
|
|
135
|
+
return this.httpService.hasAccessToken();
|
|
134
136
|
}
|
|
135
137
|
|
|
136
138
|
/**
|
|
137
139
|
* Get the raw access token (for constructing anchor URLs when needed)
|
|
138
140
|
*/
|
|
139
141
|
getAccessToken() {
|
|
140
|
-
return this.
|
|
142
|
+
return this.httpService.getAccessToken();
|
|
141
143
|
}
|
|
142
144
|
|
|
143
145
|
/**
|
|
@@ -160,7 +162,7 @@ export class OxyServicesBase {
|
|
|
160
162
|
*/
|
|
161
163
|
async waitForAuth(timeoutMs = 5000) {
|
|
162
164
|
// Immediate synchronous check - no delay if token is ready
|
|
163
|
-
if (this.
|
|
165
|
+
if (this.httpService.hasAccessToken()) {
|
|
164
166
|
return true;
|
|
165
167
|
}
|
|
166
168
|
const startTime = performance.now();
|
|
@@ -171,7 +173,7 @@ export class OxyServicesBase {
|
|
|
171
173
|
|
|
172
174
|
while (performance.now() < maxTime) {
|
|
173
175
|
await new Promise(resolve => setTimeout(resolve, pollInterval));
|
|
174
|
-
if (this.
|
|
176
|
+
if (this.httpService.hasAccessToken()) {
|
|
175
177
|
return true;
|
|
176
178
|
}
|
|
177
179
|
|
|
@@ -197,7 +199,7 @@ export class OxyServicesBase {
|
|
|
197
199
|
for (let attempt = 0; attempt <= maxRetries; attempt++) {
|
|
198
200
|
try {
|
|
199
201
|
// First attempt: check if we have a token
|
|
200
|
-
if (!this.
|
|
202
|
+
if (!this.httpService.hasAccessToken()) {
|
|
201
203
|
if (attempt === 0) {
|
|
202
204
|
// On first attempt, wait briefly for authentication to complete
|
|
203
205
|
const authReady = await this.waitForAuth(authTimeoutMs);
|
|
@@ -214,7 +216,8 @@ export class OxyServicesBase {
|
|
|
214
216
|
return await operation();
|
|
215
217
|
} catch (error) {
|
|
216
218
|
const isLastAttempt = attempt === maxRetries;
|
|
217
|
-
const
|
|
219
|
+
const errorObj = error && typeof error === 'object' ? error : null;
|
|
220
|
+
const isAuthError = errorObj?.response?.status === 401 || errorObj?.code === 'MISSING_TOKEN' || errorObj?.message?.includes('Authentication') || error instanceof OxyAuthenticationError;
|
|
218
221
|
if (isAuthError && !isLastAttempt && !(error instanceof OxyAuthenticationTimeoutError)) {
|
|
219
222
|
await new Promise(resolve => setTimeout(resolve, retryDelay));
|
|
220
223
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jwtDecode","handleHttpError","
|
|
1
|
+
{"version":3,"names":["jwtDecode","handleHttpError","HttpService","OxyAuthenticationError","OxyAuthenticationTimeoutError","OxyServicesBase","constructor","args","config","Error","cloudURL","httpService","__resetTokensForTests","makeRequest","method","url","data","options","request","undefined","params","getBaseURL","getClient","getMetrics","clearCache","clearCacheEntry","key","getCacheStats","getCloudURL","setTokens","accessToken","refreshToken","clearTokens","getCurrentUserId","getAccessToken","decoded","userId","id","error","hasValidToken","hasAccessToken","waitForAuth","timeoutMs","startTime","performance","now","maxTime","pollInterval","Promise","resolve","setTimeout","Math","min","withAuthRetry","operation","operationName","maxRetries","retryDelay","authTimeoutMs","attempt","authReady","isLastAttempt","errorObj","isAuthError","response","status","code","message","includes","handleError","validate","res","cache","retry","valid","api","err","details","healthCheck"],"sourceRoot":"../../../src","sources":["core/OxyServices.base.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -70,8 +70,7 @@ import { composeOxyServices } from './mixins';
|
|
|
70
70
|
* This class provides all API functionality in one simple, easy-to-use interface.
|
|
71
71
|
*
|
|
72
72
|
* ## Architecture
|
|
73
|
-
* - **
|
|
74
|
-
* - **RequestManager**: Handles caching, deduplication, queuing, and retry
|
|
73
|
+
* - **HttpService**: Unified HTTP service handling authentication, caching, deduplication, queuing, and retry
|
|
75
74
|
* - **OxyServices**: Provides high-level API methods
|
|
76
75
|
*
|
|
77
76
|
* ## Mixin Composition
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OxyAuthenticationError","OxyAuthenticationTimeoutError","composeOxyServices","OxyServicesComposed","OxyServices","constructor","config","OXY_CLOUD_URL","OXY_API_URL","process","env","oxyClient","baseURL","cloudURL"],"sourceRoot":"../../../src","sources":["core/OxyServices.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,sBAAsB,EAAEC,6BAA6B,QAAQ,sBAAsB;;AAE5F;AACA,SAASC,kBAAkB,QAAQ,UAAU;;AAE7C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA
|
|
1
|
+
{"version":3,"names":["OxyAuthenticationError","OxyAuthenticationTimeoutError","composeOxyServices","OxyServicesComposed","OxyServices","constructor","config","OXY_CLOUD_URL","OXY_API_URL","process","env","oxyClient","baseURL","cloudURL"],"sourceRoot":"../../../src","sources":["core/OxyServices.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,sBAAsB,EAAEC,6BAA6B,QAAQ,sBAAsB;;AAE5F;AACA,SAASC,kBAAkB,QAAQ,UAAU;;AAE7C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,mBAA0D,GAAGD,kBAAkB,CAAC,CAAC;;AAEvF;AACA,OAAO,MAAME,WAAW,SAASD,mBAAmB,CAAC;EACnDE,WAAWA,CAACC,MAAiB,EAAE;IAC7B,KAAK,CAACA,MAAM,CAAC;EACf;AACF;;AAEA;AACA,SAASN,sBAAsB,EAAEC,6BAA6B;;AAE9D;AACA;AACA;AACA,OAAO,MAAMM,aAAa,GAAG,sBAAsB;;AAEnD;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GAAI,OAAOC,OAAO,KAAK,WAAW,IAAIA,OAAO,CAACC,GAAG,IAAID,OAAO,CAACC,GAAG,CAACF,WAAW,IAAK,oBAAoB;;AAE7H;AACA;AACA;AACA;AACA,OAAO,MAAMG,SAAS,GAAG,IAAIP,WAAW,CAAC;EAAEQ,OAAO,EAAEJ,WAAW;EAAEK,QAAQ,EAAEN;AAAc,CAAC,CAAC","ignoreList":[]}
|
|
@@ -223,11 +223,12 @@ export function OxyServicesAssetsMixin(Base) {
|
|
|
223
223
|
// Fallback: direct upload via API to avoid CORS issues
|
|
224
224
|
const fd = new FormData();
|
|
225
225
|
fd.append('file', file);
|
|
226
|
-
// Use
|
|
226
|
+
// Use httpService directly for FormData uploads (bypasses caching for special handling)
|
|
227
227
|
await this.getClient().request({
|
|
228
228
|
method: 'POST',
|
|
229
229
|
url: `/api/assets/${encodeURIComponent(initResponse.fileId)}/upload-direct`,
|
|
230
|
-
data: fd
|
|
230
|
+
data: fd,
|
|
231
|
+
cache: false
|
|
231
232
|
});
|
|
232
233
|
}
|
|
233
234
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OxyServicesAssetsMixin","Base","constructor","args","deleteFile","fileId","makeRequest","encodeURIComponent","undefined","cache","error","handleError","getFileDownloadUrl","variant","expiresIn","base","getBaseURL","params","URLSearchParams","set","String","token","getClient","getAccessToken","qs","toString","getFileDownloadUrlAsync","url","fetchAssetDownloadUrl","getAssetUrlCacheTTL","getFileStreamUrl","getCloudURL","listUserFiles","limit","offset","paramsObj","getFileContentAsText","downloadUrl","Error","fetchAssetContent","getFileContentAsBlob","getBatchFileAccess","fileIds","context","getFileDownloadUrls","response","urls","results","id","result","Object","entries","allowed","uploadRawFile","file","visibility","metadata","assetUpload","calculateSHA256","buffer","arrayBuffer","hashBuffer","crypto","subtle","digest","hashArray","Array","from","Uint8Array","map","b","padStart","join","assetInit","sha256","size","mime","assetComplete","originalName","onProgress","initResponse","type","uploadToPresignedUrl","uploadUrl","e","fd","FormData","append","request","method","data","name","Promise","resolve","reject","xhr","XMLHttpRequest","upload","addEventListener","event","lengthComputable","progress","loaded","total","status","open","setRequestHeader","send","assetLink","app","entityType","entityId","webhookUrl","body","assetUnlink","assetGet","cacheTTL","assetGetUrl","assetRestore","assetDelete","force","assetGetVariants","assetData","variants","assetUpdateVisibility","uploadAvatar","userId","asset","uploadProfileBanner","desiredTtlMs","Math","min","urlRes","keys","length","fetch","ok","text","blob"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.assets.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["OxyServicesAssetsMixin","Base","constructor","args","deleteFile","fileId","makeRequest","encodeURIComponent","undefined","cache","error","handleError","getFileDownloadUrl","variant","expiresIn","base","getBaseURL","params","URLSearchParams","set","String","token","getClient","getAccessToken","qs","toString","getFileDownloadUrlAsync","url","fetchAssetDownloadUrl","getAssetUrlCacheTTL","getFileStreamUrl","getCloudURL","listUserFiles","limit","offset","paramsObj","getFileContentAsText","downloadUrl","Error","fetchAssetContent","getFileContentAsBlob","getBatchFileAccess","fileIds","context","getFileDownloadUrls","response","urls","results","id","result","Object","entries","allowed","uploadRawFile","file","visibility","metadata","assetUpload","calculateSHA256","buffer","arrayBuffer","hashBuffer","crypto","subtle","digest","hashArray","Array","from","Uint8Array","map","b","padStart","join","assetInit","sha256","size","mime","assetComplete","originalName","onProgress","initResponse","type","uploadToPresignedUrl","uploadUrl","e","fd","FormData","append","request","method","data","name","Promise","resolve","reject","xhr","XMLHttpRequest","upload","addEventListener","event","lengthComputable","progress","loaded","total","status","open","setRequestHeader","send","assetLink","app","entityType","entityId","webhookUrl","body","assetUnlink","assetGet","cacheTTL","assetGetUrl","assetRestore","assetDelete","force","assetGetVariants","assetData","variants","assetUpdateVisibility","uploadAvatar","userId","asset","uploadProfileBanner","desiredTtlMs","Math","min","urlRes","keys","length","fetch","ok","text","blob"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.assets.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -181,12 +181,16 @@ export function OxyServicesUserMixin(Base) {
|
|
|
181
181
|
*/
|
|
182
182
|
async downloadAccountData(format = 'json') {
|
|
183
183
|
try {
|
|
184
|
-
// Use
|
|
185
|
-
const
|
|
186
|
-
|
|
187
|
-
|
|
184
|
+
// Use httpService for blob responses (it handles blob responses automatically)
|
|
185
|
+
const result = await this.getClient().request({
|
|
186
|
+
method: 'GET',
|
|
187
|
+
url: `/api/users/me/data`,
|
|
188
|
+
params: {
|
|
189
|
+
format
|
|
190
|
+
},
|
|
191
|
+
cache: false
|
|
188
192
|
});
|
|
189
|
-
return
|
|
193
|
+
return result;
|
|
190
194
|
} catch (error) {
|
|
191
195
|
throw this.handleError(error);
|
|
192
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["buildSearchParams","buildPaginationParams","OxyServicesUserMixin","Base","constructor","args","getProfileByUsername","username","makeRequest","undefined","cache","cacheTTL","error","handleError","searchProfiles","query","pagination","params","searchParams","paramsObj","Object","fromEntries","entries","response","isSearchProfilesResponse","payload","Array","isArray","data","typedResponse","paginationInfo","total","length","limit","offset","hasMore","fallbackLimit","fallbackPagination","Error","getProfileRecommendations","withAuthRetry","getUserById","userId","getCurrentUser","updateProfile","updates","getPrivacySettings","id","updatePrivacySettings","settings","requestAccountVerification","reason","evidence","downloadAccountData","format","
|
|
1
|
+
{"version":3,"names":["buildSearchParams","buildPaginationParams","OxyServicesUserMixin","Base","constructor","args","getProfileByUsername","username","makeRequest","undefined","cache","cacheTTL","error","handleError","searchProfiles","query","pagination","params","searchParams","paramsObj","Object","fromEntries","entries","response","isSearchProfilesResponse","payload","Array","isArray","data","typedResponse","paginationInfo","total","length","limit","offset","hasMore","fallbackLimit","fallbackPagination","Error","getProfileRecommendations","withAuthRetry","getUserById","userId","getCurrentUser","updateProfile","updates","getPrivacySettings","id","updatePrivacySettings","settings","requestAccountVerification","reason","evidence","downloadAccountData","format","result","getClient","request","method","url","deleteAccount","password","confirmText","updateUser","followUser","unfollowUser","getFollowStatus","getUserFollowers","followers","getUserFollowing","following","getNotifications","getUnreadCount","res","count","createNotification","markNotificationAsRead","notificationId","markAllNotificationsAsRead","deleteNotification"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.user.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -147,6 +147,7 @@ export function OxyServicesUtilityMixin(Base) {
|
|
|
147
147
|
} catch (error) {
|
|
148
148
|
const apiError = this.handleError(error);
|
|
149
149
|
if (debug) {
|
|
150
|
+
// Debug logging - using console.log is acceptable here for development
|
|
150
151
|
console.log(`❌ Auth: Unexpected error:`, apiError);
|
|
151
152
|
}
|
|
152
153
|
if (onError) return onError(apiError);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jwtDecode","CACHE_TIMES","OxyServicesUtilityMixin","Base","constructor","args","fetchLinkMetadata","url","makeRequest","cache","cacheTTL","EXTRA_LONG","error","handleError","auth","options","debug","onError","loadUser","session","req","res","next","authHeader","headers","token","startsWith","substring","console","log","method","path","message","code","status","json","decoded","userId","id","decodeError","exp","Math","floor","Date","now","accessToken","user","setTokens","apiError"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.utility.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["jwtDecode","CACHE_TIMES","OxyServicesUtilityMixin","Base","constructor","args","fetchLinkMetadata","url","makeRequest","cache","cacheTTL","EXTRA_LONG","error","handleError","auth","options","debug","onError","loadUser","session","req","res","next","authHeader","headers","token","startsWith","substring","console","log","method","path","message","code","status","json","decoded","userId","id","decodeError","exp","Math","floor","Date","now","accessToken","user","setTokens","apiError"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.utility.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { useEffect, useCallback } from 'react';
|
|
4
|
-
import { TouchableOpacity, Text,
|
|
4
|
+
import { TouchableOpacity, Text, Platform, ActivityIndicator } from 'react-native';
|
|
5
5
|
import Animated, { useSharedValue, useAnimatedStyle, withSpring, interpolateColor, Easing, withTiming } from 'react-native-reanimated';
|
|
6
6
|
import { useOxy } from '../context/OxyContext';
|
|
7
7
|
import { fontFamilies } from '../styles/fonts';
|
|
@@ -203,59 +203,6 @@ const FollowButton = ({
|
|
|
203
203
|
})
|
|
204
204
|
});
|
|
205
205
|
};
|
|
206
|
-
const styles = StyleSheet.create({
|
|
207
|
-
// Legacy styles kept for backward compatibility but not used in new implementation
|
|
208
|
-
buttonSmall: {
|
|
209
|
-
paddingVertical: 4,
|
|
210
|
-
paddingHorizontal: 12,
|
|
211
|
-
borderRadius: 16,
|
|
212
|
-
minWidth: 60,
|
|
213
|
-
alignItems: 'center',
|
|
214
|
-
justifyContent: 'center'
|
|
215
|
-
},
|
|
216
|
-
buttonMedium: {
|
|
217
|
-
paddingVertical: 8,
|
|
218
|
-
paddingHorizontal: 20,
|
|
219
|
-
borderRadius: 20,
|
|
220
|
-
minWidth: 90,
|
|
221
|
-
alignItems: 'center',
|
|
222
|
-
justifyContent: 'center'
|
|
223
|
-
},
|
|
224
|
-
buttonLarge: {
|
|
225
|
-
paddingVertical: 12,
|
|
226
|
-
paddingHorizontal: 32,
|
|
227
|
-
borderRadius: 24,
|
|
228
|
-
minWidth: 120,
|
|
229
|
-
alignItems: 'center',
|
|
230
|
-
justifyContent: 'center'
|
|
231
|
-
},
|
|
232
|
-
following: {
|
|
233
|
-
backgroundColor: '#007AFF'
|
|
234
|
-
},
|
|
235
|
-
notFollowing: {
|
|
236
|
-
backgroundColor: '#fff',
|
|
237
|
-
borderWidth: 1,
|
|
238
|
-
borderColor: '#007AFF'
|
|
239
|
-
},
|
|
240
|
-
textSmall: {
|
|
241
|
-
fontSize: 13,
|
|
242
|
-
fontFamily: fontFamilies.phuduMedium
|
|
243
|
-
},
|
|
244
|
-
textMedium: {
|
|
245
|
-
fontSize: 15,
|
|
246
|
-
fontFamily: fontFamilies.phuduMedium
|
|
247
|
-
},
|
|
248
|
-
textLarge: {
|
|
249
|
-
fontSize: 18,
|
|
250
|
-
fontFamily: fontFamilies.phuduMedium
|
|
251
|
-
},
|
|
252
|
-
textFollowing: {
|
|
253
|
-
color: '#fff'
|
|
254
|
-
},
|
|
255
|
-
textNotFollowing: {
|
|
256
|
-
color: '#007AFF'
|
|
257
|
-
}
|
|
258
|
-
});
|
|
259
206
|
export { FollowButton };
|
|
260
207
|
export default FollowButton;
|
|
261
208
|
//# sourceMappingURL=FollowButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useEffect","useCallback","TouchableOpacity","Text","
|
|
1
|
+
{"version":3,"names":["useEffect","useCallback","TouchableOpacity","Text","Platform","ActivityIndicator","Animated","useSharedValue","useAnimatedStyle","withSpring","interpolateColor","Easing","withTiming","useOxy","fontFamilies","toast","useFollow","useThemeColors","jsx","_jsx","AnimatedTouchableOpacity","createAnimatedComponent","AnimatedText","FollowButton","userId","initiallyFollowing","size","onFollowChange","style","textStyle","disabled","showLoadingState","preventParentActions","theme","oxyServices","isAuthenticated","colors","isFollowing","isLoading","error","toggleFollow","setFollowStatus","fetchStatus","clearError","animationProgress","scale","handlePress","event","preventDefault","stopPropagation","value","duration","finished","damping","stiffness","err","Error","String","message","easing","inOut","ease","animatedButtonStyle","transform","backgroundColor","background","primary","borderColor","border","animatedTextStyle","color","text","getBaseButtonStyle","baseStyle","flexDirection","alignItems","justifyContent","borderWidth","select","web","boxShadow","default","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","sizeStyle","paddingVertical","paddingHorizontal","minWidth","borderRadius","getBaseTextStyle","baseTextStyle","fontFamily","phuduSemiBold","fontWeight","sizeTextStyle","fontSize","onPress","activeOpacity","children"],"sourceRoot":"../../../../src","sources":["ui/components/FollowButton.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,8 +4,11 @@
|
|
|
4
4
|
* Async utilities for common asynchronous patterns and error handling
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
+
import { logger } from './loggerUtils';
|
|
8
|
+
|
|
7
9
|
/**
|
|
8
10
|
* Wrapper for async operations with automatic error handling
|
|
11
|
+
* Returns null on error instead of throwing
|
|
9
12
|
*/
|
|
10
13
|
export async function withErrorHandling(operation, errorHandler, context) {
|
|
11
14
|
try {
|
|
@@ -14,7 +17,10 @@ export async function withErrorHandling(operation, errorHandler, context) {
|
|
|
14
17
|
if (errorHandler) {
|
|
15
18
|
errorHandler(error);
|
|
16
19
|
} else {
|
|
17
|
-
|
|
20
|
+
logger.error(`Error in ${context || 'operation'}`, error instanceof Error ? error : new Error(String(error)), {
|
|
21
|
+
component: 'asyncUtils',
|
|
22
|
+
method: 'withErrorHandling'
|
|
23
|
+
});
|
|
18
24
|
}
|
|
19
25
|
return null;
|
|
20
26
|
}
|
|
@@ -30,9 +36,22 @@ export async function parallelWithErrorHandling(operations, errorHandler) {
|
|
|
30
36
|
|
|
31
37
|
/**
|
|
32
38
|
* Retry an async operation with exponential backoff
|
|
39
|
+
*
|
|
40
|
+
* By default, does not retry on 4xx errors (client errors).
|
|
41
|
+
* Use shouldRetry callback to customize retry behavior.
|
|
33
42
|
*/
|
|
34
43
|
export async function retryAsync(operation, maxRetries = 3, baseDelay = 1000, shouldRetry) {
|
|
35
44
|
let lastError;
|
|
45
|
+
|
|
46
|
+
// Default shouldRetry: don't retry on 4xx errors
|
|
47
|
+
const defaultShouldRetry = error => {
|
|
48
|
+
// Don't retry on 4xx errors (client errors)
|
|
49
|
+
if (error?.response?.status >= 400 && error?.response?.status < 500) {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
return true;
|
|
53
|
+
};
|
|
54
|
+
const retryCheck = shouldRetry || defaultShouldRetry;
|
|
36
55
|
for (let attempt = 0; attempt <= maxRetries; attempt++) {
|
|
37
56
|
try {
|
|
38
57
|
return await operation();
|
|
@@ -41,10 +60,12 @@ export async function retryAsync(operation, maxRetries = 3, baseDelay = 1000, sh
|
|
|
41
60
|
if (attempt === maxRetries) {
|
|
42
61
|
break;
|
|
43
62
|
}
|
|
44
|
-
if (
|
|
63
|
+
if (!retryCheck(error)) {
|
|
45
64
|
break;
|
|
46
65
|
}
|
|
47
|
-
|
|
66
|
+
|
|
67
|
+
// Calculate delay with exponential backoff and jitter
|
|
68
|
+
const delay = baseDelay * Math.pow(2, attempt) + Math.random() * 1000;
|
|
48
69
|
await new Promise(resolve => setTimeout(resolve, delay));
|
|
49
70
|
}
|
|
50
71
|
}
|