monaco-languageclient 9.8.0 → 10.0.0-next.0

package/lib/wrapper/lcwrapper.js

@@ -0,0 +1,247 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageserver-protocol/browser.js';
+import { CloseAction, ErrorAction, MessageTransports, State } from 'vscode-languageclient/browser.js';
+import { createUrl } from 'monaco-languageclient/common';
+import { toSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
+import { MonacoLanguageClient } from 'monaco-languageclient';
+export class LanguageClientWrapper {
+    languageClient;
+    languageClientConfig;
+    worker;
+    port;
+    name;
+    logger;
+    constructor(config, logger) {
+        this.languageClientConfig = config;
+        this.name = this.languageClientConfig.name ?? 'unnamed';
+        this.logger = logger;
+    }
+    haveLanguageClient() {
+        return this.languageClient !== undefined;
+    }
+    getLanguageClient() {
+        return this.languageClient;
+    }
+    getWorker() {
+        return this.worker;
+    }
+    isStarted() {
+        return this.languageClient !== undefined && this.languageClient.isRunning();
+    }
+    async start() {
+        if (this.languageClient?.isRunning() ?? false) {
+            this.logger?.info('startLanguageClientConnection: monaco-languageclient already running!');
+            return Promise.resolve();
+        }
+        return new Promise((resolve, reject) => {
+            const conConfig = this.languageClientConfig.connection;
+            const conOptions = conConfig.options;
+            if (conOptions.$type === 'WebSocketDirect' || conOptions.$type === 'WebSocketParams' || conOptions.$type === 'WebSocketUrl') {
+                const webSocket = conOptions.$type === 'WebSocketDirect' ? conOptions.webSocket : new WebSocket(createUrl(conOptions));
+                this.initMessageTransportWebSocket(webSocket, resolve, reject);
+            }
+            else {
+                // init of worker and start of languageclient can be handled directly, because worker available already
+                this.initMessageTransportWorker(conOptions, resolve, reject);
+            }
+        });
+    }
+    /**
+     * Restart the languageclient with options to control worker handling
+     *
+     * @param updatedWorker Set a new worker here that should be used. keepWorker has no effect then, as we want to dispose of the prior workers
+     * @param disposeWorker Set to false if worker should not be disposed
+     */
+    async restart(updatedWorker, forceWorkerDispose) {
+        await this.dispose(forceWorkerDispose);
+        this.worker = updatedWorker;
+        this.logger?.info('Re-Starting monaco-languageclient');
+        return this.start();
+    }
+    async initMessageTransportWebSocket(webSocket, resolve, reject) {
+        let messageTransports = this.languageClientConfig.connection.messageTransports;
+        if (messageTransports === undefined) {
+            const iWebSocket = toSocket(webSocket);
+            messageTransports = {
+                reader: new WebSocketMessageReader(iWebSocket),
+                writer: new WebSocketMessageWriter(iWebSocket)
+            };
+        }
+        // if websocket is already open, then start the languageclient directly
+        if (webSocket.readyState === WebSocket.OPEN) {
+            await this.performLanguageClientStart(messageTransports, resolve, reject);
+        }
+        // otherwise start on open
+        webSocket.onopen = async () => {
+            await this.performLanguageClientStart(messageTransports, resolve, reject);
+        };
+        webSocket.onerror = (ev) => {
+            const languageClientError = {
+                message: `languageClientWrapper (${this.name}): Websocket connection failed.`,
+                error: ev.error ?? 'No error was provided.'
+            };
+            reject(languageClientError);
+        };
+    }
+    async initMessageTransportWorker(lccOptions, resolve, reject) {
+        if (!this.worker) {
+            if (lccOptions.$type === 'WorkerConfig') {
+                const workerConfig = lccOptions;
+                this.worker = new Worker(workerConfig.url.href, {
+                    type: workerConfig.type,
+                    name: workerConfig.workerName
+                });
+                this.worker.onerror = (ev) => {
+                    const languageClientError = {
+                        message: `languageClientWrapper (${this.name}): Illegal worker configuration detected.`,
+                        error: ev.error ?? 'No error was provided.'
+                    };
+                    reject(languageClientError);
+                };
+            }
+            else {
+                const workerDirectConfig = lccOptions;
+                this.worker = workerDirectConfig.worker;
+            }
+            if (lccOptions.messagePort !== undefined) {
+                this.port = lccOptions.messagePort;
+            }
+        }
+        const portOrWorker = this.port ? this.port : this.worker;
+        let messageTransports = this.languageClientConfig.connection.messageTransports;
+        if (messageTransports === undefined) {
+            messageTransports = {
+                reader: new BrowserMessageReader(portOrWorker),
+                writer: new BrowserMessageWriter(portOrWorker)
+            };
+        }
+        await this.performLanguageClientStart(messageTransports, resolve, reject);
+    }
+    async performLanguageClientStart(messageTransports, resolve, reject) {
+        let starting = true;
+        // do not perform another start attempt if already running
+        if (this.languageClient?.isRunning() ?? false) {
+            this.logger?.info('performLanguageClientStart: monaco-languageclient already running!');
+            resolve();
+        }
+        const mlcConfig = {
+            name: this.languageClientConfig.name ?? 'Monaco Wrapper Language Client',
+            clientOptions: {
+                // disable the default error handler...
+                errorHandler: {
+                    error: (e) => {
+                        if (starting) {
+                            reject(`Error occurred in language client: ${e}`);
+                            return { action: ErrorAction.Shutdown };
+                        }
+                        else {
+                            return { action: ErrorAction.Continue };
+                        }
+                    },
+                    closed: () => ({ action: CloseAction.DoNotRestart })
+                },
+                // ...but allowm to override all options
+                ...this.languageClientConfig.clientOptions,
+            },
+            messageTransports
+        };
+        this.languageClient = new MonacoLanguageClient(mlcConfig);
+        const conOptions = this.languageClientConfig.connection.options;
+        this.initRestartConfiguration(messageTransports, this.languageClientConfig.restartOptions);
+        const isWebSocket = conOptions.$type === 'WebSocketParams' || conOptions.$type === 'WebSocketUrl' || conOptions.$type === 'WebSocketDirect';
+        messageTransports.reader.onClose(async () => {
+            await this.languageClient?.stop();
+            if (isWebSocket && conOptions.stopOptions !== undefined) {
+                const stopOptions = conOptions.stopOptions;
+                stopOptions.onCall(this.getLanguageClient());
+                if (stopOptions.reportStatus !== undefined) {
+                    this.logger?.info(this.reportStatus().join('\n'));
+                }
+            }
+        });
+        try {
+            await this.languageClient.start();
+            if (isWebSocket && conOptions.startOptions !== undefined) {
+                const startOptions = conOptions.startOptions;
+                startOptions.onCall(this.getLanguageClient());
+                if (startOptions.reportStatus !== undefined) {
+                    this.logger?.info(this.reportStatus().join('\n'));
+                }
+            }
+        }
+        catch (e) {
+            const languageClientError = {
+                message: `languageClientWrapper (${this.name}): Start was unsuccessful.`,
+                error: Object.hasOwn(e ?? {}, 'cause') ? e : 'No error was provided.'
+            };
+            reject(languageClientError);
+        }
+        this.logger?.info(`languageClientWrapper (${this.name}): Started successfully.`);
+        resolve();
+        starting = false;
+    }
+    initRestartConfiguration(messageTransports, restartOptions) {
+        if (restartOptions !== undefined) {
+            let retry = 0;
+            const readerOnError = messageTransports.reader.onError(() => restartLC);
+            const readerOnClose = messageTransports.reader.onClose(() => restartLC);
+            const restartLC = async () => {
+                if (this.isStarted()) {
+                    try {
+                        readerOnError.dispose();
+                        readerOnClose.dispose();
+                        await this.restart(this.worker, restartOptions.keepWorker);
+                    }
+                    finally {
+                        retry++;
+                        if (retry > (restartOptions.retries) && !this.isStarted()) {
+                            this.logger?.info('Disabling Language Client. Failed to start clangd after 5 retries');
+                        }
+                        else {
+                            setTimeout(async () => {
+                                await this.restart(this.worker, restartOptions.keepWorker);
+                            }, restartOptions.timeout);
+                        }
+                    }
+                }
+            };
+        }
+    }
+    disposeWorker() {
+        this.worker?.terminate();
+        this.worker = undefined;
+    }
+    async dispose(forceWorkerDispose) {
+        try {
+            if (this.isStarted()) {
+                await this.languageClient?.dispose();
+                this.languageClient = undefined;
+                this.logger?.info('monaco-languageclient and monaco-editor were successfully disposed.');
+            }
+        }
+        catch (e) {
+            const languageClientError = {
+                message: `languageClientWrapper (${this.name}): Disposing the monaco-languageclient resulted in error.`,
+                error: Object.hasOwn(e ?? {}, 'cause') ? e : 'No error was provided.'
+            };
+            return Promise.reject(languageClientError);
+        }
+        finally {
+            // always terminate the worker if desired
+            if (this.languageClientConfig.disposeWorker === true || forceWorkerDispose === true) {
+                this.disposeWorker();
+            }
+        }
+    }
+    reportStatus() {
+        const status = [];
+        const languageClient = this.getLanguageClient();
+        status.push('LanguageClientWrapper status:');
+        status.push(`LanguageClient: ${languageClient?.name ?? 'Language Client'} is in a '${State[languageClient?.state ?? 1]}' state`);
+        return status;
+    }
+}
+//# sourceMappingURL=lcwrapper.js.map

package/lib/wrapper/lcwrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lcwrapper.js","sourceRoot":"","sources":["../../src/wrapper/lcwrapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "9.8.0",
+  "version": "10.0.0-next.0",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -24,25 +24,33 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./tools": {
-      "types": "./lib/tools/index.d.ts",
-      "default": "./lib/tools/index.js"
+    "./common": {
+      "types": "./lib/common/index.d.ts",
+      "default": "./lib/common/index.js"
     },
-    "./vscode/services": {
+    "./vscodeApiWrapper": {
       "types": "./lib/vscode/index.d.ts",
       "default": "./lib/vscode/index.js"
     },
+    "./vscodeApiLocales": {
+      "types": "./lib/vscode/locales.d.ts",
+      "default": "./lib/vscode/locales.js"
+    },
     "./fs": {
       "types": "./lib/fs/index.d.ts",
       "default": "./lib/fs/index.js"
     },
     "./workerFactory": {
-      "types": "./lib/workerFactory.d.ts",
-      "default": "./lib/workerFactory.js"
+      "types": "./lib/worker/index.d.ts",
+      "default": "./lib/worker/index.js"
+    },
+    "./lcwrapper": {
+      "types": "./lib/wrapper/index.d.ts",
+      "default": "./lib/wrapper/index.js"
     },
-    "./wrapper": {
-      "types": "./lib/languageClientWrapper.test.d.ts",
-      "default": "./lib/languageClientWrapper.test.js"
+    "./editorApp": {
+      "types": "./lib/editorApp/index.d.ts",
+      "default": "./lib/editorApp/index.js"
     }
   },
   "typesVersions": {
@@ -50,20 +58,26 @@
       ".": [
         "lib/index.d.ts"
       ],
-      "tools": [
-        "lib/tools/index"
+      "common": [
+        "lib/common/index"
       ],
-      "vscode/services": [
+      "vscodeApiWrapper": [
         "lib/vscode/index"
       ],
+      "vscodeApiLocales": [
+        "lib/vscode/locales"
+      ],
       "fs": [
         "lib/fs/index"
       ],
       "workerFactory": [
-        "lib/workerFactory"
+        "lib/worker/index"
       ],
-      "wrapper": [
-        "lib/languageClientWrapper"
+      "lcwrapper": [
+        "lib/lrapper/index"
+      ],
+      "editorApp": [
+        "lib/editorApp/index"
       ]
     }
   },
@@ -83,18 +97,46 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-api": "~18.1.0",
-    "@codingame/monaco-vscode-configuration-service-override": "~18.1.0",
-    "@codingame/monaco-vscode-editor-api": "~18.1.0",
-    "@codingame/monaco-vscode-editor-service-override": "~18.1.0",
-    "@codingame/monaco-vscode-extensions-service-override": "~18.1.0",
-    "@codingame/monaco-vscode-extension-api": "~18.1.0",
-    "@codingame/monaco-vscode-languages-service-override": "~18.1.0",
-    "@codingame/monaco-vscode-localization-service-override": "~18.1.0",
-    "@codingame/monaco-vscode-log-service-override": "~18.1.0",
-    "@codingame/monaco-vscode-model-service-override": "~18.1.0",
-    "vscode": "npm:@codingame/monaco-vscode-extension-api@~18.1.0",
-    "vscode-languageclient": "~9.0.1"
+    "@codingame/monaco-vscode-api": "~18.2.0",
+    "@codingame/monaco-vscode-configuration-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-editor-api": "~18.2.0",
+    "@codingame/monaco-vscode-editor-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-extensions-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-extension-api": "~18.2.0",
+    "@codingame/monaco-vscode-languages-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-cs": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-de": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-es": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-fr": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-it": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-ja": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-ko": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-pl": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-pt-br": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-qps-ploc": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-ru": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-tr": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-zh-hans": "~18.2.0",
+    "@codingame/monaco-vscode-language-pack-zh-hant": "~18.2.0",
+    "@codingame/monaco-vscode-localization-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-log-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-model-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-monarch-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-textmate-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~18.2.0",
+    "@codingame/monaco-vscode-theme-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-views-service-override": "~18.2.0",
+    "@codingame/monaco-vscode-workbench-service-override": "~18.2.0",
+    "vscode-languageclient": "~9.0.1",
+    "vscode-languageserver-protocol": "~3.17.5",
+    "vscode-ws-jsonrpc": "~3.4.0"
+  },
+  "devDependencies": {
+    "@codingame/monaco-vscode-standalone-languages": "~18.2.0",
+    "@codingame/monaco-vscode-standalone-css-language-features": "~18.2.0",
+    "@codingame/monaco-vscode-standalone-html-language-features": "~18.2.0",
+    "@codingame/monaco-vscode-standalone-json-language-features": "~18.2.0",
+    "@codingame/monaco-vscode-standalone-typescript-language-features": "~18.2.0"
   },
   "scripts": {
     "clean": "shx rm -fr ./lib *.tsbuildinfo",

package/src/{commonTypes.ts → common/commonTypes.ts}

@@ -3,13 +3,13 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import type { MonacoLanguageClient } from './client.js';
+import { BaseLanguageClient } from 'vscode-languageclient/browser.js';
 
 export type ConnectionConfigOptions = WebSocketConfigOptionsDirect | WebSocketConfigOptionsParams | WebSocketConfigOptionsUrl | WorkerConfigOptionsParams | WorkerConfigOptionsDirect;
 
 export interface WebSocketCallOptions {
     /** Adds handle on languageClient */
-    onCall: (languageClient?: MonacoLanguageClient) => void;
+    onCall: (languageClient?: BaseLanguageClient) => void;
     /** Reports Status Of Language Client */
     reportStatus?: boolean;
 }

package/src/{tools → common}/index.ts

@@ -3,5 +3,6 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
+export * from './commonTypes.js';
 export * from './logging.js';
 export * from './utils.js';

package/src/{tools → common}/utils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
 
-import type { WebSocketUrlParams, WebSocketUrlString } from 'monaco-languageclient';
+import type { WebSocketUrlParams, WebSocketUrlString } from './commonTypes.js';
 
 export const createUrl = (config: WebSocketUrlParams | WebSocketUrlString) => {
     let buildUrl = '';
@@ -37,3 +37,18 @@ export const createUrl = (config: WebSocketUrlParams | WebSocketUrlString) => {
     }
     return buildUrl;
 };
+
+export const verifyUrlOrCreateDataUrl = (input: string | URL) => {
+    if (input instanceof URL) {
+        return input.href;
+    } else {
+        const bytes = new TextEncoder().encode(input);
+        const binString = Array.from(bytes, (b) => String.fromCodePoint(b)).join('');
+        const base64 = btoa(binString);
+        return new URL(`data:text/plain;base64,${base64}`).href;
+    }
+};
+
+export const delayExecution = (ms: number) => {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+};

package/src/editorApp/config.ts

@@ -0,0 +1,67 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import { LogLevel } from '@codingame/monaco-vscode-api';
+import { type ITextFileEditorModel } from '@codingame/monaco-vscode-api/monaco';
+import * as monaco from '@codingame/monaco-vscode-editor-api';
+import type { IReference } from '@codingame/monaco-vscode-editor-service-override';
+import { type OverallConfigType } from 'monaco-languageclient/vscodeApiWrapper';
+
+export class ModelRefs {
+    modified?: IReference<ITextFileEditorModel>;
+    original?: IReference<ITextFileEditorModel>;
+}
+
+export interface TextModels {
+    modified?: monaco.editor.ITextModel | null;
+    original?: monaco.editor.ITextModel | null;
+}
+
+export interface TextContents {
+    modified?: string;
+    original?: string;
+}
+
+export interface CodeContent {
+    text: string;
+    uri: string;
+    enforceLanguageId?: string;
+}
+
+export interface CodeResources {
+    modified?: CodeContent;
+    original?: CodeContent;
+}
+
+export interface CallbackDisposeable {
+    modified?: monaco.IDisposable;
+    original?: monaco.IDisposable;
+}
+
+export interface DisposableModelRefs {
+    modified?: IReference<ITextFileEditorModel>;
+    original?: IReference<ITextFileEditorModel>;
+}
+
+export interface EditorAppConfig {
+    id?: string;
+    $type?: OverallConfigType;
+    logLevel?: LogLevel | number;
+    codeResources?: CodeResources;
+    useDiffEditor?: boolean;
+    domReadOnly?: boolean;
+    readOnly?: boolean;
+    overrideAutomaticLayout?: boolean;
+    editorOptions?: monaco.editor.IStandaloneEditorConstructionOptions;
+    diffEditorOptions?: monaco.editor.IStandaloneDiffEditorConstructionOptions;
+    languageDef?: {
+        languageExtensionConfig: monaco.languages.ILanguageExtensionPoint;
+        monarchLanguage?: monaco.languages.IMonarchLanguage;
+        theme?: {
+            name: monaco.editor.BuiltinTheme | string;
+            data: monaco.editor.IStandaloneThemeData;
+        }
+    }
+}