Page MenuHomePhabricator
Differential D9156

[tunnelbroker] Make WebSocketSession generic
ClosedPublic
Actions

Authored by bartek on Sep 12 2023, 1:47 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 27, 3:38 AM
Unknown Object (File)
Sat, Mar 22, 8:48 PM
Unknown Object (File)
Sat, Mar 22, 8:48 PM
Unknown Object (File)
Sat, Mar 22, 8:48 PM
Unknown Object (File)
Sat, Mar 22, 1:31 PM
Unknown Object (File)
Sat, Mar 22, 12:13 PM
Unknown Object (File)
Mon, Mar 3, 8:26 PM
Unknown Object (File)
Sat, Mar 1, 1:50 PM
View All 99 Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
michal
varun
• jon
Commits
rCOMMc6850660a189: [tunnelbroker] Make WebSocketSession generic
Summary

We don't rely on specific websocket stream type, so this can be made generic.
This will be used in the next diff, where we will change TcpStream to a different type.

Depends on D9155

Test Plan

Tunnelbroker still builds, integration tests pass.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

bartek created this revision.Sep 12 2023, 1:47 PM
bartek held this revision as a draft.
Herald added a reviewer: • jon. · View Herald TranscriptSep 12 2023, 1:47 PM
Herald added subscribers: tomek, ashoat. · View Herald Transcript
bartek added a child revision: D9158: [tunnelbroker] Hyper service for WebSocket connections.Sep 12 2023, 1:53 PM
bartek published this revision for review.Sep 12 2023, 2:05 PM
bartek added inline comments.
services/tunnelbroker/src/websockets/mod.rs
110

These are traits that all socket stream types implement

Harbormaster completed remote builds in B22544: Diff 30990.Sep 12 2023, 2:10 PM
michal added a comment.Sep 13 2023, 1:33 AM

Is generic-ness of this is going to be helpful in the future? Or is it going to be always HyperWebsocket under the hood? Because in that case we should just remove the generics and use HyperWebsocket directly

bartek added a comment.Sep 13 2023, 4:05 AM
In D9156#269886, @michal wrote:

Is generic-ness of this is going to be helpful in the future? Or is it going to be always HyperWebsocket under the hood? Because in that case we should just remove the generics and use HyperWebsocket directly

It's not HyperWebsocket but rather a type gathered from hyper_websocket.await.split(). Alternatively, we could simply hardcode WebSocketStream<Upgraded> which is the exact type returned by this fn, but I'm not a fan because such hardcoding is the reason I had to do this change.

Perhaps we can do better, but refactoring is not my goal here.

michal accepted this revision.Sep 13 2023, 5:44 AM
This revision is now accepted and ready to land.Sep 13 2023, 5:44 AM
kamil accepted this revision.Sep 13 2023, 9:24 AM
Closed by commit rCOMMc6850660a189: [tunnelbroker] Make WebSocketSession generic (authored by bartek). · Explain WhySep 14 2023, 12:46 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMc6850660a189: [tunnelbroker] Make WebSocketSession generic.

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
src/
websockets/
7 lines
17 lines

Diff 30990

View Options

services/tunnelbroker/src/websockets/mod.rs

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import _maxBy from 'lodash/fp/maxBy.js'; import _maxBy from 'lodash/fp/maxBy.js';
import _orderBy from 'lodash/fp/orderBy.js'; import _orderBy from 'lodash/fp/orderBy.js';
import * as React from 'react'; import * as React from 'react';
import { codeBlockRegex, type ParserRules } from './markdown.js'; import { codeBlockRegex, type ParserRules } from './markdown.js';
import type { CreationSideEffectsFunc } from './messages/message-spec.js'; import type { CreationSideEffectsFunc } from './messages/message-spec.js';
import { messageSpecs } from './messages/message-specs.js'; import { messageSpecs } from './messages/message-specs.js';
import { threadIsGroupChat } from './thread-utils.js'; import { threadIsGroupChat } from './thread-utils.js';
import { useStringForUser } from '../hooks/ens-cache.js'; import { useStringForUser } from '../hooks/ens-cache.js';
import { contentStringForMediaArray } from '../media/media-utils.js';
import { userIDsToRelativeUserInfos } from '../selectors/user-selectors.js'; import { userIDsToRelativeUserInfos } from '../selectors/user-selectors.js';
import { type PlatformDetails, isWebPlatform } from '../types/device-types.js'; import { type PlatformDetails, isWebPlatform } from '../types/device-types.js';
import type { Media } from '../types/media-types.js'; import type { Media } from '../types/media-types.js';
import { import {
type MessageInfo, type MessageInfo,
type RawMessageInfo, type RawMessageInfo,
type RobotextMessageInfo, type RobotextMessageInfo,
type RawMultimediaMessageInfo, type RawMultimediaMessageInfo,
▲ Show 20 Lines • Show All 543 Lines • ▼ Show 20 Lines): CreationSideEffectsFunc<Info> {
invariant(messageSpec, `we're not aware of messageType ${messageType}`); invariant(messageSpec, `we're not aware of messageType ${messageType}`);
invariant( invariant(
messageSpec.useCreationSideEffectsFunc, messageSpec.useCreationSideEffectsFunc,
`no useCreationSideEffectsFunc in message spec for ${messageType}`, `no useCreationSideEffectsFunc in message spec for ${messageType}`,
); );
return messageSpec.useCreationSideEffectsFunc(); return messageSpec.useCreationSideEffectsFunc();
} }
function getPinnedContentFromMessage(targetMessage: RawMessageInfo): string {
let pinnedContent;
if (
targetMessage.type === messageTypes.IMAGES ||
targetMessage.type === messageTypes.MULTIMEDIA
) {
pinnedContent = contentStringForMediaArray(targetMessage.media);
} else {
pinnedContent = 'a message';
}
return pinnedContent;
}
export { export {
localIDPrefix, localIDPrefix,
messageKey, messageKey,
messageID, messageID,
robotextForMessageInfo, robotextForMessageInfo,
createMessageInfo, createMessageInfo,
sortMessageInfoList, sortMessageInfoList,
sortMessageIDs, sortMessageIDs,
rawMessageInfoFromMessageData, rawMessageInfoFromMessageData,
mostRecentMessageTimestamp, mostRecentMessageTimestamp,
usersInMessageInfos, usersInMessageInfos,
combineTruncationStatuses, combineTruncationStatuses,
shimUnsupportedRawMessageInfos, shimUnsupportedRawMessageInfos,
createMediaMessageData, createMediaMessageData,
createMediaMessageInfo, createMediaMessageInfo,
stripLocalIDs, stripLocalIDs,
trimMessage, trimMessage,
createMessageQuote, createMessageQuote,
createMessageReply, createMessageReply,
getMostRecentNonLocalMessageID, getMostRecentNonLocalMessageID,
getMessageTitle, getMessageTitle,
mergeThreadMessageInfos, mergeThreadMessageInfos,
useMessagePreview, useMessagePreview,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getPinnedContentFromMessage,
}; };
View Options

services/tunnelbroker/src/websockets/session.rs

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import _maxBy from 'lodash/fp/maxBy.js'; import _maxBy from 'lodash/fp/maxBy.js';
import _orderBy from 'lodash/fp/orderBy.js'; import _orderBy from 'lodash/fp/orderBy.js';
import * as React from 'react'; import * as React from 'react';
import { codeBlockRegex, type ParserRules } from './markdown.js'; import { codeBlockRegex, type ParserRules } from './markdown.js';
import type { CreationSideEffectsFunc } from './messages/message-spec.js'; import type { CreationSideEffectsFunc } from './messages/message-spec.js';
import { messageSpecs } from './messages/message-specs.js'; import { messageSpecs } from './messages/message-specs.js';
import { threadIsGroupChat } from './thread-utils.js'; import { threadIsGroupChat } from './thread-utils.js';
import { useStringForUser } from '../hooks/ens-cache.js'; import { useStringForUser } from '../hooks/ens-cache.js';
import { contentStringForMediaArray } from '../media/media-utils.js';
import { userIDsToRelativeUserInfos } from '../selectors/user-selectors.js'; import { userIDsToRelativeUserInfos } from '../selectors/user-selectors.js';
import { type PlatformDetails, isWebPlatform } from '../types/device-types.js'; import { type PlatformDetails, isWebPlatform } from '../types/device-types.js';
import type { Media } from '../types/media-types.js'; import type { Media } from '../types/media-types.js';
import { import {
type MessageInfo, type MessageInfo,
type RawMessageInfo, type RawMessageInfo,
type RobotextMessageInfo, type RobotextMessageInfo,
type RawMultimediaMessageInfo, type RawMultimediaMessageInfo,
▲ Show 20 Lines • Show All 543 Lines • ▼ Show 20 Lines): CreationSideEffectsFunc<Info> {
invariant(messageSpec, `we're not aware of messageType ${messageType}`); invariant(messageSpec, `we're not aware of messageType ${messageType}`);
invariant( invariant(
messageSpec.useCreationSideEffectsFunc, messageSpec.useCreationSideEffectsFunc,
`no useCreationSideEffectsFunc in message spec for ${messageType}`, `no useCreationSideEffectsFunc in message spec for ${messageType}`,
); );
return messageSpec.useCreationSideEffectsFunc(); return messageSpec.useCreationSideEffectsFunc();
} }
function getPinnedContentFromMessage(targetMessage: RawMessageInfo): string {
let pinnedContent;
if (
targetMessage.type === messageTypes.IMAGES ||
targetMessage.type === messageTypes.MULTIMEDIA
) {
pinnedContent = contentStringForMediaArray(targetMessage.media);
} else {
pinnedContent = 'a message';
}
return pinnedContent;
}
export { export {
localIDPrefix, localIDPrefix,
messageKey, messageKey,
messageID, messageID,
robotextForMessageInfo, robotextForMessageInfo,
createMessageInfo, createMessageInfo,
sortMessageInfoList, sortMessageInfoList,
sortMessageIDs, sortMessageIDs,
rawMessageInfoFromMessageData, rawMessageInfoFromMessageData,
mostRecentMessageTimestamp, mostRecentMessageTimestamp,
usersInMessageInfos, usersInMessageInfos,
combineTruncationStatuses, combineTruncationStatuses,
shimUnsupportedRawMessageInfos, shimUnsupportedRawMessageInfos,
createMediaMessageData, createMediaMessageData,
createMediaMessageInfo, createMediaMessageInfo,
stripLocalIDs, stripLocalIDs,
trimMessage, trimMessage,
createMessageQuote, createMessageQuote,
createMessageReply, createMessageReply,
getMostRecentNonLocalMessageID, getMostRecentNonLocalMessageID,
getMessageTitle, getMessageTitle,
mergeThreadMessageInfos, mergeThreadMessageInfos,
useMessagePreview, useMessagePreview,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getPinnedContentFromMessage,
}; };