From b4f93adf05b5a0ca3a14bafbce9ff6548827e408 Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 19 Apr 2021 23:33:16 +0200 Subject: [PATCH] reorganized imports a bit --- .../extension/browser-extension-connector.js | 13 +++----- app/scripts/comp/extension/protocol-impl.js | 32 ++++++++++--------- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/app/scripts/comp/extension/browser-extension-connector.js b/app/scripts/comp/extension/browser-extension-connector.js index 66b49380..bd0c1933 100644 --- a/app/scripts/comp/extension/browser-extension-connector.js +++ b/app/scripts/comp/extension/browser-extension-connector.js @@ -1,11 +1,6 @@ import { Launcher } from 'comp/launcher'; import { Logger } from 'util/logger'; -import { - ProtocolHandlers, - initProtocolImpl, - cleanupProtocolImpl, - deleteProtocolImplConnection -} from './protocol-impl'; +import { ProtocolHandlers, ProtocolImpl } from './protocol-impl'; import { RuntimeInfo } from 'const/runtime-info'; import { AppSettingsModel } from 'models/app-settings-model'; import { Features } from 'util/features'; @@ -40,7 +35,7 @@ const BrowserExtensionConnector = { init(appModel) { const sendEvent = this.sendEvent.bind(this); - initProtocolImpl({ appModel, logger, sendEvent }); + ProtocolImpl.init({ appModel, logger, sendEvent }); this.browserWindowMessage = this.browserWindowMessage.bind(this); @@ -75,7 +70,7 @@ const BrowserExtensionConnector = { this.stopWebMessageListener(); } - cleanupProtocolImpl(); + ProtocolImpl.cleanup(); connections.clear(); logger.info('Stopped'); @@ -198,7 +193,7 @@ const BrowserExtensionConnector = { socketClosed(socketId) { connections.delete(socketId); - deleteProtocolImplConnection(socketId); + ProtocolImpl.deleteConnection(socketId); }, async socketRequest(socketId, request) { diff --git a/app/scripts/comp/extension/protocol-impl.js b/app/scripts/comp/extension/protocol-impl.js index 2ffc013a..77eed2f8 100644 --- a/app/scripts/comp/extension/protocol-impl.js +++ b/app/scripts/comp/extension/protocol-impl.js @@ -29,25 +29,27 @@ let logger; let appModel; let sendEvent; -function initProtocolImpl(vars) { - appModel = vars.appModel; - logger = vars.logger; - sendEvent = vars.sendEvent; +const ProtocolImpl = { + init(vars) { + appModel = vars.appModel; + logger = vars.logger; + sendEvent = vars.sendEvent; - setupListeners(); -} + setupListeners(); + }, -function cleanupProtocolImpl() { - connectedClients.clear(); -} + cleanup() { + connectedClients.clear(); + }, -function deleteProtocolImplConnection(connectionId) { - for (const client of connectedClients.values()) { - if (client.connection.connectionId === connectionId) { - connectedClients.delete(client); + deleteConnection(connectionId) { + for (const client of connectedClients.values()) { + if (client.connection.connectionId === connectionId) { + connectedClients.delete(client); + } } } -} +}; function setupListeners() { Events.on('file-opened', () => { @@ -406,4 +408,4 @@ const ProtocolHandlers = { } }; -export { ProtocolHandlers, initProtocolImpl, cleanupProtocolImpl, deleteProtocolImplConnection }; +export { ProtocolHandlers, ProtocolImpl };