@theia/filesystem 1.48.0 → 1.48.1

package/src/node/filesystem-backend-module.ts

@@ -1,140 +1,140 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as path from 'path';
-import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
-import { ConnectionHandler, RpcConnectionHandler, ILogger } from '@theia/core/lib/common';
-import { FileSystemWatcherServer, FileSystemWatcherService } from '../common/filesystem-watcher-protocol';
-import { FileSystemWatcherServerClient } from './filesystem-watcher-client';
-import { NsfwFileSystemWatcherService, NsfwFileSystemWatcherServerOptions } from './nsfw-watcher/nsfw-filesystem-service';
-import { NodeFileUploadService } from './node-file-upload-service';
-import { NsfwOptions } from './nsfw-watcher/nsfw-options';
-import { DiskFileSystemProvider } from './disk-file-system-provider';
-import {
-    remoteFileSystemPath, RemoteFileSystemServer, RemoteFileSystemClient, FileSystemProviderServer, RemoteFileSystemProxyFactory
-} from '../common/remote-file-system-provider';
-import { FileSystemProvider } from '../common/files';
-import { EncodingService } from '@theia/core/lib/common/encoding-service';
-import { BackendApplicationContribution, IPCConnectionProvider } from '@theia/core/lib/node';
-import { RpcProxyFactory, ConnectionErrorHandler } from '@theia/core';
-import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher';
-
-export const NSFW_SINGLE_THREADED = process.argv.includes('--no-cluster');
-export const NSFW_WATCHER_VERBOSE = process.argv.includes('--nsfw-watcher-verbose');
-
-export const NsfwFileSystemWatcherServiceProcessOptions = Symbol('NsfwFileSystemWatcherServiceProcessOptions');
-/**
- * Options to control the way the `NsfwFileSystemWatcherService` process is spawned.
- */
-export interface NsfwFileSystemWatcherServiceProcessOptions {
-    /**
-     * Path to the script that will run the `NsfwFileSystemWatcherService` in a new process.
-     */
-    entryPoint: string;
-}
-
-export default new ContainerModule(bind => {
-    bind(EncodingService).toSelf().inSingletonScope();
-    bindFileSystemWatcherServer(bind);
-    bind(DiskFileSystemProvider).toSelf();
-    bind(FileSystemProvider).toService(DiskFileSystemProvider);
-    bind(FileSystemProviderServer).toSelf();
-    bind(RemoteFileSystemServer).toService(FileSystemProviderServer);
-    bind(ConnectionHandler).toDynamicValue(ctx =>
-        new RpcConnectionHandler<RemoteFileSystemClient>(remoteFileSystemPath, client => {
-            const server = ctx.container.get<RemoteFileSystemServer>(RemoteFileSystemServer);
-            server.setClient(client);
-            client.onDidCloseConnection(() => server.dispose());
-            return server;
-        }, RemoteFileSystemProxyFactory)
-    ).inSingletonScope();
-    bind(NodeFileUploadService).toSelf().inSingletonScope();
-    bind(BackendApplicationContribution).toService(NodeFileUploadService);
-});
-
-export function bindFileSystemWatcherServer(bind: interfaces.Bind): void {
-    bind<NsfwOptions>(NsfwOptions).toConstantValue({});
-
-    bind(FileSystemWatcherServiceDispatcher).toSelf().inSingletonScope();
-
-    bind(FileSystemWatcherServerClient).toSelf();
-    bind(FileSystemWatcherServer).toService(FileSystemWatcherServerClient);
-
-    bind<NsfwFileSystemWatcherServiceProcessOptions>(NsfwFileSystemWatcherServiceProcessOptions).toDynamicValue(ctx => ({
-        entryPoint: path.join(__dirname, 'nsfw-watcher'),
-    })).inSingletonScope();
-    bind<NsfwFileSystemWatcherServerOptions>(NsfwFileSystemWatcherServerOptions).toDynamicValue(ctx => {
-        const logger = ctx.container.get<ILogger>(ILogger);
-        const nsfwOptions = ctx.container.get<NsfwOptions>(NsfwOptions);
-        return {
-            nsfwOptions,
-            verbose: NSFW_WATCHER_VERBOSE,
-            info: (message, ...args) => logger.info(message, ...args),
-            error: (message, ...args) => logger.error(message, ...args),
-        };
-    }).inSingletonScope();
-
-    bind<FileSystemWatcherService>(FileSystemWatcherService).toDynamicValue(
-        ctx => NSFW_SINGLE_THREADED
-            ? createNsfwFileSystemWatcherService(ctx)
-            : spawnNsfwFileSystemWatcherServiceProcess(ctx)
-    ).inSingletonScope();
-}
-
-/**
- * Run the watch server in the current process.
- */
-export function createNsfwFileSystemWatcherService(ctx: interfaces.Context): FileSystemWatcherService {
-    const options = ctx.container.get<NsfwFileSystemWatcherServerOptions>(NsfwFileSystemWatcherServerOptions);
-    const dispatcher = ctx.container.get<FileSystemWatcherServiceDispatcher>(FileSystemWatcherServiceDispatcher);
-    const server = new NsfwFileSystemWatcherService(options);
-    server.setClient(dispatcher);
-    return server;
-}
-
-/**
- * Run the watch server in a child process.
- * Return a proxy forwarding calls to the child process.
- */
-export function spawnNsfwFileSystemWatcherServiceProcess(ctx: interfaces.Context): FileSystemWatcherService {
-    const options = ctx.container.get<NsfwFileSystemWatcherServiceProcessOptions>(NsfwFileSystemWatcherServiceProcessOptions);
-    const dispatcher = ctx.container.get<FileSystemWatcherServiceDispatcher>(FileSystemWatcherServiceDispatcher);
-    const serverName = 'nsfw-watcher';
-    const logger = ctx.container.get<ILogger>(ILogger);
-    const nsfwOptions = ctx.container.get<NsfwOptions>(NsfwOptions);
-    const ipcConnectionProvider = ctx.container.get<IPCConnectionProvider>(IPCConnectionProvider);
-    const proxyFactory = new RpcProxyFactory<FileSystemWatcherService>();
-    const serverProxy = proxyFactory.createProxy();
-    // We need to call `.setClient` before listening, else the JSON-RPC calls won't go through.
-    serverProxy.setClient(dispatcher);
-    const args: string[] = [
-        `--nsfwOptions=${JSON.stringify(nsfwOptions)}`
-    ];
-    if (NSFW_WATCHER_VERBOSE) {
-        args.push('--verbose');
-    }
-    ipcConnectionProvider.listen({
-        serverName,
-        entryPoint: options.entryPoint,
-        errorHandler: new ConnectionErrorHandler({
-            serverName,
-            logger,
-        }),
-        env: process.env,
-        args,
-    }, connection => proxyFactory.listen(connection));
-    return serverProxy;
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as path from 'path';
+import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
+import { ConnectionHandler, RpcConnectionHandler, ILogger } from '@theia/core/lib/common';
+import { FileSystemWatcherServer, FileSystemWatcherService } from '../common/filesystem-watcher-protocol';
+import { FileSystemWatcherServerClient } from './filesystem-watcher-client';
+import { NsfwFileSystemWatcherService, NsfwFileSystemWatcherServerOptions } from './nsfw-watcher/nsfw-filesystem-service';
+import { NodeFileUploadService } from './node-file-upload-service';
+import { NsfwOptions } from './nsfw-watcher/nsfw-options';
+import { DiskFileSystemProvider } from './disk-file-system-provider';
+import {
+    remoteFileSystemPath, RemoteFileSystemServer, RemoteFileSystemClient, FileSystemProviderServer, RemoteFileSystemProxyFactory
+} from '../common/remote-file-system-provider';
+import { FileSystemProvider } from '../common/files';
+import { EncodingService } from '@theia/core/lib/common/encoding-service';
+import { BackendApplicationContribution, IPCConnectionProvider } from '@theia/core/lib/node';
+import { RpcProxyFactory, ConnectionErrorHandler } from '@theia/core';
+import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher';
+
+export const NSFW_SINGLE_THREADED = process.argv.includes('--no-cluster');
+export const NSFW_WATCHER_VERBOSE = process.argv.includes('--nsfw-watcher-verbose');
+
+export const NsfwFileSystemWatcherServiceProcessOptions = Symbol('NsfwFileSystemWatcherServiceProcessOptions');
+/**
+ * Options to control the way the `NsfwFileSystemWatcherService` process is spawned.
+ */
+export interface NsfwFileSystemWatcherServiceProcessOptions {
+    /**
+     * Path to the script that will run the `NsfwFileSystemWatcherService` in a new process.
+     */
+    entryPoint: string;
+}
+
+export default new ContainerModule(bind => {
+    bind(EncodingService).toSelf().inSingletonScope();
+    bindFileSystemWatcherServer(bind);
+    bind(DiskFileSystemProvider).toSelf();
+    bind(FileSystemProvider).toService(DiskFileSystemProvider);
+    bind(FileSystemProviderServer).toSelf();
+    bind(RemoteFileSystemServer).toService(FileSystemProviderServer);
+    bind(ConnectionHandler).toDynamicValue(ctx =>
+        new RpcConnectionHandler<RemoteFileSystemClient>(remoteFileSystemPath, client => {
+            const server = ctx.container.get<RemoteFileSystemServer>(RemoteFileSystemServer);
+            server.setClient(client);
+            client.onDidCloseConnection(() => server.dispose());
+            return server;
+        }, RemoteFileSystemProxyFactory)
+    ).inSingletonScope();
+    bind(NodeFileUploadService).toSelf().inSingletonScope();
+    bind(BackendApplicationContribution).toService(NodeFileUploadService);
+});
+
+export function bindFileSystemWatcherServer(bind: interfaces.Bind): void {
+    bind<NsfwOptions>(NsfwOptions).toConstantValue({});
+
+    bind(FileSystemWatcherServiceDispatcher).toSelf().inSingletonScope();
+
+    bind(FileSystemWatcherServerClient).toSelf();
+    bind(FileSystemWatcherServer).toService(FileSystemWatcherServerClient);
+
+    bind<NsfwFileSystemWatcherServiceProcessOptions>(NsfwFileSystemWatcherServiceProcessOptions).toDynamicValue(ctx => ({
+        entryPoint: path.join(__dirname, 'nsfw-watcher'),
+    })).inSingletonScope();
+    bind<NsfwFileSystemWatcherServerOptions>(NsfwFileSystemWatcherServerOptions).toDynamicValue(ctx => {
+        const logger = ctx.container.get<ILogger>(ILogger);
+        const nsfwOptions = ctx.container.get<NsfwOptions>(NsfwOptions);
+        return {
+            nsfwOptions,
+            verbose: NSFW_WATCHER_VERBOSE,
+            info: (message, ...args) => logger.info(message, ...args),
+            error: (message, ...args) => logger.error(message, ...args),
+        };
+    }).inSingletonScope();
+
+    bind<FileSystemWatcherService>(FileSystemWatcherService).toDynamicValue(
+        ctx => NSFW_SINGLE_THREADED
+            ? createNsfwFileSystemWatcherService(ctx)
+            : spawnNsfwFileSystemWatcherServiceProcess(ctx)
+    ).inSingletonScope();
+}
+
+/**
+ * Run the watch server in the current process.
+ */
+export function createNsfwFileSystemWatcherService(ctx: interfaces.Context): FileSystemWatcherService {
+    const options = ctx.container.get<NsfwFileSystemWatcherServerOptions>(NsfwFileSystemWatcherServerOptions);
+    const dispatcher = ctx.container.get<FileSystemWatcherServiceDispatcher>(FileSystemWatcherServiceDispatcher);
+    const server = new NsfwFileSystemWatcherService(options);
+    server.setClient(dispatcher);
+    return server;
+}
+
+/**
+ * Run the watch server in a child process.
+ * Return a proxy forwarding calls to the child process.
+ */
+export function spawnNsfwFileSystemWatcherServiceProcess(ctx: interfaces.Context): FileSystemWatcherService {
+    const options = ctx.container.get<NsfwFileSystemWatcherServiceProcessOptions>(NsfwFileSystemWatcherServiceProcessOptions);
+    const dispatcher = ctx.container.get<FileSystemWatcherServiceDispatcher>(FileSystemWatcherServiceDispatcher);
+    const serverName = 'nsfw-watcher';
+    const logger = ctx.container.get<ILogger>(ILogger);
+    const nsfwOptions = ctx.container.get<NsfwOptions>(NsfwOptions);
+    const ipcConnectionProvider = ctx.container.get<IPCConnectionProvider>(IPCConnectionProvider);
+    const proxyFactory = new RpcProxyFactory<FileSystemWatcherService>();
+    const serverProxy = proxyFactory.createProxy();
+    // We need to call `.setClient` before listening, else the JSON-RPC calls won't go through.
+    serverProxy.setClient(dispatcher);
+    const args: string[] = [
+        `--nsfwOptions=${JSON.stringify(nsfwOptions)}`
+    ];
+    if (NSFW_WATCHER_VERBOSE) {
+        args.push('--verbose');
+    }
+    ipcConnectionProvider.listen({
+        serverName,
+        entryPoint: options.entryPoint,
+        errorHandler: new ConnectionErrorHandler({
+            serverName,
+            logger,
+        }),
+        env: process.env,
+        args,
+    }, connection => proxyFactory.listen(connection));
+    return serverProxy;
+}

package/src/node/filesystem-watcher-client.ts

@@ -1,72 +1,72 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { FileSystemWatcherServer, WatchOptions, FileSystemWatcherClient, FileSystemWatcherService } from '../common/filesystem-watcher-protocol';
-import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher';
-
-export const NSFW_WATCHER = 'nsfw-watcher';
-
-/**
- * Wraps the NSFW singleton service for each frontend.
- */
-@injectable()
-export class FileSystemWatcherServerClient implements FileSystemWatcherServer {
-
-    protected static clientIdSequence = 0;
-
-    /**
-     * Track allocated watcherIds to de-allocate on disposal.
-     */
-    protected watcherIds = new Set<number>();
-
-    /**
-     * @todo make this number precisely map to one specific frontend.
-     */
-    protected readonly clientId = FileSystemWatcherServerClient.clientIdSequence++;
-
-    @inject(FileSystemWatcherServiceDispatcher)
-    protected readonly watcherDispatcher: FileSystemWatcherServiceDispatcher;
-
-    @inject(FileSystemWatcherService)
-    protected readonly watcherService: FileSystemWatcherService;
-
-    async watchFileChanges(uri: string, options?: WatchOptions): Promise<number> {
-        const watcherId = await this.watcherService.watchFileChanges(this.clientId, uri, options);
-        this.watcherIds.add(watcherId);
-        return watcherId;
-    }
-
-    async unwatchFileChanges(watcherId: number): Promise<void> {
-        this.watcherIds.delete(watcherId);
-        return this.watcherService.unwatchFileChanges(watcherId);
-    }
-
-    setClient(client: FileSystemWatcherClient | undefined): void {
-        if (client !== undefined) {
-            this.watcherDispatcher.registerClient(this.clientId, client);
-        } else {
-            this.watcherDispatcher.unregisterClient(this.clientId);
-        }
-    }
-
-    dispose(): void {
-        this.setClient(undefined);
-        for (const watcherId of this.watcherIds) {
-            this.unwatchFileChanges(watcherId);
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { FileSystemWatcherServer, WatchOptions, FileSystemWatcherClient, FileSystemWatcherService } from '../common/filesystem-watcher-protocol';
+import { FileSystemWatcherServiceDispatcher } from './filesystem-watcher-dispatcher';
+
+export const NSFW_WATCHER = 'nsfw-watcher';
+
+/**
+ * Wraps the NSFW singleton service for each frontend.
+ */
+@injectable()
+export class FileSystemWatcherServerClient implements FileSystemWatcherServer {
+
+    protected static clientIdSequence = 0;
+
+    /**
+     * Track allocated watcherIds to de-allocate on disposal.
+     */
+    protected watcherIds = new Set<number>();
+
+    /**
+     * @todo make this number precisely map to one specific frontend.
+     */
+    protected readonly clientId = FileSystemWatcherServerClient.clientIdSequence++;
+
+    @inject(FileSystemWatcherServiceDispatcher)
+    protected readonly watcherDispatcher: FileSystemWatcherServiceDispatcher;
+
+    @inject(FileSystemWatcherService)
+    protected readonly watcherService: FileSystemWatcherService;
+
+    async watchFileChanges(uri: string, options?: WatchOptions): Promise<number> {
+        const watcherId = await this.watcherService.watchFileChanges(this.clientId, uri, options);
+        this.watcherIds.add(watcherId);
+        return watcherId;
+    }
+
+    async unwatchFileChanges(watcherId: number): Promise<void> {
+        this.watcherIds.delete(watcherId);
+        return this.watcherService.unwatchFileChanges(watcherId);
+    }
+
+    setClient(client: FileSystemWatcherClient | undefined): void {
+        if (client !== undefined) {
+            this.watcherDispatcher.registerClient(this.clientId, client);
+        } else {
+            this.watcherDispatcher.unregisterClient(this.clientId);
+        }
+    }
+
+    dispose(): void {
+        this.setClient(undefined);
+        for (const watcherId of this.watcherIds) {
+            this.unwatchFileChanges(watcherId);
+        }
+    }
+}

package/src/node/filesystem-watcher-dispatcher.ts

@@ -1,82 +1,82 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import {
-    FileSystemWatcherClient, FileSystemWatcherServiceClient,
-    DidFilesChangedParams, FileSystemWatcherErrorParams
-} from '../common/filesystem-watcher-protocol';
-
-/**
- * This component routes watch events to the right clients.
- */
-@injectable()
-export class FileSystemWatcherServiceDispatcher implements FileSystemWatcherServiceClient {
-
-    /**
-     * Mapping of `clientId` to actual clients.
-     */
-    protected readonly clients = new Map<number, FileSystemWatcherClient>();
-
-    onDidFilesChanged(event: DidFilesChangedParams): void {
-        for (const client of this.iterRegisteredClients(event.clients)) {
-            client.onDidFilesChanged(event);
-        }
-    }
-
-    onError(event: FileSystemWatcherErrorParams): void {
-        for (const client of this.iterRegisteredClients(event.clients)) {
-            client.onError();
-        }
-    }
-
-    /**
-     * Listen for events targeted at `clientId`.
-     */
-    registerClient(clientId: number, client: FileSystemWatcherClient): void {
-        if (this.clients.has(clientId)) {
-            console.warn(`FileSystemWatcherServer2Dispatcher: a client was already registered! clientId=${clientId}`);
-        }
-        this.clients.set(clientId, client);
-    }
-
-    unregisterClient(clientId: number): void {
-        if (!this.clients.has(clientId)) {
-            console.warn(`FileSystemWatcherServer2Dispatcher: tried to remove unknown client! clientId=${clientId}`);
-        }
-        this.clients.delete(clientId);
-    }
-
-    /**
-     * Only yield registered clients for the given `clientIds`.
-     *
-     * If clientIds is empty, will return all clients.
-     */
-    protected *iterRegisteredClients(clientIds?: number[]): Iterable<FileSystemWatcherClient> {
-        if (!Array.isArray(clientIds) || clientIds.length === 0) {
-            // If we receive an event targeted to "no client",
-            // interpret that as notifying all clients:
-            yield* this.clients.values();
-        } else {
-            for (const clientId of clientIds) {
-                const client = this.clients.get(clientId);
-                if (client !== undefined) {
-                    yield client;
-                }
-            }
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import {
+    FileSystemWatcherClient, FileSystemWatcherServiceClient,
+    DidFilesChangedParams, FileSystemWatcherErrorParams
+} from '../common/filesystem-watcher-protocol';
+
+/**
+ * This component routes watch events to the right clients.
+ */
+@injectable()
+export class FileSystemWatcherServiceDispatcher implements FileSystemWatcherServiceClient {
+
+    /**
+     * Mapping of `clientId` to actual clients.
+     */
+    protected readonly clients = new Map<number, FileSystemWatcherClient>();
+
+    onDidFilesChanged(event: DidFilesChangedParams): void {
+        for (const client of this.iterRegisteredClients(event.clients)) {
+            client.onDidFilesChanged(event);
+        }
+    }
+
+    onError(event: FileSystemWatcherErrorParams): void {
+        for (const client of this.iterRegisteredClients(event.clients)) {
+            client.onError();
+        }
+    }
+
+    /**
+     * Listen for events targeted at `clientId`.
+     */
+    registerClient(clientId: number, client: FileSystemWatcherClient): void {
+        if (this.clients.has(clientId)) {
+            console.warn(`FileSystemWatcherServer2Dispatcher: a client was already registered! clientId=${clientId}`);
+        }
+        this.clients.set(clientId, client);
+    }
+
+    unregisterClient(clientId: number): void {
+        if (!this.clients.has(clientId)) {
+            console.warn(`FileSystemWatcherServer2Dispatcher: tried to remove unknown client! clientId=${clientId}`);
+        }
+        this.clients.delete(clientId);
+    }
+
+    /**
+     * Only yield registered clients for the given `clientIds`.
+     *
+     * If clientIds is empty, will return all clients.
+     */
+    protected *iterRegisteredClients(clientIds?: number[]): Iterable<FileSystemWatcherClient> {
+        if (!Array.isArray(clientIds) || clientIds.length === 0) {
+            // If we receive an event targeted to "no client",
+            // interpret that as notifying all clients:
+            yield* this.clients.values();
+        } else {
+            for (const clientId of clientIds) {
+                const client = this.clients.get(clientId);
+                if (client !== undefined) {
+                    yield client;
+                }
+            }
+        }
+    }
+}