Page MenuHomePhabricator
Differential D7691 Diff 28982 keyserver/src/socket/tunnelbroker.js

Changeset View

Standalone View

View Options

keyserver/src/socket/tunnelbroker.js

  • This file was added.
// @flow
import WebSocket from 'ws';
import { type TBKeyserverConnectionInitializationMessage } from 'lib/types/tunnelbroker-messages.js';
import sleep from 'lib/utils/sleep.js';
import { fetchOlmAccount } from '../updaters/olm-account-updater.js';
import type { IdentityInfo } from '../user/identity.js';
async function createAndMaintainTunnelbrokerWebsocket(
identityInfo: IdentityInfo,
) {
const accountInfo = await fetchOlmAccount('content');
const deviceId = JSON.parse(accountInfo.account.identity_keys()).curve25519;
ashoatUnsubmitted
Done
Inline Actions
const accountInfo = await fetchOlmAccount('content');
- const deviceId = JSON.parse(accountInfo.account.identity_keys()).curve25519;
+ const deviceID = JSON.parse(accountInfo.account.identity_keys()).curve25519;
await openTunnelbrokerConnection(

Please apply this feedback to every place in the diff that it applies to

ashoat: Please apply this feedback to every place in the diff that it applies to
await openTunnelbrokerConnection(
ashoatUnsubmitted
Done
Inline Actions

You should not be awaiting something that doesn't return a promise

ashoat: You should not be `await`ing something that doesn't return a promise
deviceId,
identityInfo.userId,
identityInfo.accessToken,
);
}
function openTunnelbrokerConnection(
deviceId: string,
userId: string,
accessToken: string,
) {
try {
const tunnelbrokerSocket = new WebSocket('ws://localhost:51001');
tunnelbrokerSocket.on('open', () => {
const message: TBKeyserverConnectionInitializationMessage = {
type: 'sessionRequest',
accessToken,
deviceId,
deviceType: 'keyserver',
userId,
};
tunnelbrokerSocket.send(JSON.stringify(message));
console.info('Connection to tunnelbroker established');
ashoatUnsubmitted
Done
Inline Actions
tunnelbrokerSocket.send(JSON.stringify(message));
- console.info('Connection to tunnelbroker established');
+ console.info('Connection to Tunnelbroker established');
});
tunnelbrokerSocket.on('close', async () => {
ashoat:
});
tunnelbrokerSocket.on('close', async () => {
console.warn('Connection to tunnelbroker closed');
ashoatUnsubmitted
Done
Inline Actions
tunnelbrokerSocket.on('close', async () => {
- console.warn('Connection to tunnelbroker closed');
+ console.warn('Connection to Tunnelbroker closed');
await sleep(1000);
ashoat:
await sleep(1000);
console.info('Attempting to re-establish tunnelbroker connection');
ashoatUnsubmitted
Done
Inline Actions
await sleep(1000);
- console.info('Attempting to re-establish tunnelbroker connection');
+ console.info('Attempting to re-establish Tunnelbroker connection');
openTunnelbrokerConnection(deviceId, userId, accessToken);

Please apply this feedback everywhere

ashoat: Please apply this feedback everywhere
openTunnelbrokerConnection(deviceId, userId, accessToken);
});
tunnelbrokerSocket.on('error', (error: Error) => {
console.error('Tunnelbroker socket error: ' + error.message);
ashoatUnsubmitted
Done
Inline Actions
tunnelbrokerSocket.on('error', (error: Error) => {
- console.error('Tunnelbroker socket error: ' + error.message);
+ console.error('Tunnelbroker socket error', error);
});
} catch (err) {
ashoat:
});
} catch (err) {
ashoatUnsubmitted
Done
Inline Actions
console.error('Tunnelbroker socket error: ' + error.message);
});
- } catch (err) {
+ } catch {
console.log('Failed to open connection with tunnelbroker');

If we're not doing anything with err, we can omit it

ashoat: If we're not doing anything with `err`, we can omit it
console.log('Failed to open connection with tunnelbroker');
}
}
export { createAndMaintainTunnelbrokerWebsocket };