@clix-so/react-native-sdk 1.1.0 → 1.1.1-beta.1
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/module/services/NotificationService.js +3 -2
- package/lib/module/services/NotificationService.js.map +1 -1
- package/lib/module/utils/http/HTTPClient.js +9 -1
- package/lib/module/utils/http/HTTPClient.js.map +1 -1
- package/lib/typescript/src/services/NotificationService.d.ts.map +1 -1
- package/lib/typescript/src/utils/http/HTTPClient.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/services/NotificationService.ts +6 -4
- package/src/utils/http/HTTPClient.ts +14 -1
|
@@ -137,6 +137,7 @@ export class NotificationService {
|
|
|
137
137
|
*/
|
|
138
138
|
async handleBackgroundMessage(remoteMessage) {
|
|
139
139
|
ClixLogger.debug('Handling background message:', remoteMessage.messageId);
|
|
140
|
+
setTimeout(() => ClixLogger.debug('still alive after 3s'), 3000);
|
|
140
141
|
const data = remoteMessage.data ?? {};
|
|
141
142
|
try {
|
|
142
143
|
await this.backgroundMessageHandler?.(data);
|
|
@@ -149,10 +150,10 @@ export class NotificationService {
|
|
|
149
150
|
ClixLogger.warn('No Clix payload found in background message');
|
|
150
151
|
return;
|
|
151
152
|
}
|
|
152
|
-
await this.trackPushReceivedEvent(clixPayload);
|
|
153
153
|
if (!remoteMessage.notification) {
|
|
154
154
|
await this.displayNotification(remoteMessage, clixPayload);
|
|
155
155
|
}
|
|
156
|
+
await this.trackPushReceivedEvent(clixPayload);
|
|
156
157
|
} catch (error) {
|
|
157
158
|
ClixLogger.error('Background message handler error:', error);
|
|
158
159
|
}
|
|
@@ -189,11 +190,11 @@ export class NotificationService {
|
|
|
189
190
|
return;
|
|
190
191
|
}
|
|
191
192
|
this.processedMessageIds.add(messageId);
|
|
193
|
+
await this.displayNotification(remoteMessage, clixPayload);
|
|
192
194
|
if (Platform.OS === 'android') {
|
|
193
195
|
// NOTE(nyanxyz): on iOS, Received event is tracked in Notification Service Extension
|
|
194
196
|
await this.trackPushReceivedEvent(clixPayload);
|
|
195
197
|
}
|
|
196
|
-
await this.displayNotification(remoteMessage, clixPayload);
|
|
197
198
|
} catch (error) {
|
|
198
199
|
ClixLogger.error('Failed to handle foreground message', error);
|
|
199
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["notifee","AndroidCategory","AndroidGroupAlertBehavior","AndroidImportance","AndroidStyle","AndroidVisibility","AuthorizationStatus","EventType","messaging","Linking","Platform","ClixLogger","NotificationService","autoHandleLandingUrl","isInitialized","processedMessageIds","Set","DEFAULT_CHANNEL","id","name","description","importance","HIGH","sound","vibration","lights","ANDROID_GROUP_ID","constructor","deviceService","tokenService","eventService","initialize","debug","setupTokenRefreshListener","setupPushReceivedHandler","setupPushTappedHandler","OS","createNotificationChannels","error","cleanup","unsubscribeMessage","unsubscribeNotificationOpenedApp","unsubscribeTokenRefresh","unsubscribeForegroundEvent","clear","requestPermission","settings","alert","badge","provisional","announcement","carPlay","criticalAlert","isGranted","authorizationStatus","AUTHORIZED","PROVISIONAL","setPermissionGranted","updatePushPermission","warn","setBackgroundMessageHandler","handleBackgroundMessage","bind","onMessage","handleForegroundMessage","onBackgroundEvent","handleNotificationEvent","onForegroundEvent","handleForegroundNotificationEvent","onNotificationOpenedApp","handleNotificationOpenedApp","handleInitialNotification","onTokenRefresh","token","tokenRefreshHandler","saveToken","updatePushToken","createChannel","remoteMessage","messageId","data","backgroundMessageHandler","clixPayload","parseClixPayload","trackPushReceivedEvent","notification","displayNotification","has","result","messageHandler","add","notificationOpenedAppHandler","trackPushTappedEvent","handleUrlNavigation","initialNotification","getInitialNotification","event","type","detail","PRESS","ACTION_PRESS","DISMISSED","foregroundEventHandler","payload","trackEvent","userJourneyId","userJourneyNodeId","title","body","hasImage","imageUrl","notificationConfig","createNotificationConfig","Error","message","stack","channelId","config","Date","now","toString","android","category","MESSAGE","visibility","PUBLIC","groupId","groupSummary","groupAlertBehavior","CHILDREN","ticker","style","BIGTEXT","text","pressAction","ios","foregroundPresentationOptions","banner","list","largeIcon","url","landingUrl","landing_url","link","click_action","supported","canOpenURL","openURL","userInfo","clix","JSON","parse","parseError","message_id","image_url","undefined","user_journey_id","user_journey_node_id"],"sourceRoot":"../../../src","sources":["services/NotificationService.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["notifee","AndroidCategory","AndroidGroupAlertBehavior","AndroidImportance","AndroidStyle","AndroidVisibility","AuthorizationStatus","EventType","messaging","Linking","Platform","ClixLogger","NotificationService","autoHandleLandingUrl","isInitialized","processedMessageIds","Set","DEFAULT_CHANNEL","id","name","description","importance","HIGH","sound","vibration","lights","ANDROID_GROUP_ID","constructor","deviceService","tokenService","eventService","initialize","debug","setupTokenRefreshListener","setupPushReceivedHandler","setupPushTappedHandler","OS","createNotificationChannels","error","cleanup","unsubscribeMessage","unsubscribeNotificationOpenedApp","unsubscribeTokenRefresh","unsubscribeForegroundEvent","clear","requestPermission","settings","alert","badge","provisional","announcement","carPlay","criticalAlert","isGranted","authorizationStatus","AUTHORIZED","PROVISIONAL","setPermissionGranted","updatePushPermission","warn","setBackgroundMessageHandler","handleBackgroundMessage","bind","onMessage","handleForegroundMessage","onBackgroundEvent","handleNotificationEvent","onForegroundEvent","handleForegroundNotificationEvent","onNotificationOpenedApp","handleNotificationOpenedApp","handleInitialNotification","onTokenRefresh","token","tokenRefreshHandler","saveToken","updatePushToken","createChannel","remoteMessage","messageId","setTimeout","data","backgroundMessageHandler","clixPayload","parseClixPayload","notification","displayNotification","trackPushReceivedEvent","has","result","messageHandler","add","notificationOpenedAppHandler","trackPushTappedEvent","handleUrlNavigation","initialNotification","getInitialNotification","event","type","detail","PRESS","ACTION_PRESS","DISMISSED","foregroundEventHandler","payload","trackEvent","userJourneyId","userJourneyNodeId","title","body","hasImage","imageUrl","notificationConfig","createNotificationConfig","Error","message","stack","channelId","config","Date","now","toString","android","category","MESSAGE","visibility","PUBLIC","groupId","groupSummary","groupAlertBehavior","CHILDREN","ticker","style","BIGTEXT","text","pressAction","ios","foregroundPresentationOptions","banner","list","largeIcon","url","landingUrl","landing_url","link","click_action","supported","canOpenURL","openURL","userInfo","clix","JSON","parse","parseError","message_id","image_url","undefined","user_journey_id","user_journey_node_id"],"sourceRoot":"../../../src","sources":["services/NotificationService.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,16 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { ClixLogger } from "../logging/ClixLogger.js";
|
|
3
4
|
import { HTTPMethod } from "./HTTPMethod.js";
|
|
4
5
|
export class HTTPClient {
|
|
5
6
|
static shared = new HTTPClient();
|
|
6
7
|
async request(request) {
|
|
8
|
+
const controller = new AbortController();
|
|
9
|
+
const timeoutId = setTimeout(() => {
|
|
10
|
+
ClixLogger.warn(`HTTP request to ${request.url} timed out after 2000ms`);
|
|
11
|
+
controller.abort();
|
|
12
|
+
}, 2000);
|
|
7
13
|
const url = this.buildUrlWithParams(request.url, request.params);
|
|
8
14
|
const headers = {
|
|
9
15
|
...(request.headers || {})
|
|
10
16
|
};
|
|
11
17
|
const init = {
|
|
12
18
|
method: request.method,
|
|
13
|
-
headers
|
|
19
|
+
headers,
|
|
20
|
+
signal: controller.signal
|
|
14
21
|
};
|
|
15
22
|
const body = this.prepareBody(request.data);
|
|
16
23
|
if (body !== undefined && request.method !== HTTPMethod.GET && request.method !== HTTPMethod.DELETE) {
|
|
@@ -18,6 +25,7 @@ export class HTTPClient {
|
|
|
18
25
|
}
|
|
19
26
|
const response = await fetch(url, init);
|
|
20
27
|
const data = await this.parseResponse(response);
|
|
28
|
+
clearTimeout(timeoutId);
|
|
21
29
|
return {
|
|
22
30
|
data,
|
|
23
31
|
statusCode: response.status,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["HTTPMethod","HTTPClient","shared","request","url","buildUrlWithParams","params","headers","init","method","body","prepareBody","data","undefined","GET","DELETE","response","fetch","parseResponse","statusCode","status","headersToRecord","get","post","POST","put","PUT","delete","Object","keys","length","queryString","entries","flatMap","key","value","Array","isArray","filter","item","map","encodeURIComponent","String","Boolean","join","separator","includes","JSON","stringify","contentType","json","text","record","forEach"],"sourceRoot":"../../../../src","sources":["utils/http/HTTPClient.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,iBAAc;AAIzC,OAAO,MAAMC,UAAU,CAAC;EACtB,OAAOC,MAAM,GAAG,IAAID,UAAU,CAAC,CAAC;EAEhC,MAAME,OAAOA,CAAIA,OAAoB,EAA4B;IAC/D,MAAMC,GAAG,GAAG,IAAI,
|
|
1
|
+
{"version":3,"names":["ClixLogger","HTTPMethod","HTTPClient","shared","request","controller","AbortController","timeoutId","setTimeout","warn","url","abort","buildUrlWithParams","params","headers","init","method","signal","body","prepareBody","data","undefined","GET","DELETE","response","fetch","parseResponse","clearTimeout","statusCode","status","headersToRecord","get","post","POST","put","PUT","delete","Object","keys","length","queryString","entries","flatMap","key","value","Array","isArray","filter","item","map","encodeURIComponent","String","Boolean","join","separator","includes","JSON","stringify","contentType","json","text","record","forEach"],"sourceRoot":"../../../../src","sources":["utils/http/HTTPClient.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../../../src/services/NotificationService.ts"],"names":[],"mappings":"AAAA,OAAgB,EASd,KAAK,KAAK,EAEV,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG,CAC3B,IAAI,EAAE,gBAAgB,KACnB,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;AAChC,MAAM,MAAM,wBAAwB,GAAG,CACrC,IAAI,EAAE,gBAAgB,KACnB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,4BAA4B,GAAG,CACzC,IAAI,EAAE,gBAAgB,KACnB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC1E,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE5E,qBAAa,mBAAmB;IA2B5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IA5B/B,oBAAoB,UAAQ;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,4BAA4B,CAAC,EAAE,4BAA4B,CAAC;IAC5D,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAEhD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,kBAAkB,CAAC,CAAa;IACxC,OAAO,CAAC,gCAAgC,CAAC,CAAa;IACtD,OAAO,CAAC,uBAAuB,CAAC,CAAa;IAC7C,OAAO,CAAC,0BAA0B,CAAC,CAAa;IAEhD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAQrC;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;gBAGlD,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY;IAGvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBjC,OAAO,IAAI,IAAI;IAUT,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAoBlD,oBAAoB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D,OAAO,CAAC,wBAAwB;YAkBlB,sBAAsB;IAwBpC,OAAO,CAAC,yBAAyB;YAoBnB,0BAA0B;IASxC;;OAEG;YACW,uBAAuB;
|
|
1
|
+
{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../../../src/services/NotificationService.ts"],"names":[],"mappings":"AAAA,OAAgB,EASd,KAAK,KAAK,EAEV,KAAK,oBAAoB,EAC1B,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5C,MAAM,MAAM,cAAc,GAAG,CAC3B,IAAI,EAAE,gBAAgB,KACnB,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;AAChC,MAAM,MAAM,wBAAwB,GAAG,CACrC,IAAI,EAAE,gBAAgB,KACnB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,4BAA4B,GAAG,CACzC,IAAI,EAAE,gBAAgB,KACnB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC1B,MAAM,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAC1E,MAAM,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE5E,qBAAa,mBAAmB;IA2B5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IA5B/B,oBAAoB,UAAQ;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,4BAA4B,CAAC,EAAE,4BAA4B,CAAC;IAC5D,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAC1C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;IAEhD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,kBAAkB,CAAC,CAAa;IACxC,OAAO,CAAC,gCAAgC,CAAC,CAAa;IACtD,OAAO,CAAC,uBAAuB,CAAC,CAAa;IAC7C,OAAO,CAAC,0BAA0B,CAAC,CAAa;IAEhD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAQrC;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAA6B;gBAGlD,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY;IAGvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBjC,OAAO,IAAI,IAAI;IAUT,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAoBlD,oBAAoB,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7D,OAAO,CAAC,wBAAwB;YAkBlB,sBAAsB;IAwBpC,OAAO,CAAC,yBAAyB;YAoBnB,0BAA0B;IASxC;;OAEG;YACW,uBAAuB;IA+BrC;;OAEG;YACW,uBAAuB;IAqDrC;;OAEG;YACW,2BAA2B;IA+BzC;;OAEG;YACW,yBAAyB;IAuBvC;;OAEG;YACW,uBAAuB;IAwBrC;;OAEG;YACW,iCAAiC;YAUjC,sBAAsB;YAuBtB,oBAAoB;YAoBpB,mBAAmB;YAqCnB,wBAAwB;YAiDxB,mBAAmB;IA8BjC,OAAO,CAAC,gBAAgB;CAuDzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HTTPClient.d.ts","sourceRoot":"","sources":["../../../../../src/utils/http/HTTPClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HTTPClient.d.ts","sourceRoot":"","sources":["../../../../../src/utils/http/HTTPClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,qBAAa,UAAU;IACrB,MAAM,CAAC,MAAM,aAAoB;IAE3B,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAoC1D,GAAG,CAAC,CAAC,EACT,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAIrB,IAAI,CAAC,CAAC,EACV,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,GAAG,EACV,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAUrB,GAAG,CAAC,CAAC,EACT,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,GAAG,EACV,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAUrB,MAAM,CAAC,CAAC,EACZ,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAI3B,OAAO,CAAC,kBAAkB;IAsC1B,OAAO,CAAC,WAAW;YAQL,aAAa;IAU3B,OAAO,CAAC,eAAe;CAOxB"}
|
package/package.json
CHANGED
|
@@ -214,6 +214,8 @@ export class NotificationService {
|
|
|
214
214
|
): Promise<void> {
|
|
215
215
|
ClixLogger.debug('Handling background message:', remoteMessage.messageId);
|
|
216
216
|
|
|
217
|
+
setTimeout(() => ClixLogger.debug('still alive after 3s'), 3000);
|
|
218
|
+
|
|
217
219
|
const data = remoteMessage.data ?? {};
|
|
218
220
|
try {
|
|
219
221
|
await this.backgroundMessageHandler?.(data);
|
|
@@ -228,11 +230,11 @@ export class NotificationService {
|
|
|
228
230
|
return;
|
|
229
231
|
}
|
|
230
232
|
|
|
231
|
-
await this.trackPushReceivedEvent(clixPayload);
|
|
232
|
-
|
|
233
233
|
if (!remoteMessage.notification) {
|
|
234
234
|
await this.displayNotification(remoteMessage, clixPayload);
|
|
235
235
|
}
|
|
236
|
+
|
|
237
|
+
await this.trackPushReceivedEvent(clixPayload);
|
|
236
238
|
} catch (error) {
|
|
237
239
|
ClixLogger.error('Background message handler error:', error);
|
|
238
240
|
}
|
|
@@ -283,12 +285,12 @@ export class NotificationService {
|
|
|
283
285
|
|
|
284
286
|
this.processedMessageIds.add(messageId);
|
|
285
287
|
|
|
288
|
+
await this.displayNotification(remoteMessage, clixPayload);
|
|
289
|
+
|
|
286
290
|
if (Platform.OS === 'android') {
|
|
287
291
|
// NOTE(nyanxyz): on iOS, Received event is tracked in Notification Service Extension
|
|
288
292
|
await this.trackPushReceivedEvent(clixPayload);
|
|
289
293
|
}
|
|
290
|
-
|
|
291
|
-
await this.displayNotification(remoteMessage, clixPayload);
|
|
292
294
|
} catch (error) {
|
|
293
295
|
ClixLogger.error('Failed to handle foreground message', error);
|
|
294
296
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ClixLogger } from '../logging/ClixLogger';
|
|
1
2
|
import { HTTPMethod } from './HTTPMethod';
|
|
2
3
|
import type { HTTPRequest } from './HTTPRequest';
|
|
3
4
|
import type { HTTPResponse } from './HTTPResponse';
|
|
@@ -6,9 +7,19 @@ export class HTTPClient {
|
|
|
6
7
|
static shared = new HTTPClient();
|
|
7
8
|
|
|
8
9
|
async request<T>(request: HTTPRequest): Promise<HTTPResponse<T>> {
|
|
10
|
+
const controller = new AbortController();
|
|
11
|
+
const timeoutId = setTimeout(() => {
|
|
12
|
+
ClixLogger.warn(`HTTP request to ${request.url} timed out after 2000ms`);
|
|
13
|
+
controller.abort();
|
|
14
|
+
}, 2000);
|
|
15
|
+
|
|
9
16
|
const url = this.buildUrlWithParams(request.url, request.params);
|
|
10
17
|
const headers = { ...(request.headers || {}) };
|
|
11
|
-
const init: RequestInit = {
|
|
18
|
+
const init: RequestInit = {
|
|
19
|
+
method: request.method,
|
|
20
|
+
headers,
|
|
21
|
+
signal: controller.signal,
|
|
22
|
+
};
|
|
12
23
|
|
|
13
24
|
const body = this.prepareBody(request.data);
|
|
14
25
|
if (
|
|
@@ -22,6 +33,8 @@ export class HTTPClient {
|
|
|
22
33
|
const response = await fetch(url, init);
|
|
23
34
|
const data = await this.parseResponse<T>(response);
|
|
24
35
|
|
|
36
|
+
clearTimeout(timeoutId);
|
|
37
|
+
|
|
25
38
|
return {
|
|
26
39
|
data,
|
|
27
40
|
statusCode: response.status,
|