Merge remote-tracking branch 'origin/master' into upadte-changelog-for-event-with-ampersand-fix

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -1,17 +1,19 @@
 ## Version 25.03.xx
+Fixes:
+- [push] Fixed timeout setting
+
 Enterprise Fixes:
 - [data-manager] Fixed bug when merging events with ampersand symbol in the name
 
 ## Version 25.03.25
 Fixes:
 - [crashes] Fixed resolving audit log recording
 - [location] Fixed updating none gps coordinate location after gps location was used
-- 
+
 Enterprise Fixes:
 - [ab-testing] Add script for fixing variant cohort
 - [groups] Fix user permission update after updating user group permission
 
-
 ## Version 25.03.24
 Fixes:
 - [jobs] Fix condition for scheduling alert job

package-lock.json

@@ -59,7 +59,7 @@
     "ejs": "3.1.10",
     "errorhandler": "1.5.1",
     "express": "4.21.2",
-    "express-rate-limit": "8.1.0",
+    "express-rate-limit": "8.2.0",
     "express-session": "1.18.2",
     "form-data": "^4.0.0",
     "formidable": "2.1.3",

package.json

@@ -65,6 +65,7 @@ plugins.setConfigs(FEATURE_NAME, {
     pool_concurrency: 5, // max number of same type connections
     pool_pools: 10, // max number of connections in total
     default_content_available: false, // sets content-available: 1 by default for ios
+    message_timeout: 3600000, // timeout for a message not sent yet (for TooLateToSend error)
 });
 
 plugins.internalEvents.push('[CLY]_push_sent');

plugins/push/api/api.js

@@ -169,7 +169,7 @@ class Connector extends DoFinish {
                         }
                     }, callback);
             }
-            else if (push._id.getTimestamp().getTime() < Date.now() - 3600000) {
+            else if (push._id.getTimestamp().getTime() < (Date.now() - this.state.cfg.message_timeout)) {
                 this.tooLateToSend.addAffected(push._id, 1);
                 this.do_flush(callback, true);
                 return;

plugins/push/api/jobs/util/connector.js

@@ -119,21 +119,29 @@ class Sender {
                     auth: !(plugins.push.proxyunauthorized || false),
                 };
             }
+            if (plugins.push.message_timeout) {
+                if (typeof plugins.push.message_timeout === "number") {
+                    cfg.message_timeout = plugins.push.message_timeout;
+                }
+                else {
+                    common.log(`push:send`).w('Invalid message timeout configuration: %j', plugins.push.message_timeout);
+                }
+            }
         }
 
         return cfg;
     }
 
     /**
-     * Watch push collection for pushes to send, 
+     * Watch push collection for pushes to send,
      */
     async watch() {
         let oid = dbext.oidBlankWithDate(new Date()),
             count = await common.db.collection('push').count({_id: {$lte: oid}});
         return count > 0;
     }
     // /**
-    //  * Watch push collection for pushes to send, 
+    //  * Watch push collection for pushes to send,
     //  */
     //  async watch() {
     //     let oid = dbext.oidBlankWithDate(new Date());

plugins/push/api/send/sender.js

@@ -394,6 +394,7 @@ push.pool_pushes = Number of notifications in stream batches
 push.pool_bytes = Bytes in binary stream batches
 push.pool_concurrency = Maximum number of same type connections
 push.pool_pools = Maximum number of connections in total
+push.message_timeout = Timeout of a message to be send (in milliseconds)
 push.default_content_available = Set content-available to 1 by default for IOS
 
 #Drawer from other views