senza-sdk 4.2.44 → 4.2.46-2f4b6fa.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.44",
+    "version": "4.2.46-2f4b6fa.0",
     "main": "./src/api.js",
     "description": "API for Senza application",
     "license": "MIT",

package/src/alarmManager.js

@@ -27,18 +27,32 @@ class AlarmManager extends EventTarget {
     constructor() {
         super();
         this._eventListeners = {};
+        this._isFirstAlarm = true;
         typeof document !== "undefined" && document.addEventListener("hs/alarmFiredEvent", (e) => {
             const logger = sdkLogger.withFields({alarmName: e.detail?.alarmName});
             logger.log("Got hs/alarmFiredEvent", JSON.stringify(e.detail));
             if (e.detail?.alarmName) {
                 if (this._eventListeners[e.detail.alarmName]) {
                     const event = new CustomEvent(e.detail.alarmName, {detail: e.detail.payload});
+                    const timeBeforeAlarmHandling = Date.now();
+                    let uiStateBeforeAlarmHandling;
+                    if (lifecycle.state === lifecycle.UiState.FOREGROUND || lifecycle.state === lifecycle.UiState.IN_TRANSITION_TO_FOREGROUND) {
+                        uiStateBeforeAlarmHandling = "foreground";
+                    } else {
+                        uiStateBeforeAlarmHandling = "background";
+                    }
                     Promise.allSettled(Array.from(this._eventListeners[e.detail.alarmName], cb => cb(event))).then(() => {
-                        logger.log(`All callbacks for alarm '${e.detail.alarmName}' are finished`);
+                        const alarmHandlingDuration = Date.now() - timeBeforeAlarmHandling;
+                        logger.log(`All callbacks for alarm '${e.detail.alarmName}' are finished within ${alarmHandlingDuration}ms`);
                         // If the application was triggered due to an alarm, and after all callbacks are handled, the application is still in the background and
                         // moveToForeground has not been called as a result of the alarm, we want to intentionally terminate the ui in order to save resources.
-                        if (getTriggerEvent().type === "alarmFiredEvent" && lifecycle.state === lifecycle.UiState.BACKGROUND && !this._moveToForegroundHasBeenCalled) {
-                            if (window.cefQuery) {
+                        let isTriggering = false;
+                        if (getTriggerEvent().type === "alarmFiredEvent" && lifecycle.state === lifecycle.UiState.BACKGROUND) {
+                            if (this._isFirstAlarm) {
+                                isTriggering = true;
+                                this._isFirstAlarm = false;
+                            }
+                            if (!this._moveToForegroundHasBeenCalled && window.cefQuery) {
                                 logger.log("Application is about to be terminated since didn't move to foreground");
                                 const message = { type: "terminating" };
                                 const request = { target:"TC", waitForResponse: false, message: JSON.stringify(message) };
@@ -54,6 +68,22 @@ class AlarmManager extends EventTarget {
                                 });
                             }
                         }
+                        // For monitoring purposes, log a json with all the necessary labels and a unique prefix [hs-sdk][metrics]
+                        // The ui-streamer will recognize this prefix and handle the json accordingly.
+                        let uiStateAfterAlarmHandling;
+                        if (lifecycle.state === lifecycle.UiState.FOREGROUND || lifecycle.state === lifecycle.UiState.IN_TRANSITION_TO_FOREGROUND) {
+                            uiStateAfterAlarmHandling = "foreground";
+                        } else {
+                            uiStateAfterAlarmHandling = "background";
+                        }
+                        logger.metrics({
+                            type: "monitorAlarm",
+                            alarmName: e.detail.alarmName,
+                            isTriggering,
+                            uiStateBefore: uiStateBeforeAlarmHandling,
+                            uiStateAfter: uiStateAfterAlarmHandling,
+                            alarmHandlingDuration
+                        });
                     });
                 }
             }

package/src/utils.js

@@ -38,6 +38,9 @@ class SdkLogger {
     error(...data) {
         console.error(this.formatLogString(data));
     }
+    metrics(metricObj) {
+        console.info(`[hs-sdk] [metrics] ${JSON.stringify(metricObj)}`);
+    }
     withFields(logFields) {
         return new SdkLogger({...this.logFields, ...logFields});
     }