From 935ac8d8f911616731c20aa5b45b79bea6895731 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 2 Jun 2020 11:36:33 +1000 Subject: [PATCH] lint --- ts/session/protocols/SessionProtocol.ts | 66 +++++++++++++------ ts/session/sending/MessageQueue.ts | 5 +- ts/session/sending/MessageQueueInterface.ts | 5 +- .../session/protocols/SessionProtocol_test.ts | 2 - 4 files changed, 55 insertions(+), 23 deletions(-) diff --git a/ts/session/protocols/SessionProtocol.ts b/ts/session/protocols/SessionProtocol.ts index d568b679f..eae8fcbad 100644 --- a/ts/session/protocols/SessionProtocol.ts +++ b/ts/session/protocols/SessionProtocol.ts @@ -5,7 +5,6 @@ interface StringToNumberMap { [key: string]: number; } - /** * This map olds the sent session timestamps, i.e. session requests message effectively sent to the recipient. * It is backed by a database entry so it's loaded from db on startup. @@ -29,7 +28,6 @@ let processedSessionsTimestamp: StringToNumberMap; */ const pendingSendSessionsTimestamp: Set = new Set(); - /** ======= exported functions ======= */ /** Returns true if we already have a session with that device */ @@ -68,7 +66,9 @@ export async function sendSessionRequestIfNeeded( return Promise.resolve(); } - const preKeyBundle = await window.libloki.storage.getPreKeyBundleForContact(device); + const preKeyBundle = await window.libloki.storage.getPreKeyBundleForContact( + device + ); const sessionReset = new SessionResetMessage({ preKeyBundle, timestamp: Date.now(), @@ -112,10 +112,14 @@ export async function shouldProcessSessionRequest( device: string, messageTimestamp: number ): Promise { - const existingSentTimestamp = await _getSentSessionRequest(device) || 0; - const existingProcessedTimestamp = await _getProcessedSessionRequest(device) || 0; + const existingSentTimestamp = (await _getSentSessionRequest(device)) || 0; + const existingProcessedTimestamp = + (await _getProcessedSessionRequest(device)) || 0; - return messageTimestamp > existingSentTimestamp && messageTimestamp > existingProcessedTimestamp; + return ( + messageTimestamp > existingSentTimestamp && + messageTimestamp > existingProcessedTimestamp + ); } export async function onSessionRequestProcessed(device: string) { @@ -124,20 +128,23 @@ export async function onSessionRequestProcessed(device: string) { /** ======= local / utility functions ======= */ - /** * We only need to fetch once from the database, because we are the only one writing to it */ async function _fetchFromDBIfNeeded(): Promise { if (!sentSessionsTimestamp) { - const sentItem = await window.Signal.Data.getItemById('sentSessionsTimestamp'); + const sentItem = await window.Signal.Data.getItemById( + 'sentSessionsTimestamp' + ); if (sentItem) { sentSessionsTimestamp = sentItem.value; } else { sentSessionsTimestamp = {}; } - const processedItem = await window.Signal.Data.getItemById('processedSessionsTimestamp'); + const processedItem = await window.Signal.Data.getItemById( + 'processedSessionsTimestamp' + ); if (processedItem) { processedSessionsTimestamp = processedItem.value; } else { @@ -147,22 +154,31 @@ async function _fetchFromDBIfNeeded(): Promise { } async function _writeToDBSentSessions(): Promise { - const data = { id: 'sentSessionsTimestamp', value: JSON.stringify(sentSessionsTimestamp) }; + const data = { + id: 'sentSessionsTimestamp', + value: JSON.stringify(sentSessionsTimestamp), + }; await window.Signal.Data.createOrUpdateItem(data); } async function _writeToDBProcessedSessions(): Promise { - const data = { id: 'processedSessionsTimestamp', value: JSON.stringify(processedSessionsTimestamp) }; + const data = { + id: 'processedSessionsTimestamp', + value: JSON.stringify(processedSessionsTimestamp), + }; await window.Signal.Data.createOrUpdateItem(data); } - /** * This is a utility function to avoid duplicated code of _updateSentSessionTimestamp and _updateProcessedSessionTimestamp */ -async function _updateSessionTimestamp(device: string, timestamp: number | undefined, map: StringToNumberMap): Promise { +async function _updateSessionTimestamp( + device: string, + timestamp: number | undefined, + map: StringToNumberMap +): Promise { await _fetchFromDBIfNeeded(); if (!timestamp) { if (!!map[device]) { @@ -183,7 +199,10 @@ async function _updateSessionTimestamp(device: string, timestamp: number | undef * @param device the device id * @param timestamp undefined to remove the key/value pair, otherwise updates the sent timestamp and write to DB */ -async function _updateSentSessionTimestamp(device: string, timestamp: number|undefined): Promise { +async function _updateSentSessionTimestamp( + device: string, + timestamp: number | undefined +): Promise { if (_updateSessionTimestamp(device, timestamp, sentSessionsTimestamp)) { await _writeToDBSentSessions(); } @@ -192,27 +211,36 @@ async function _updateSentSessionTimestamp(device: string, timestamp: number|und /** * timestamp undefined to remove the key/value pair, otherwise updates the processed timestamp and writes to DB */ -async function _updateProcessedSessionTimestamp(device: string, timestamp: number|undefined): Promise { +async function _updateProcessedSessionTimestamp( + device: string, + timestamp: number | undefined +): Promise { if (_updateSessionTimestamp(device, timestamp, processedSessionsTimestamp)) { await _writeToDBProcessedSessions(); } } - /** * This is a utility function to avoid duplicate code between `_getProcessedSessionRequest()` and `_getSentSessionRequest()` */ -async function _getSessionRequest(device: string, map: StringToNumberMap): Promise { +async function _getSessionRequest( + device: string, + map: StringToNumberMap +): Promise { await _fetchFromDBIfNeeded(); return map[device]; } -async function _getSentSessionRequest(device: string): Promise { +async function _getSentSessionRequest( + device: string +): Promise { return _getSessionRequest(device, sentSessionsTimestamp); } -async function _getProcessedSessionRequest(device: string): Promise { +async function _getProcessedSessionRequest( + device: string +): Promise { return _getSessionRequest(device, processedSessionsTimestamp); } diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index ae922e306..90bb5d424 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -3,7 +3,10 @@ import { MessageQueueInterface, MessageQueueInterfaceEvents, } from './MessageQueueInterface'; -import { ContentMessage as OutgoingContentMessage, OpenGroupMessage } from '../messages/outgoing'; +import { + ContentMessage as OutgoingContentMessage, + OpenGroupMessage, +} from '../messages/outgoing'; import { PendingMessageCache } from './PendingMessageCache'; import { JobQueue, TypedEventEmitter } from '../utils'; diff --git a/ts/session/sending/MessageQueueInterface.ts b/ts/session/sending/MessageQueueInterface.ts index 69a19ff89..73c6f802c 100644 --- a/ts/session/sending/MessageQueueInterface.ts +++ b/ts/session/sending/MessageQueueInterface.ts @@ -1,4 +1,7 @@ -import { ContentMessage as OutgoingContentMessage, OpenGroupMessage } from '../messages/outgoing'; +import { + ContentMessage as OutgoingContentMessage, + OpenGroupMessage, +} from '../messages/outgoing'; import { RawMessage } from '../types/RawMessage'; import { TypedEventEmitter } from '../utils'; diff --git a/ts/test/session/protocols/SessionProtocol_test.ts b/ts/test/session/protocols/SessionProtocol_test.ts index 6d0f00d12..8cd26ddfc 100644 --- a/ts/test/session/protocols/SessionProtocol_test.ts +++ b/ts/test/session/protocols/SessionProtocol_test.ts @@ -1,8 +1,6 @@ // import { expect } from 'chai'; // import { SessionProtocol } from '../../../session/protocols'; - - // describe('SessionProtocol', () => { // it('has ', () => {