Address linter issues

Signed-off-by: Thomas Mäder <t.s.maeder@gmail.com>

packages/core/src/browser/messaging/connection-source.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Channel, Event } from "../../common";
+import { Channel, Event } from '../../common';
 
 export const ConnectionSource = Symbol('ConnectionSource');
 
@@ -23,4 +23,4 @@ export const ConnectionSource = Symbol('ConnectionSource');
  */
 export interface ConnectionSource {
     onConnectionDidOpen: Event<Channel>;
-}
+}

packages/core/src/browser/messaging/frontend-id-provider.ts

@@ -14,13 +14,13 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from "inversify";
-import { generateUuid } from "../../common/uuid";
+import { injectable } from 'inversify';
+import { generateUuid } from '../../common/uuid';
 
 export const FrontendIdProvider = Symbol('FrontendIdProvider');
 
 /**
- * A FronendIdProvider computes an id for an instance of the front end that may be reconnected to a back end 
+ * A FronendIdProvider computes an id for an instance of the front end that may be reconnected to a back end
  * connection context.
  */
 export interface FrontendIdProvider {
@@ -34,5 +34,4 @@ export class BrowserFrontendIdProvider implements FrontendIdProvider {
     getId(): string {
         return this.id;
     }
-
-}
+}

packages/core/src/browser/messaging/messaging-frontend-module.ts

@@ -25,9 +25,7 @@ import { WebSocketConnectionProvider } from './ws-connection-provider';
 const backendServiceProvider = Symbol('backendServiceProvider');
 
 export const messagingFrontendModule = new ContainerModule(bind => {
-    bind(ConnectionCloseService).toDynamicValue(ctx => {
-        return WebSocketConnectionProvider.createProxy(ctx.container, connectionCloseServicePath);
-    }).inSingletonScope();
+    bind(ConnectionCloseService).toDynamicValue(ctx => WebSocketConnectionProvider.createProxy(ctx.container, connectionCloseServicePath)).inSingletonScope();
     bind(BrowserFrontendIdProvider).toSelf().inSingletonScope();
     bind(FrontendIdProvider).toService(BrowserFrontendIdProvider);
     bind(WebsocketConnectionSource).toSelf().inSingletonScope();

packages/core/src/browser/messaging/service-connection-provider.ts

@@ -20,7 +20,6 @@ import { ChannelMultiplexer } from '../../common/message-rpc/channel';
 import { Deferred } from '../../common/promise-util';
 import { ConnectionSource } from './connection-source';
 
-
 export const LocalConnectionProvider = Symbol('LocalConnectionProvider');
 export const RemoteConnectionProvider = Symbol('RemoteConnectionProvider');
 

packages/core/src/browser/messaging/ws-connection-provider.ts

@@ -45,6 +45,4 @@ export class WebSocketConnectionProvider {
     createProxy<T extends object>(path: string, factory: RpcProxyFactory<T>): RpcProxy<T> {
         return this.remoteConnectionProvider.createProxy(path, factory);
     }
-
-
 }

packages/core/src/browser/messaging/ws-connection-source.ts

@@ -14,17 +14,17 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { AbstractChannel, Channel, Disposable, DisposableCollection, Emitter, Event, servicesPath } from "../../common";
-import { ConnectionSource } from "./connection-source";
-import { Socket, io } from "socket.io-client";
-import { Endpoint } from "../endpoint";
-import { ForwardingChannel } from "../../common/message-rpc/channel";
-import { Uint8ArrayReadBuffer, Uint8ArrayWriteBuffer } from "../../common/message-rpc/uint8-array-message-buffer";
-import { inject, injectable } from "inversify";
-import { FrontendIdProvider } from "./frontend-id-provider";
-import { FrontendApplicationConfigProvider } from "../frontend-application-config-provider";
-import { SocketWriteBuffer } from "../../common/messaging/socket-write-buffer";
-import { ConnectionManagementMessages } from "../../common/messaging/connection-management";
+import { AbstractChannel, Channel, Disposable, DisposableCollection, Emitter, Event, servicesPath } from '../../common';
+import { ConnectionSource } from './connection-source';
+import { Socket, io } from 'socket.io-client';
+import { Endpoint } from '../endpoint';
+import { ForwardingChannel } from '../../common/message-rpc/channel';
+import { Uint8ArrayReadBuffer, Uint8ArrayWriteBuffer } from '../../common/message-rpc/uint8-array-message-buffer';
+import { inject, injectable } from 'inversify';
+import { FrontendIdProvider } from './frontend-id-provider';
+import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
+import { SocketWriteBuffer } from '../../common/messaging/socket-write-buffer';
+import { ConnectionManagementMessages } from '../../common/messaging/connection-management';
 
 @injectable()
 export class WebsocketConnectionSource implements ConnectionSource {
@@ -74,7 +74,7 @@ export class WebsocketConnectionSource implements ConnectionSource {
 
         this._socket.on('disconnect', () => {
             this.onSocketDidCloseEmitter.fire();
-        })
+        });
 
         this._socket.on('error', reason => {
             if (this.currentChannel) {
@@ -83,7 +83,7 @@ export class WebsocketConnectionSource implements ConnectionSource {
         });
     }
 
-    protected handleSocketConnected() {
+    protected handleSocketConnected(): void {
         if (this.currentChannel) {
             const reconnectListener = (hasConnection: boolean) => {
                 this._socket.off(ConnectionManagementMessages.RECONNECT, reconnectListener);
@@ -122,6 +122,7 @@ export class WebsocketConnectionSource implements ConnectionSource {
     protected createChannel(): AbstractChannel {
         const toDispose = new DisposableCollection();
 
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const messageHandler = (data: any) => {
             this.onIncomingMessageActivityEmitter.fire();
             if (this.currentChannel) {
@@ -202,4 +203,4 @@ export class WebsocketConnectionSource implements ConnectionSource {
         }
         return pathname + 'socket.io';
     }
-}
+}

packages/core/src/common/messaging/connection-management.ts

@@ -40,4 +40,4 @@ export namespace ConnectionManagementMessages {
  */
 export interface ConnectionCloseService {
     markForClose(frontEndId: string): Promise<void>;
-}
+}

packages/core/src/common/messaging/socket-write-buffer.ts

@@ -27,7 +27,7 @@ export class SocketWriteBuffer {
     private disconnectedBuffer: Uint8Array | undefined;
     private bufferWritePosition = 0;
 
-    buffer(data: Uint8Array) {
+    buffer(data: Uint8Array): void {
         this.ensureWriteBuffer(data.byteLength);
         this.disconnectedBuffer?.set(data, this.bufferWritePosition);
         this.bufferWritePosition += data.byteLength;
@@ -44,7 +44,7 @@ export class SocketWriteBuffer {
         }
     }
 
-    flush(socket: WebSocket) {
+    flush(socket: WebSocket): void {
         if (this.disconnectedBuffer) {
             socket.send(this.disconnectedBuffer.slice(0, this.bufferWritePosition));
             this.disconnectedBuffer = undefined;
@@ -54,4 +54,4 @@ export class SocketWriteBuffer {
     drain(): void {
         this.disconnectedBuffer = undefined;
     }
-}
+}

packages/core/src/electron-browser/messaging/electron-frontend-id-provider.ts

@@ -14,12 +14,12 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable } from "inversify";
-import { FrontendIdProvider } from "../../browser/messaging/frontend-id-provider";
+import { injectable } from 'inversify';
+import { FrontendIdProvider } from '../../browser/messaging/frontend-id-provider';
 
 @injectable()
 export class ElectronFrontendIdProvider implements FrontendIdProvider {
     getId(): string {
         return window.electronTheiaCore.WindowMetadata.webcontentId;
     }
-}
+}

packages/core/src/electron-browser/messaging/electron-ipc-connection-source.ts

@@ -36,16 +36,13 @@ export namespace ElectronIpcConnectionProvider {
     export function createProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): RpcProxy<T> {
         return container.get<ServiceConnectionProvider>(ElectronMainConnectionProvider).createProxy<T>(path, arg);
     }
-
-
 }
 
 @injectable()
 export class ElectronIpcConnectionSource implements ConnectionSource, FrontendApplicationContribution {
     protected readonly onConnectionDidOpenEmitter: Emitter<Channel> = new Emitter();
     onConnectionDidOpen: Event<Channel> = this.onConnectionDidOpenEmitter.event;
 
-
     onStart(): MaybePromise<void> {
         const channel = new ElectronIpcRendererChannel();
         this.onConnectionDidOpenEmitter.fire(channel);

packages/core/src/electron-browser/messaging/electron-messaging-frontend-module.ts

@@ -31,9 +31,7 @@ const backendServiceProvider = Symbol('backendServiceProvider2');
 const localServiceProvider = Symbol('localServiceProvider');
 
 export const messagingFrontendModule = new ContainerModule(bind => {
-    bind(ConnectionCloseService).toDynamicValue(ctx => {
-        return WebSocketConnectionProvider.createProxy(ctx.container, connectionCloseServicePath);
-    }).inSingletonScope();
+    bind(ConnectionCloseService).toDynamicValue(ctx => WebSocketConnectionProvider.createProxy(ctx.container, connectionCloseServicePath)).inSingletonScope();
     bind(ElectronWebSocketConnectionSource).toSelf().inSingletonScope();
     bind(WebsocketConnectionSource).toService(ElectronWebSocketConnectionSource);
     bind(ElectronIpcConnectionSource).toSelf().inSingletonScope();

packages/core/src/electron-browser/preload.ts

@@ -25,7 +25,8 @@ import {
     CHANNEL_ON_WINDOW_EVENT, CHANNEL_GET_ZOOM_LEVEL, CHANNEL_SET_ZOOM_LEVEL, CHANNEL_IS_FULL_SCREENABLE, CHANNEL_TOGGLE_FULL_SCREEN,
     CHANNEL_IS_FULL_SCREEN, CHANNEL_SET_MENU_BAR_VISIBLE, CHANNEL_REQUEST_CLOSE, CHANNEL_SET_TITLE_STYLE, CHANNEL_RESTART,
     CHANNEL_REQUEST_RELOAD, CHANNEL_APP_STATE_CHANGED, CHANNEL_SHOW_ITEM_IN_FOLDER, CHANNEL_READ_CLIPBOARD, CHANNEL_WRITE_CLIPBOARD,
-    CHANNEL_KEYBOARD_LAYOUT_CHANGED, CHANNEL_IPC_CONNECTION, InternalMenuDto, CHANNEL_REQUEST_SECONDARY_CLOSE, CHANNEL_SET_BACKGROUND_COLOR, CHANNEL_WC_METADATA, CHANNEL_ABOUT_TO_CLOSE
+    CHANNEL_KEYBOARD_LAYOUT_CHANGED, CHANNEL_IPC_CONNECTION, InternalMenuDto, CHANNEL_REQUEST_SECONDARY_CLOSE, CHANNEL_SET_BACKGROUND_COLOR,
+    CHANNEL_WC_METADATA, CHANNEL_ABOUT_TO_CLOSE
 } from '../electron-common/electron-api';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -125,7 +126,7 @@ const api: TheiaCoreAPI = {
         const h = (event: Electron.IpcRendererEvent, replyChannel: string) => {
             handler();
             event.sender.send(replyChannel);
-        }
+        };
 
         ipcRenderer.on(CHANNEL_ABOUT_TO_CLOSE, h);
         return Disposable.create(() => ipcRenderer.off(CHANNEL_ABOUT_TO_CLOSE, h));

packages/core/src/electron-common/electron-api.ts

@@ -122,7 +122,7 @@ export const CHANNEL_MINIMIZE = 'Minimize';
 export const CHANNEL_MAXIMIZE = 'Maximize';
 export const CHANNEL_IS_MAXIMIZED = 'IsMaximized';
 
-export const CHANNEL_ABOUT_TO_CLOSE = "AboutToClose";
+export const CHANNEL_ABOUT_TO_CLOSE = 'AboutToClose';
 
 export const CHANNEL_UNMAXIMIZE = 'UnMaximize';
 export const CHANNEL_ON_WINDOW_EVENT = 'OnWindowEvent';

packages/core/src/electron-main/messaging/electron-messaging-contribution.ts

@@ -54,7 +54,6 @@ export class ElectronMessagingContribution implements ElectronMainApplicationCon
         TheiaRendererAPI.onIpcData((sender, data) => this.handleIpcEvent(sender, data));
     }
 
-
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ipcChannel(spec: string, callback: (params: any, channel: Channel) => void): void {
         this.channelHandlers.push(spec, callback);
@@ -99,7 +98,7 @@ export class ElectronMessagingContribution implements ElectronMainApplicationCon
         return mainChannel;
     }
 
-    protected deleteChannel(senderId: number, reason: string) {
+    protected deleteChannel(senderId: number, reason: string): void {
         const channel = this.openChannels.get(senderId);
         if (channel) {
             this.openChannels.delete(senderId);

packages/core/src/node/messaging/messaging-backend-module.ts

@@ -43,12 +43,10 @@ export const messagingBackendModule = new ContainerModule(bind => {
 
     bind(ConnectionHandler).toDynamicValue(context => {
         const connectionService = context.container.get<WebsocketFrontendConnectionService>(FrontendConnectionService);
-        return new RpcConnectionHandler<object>(connectionCloseServicePath, () => {
-            return {
-                markForClose: (channelId: string) => {
-                    connectionService.markForClose(channelId);
-                }
-            };
-        });
+        return new RpcConnectionHandler<object>(connectionCloseServicePath, () => ({
+            markForClose: (channelId: string) => {
+                connectionService.markForClose(channelId);
+            }
+        }));
     }).inSingletonScope();
 });

packages/core/src/node/messaging/websocket-frontend-connection-service.ts

@@ -47,6 +47,7 @@ export class WebsocketFrontendConnectionService implements FrontendConnectionSer
     }
 
     protected async handleConnection(socket: Socket, channelCreatedHandler: (channel: Channel) => void): Promise<void> {
+        // eslint-disable-next-line prefer-const
         let reconnectListener: (frontEndId: string) => void;
         const initialConnectListener = (frontEndId: string) => {
             socket.off(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
@@ -119,7 +120,7 @@ export class WebsocketFrontendConnectionService implements FrontendConnectionSer
         return channel;
     }
 
-    markForClose(channelId: string) {
+    markForClose(channelId: string): void {
         this.channelsMarkedForClose.add(channelId);
     }
 }
@@ -140,20 +141,21 @@ class ReconnectableSocketChannel extends AbstractChannel {
         }));
         socket.on('error', errorHandler);
 
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const dataListener = (data: any) => {
             // In the browser context socketIO receives binary messages as ArrayBuffers.
             // So we have to convert them to a Uint8Array before delegating the message to the read buffer.
             const buffer = data instanceof ArrayBuffer ? new Uint8Array(data) : data;
             this.onMessageEmitter.fire(() => new Uint8ArrayReadBuffer(buffer));
-        }
+        };
         this.disposables.push(Disposable.create(() => {
             socket.off('message', dataListener);
         }));
         socket.on('message', dataListener);
         this.socketBuffer.flush(socket);
     }
 
-    disconnect() {
+    disconnect(): void {
         this.disposables.dispose();
         this.socket = undefined;
     }