From 5e35c52020e7a4b16c112dacfc0ce708a58a8fe1 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 18 Oct 2023 18:03:35 +0200 Subject: [PATCH] fix #3 --- .../UVLPlayground/package-lock.json | 28 +++++++++++++++++++ WebSocketClient/UVLPlayground/package.json | 16 ++++++----- WebSocketClient/UVLPlayground/src/main.ts | 5 +++- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/WebSocketClient/UVLPlayground/package-lock.json b/WebSocketClient/UVLPlayground/package-lock.json index e3ebf47..59bdf0b 100644 --- a/WebSocketClient/UVLPlayground/package-lock.json +++ b/WebSocketClient/UVLPlayground/package-lock.json @@ -17,6 +17,7 @@ "@codingame/monaco-vscode-textmate-service-override": "~1.83.2", "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.2", "@codingame/monaco-vscode-theme-service-override": "~1.83.2", + "dotenv": "^16.3.1", "monaco-editor": "^0.44.0", "monaco-editor-workers": "~0.44.0", "monaco-languageclient": "^6.6.0", @@ -26,6 +27,7 @@ "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { + "@types/node": "^20.8.7", "@types/vscode": "~1.83.0", "typescript": "^5.0.2", "vite": "^4.5.0", @@ -482,6 +484,15 @@ "node": ">=12" } }, + "node_modules/@types/node": { + "version": "20.8.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz", + "integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==", + "dev": true, + "dependencies": { + "undici-types": "~5.25.1" + } + }, "node_modules/@types/vscode": { "version": "1.83.0", "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.83.0.tgz", @@ -506,6 +517,17 @@ "balanced-match": "^1.0.0" } }, + "node_modules/dotenv": { + "version": "16.3.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", + "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, "node_modules/esbuild": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", @@ -734,6 +756,12 @@ "node": ">=14.17" } }, + "node_modules/undici-types": { + "version": "5.25.3", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", + "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", + "dev": true + }, "node_modules/vite": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", diff --git a/WebSocketClient/UVLPlayground/package.json b/WebSocketClient/UVLPlayground/package.json index 5e5c95b..73327b1 100644 --- a/WebSocketClient/UVLPlayground/package.json +++ b/WebSocketClient/UVLPlayground/package.json @@ -9,14 +9,13 @@ "preview": "vite preview" }, "devDependencies": { + "@types/node": "^20.8.7", + "@types/vscode": "~1.83.0", "typescript": "^5.0.2", "vite": "^4.5.0", - "vscode-languageserver-types": "~3.17.3", - "@types/vscode": "~1.83.0" + "vscode-languageserver-types": "~3.17.3" }, "dependencies": { - "monaco-editor": "^0.44.0", - "monaco-languageclient": "^6.6.0", "@codingame/monaco-vscode-configuration-service-override": "~1.83.2", "@codingame/monaco-vscode-editor-service-override": "~1.83.2", "@codingame/monaco-vscode-files-service-override": "~1.83.2", @@ -26,10 +25,13 @@ "@codingame/monaco-vscode-textmate-service-override": "~1.83.2", "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.2", "@codingame/monaco-vscode-theme-service-override": "~1.83.2", + "dotenv": "^16.3.1", + "monaco-editor": "^0.44.0", + "monaco-editor-workers": "~0.44.0", + "monaco-languageclient": "^6.6.0", + "vite": "~4.4.11", "vscode-json-languageservice": "~5.3.7", "vscode-uri": "~3.0.8", - "vscode-ws-jsonrpc": "~3.0.0", - "monaco-editor-workers": "~0.44.0", - "vite": "~4.4.11" + "vscode-ws-jsonrpc": "~3.0.0" } } diff --git a/WebSocketClient/UVLPlayground/src/main.ts b/WebSocketClient/UVLPlayground/src/main.ts index 8030c9b..532f55b 100644 --- a/WebSocketClient/UVLPlayground/src/main.ts +++ b/WebSocketClient/UVLPlayground/src/main.ts @@ -142,7 +142,10 @@ export const startPythonClient = async () => { registerFileSystemOverlay(1, fileSystemProvider); // create the web socket and configure to start the language client on open, can add extra parameters to the url if needed. - createWebSocket(createUrl('590c9306-8ced-48f6-85f2-bb8caa1bfd52.ul.bw-cloud-instance.org', 30000, '/pyright', { + createWebSocket(createUrl( + process.env.UVLS_HOST_NAME === undefined ? 'localhost' : process.env.UVLS_HOST_NAME, + process.env.PORT === undefined ? 30000 : parseInt(process.env.PORT), + '/pyright', { // Used to parse an auth token or additional parameters such as import IDs to the language server authorization: 'UserAuth' // By commenting above line out and commenting below line in, connection to language server will be denied.