Page MenuHomePhabricator
Differential D12895

[tunnelbroker][lib] Add WebPush notif message type
ClosedPublic
Actions

Authored by bartek on Jul 26 2024, 6:25 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 1:07 AM
Unknown Object (File)
Wed, Mar 12, 6:09 AM
Unknown Object (File)
Tue, Mar 11, 9:31 AM
Unknown Object (File)
Wed, Mar 5, 8:52 AM
Unknown Object (File)
Wed, Mar 5, 7:45 AM
Unknown Object (File)
Mon, Mar 3, 6:24 AM
Unknown Object (File)
Mon, Mar 3, 6:24 AM
Unknown Object (File)
Mon, Mar 3, 6:24 AM
View All 86 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
marcin
Commits
rCOMM61bfe5dd37da: [tunnelbroker][lib] Add WebPush notif message type
Summary

Message send from client to send notif using WebPush service.

Depends on D12894

Test Plan

Tested together with the rest of the stack.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Jul 26 2024, 6:25 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 26 2024, 6:26 AM
bartek added a child revision: D12896: [tunnelbroker] Implement sending WebPush notifs by clients.Jul 26 2024, 6:27 AM
bartek published this revision for review.Jul 26 2024, 6:40 AM
Harbormaster failed remote builds in B30710: Diff 42833!Jul 26 2024, 6:49 AM
bartek mentioned this in D12901: [shared][rust] Add proc-macro to deserialize tagged enum variants.Jul 28 2024, 7:12 AM
bartek updated this revision to Diff 42850.Jul 28 2024, 7:18 AM

Add TagAwareDeserialize to the struct. This should fix CI

bartek added a parent revision: D12903: [util-macros] Improve TagAwareDeserialize to read serde attributes.Jul 28 2024, 7:22 AM
Harbormaster completed remote builds in B30724: Diff 42850.Jul 28 2024, 7:36 AM
kamil accepted this revision.Jul 29 2024, 2:12 AM
kamil added inline comments.
shared/tunnelbroker_messages/src/messages/notif.rs
29 ↗(On Diff #42850)

Is it worth adding TagAwareDeserialize to all structs used here? I think there are other having the same structure and only tag is different

This revision is now accepted and ready to land.Jul 29 2024, 2:12 AM
bartek added inline comments.Jul 29 2024, 5:52 AM
shared/tunnelbroker_messages/src/messages/notif.rs
29 ↗(On Diff #42850)

Yes it is, but I also want to unit test all of them,
Created https://linear.app/comm/issue/ENG-8905/add-tagawaredeserialize-to-messages-and-test-serialization to track this

Closed by commit rCOMM61bfe5dd37da: [tunnelbroker][lib] Add WebPush notif message type (authored by bartek). · Explain WhyJul 29 2024, 5:56 AM
This revision was automatically updated to reflect the committed changes.
bartek mentioned this in rCOMM9463274996c6: [shared][rust] Add proc-macro to deserialize tagged enum variants.
bartek added a commit: rCOMM61bfe5dd37da: [tunnelbroker][lib] Add WebPush notif message type.

Revision Contents
Changeset List

PathSize
lib/
types/
tunnelbroker/
12 lines
shared/
tunnelbroker_messages/
1 line
src/
messages/
1 line
12 lines

Diff 42890

View Options

Cargo.lock

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

lib/types/tunnelbroker/notif-types.js

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

shared/tunnelbroker_messages/Cargo.toml

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

shared/tunnelbroker_messages/src/messages/mod.rs

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

shared/tunnelbroker_messages/src/messages/notif.rs

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines