Feat: Add urgency support #841

jrconlin · 2025-02-14T18:16:12Z

Allow clients to define the minimum urgency of messages they wish to receive. For example, a client with low battery can request a high urgency message only until their battery is good again.

Note: this is a resubmit of
#815.

cc https://github.com/p1gp1g

Allow clients to define the minimum urgency of messages they wish to receive. For example, a client with low battery can request a high urgency message only until their battery is good again. Note: this is a resubmit of #815.

p1gp1g · 2025-03-20T09:16:31Z

Anything is blocking ?

jrconlin · 2025-03-21T17:28:09Z

Yes, there was a minor conflict in Cargo.toml. Just resolved it.

We're a little thin right now, so getting review time is a challenge. I'll poke the other two again to see if they've got time.

wrenix · 2025-04-28T14:56:27Z

Forgetten? Could you take another look for a timeslot?

jrconlin

I know I am probably seeming like a stickler about it, but putting the urgency elements behind a non-default feature flag means that it's not supported, meaning that we do not need to have unit and integration tests for this since it's not part of the critical code path.

jrconlin · 2025-04-28T16:33:01Z

autoconnect/autoconnect-ws/autoconnect-ws-sm/src/identified/mod.rs

 use autoconnect_settings::{AppState, Settings};
 use autopush_common::{
-    db::User,
+    db::{Urgency, User},


Not fully isolated:

Suggested change

db::{Urgency, User},

#[cfg(feature = "urgency" )]

use autopush_common::Urgency;

use autopush_common::{

db::User,

notification::Notification,

util::{ms_since_epoch, user_agent::UserAgentInfo},

};

jrconlin · 2025-04-28T16:33:48Z

autoconnect/autoconnect-ws/autoconnect-ws-sm/src/identified/mod.rs

    /// First time a user has connected "today"
    pub emit_channel_metrics: bool,
+    /// Minimum urgency
+    pub min_urgency: Urgency,


Suggested change

pub min_urgency: Urgency,

#[cfg(feature = "urgency")]

pub min_urgency: Urgency,

jrconlin · 2025-04-28T16:34:07Z

autoconnect/autoconnect-ws/autoconnect-ws-sm/src/identified/mod.rs

            check_storage: false,
            old_record_version: false,
            emit_channel_metrics: false,
+            min_urgency: Urgency::VeryLow,


Suggested change

min_urgency: Urgency::VeryLow,

#[cfg(feature = "urgency")]

min_urgency: Urgency::VeryLow,

jrconlin · 2025-04-28T16:35:38Z

autoconnect/autoconnect-ws/autoconnect-ws-sm/src/identified/on_server_notif.rs

-use crate::error::{SMError, SMErrorKind};
+use crate::{
+    error::{SMError, SMErrorKind},
+    identified::Urgency,


#[cfg(feature = "urgency")] use crate::identified::Urgency;

jrconlin · 2025-04-28T16:41:22Z

autoconnect/autoconnect-ws/autoconnect-ws-sm/src/identified/on_server_notif.rs

        messages.retain(|msg| {
            if !msg.expired(now_sec) {
-                return true;
+                if let Some(headers) = msg.headers.as_ref() {


#[cfg(feature = "urgency")] if let Some(headers) = msg.headers.as_ref() { return Urgency::from(headers.get("urgency")) >= self.flags.min_urgency; } else { return true; } } #[cfg(not(feature="urgency"))] return true;

jrconlin · 2025-04-28T16:42:40Z

autoconnect/autoconnect-ws/autoconnect-ws-sm/src/unidentified.rs

 use autoconnect_settings::{AppState, Settings};
 use autopush_common::{
-    db::{User, USER_RECORD_VERSION},
+    db::{Urgency, User, USER_RECORD_VERSION},


#[cfg(feature = "urgency")] use autopush_common::db::Urgency use autopush_common::{ db::{User, USER_RECORD_VERSION},

jrconlin · 2025-04-28T16:43:06Z

autoconnect/autoconnect-ws/autoconnect-ws-sm/src/unidentified.rs

                        .record_version
                        .is_none_or(|rec_ver| rec_ver < USER_RECORD_VERSION),
                    emit_channel_metrics: user.connected_at < ms_utc_midnight(),
+                    min_urgency: user.urgency.unwrap_or(Urgency::VeryLow),


Suggested change

min_urgency: user.urgency.unwrap_or(Urgency::VeryLow),

#[cfg(feature = "urgency")]

min_urgency: user.urgency.unwrap_or(Urgency::VeryLow),

jrconlin · 2025-04-28T16:44:50Z

autoendpoint/src/extractors/notification_headers.rs

 use std::cmp::min;
 use std::collections::HashMap;
-use validator::Validate;
+use validator::{Validate, ValidationError};


Again, we want to isolate the urgency stuff to a feature flag, so the bits that are urgency based need to be behind that flag.

wrenix · 2025-06-05T14:41:17Z

Thank for the work on this feature.

PS: I believe it is not mergeable since reliable_report with #778 and #826 (on v1.74.0) is merged.

So please rebase.

EDIT/PSS: Sorry i believe i mix it up with #813

wrenix · 2025-08-08T14:29:37Z

Sorry that i am so annoying. Is there anything blocking? Could i somewhere help to get this over the finish line?

Is there any reason why this is not merged?

jrconlin · 2025-08-08T23:36:48Z

Well, currently, one of the biggest blockers is probably just me. Mostly because I've got a few higher priority things I am working on that I really need to get resolved. (I'm very close to doing that, and yes, I'm also very frustrated that I'm not able to get them finished, but complex systems are complex and there are blockers outside of my control).

Once those things are done, I can look at the conflicts and try to resolve them (or you can, I don't expect any other conflicts), and after that's done I can merge, tag, and hopefully release shortly afterward.

jrconlin · 2025-08-12T21:59:11Z

Hmm, so circling back on this and it looks like the redis library changed how it recommends async connections, which will require redoing some of the reliability stuff as well.
This might take a bit.

wrenix · 2025-08-12T22:49:48Z

Thank you for this feedback.

… feat/urgency

jrconlin · 2025-08-12T23:34:13Z

Ok, so took a swing at merging and updating a few things to get this up. I'm going to convert to a draft because I'm not sure that I got things right, and I'd like to have some testing as well.

Feat: Add urgency support

bf6c2cc

Allow clients to define the minimum urgency of messages they wish to receive. For example, a client with low battery can request a high urgency message only until their battery is good again. Note: this is a resubmit of #815.

jrconlin requested review from pjenvey and taddes February 14, 2025 18:16

jrconlin mentioned this pull request Feb 14, 2025

Feat: Add urgency support #815

Closed

f clippy

311d47d

Merge branch 'master' into feat/urgency

246b415

Merge branch 'master' into feat/urgency

bf66106

Merge branch 'master' into feat/urgency

eb5a95d

jrconlin commented Apr 28, 2025

View reviewed changes

jrconlin added 3 commits April 28, 2025 10:57

f update to put all urgency behind a feature flag

149f450

f audit

67c4b83

f fix test / audit

95d9a99

Merge branch 'master' of github.com:mozilla-services/autopush-rs into…

b16adc5

… feat/urgency

jrconlin marked this pull request as draft August 12, 2025 23:33

-    db::{Urgency, User},
+#[cfg(feature = "urgency" )]
+use autopush_common::Urgency;
+use autopush_common::{
+    db::User,
+    notification::Notification,
+    util::{ms_since_epoch, user_agent::UserAgentInfo},
+};

	pub min_urgency: Urgency,
	#[cfg(feature = "urgency")]
	pub min_urgency: Urgency,

	min_urgency: Urgency::VeryLow,
	#[cfg(feature = "urgency")]
	min_urgency: Urgency::VeryLow,

	min_urgency: user.urgency.unwrap_or(Urgency::VeryLow),
	#[cfg(feature = "urgency")]
	min_urgency: user.urgency.unwrap_or(Urgency::VeryLow),

Feat: Add urgency support #841

Are you sure you want to change the base?

Feat: Add urgency support #841

Uh oh!

Conversation

jrconlin commented Feb 14, 2025

Uh oh!

p1gp1g commented Mar 20, 2025

Uh oh!

jrconlin commented Mar 21, 2025

Uh oh!

wrenix commented Apr 28, 2025

Uh oh!

jrconlin left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wrenix commented Jun 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wrenix commented Aug 8, 2025

Uh oh!

jrconlin commented Aug 8, 2025

Uh oh!

jrconlin commented Aug 12, 2025

Uh oh!

wrenix commented Aug 12, 2025

Uh oh!

jrconlin commented Aug 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

wrenix commented Jun 5, 2025 •

edited

Loading