Page MenuHomePhabricator
Differential D7610

[Tunnelbroker] Add initial websocket connection support and connection map
ClosedPublic
Actions

Authored by • jon on Apr 25 2023, 8:56 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 2, 1:04 AM
Unknown Object (File)
Tue, Mar 11, 12:52 AM
Unknown Object (File)
Tue, Mar 11, 12:50 AM
Unknown Object (File)
Tue, Mar 11, 12:49 AM
Unknown Object (File)
Tue, Mar 11, 12:44 AM
Unknown Object (File)
Tue, Mar 11, 12:42 AM
Unknown Object (File)
Mon, Mar 10, 5:21 AM
Unknown Object (File)
Feb 25 2025, 6:54 AM
View All Files
Subscribers
ashoat
atul
tomek

Details

Reviewers
varun
bartek
Commits
rCOMMd51b1f099fd1: [Tunnelbroker] Add initial websocket connection support and connection map
Summary

Add simple websocket implementation which can be used to easily onboard
keyserver support.

Part of:

Test Plan
cd services/tunnelbroker
cargo run

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jon created this revision.Apr 25 2023, 8:56 AM
Herald added subscribers: atul, tomek, ashoat. · View Herald TranscriptApr 25 2023, 8:56 AM
Harbormaster completed remote builds in B18742: Diff 25680.Apr 25 2023, 9:15 AM
• jon requested review of this revision.Apr 25 2023, 9:15 AM
bartek accepted this revision.Apr 26 2023, 6:20 AM
bartek added inline comments.
services/tunnelbroker/Cargo.toml
30–33 ↗(On Diff #25680)

Nit: IIRC we agreed sometime ago to omit the patch version numbers and keep major.minor only (and most of the previous deps stick to this rule). However, due to Cargo resolution rules, I don't think it matters much.

BTW. it would be nice to keep them sorted alphabetically ;)

This revision is now accepted and ready to land.Apr 26 2023, 6:20 AM
• jon updated this revision to Diff 25833.Apr 27 2023, 7:01 AM

Use only major.minor for versions.

Alphabetize crates

• jon added a child revision: D7659: [Tunnelbroker] Remove references to cxx.Apr 27 2023, 7:07 AM
• jon marked an inline comment as done.
• jon added inline comments.
services/tunnelbroker/Cargo.toml
30–33 ↗(On Diff #25680)

oh yea, cargo add does this behavior by default

Harbormaster completed remote builds in B18864: Diff 25833.Apr 27 2023, 7:19 AM
Closed by commit rCOMMd51b1f099fd1: [Tunnelbroker] Add initial websocket connection support and connection map (authored by • jon). · Explain WhyApr 27 2023, 8:59 AM
This revision was automatically updated to reflect the committed changes.
• jon marked an inline comment as done.
• jon added a commit: rCOMMd51b1f099fd1: [Tunnelbroker] Add initial websocket connection support and connection map.

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
25 lines
src/
8 lines
websockets/
68 lines
shared/
tunnelbroker_messages/
src/
messages/
8 lines

Diff 25862

View Options

services/tunnelbroker/Cargo.lock

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/Cargo.toml

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/src/main.rs

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/src/websockets/mod.rs

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines
View Options

shared/tunnelbroker_messages/src/messages/mod.rs

Show First 20 Lines • Show All 226 Lines • ▼ Show 20 Lines const row = [
description, description,
viewer.userID, viewer.userID,
time, time,
color, color,
parentThreadID, parentThreadID,
threadAncestry.containingThreadID, threadAncestry.containingThreadID,
threadAncestry.community, threadAncestry.community,
threadAncestry.depth, threadAncestry.depth,
newRoles.default.id,
sourceMessageID, sourceMessageID,
]; ];
let existingThreadQuery = null; let existingThreadQuery = null;
if (threadType === threadTypes.PERSONAL) { if (threadType === threadTypes.PERSONAL) {
const otherMemberID = initialMemberIDs?.[0]; const otherMemberID = initialMemberIDs?.[0];
invariant( invariant(
otherMemberID, otherMemberID,
'Other member id should be set for a PERSONAL thread', 'Other member id should be set for a PERSONAL thread',
); );
existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID); existingThreadQuery = personalThreadQuery(viewer.userID, otherMemberID);
} else if (sourceMessageID) { } else if (sourceMessageID) {
existingThreadQuery = SQL` existingThreadQuery = SQL`
SELECT t.id SELECT t.id
FROM threads t FROM threads t
WHERE t.source_message = ${sourceMessageID} WHERE t.source_message = ${sourceMessageID}
`; `;
} }
if (existingThreadQuery) { if (existingThreadQuery) {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
SELECT ${row} SELECT ${row}
WHERE NOT EXISTS (`; WHERE NOT EXISTS (`;
query.append(existingThreadQuery).append(SQL`)`); query.append(existingThreadQuery).append(SQL`)`);
const [result] = await dbQuery(query); const [result] = await dbQuery(query);
if (result.affectedRows === 0) { if (result.affectedRows === 0) {
const deleteRoles = SQL` const deleteRoles = SQL`
DELETE FROM roles DELETE FROM roles
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines if (result.affectedRows === 0) {
userInfos, userInfos,
newMessageInfos, newMessageInfos,
}; };
} }
} else { } else {
const query = SQL` const query = SQL`
INSERT INTO threads(id, type, name, description, creator, creation_time, INSERT INTO threads(id, type, name, description, creator, creation_time,
color, parent_thread_id, containing_thread_id, community, depth, color, parent_thread_id, containing_thread_id, community, depth,
default_role, source_message) source_message)
VALUES ${[row]} VALUES ${[row]}
`; `;
await dbQuery(query); await dbQuery(query);
} }
let initialMemberPromise; let initialMemberPromise;
if (initialMemberIDs) { if (initialMemberIDs) {
initialMemberPromise = changeRole(id, initialMemberIDs, null, { initialMemberPromise = changeRole(id, initialMemberIDs, null, {
▲ Show 20 Lines • Show All 178 Lines • Show Last 20 Lines