Page MenuHomePhabricator
Differential D11118

[web] Only open tunnelbroker on the active tab
ClosedPublic
Actions

Authored by michal on Feb 20 2024, 4:44 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 12:03 AM
Unknown Object (File)
Wed, Apr 9, 12:03 AM
Unknown Object (File)
Wed, Apr 9, 12:03 AM
Unknown Object (File)
Wed, Apr 9, 12:03 AM
Unknown Object (File)
Wed, Apr 9, 12:03 AM
Unknown Object (File)
Mon, Apr 7, 2:45 PM
Unknown Object (File)
Mar 20 2025, 3:29 AM
Unknown Object (File)
Mar 19 2025, 5:16 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
inka
bartek
Commits
rCOMMaff06cc4ecab: [web] Only open tunnelbroker on the active tab
Summary

ENG-6668 : Only open tunnelbroker on a tab with a lock

Using the previously useWebLock hook, we can open the tunnelbroker connection only on one of the tabs in the foreground.

Depends on D11114

Test Plan

Switch between different tabs, make sure after a little bit of time (disconnetion of the previous tab and connection of the current tab) the new tabs connects to the tunnelbroker. Make sure that if multiple tabs are visible and in the foreground, only one tab connects to the tunnelbroker.

Because of ENG-6875 I introduced a quickfix to test this diff. I will wait with landing and after the issue is resolved I will re-test it.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

michal created this revision.Feb 20 2024, 4:44 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptFeb 20 2024, 4:44 AM
Harbormaster completed remote builds in B26992: Diff 37352.Feb 20 2024, 4:58 AM
michal requested review of this revision.Feb 20 2024, 4:58 AM
michal edited the test plan for this revision. (Show Details)Feb 20 2024, 6:10 AM
michal updated this revision to Diff 37356.Feb 20 2024, 6:17 AM

Fix a bug

Harbormaster completed remote builds in B26996: Diff 37356.Feb 20 2024, 6:32 AM
michal added a child revision: D11123: [web] Proxy tunnelbroker messages to the active tab.Feb 20 2024, 7:21 AM
michal updated this revision to Diff 37650.Feb 27 2024, 6:02 AM

Rebase

Harbormaster completed remote builds in B27201: Diff 37650.Feb 27 2024, 6:17 AM
kamil accepted this revision.Mar 4 2024, 5:58 AM
kamil mentioned this in D11113: [web] Introduce useWebLock.
This revision is now accepted and ready to land.Mar 4 2024, 6:00 AM
michal updated this revision to Diff 37775.Mar 4 2024, 6:50 AM

Rebase

Harbormaster completed remote builds in B27298: Diff 37775.Mar 4 2024, 7:05 AM
Closed by commit rCOMMaff06cc4ecab: [web] Only open tunnelbroker on the active tab (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMar 4 2024, 7:18 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMMaff06cc4ecab: [web] Only open tunnelbroker on the active tab.

Revision Contents
Changeset List

PathSize
lib/
tunnelbroker/
16 lines
web/
11 lines
4 lines

Diff 37779

View Options

lib/tunnelbroker/tunnelbroker-context.js

Show First 20 Lines • Show All 195 Lines • ▼ Show 20 Lines try {
}; };
} }
} }
async function encryptAndroidNotification( async function encryptAndroidNotification(
cookieID: string, cookieID: string,
notification: AndroidNotification, notification: AndroidNotification,
notificationSizeValidator?: AndroidNotification => boolean, notificationSizeValidator?: AndroidNotification => boolean,
blobHolder?: ?string,
): Promise<{ ): Promise<{
+notification: AndroidNotification, +notification: AndroidNotification,
+payloadSizeExceeded: boolean, +payloadSizeExceeded: boolean,
+encryptionOrder?: number, +encryptionOrder?: number,
}> { }> {
const { id, keyserverID, badgeOnly, ...unencryptedPayload } = const { id, keyserverID, badgeOnly, ...rest } = notification.data;
notification.data;
let unencryptedData = { badgeOnly, keyserverID }; let unencryptedData = { badgeOnly, keyserverID };
if (id) { if (id) {
unencryptedData = { ...unencryptedData, id }; unencryptedData = { ...unencryptedData, id };
} }
let unencryptedPayload = rest;
if (blobHolder) {
unencryptedPayload = { ...unencryptedPayload, blobHolder };
}
let payloadSizeValidator; let payloadSizeValidator;
if (notificationSizeValidator) { if (notificationSizeValidator) {
payloadSizeValidator = ( payloadSizeValidator = (
payload: AndroidNotificationPayload | { +encryptedPayload: string }, payload: AndroidNotificationPayload | { +encryptedPayload: string },
) => { ) => {
return notificationSizeValidator({ return notificationSizeValidator({
data: { ...unencryptedData, ...payload }, data: { ...unencryptedData, ...payload },
}); });
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines $ReadOnlyArray<{
+cookieID: string, +cookieID: string,
+deviceToken: string, +deviceToken: string,
+notification: AndroidNotification, +notification: AndroidNotification,
+payloadSizeExceeded: boolean, +payloadSizeExceeded: boolean,
+encryptionOrder?: number, +encryptionOrder?: number,
}>, }>,
> { > {
const notificationPromises = devices.map( const notificationPromises = devices.map(
async ({ deviceToken, cookieID }) => { async ({ deviceToken, cookieID, blobHolder }) => {
const notif = await encryptAndroidNotification( const notif = await encryptAndroidNotification(
cookieID, cookieID,
notification, notification,
notificationSizeValidator, notificationSizeValidator,
blobHolder,
); );
return { deviceToken, cookieID, ...notif }; return { deviceToken, cookieID, ...notif };
}, },
); );
return Promise.all(notificationPromises); return Promise.all(notificationPromises);
} }
function prepareEncryptedAndroidNotificationRescinds( function prepareEncryptedAndroidNotificationRescinds(
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines
View Options

web/app.react.js

Show First 20 Lines • Show All 195 Lines • ▼ Show 20 Lines try {
}; };
} }
} }
async function encryptAndroidNotification( async function encryptAndroidNotification(
cookieID: string, cookieID: string,
notification: AndroidNotification, notification: AndroidNotification,
notificationSizeValidator?: AndroidNotification => boolean, notificationSizeValidator?: AndroidNotification => boolean,
blobHolder?: ?string,
): Promise<{ ): Promise<{
+notification: AndroidNotification, +notification: AndroidNotification,
+payloadSizeExceeded: boolean, +payloadSizeExceeded: boolean,
+encryptionOrder?: number, +encryptionOrder?: number,
}> { }> {
const { id, keyserverID, badgeOnly, ...unencryptedPayload } = const { id, keyserverID, badgeOnly, ...rest } = notification.data;
notification.data;
let unencryptedData = { badgeOnly, keyserverID }; let unencryptedData = { badgeOnly, keyserverID };
if (id) { if (id) {
unencryptedData = { ...unencryptedData, id }; unencryptedData = { ...unencryptedData, id };
} }
let unencryptedPayload = rest;
if (blobHolder) {
unencryptedPayload = { ...unencryptedPayload, blobHolder };
}
let payloadSizeValidator; let payloadSizeValidator;
if (notificationSizeValidator) { if (notificationSizeValidator) {
payloadSizeValidator = ( payloadSizeValidator = (
payload: AndroidNotificationPayload | { +encryptedPayload: string }, payload: AndroidNotificationPayload | { +encryptedPayload: string },
) => { ) => {
return notificationSizeValidator({ return notificationSizeValidator({
data: { ...unencryptedData, ...payload }, data: { ...unencryptedData, ...payload },
}); });
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines $ReadOnlyArray<{
+cookieID: string, +cookieID: string,
+deviceToken: string, +deviceToken: string,
+notification: AndroidNotification, +notification: AndroidNotification,
+payloadSizeExceeded: boolean, +payloadSizeExceeded: boolean,
+encryptionOrder?: number, +encryptionOrder?: number,
}>, }>,
> { > {
const notificationPromises = devices.map( const notificationPromises = devices.map(
async ({ deviceToken, cookieID }) => { async ({ deviceToken, cookieID, blobHolder }) => {
const notif = await encryptAndroidNotification( const notif = await encryptAndroidNotification(
cookieID, cookieID,
notification, notification,
notificationSizeValidator, notificationSizeValidator,
blobHolder,
); );
return { deviceToken, cookieID, ...notif }; return { deviceToken, cookieID, ...notif };
}, },
); );
return Promise.all(notificationPromises); return Promise.all(notificationPromises);
} }
function prepareEncryptedAndroidNotificationRescinds( function prepareEncryptedAndroidNotificationRescinds(
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines
View Options

web/web-lock.js

Show First 20 Lines • Show All 195 Lines • ▼ Show 20 Lines try {
}; };
} }
} }
async function encryptAndroidNotification( async function encryptAndroidNotification(
cookieID: string, cookieID: string,
notification: AndroidNotification, notification: AndroidNotification,
notificationSizeValidator?: AndroidNotification => boolean, notificationSizeValidator?: AndroidNotification => boolean,
blobHolder?: ?string,
): Promise<{ ): Promise<{
+notification: AndroidNotification, +notification: AndroidNotification,
+payloadSizeExceeded: boolean, +payloadSizeExceeded: boolean,
+encryptionOrder?: number, +encryptionOrder?: number,
}> { }> {
const { id, keyserverID, badgeOnly, ...unencryptedPayload } = const { id, keyserverID, badgeOnly, ...rest } = notification.data;
notification.data;
let unencryptedData = { badgeOnly, keyserverID }; let unencryptedData = { badgeOnly, keyserverID };
if (id) { if (id) {
unencryptedData = { ...unencryptedData, id }; unencryptedData = { ...unencryptedData, id };
} }
let unencryptedPayload = rest;
if (blobHolder) {
unencryptedPayload = { ...unencryptedPayload, blobHolder };
}
let payloadSizeValidator; let payloadSizeValidator;
if (notificationSizeValidator) { if (notificationSizeValidator) {
payloadSizeValidator = ( payloadSizeValidator = (
payload: AndroidNotificationPayload | { +encryptedPayload: string }, payload: AndroidNotificationPayload | { +encryptedPayload: string },
) => { ) => {
return notificationSizeValidator({ return notificationSizeValidator({
data: { ...unencryptedData, ...payload }, data: { ...unencryptedData, ...payload },
}); });
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines $ReadOnlyArray<{
+cookieID: string, +cookieID: string,
+deviceToken: string, +deviceToken: string,
+notification: AndroidNotification, +notification: AndroidNotification,
+payloadSizeExceeded: boolean, +payloadSizeExceeded: boolean,
+encryptionOrder?: number, +encryptionOrder?: number,
}>, }>,
> { > {
const notificationPromises = devices.map( const notificationPromises = devices.map(
async ({ deviceToken, cookieID }) => { async ({ deviceToken, cookieID, blobHolder }) => {
const notif = await encryptAndroidNotification( const notif = await encryptAndroidNotification(
cookieID, cookieID,
notification, notification,
notificationSizeValidator, notificationSizeValidator,
blobHolder,
); );
return { deviceToken, cookieID, ...notif }; return { deviceToken, cookieID, ...notif };
}, },
); );
return Promise.all(notificationPromises); return Promise.all(notificationPromises);
} }
function prepareEncryptedAndroidNotificationRescinds( function prepareEncryptedAndroidNotificationRescinds(
▲ Show 20 Lines • Show All 95 Lines • Show Last 20 Lines