monaco-languageclient-examples 6.5.3-next.0 → 6.5.3-next.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/browser/main.js +1 -1
- package/dist/browser/main.js.map +1 -1
- package/dist/{common.d.ts → common/client-commons.d.ts} +1 -1
- package/dist/common/client-commons.d.ts.map +1 -0
- package/dist/{common.js → common/client-commons.js} +3 -2
- package/dist/common/client-commons.js.map +1 -0
- package/dist/common/server-commons.d.ts +16 -0
- package/dist/common/server-commons.d.ts.map +1 -0
- package/dist/common/server-commons.js +71 -0
- package/dist/common/server-commons.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/json/client/main.js +2 -2
- package/dist/json/client/main.js.map +1 -1
- package/dist/json/server/direct.js +5 -1
- package/dist/json/server/direct.js.map +1 -1
- package/dist/json/server/json-server.d.ts.map +1 -1
- package/dist/json/server/json-server.js +4 -1
- package/dist/json/server/json-server.js.map +1 -1
- package/dist/json/server/main.d.ts +1 -1
- package/dist/json/server/main.d.ts.map +1 -1
- package/dist/json/server/main.js +10 -45
- package/dist/json/server/main.js.map +1 -1
- package/dist/node.d.ts +1 -0
- package/dist/node.d.ts.map +1 -1
- package/dist/node.js +1 -0
- package/dist/node.js.map +1 -1
- package/dist/python/client/main.js +2 -2
- package/dist/python/client/main.js.map +1 -1
- package/dist/python/server/main.d.ts.map +1 -1
- package/dist/python/server/main.js +9 -60
- package/dist/python/server/main.js.map +1 -1
- package/dist/react/app.js +1 -1
- package/dist/react/app.js.map +1 -1
- package/dist/react/main.js +1 -1
- package/dist/react/main.js.map +1 -1
- package/package.json +2 -2
- package/src/browser/main.ts +1 -1
- package/src/{common.ts → common/client-commons.ts} +2 -1
- package/src/common/server-commons.ts +82 -0
- package/src/index.ts +1 -1
- package/src/json/client/main.ts +2 -2
- package/src/json/server/direct.ts +5 -1
- package/src/json/server/json-server.ts +5 -1
- package/src/json/server/main.ts +11 -47
- package/src/node.ts +1 -0
- package/src/python/client/main.ts +2 -2
- package/src/python/server/main.ts +9 -63
- package/src/react/app.tsx +1 -1
- package/src/react/main.tsx +1 -1
- package/dist/common.d.ts.map +0 -1
- package/dist/common.js.map +0 -1
package/dist/browser/main.js
CHANGED
|
@@ -6,7 +6,7 @@ import { languages, workspace } from 'vscode';
|
|
|
6
6
|
import { getLanguageService, TextDocument } from 'vscode-json-languageservice';
|
|
7
7
|
import { createConverter as createCodeConverter } from 'vscode-languageclient/lib/common/codeConverter.js';
|
|
8
8
|
import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js';
|
|
9
|
-
import { createDefaultJsonContent, createJsonEditor, performInit } from '../common.js';
|
|
9
|
+
import { createDefaultJsonContent, createJsonEditor, performInit } from '../common/client-commons.js';
|
|
10
10
|
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
11
11
|
import '@codingame/monaco-vscode-json-default-extension';
|
|
12
12
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
package/dist/browser/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,SAAS,EAAE,SAAS,EAAsC,MAAM,QAAQ,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAC3G,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AACnH,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client-commons.d.ts","sourceRoot":"","sources":["../../src/common/client-commons.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAa,MAAM,eAAe,CAAC;AAClD,OAAO,EAAgD,UAAU,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC/G,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAKzD,OAAO,EAAgB,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAA4B,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,eAAO,MAAM,oBAAoB,eAAgB,iBAAiB,KAAG,oBAmBpE,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,MAAM,QAAQ,MAAM,QAAQ,MAAM,iBAAgB,OAAO,MAAM,EAAE,GAAG,CAAC,WAAe,OAAO,KAAoC,MAclK,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAS,MAAM,KAAG,SAc3D,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAO,MAK3C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,qBAAqB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC9C,CAAA;AAED,eAAO,MAAM,WAAW,kBAAyB,OAAO,kBAoBvD,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAkB;IAC3C,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAA;CAClB,+BAuBA,CAAC"}
|
|
@@ -100,7 +100,8 @@ export const createJsonEditor = async (config) => {
|
|
|
100
100
|
lightbulb: {
|
|
101
101
|
enabled: true
|
|
102
102
|
},
|
|
103
|
-
automaticLayout: true
|
|
103
|
+
automaticLayout: true,
|
|
104
|
+
wordBasedSuggestions: false
|
|
104
105
|
});
|
|
105
106
|
const result = {
|
|
106
107
|
editor,
|
|
@@ -109,4 +110,4 @@ export const createJsonEditor = async (config) => {
|
|
|
109
110
|
};
|
|
110
111
|
return Promise.resolve(result);
|
|
111
112
|
};
|
|
112
|
-
//# sourceMappingURL=
|
|
113
|
+
//# sourceMappingURL=client-commons.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"client-commons.js","sourceRoot":"","sources":["../../src/common/client-commons.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { WebSocketServer } from 'ws';
|
|
2
|
+
import { Server } from 'http';
|
|
3
|
+
import { IWebSocket } from 'vscode-ws-jsonrpc';
|
|
4
|
+
/**
|
|
5
|
+
* start the language server inside the current process
|
|
6
|
+
*/
|
|
7
|
+
export declare const launchLanguageServer: (serverName: string, socket: IWebSocket, baseDir: string, relativeDir: string) => void;
|
|
8
|
+
export declare const upgradeWsServer: (config: {
|
|
9
|
+
serverName: string;
|
|
10
|
+
pathName: string;
|
|
11
|
+
server: Server;
|
|
12
|
+
wss: WebSocketServer;
|
|
13
|
+
baseDir: string;
|
|
14
|
+
relativeDir: string;
|
|
15
|
+
}) => void;
|
|
16
|
+
//# sourceMappingURL=server-commons.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server-commons.d.ts","sourceRoot":"","sources":["../../src/common/server-commons.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAmB,MAAM,EAAE,MAAM,MAAM,CAAC;AAG/C,OAAO,EAAE,UAAU,EAAkD,MAAM,mBAAmB,CAAC;AAI/F;;GAEG;AACH,eAAO,MAAM,oBAAoB,eAAgB,MAAM,UAAU,UAAU,WAAW,MAAM,eAAe,MAAM,SAyBhH,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,eAAe,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAA;CACtB,SA+BA,CAAC"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
/* --------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
* ------------------------------------------------------------------------------------------ */
|
|
5
|
+
import { resolve } from 'path';
|
|
6
|
+
import { URL } from 'url';
|
|
7
|
+
import { WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
8
|
+
import { createConnection, createServerProcess, forward } from 'vscode-ws-jsonrpc/server';
|
|
9
|
+
import { Message, InitializeRequest } from 'vscode-languageserver';
|
|
10
|
+
/**
|
|
11
|
+
* start the language server inside the current process
|
|
12
|
+
*/
|
|
13
|
+
export const launchLanguageServer = (serverName, socket, baseDir, relativeDir) => {
|
|
14
|
+
// start the language server as an external process
|
|
15
|
+
const ls = resolve(baseDir, relativeDir);
|
|
16
|
+
const serverConnection = createServerProcess(serverName, 'node', [ls, '--stdio']);
|
|
17
|
+
const reader = new WebSocketMessageReader(socket);
|
|
18
|
+
const writer = new WebSocketMessageWriter(socket);
|
|
19
|
+
const socketConnection = createConnection(reader, writer, () => socket.dispose());
|
|
20
|
+
if (serverConnection) {
|
|
21
|
+
forward(socketConnection, serverConnection, message => {
|
|
22
|
+
if (Message.isRequest(message)) {
|
|
23
|
+
console.log(`${serverName} Server received:`);
|
|
24
|
+
console.log(message);
|
|
25
|
+
if (message.method === InitializeRequest.type.method) {
|
|
26
|
+
const initializeParams = message.params;
|
|
27
|
+
initializeParams.processId = process.pid;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
if (Message.isResponse(message)) {
|
|
31
|
+
console.log(`${serverName} Server sent:`);
|
|
32
|
+
console.log(message);
|
|
33
|
+
}
|
|
34
|
+
return message;
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
export const upgradeWsServer = (config) => {
|
|
39
|
+
config.server.on('upgrade', (request, socket, head) => {
|
|
40
|
+
const baseURL = `http://${request.headers.host}/`;
|
|
41
|
+
const pathName = request.url ? new URL(request.url, baseURL).pathname : undefined;
|
|
42
|
+
if (pathName === config.pathName) {
|
|
43
|
+
config.wss.handleUpgrade(request, socket, head, webSocket => {
|
|
44
|
+
const socket = {
|
|
45
|
+
send: content => webSocket.send(content, error => {
|
|
46
|
+
if (error) {
|
|
47
|
+
throw error;
|
|
48
|
+
}
|
|
49
|
+
}),
|
|
50
|
+
onMessage: cb => webSocket.on('message', (data) => {
|
|
51
|
+
console.log(data.toString());
|
|
52
|
+
cb(data);
|
|
53
|
+
}),
|
|
54
|
+
onError: cb => webSocket.on('error', cb),
|
|
55
|
+
onClose: cb => webSocket.on('close', cb),
|
|
56
|
+
dispose: () => webSocket.close()
|
|
57
|
+
};
|
|
58
|
+
// launch the server when the web socket is opened
|
|
59
|
+
if (webSocket.readyState === webSocket.OPEN) {
|
|
60
|
+
launchLanguageServer(config.serverName, socket, config.baseDir, config.relativeDir);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
webSocket.on('open', () => {
|
|
64
|
+
launchLanguageServer(config.serverName, socket, config.baseDir, config.relativeDir);
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
};
|
|
71
|
+
//# sourceMappingURL=server-commons.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server-commons.js","sourceRoot":"","sources":["../../src/common/server-commons.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
export * from './common.js';
|
|
5
|
+
export * from './common/client-commons.js';
|
|
6
6
|
export * from './browser/main.js';
|
|
7
7
|
export * from './json/client/main.js';
|
|
8
8
|
export * from './langium/statemachineClient.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC"}
|
package/dist/json/client/main.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../../common.js';
|
|
5
|
+
import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../../common/client-commons.js';
|
|
6
6
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
7
7
|
buildWorkerDefinition('../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
|
8
8
|
export const startJsonClient = async () => {
|
|
@@ -12,7 +12,7 @@ export const startJsonClient = async () => {
|
|
|
12
12
|
htmlElement: document.getElementById('container'),
|
|
13
13
|
content: createDefaultJsonContent()
|
|
14
14
|
});
|
|
15
|
-
const url = createUrl('localhost',
|
|
15
|
+
const url = createUrl('localhost', 30000, '/sampleServer');
|
|
16
16
|
createWebSocketAndStartClient(url);
|
|
17
17
|
};
|
|
18
18
|
//# sourceMappingURL=main.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/json/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,SAAS,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/json/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,SAAS,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AACnJ,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,qBAAqB,CAAC,wDAAwD,EAAE,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAE/H,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IACtC,gEAAgE;IAChE,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;IACxB,MAAM,gBAAgB,CAAC;QACnB,WAAW,EAAE,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAE;QAClD,OAAO,EAAE,wBAAwB,EAAE;KACtC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;IAC3D,6BAA6B,CAAC,GAAG,CAAC,CAAC;AACvC,CAAC,CAAC"}
|
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
+
import { resolve } from 'path';
|
|
5
6
|
import { runJsonServer } from './main.js';
|
|
6
|
-
|
|
7
|
+
import { getLocalDirectory } from '../../utils/fs-utils.js';
|
|
8
|
+
const baseDir = resolve(getLocalDirectory(import.meta.url));
|
|
9
|
+
const relativeDir = '../../../dist/json/server/json-server.js';
|
|
10
|
+
runJsonServer(baseDir, relativeDir);
|
|
7
11
|
//# sourceMappingURL=direct.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"direct.js","sourceRoot":"","sources":["../../../src/json/server/direct.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"direct.js","sourceRoot":"","sources":["../../../src/json/server/direct.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,MAAM,WAAW,GAAG,0CAA0C,CAAC;AAC/D,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-server.d.ts","sourceRoot":"","sources":["../../../src/json/server/json-server.ts"],"names":[],"mappings":";AAMA,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAClC,OAAO,mBAAmB,CAAC;AAC3B,OAAO,
|
|
1
|
+
{"version":3,"file":"json-server.d.ts","sourceRoot":"","sources":["../../../src/json/server/json-server.ts"],"names":[],"mappings":";AAMA,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAClC,OAAO,mBAAmB,CAAC;AAC3B,OAAO,EAAoB,WAAW,EAAE,aAAa,EAAE,oBAAoB,EAAoB,MAAM,wCAAwC,CAAC;AAC9I,OAAO,EACH,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAC1D,iBAAiB,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EACjF,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,uBAAuB,EAAwB,MAAM,gCAAgC,CAAC;AAC3O,OAAO,EAAsB,eAAe,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,qBAAa,UAAU;IAWP,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW;IAVtD,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC;IAE7C,SAAS,CAAC,QAAQ,CAAC,SAAS,8BAAmC;IAE/D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,eAAe,CAE5C;IAEH,SAAS,CAAC,QAAQ,CAAC,yBAAyB,8BAAqC;gBAElD,UAAU,EAAE,WAAW;IAoEtD,KAAK;IAIL,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,EAAE;IAQtE,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,mBAAmB,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;IASvF,SAAS,CAAC,qBAAqB,CAAC,MAAM,EAAE,uBAAuB,GAAG,iBAAiB,EAAE;IASrF,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,EAAE;IAgBzD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,6BAA6B,GAAG,QAAQ,EAAE;IAKnE,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,oBAAoB,GAAG,iBAAiB,EAAE;IAShF,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,GAAG;IAqB3D,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,0BAA0B,GAAG,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;cAS3D,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkB3D,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;IAI3E,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,0BAA0B,GAAG,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC;IASzF,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAQhD,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAQ9D,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAWlD,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAIxD,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;IAMlF,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY;CAGlE"}
|
|
@@ -6,7 +6,7 @@ import { readFile } from 'fs';
|
|
|
6
6
|
import requestLight from 'request-light';
|
|
7
7
|
import * as URI from 'vscode-uri';
|
|
8
8
|
import 'vscode-ws-jsonrpc';
|
|
9
|
-
import { TextDocuments } from 'vscode-languageserver/lib/node/main.js';
|
|
9
|
+
import { createConnection, TextDocuments, ProposedFeatures } from 'vscode-languageserver/lib/node/main.js';
|
|
10
10
|
import { TextDocumentSyncKind } from 'vscode-languageserver-protocol';
|
|
11
11
|
import { getLanguageService } from 'vscode-json-languageservice';
|
|
12
12
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
@@ -208,4 +208,7 @@ export class JsonServer {
|
|
|
208
208
|
return this.jsonService.parseJSONDocument(document);
|
|
209
209
|
}
|
|
210
210
|
}
|
|
211
|
+
const connection = createConnection(ProposedFeatures.all);
|
|
212
|
+
const ls = new JsonServer(connection);
|
|
213
|
+
ls.start();
|
|
211
214
|
//# sourceMappingURL=json-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-server.js","sourceRoot":"","sources":["../../../src/json/server/json-server.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAClC,OAAO,mBAAmB,CAAC;AAC3B,OAAO,EAAe,aAAa,EAAwB,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"json-server.js","sourceRoot":"","sources":["../../../src/json/server/json-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const runJsonServer: () => void;
|
|
1
|
+
export declare const runJsonServer: (baseDir: string, relativeDir: string) => void;
|
|
2
2
|
//# sourceMappingURL=main.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/json/server/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/json/server/main.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,aAAa,YAAa,MAAM,eAAe,MAAM,SA4BjE,CAAC"}
|
package/dist/json/server/main.js
CHANGED
|
@@ -3,24 +3,10 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import { WebSocketServer } from 'ws';
|
|
6
|
-
import { URL } from 'url';
|
|
7
6
|
import express from 'express';
|
|
8
|
-
import { WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
9
|
-
import { createConnection } from 'vscode-languageserver/lib/node/main.js';
|
|
10
7
|
import { getLocalDirectory } from '../../utils/fs-utils.js';
|
|
11
|
-
import {
|
|
12
|
-
|
|
13
|
-
* start the language server inside the current process
|
|
14
|
-
*/
|
|
15
|
-
const launchLanguageServer = (socket) => {
|
|
16
|
-
const reader = new WebSocketMessageReader(socket);
|
|
17
|
-
const writer = new WebSocketMessageWriter(socket);
|
|
18
|
-
const connection = createConnection(reader, writer);
|
|
19
|
-
const server = new JsonServer(connection);
|
|
20
|
-
server.start();
|
|
21
|
-
return server;
|
|
22
|
-
};
|
|
23
|
-
export const runJsonServer = () => {
|
|
8
|
+
import { upgradeWsServer } from '../../common/server-commons.js';
|
|
9
|
+
export const runJsonServer = (baseDir, relativeDir) => {
|
|
24
10
|
process.on('uncaughtException', function (err) {
|
|
25
11
|
console.error('Uncaught Exception: ', err.toString());
|
|
26
12
|
if (err.stack) {
|
|
@@ -33,40 +19,19 @@ export const runJsonServer = () => {
|
|
|
33
19
|
const dir = getLocalDirectory(import.meta.url);
|
|
34
20
|
app.use(express.static(dir));
|
|
35
21
|
// start the server
|
|
36
|
-
const server = app.listen(
|
|
22
|
+
const server = app.listen(30000);
|
|
37
23
|
// create the web socket
|
|
38
24
|
const wss = new WebSocketServer({
|
|
39
25
|
noServer: true,
|
|
40
26
|
perMessageDeflate: false
|
|
41
27
|
});
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (error) {
|
|
50
|
-
throw error;
|
|
51
|
-
}
|
|
52
|
-
}),
|
|
53
|
-
onMessage: cb => webSocket.on('message', (data) => {
|
|
54
|
-
console.log(data.toString());
|
|
55
|
-
cb(data);
|
|
56
|
-
}),
|
|
57
|
-
onError: cb => webSocket.on('error', cb),
|
|
58
|
-
onClose: cb => webSocket.on('close', cb),
|
|
59
|
-
dispose: () => webSocket.close()
|
|
60
|
-
};
|
|
61
|
-
// launch the server when the web socket is opened
|
|
62
|
-
if (webSocket.readyState === webSocket.OPEN) {
|
|
63
|
-
launchLanguageServer(socket);
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
66
|
-
webSocket.on('open', () => launchLanguageServer(socket));
|
|
67
|
-
}
|
|
68
|
-
});
|
|
69
|
-
}
|
|
28
|
+
upgradeWsServer({
|
|
29
|
+
serverName: 'JSON',
|
|
30
|
+
pathName: '/sampleServer',
|
|
31
|
+
server,
|
|
32
|
+
wss,
|
|
33
|
+
baseDir,
|
|
34
|
+
relativeDir
|
|
70
35
|
});
|
|
71
36
|
};
|
|
72
37
|
//# sourceMappingURL=main.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/json/server/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/json/server/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,WAAmB,EAAE,EAAE;IAClE,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAS,GAAQ;QAC7C,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,IAAI,GAAG,CAAC,KAAK,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC5B;IACL,CAAC,CAAC,CAAC;IAEH,iCAAiC;IACjC,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IACtB,6CAA6C;IAC7C,MAAM,GAAG,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/C,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,mBAAmB;IACnB,MAAM,MAAM,GAAW,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC;QAC5B,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,KAAK;KAC3B,CAAC,CAAC;IACH,eAAe,CAAC;QACZ,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAE,eAAe;QACzB,MAAM;QACN,GAAG;QACH,OAAO;QACP,WAAW;KACd,CAAC,CAAC;AACP,CAAC,CAAC"}
|
package/dist/node.d.ts
CHANGED
package/dist/node.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAKA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAKA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
|
package/dist/node.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
+
export * from './common/server-commons.js';
|
|
5
6
|
export * from './json/server/json-server.js';
|
|
6
7
|
export * from './json/server/main.js';
|
|
7
8
|
export * from './python/server/main.js';
|
package/dist/node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
|
|
@@ -18,7 +18,7 @@ import { CloseAction, ErrorAction } from 'vscode-languageclient';
|
|
|
18
18
|
import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
|
|
19
19
|
import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
|
|
20
20
|
import { Uri } from 'vscode';
|
|
21
|
-
import { createUrl } from '../../common.js';
|
|
21
|
+
import { createUrl } from '../../common/client-commons.js';
|
|
22
22
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
23
23
|
buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
|
24
24
|
const languageId = 'python';
|
|
@@ -129,7 +129,7 @@ export const startPythonClient = async () => {
|
|
|
129
129
|
fileSystemProvider.registerFile(new RegisteredMemoryFile(vscode.Uri.file('/workspace/hello.py'), 'print("Hello, World!")'));
|
|
130
130
|
registerFileSystemOverlay(1, fileSystemProvider);
|
|
131
131
|
// create the web socket and configure to start the language client on open, can add extra parameters to the url if needed.
|
|
132
|
-
createWebSocket(createUrl('localhost',
|
|
132
|
+
createWebSocket(createUrl('localhost', 30001, '/pyright', {
|
|
133
133
|
// Used to parse an auth token or additional parameters such as import IDs to the language server
|
|
134
134
|
authorization: 'UserAuth'
|
|
135
135
|
// By commenting above line out and commenting below line in, connection to language server will be denied.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,2DAA2D,CAAC;AACtF,OAAO,mDAAmD,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAqB,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,+BAA+B,EAAE,EAAE,uBAAuB,EAAE,MAAM,yDAAyD,CAAC;AACnI,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AACtF,OAAO,0BAA0B,MAAM,oDAAoD,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAChJ,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/client/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/server/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/python/server/main.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,eAAe,YAAa,MAAM,eAAe,MAAM,SA2CnE,CAAC"}
|
|
@@ -5,37 +5,8 @@
|
|
|
5
5
|
import { WebSocketServer } from 'ws';
|
|
6
6
|
import { URL } from 'url';
|
|
7
7
|
import express from 'express';
|
|
8
|
-
import { resolve } from 'path';
|
|
9
|
-
import { WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
10
|
-
import { createConnection, createServerProcess, forward } from 'vscode-ws-jsonrpc/server';
|
|
11
|
-
import { Message, InitializeRequest } from 'vscode-languageserver';
|
|
12
8
|
import { getLocalDirectory } from '../../utils/fs-utils.js';
|
|
13
|
-
|
|
14
|
-
const serverName = 'PYRIGHT';
|
|
15
|
-
// start the language server as an external process
|
|
16
|
-
const ls = resolve(baseDir, relativeDir);
|
|
17
|
-
const serverConnection = createServerProcess(serverName, 'node', [ls, '--stdio']);
|
|
18
|
-
const reader = new WebSocketMessageReader(socket);
|
|
19
|
-
const writer = new WebSocketMessageWriter(socket);
|
|
20
|
-
const socketConnection = createConnection(reader, writer, () => socket.dispose());
|
|
21
|
-
if (serverConnection) {
|
|
22
|
-
forward(socketConnection, serverConnection, message => {
|
|
23
|
-
if (Message.isRequest(message)) {
|
|
24
|
-
console.log(`${serverName} Server received:`);
|
|
25
|
-
console.log(message);
|
|
26
|
-
if (message.method === InitializeRequest.type.method) {
|
|
27
|
-
const initializeParams = message.params;
|
|
28
|
-
initializeParams.processId = process.pid;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
if (Message.isResponse(message)) {
|
|
32
|
-
console.log(`${serverName} Server sent:`);
|
|
33
|
-
console.log(message);
|
|
34
|
-
}
|
|
35
|
-
return message;
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
};
|
|
9
|
+
import { upgradeWsServer } from '../../common/server-commons.js';
|
|
39
10
|
export const runPythonServer = (baseDir, relativeDir) => {
|
|
40
11
|
process.on('uncaughtException', function (err) {
|
|
41
12
|
console.error('Uncaught Exception: ', err.toString());
|
|
@@ -49,7 +20,7 @@ export const runPythonServer = (baseDir, relativeDir) => {
|
|
|
49
20
|
const dir = getLocalDirectory(import.meta.url);
|
|
50
21
|
app.use(express.static(dir));
|
|
51
22
|
// start the server
|
|
52
|
-
const server = app.listen(
|
|
23
|
+
const server = app.listen(30001);
|
|
53
24
|
// create the web socket
|
|
54
25
|
const wss = new WebSocketServer({
|
|
55
26
|
noServer: true,
|
|
@@ -68,35 +39,13 @@ export const runPythonServer = (baseDir, relativeDir) => {
|
|
|
68
39
|
}
|
|
69
40
|
}
|
|
70
41
|
});
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
if (error) {
|
|
79
|
-
throw error;
|
|
80
|
-
}
|
|
81
|
-
}),
|
|
82
|
-
onMessage: cb => webSocket.on('message', (data) => {
|
|
83
|
-
cb(data);
|
|
84
|
-
}),
|
|
85
|
-
onError: cb => webSocket.on('error', cb),
|
|
86
|
-
onClose: cb => webSocket.on('close', cb),
|
|
87
|
-
dispose: () => webSocket.close()
|
|
88
|
-
};
|
|
89
|
-
// launch the server when the web socket is opened
|
|
90
|
-
if (webSocket.readyState === webSocket.OPEN) {
|
|
91
|
-
launchLanguageServer(socket, baseDir, relativeDir);
|
|
92
|
-
}
|
|
93
|
-
else {
|
|
94
|
-
webSocket.on('open', () => {
|
|
95
|
-
launchLanguageServer(socket, baseDir, relativeDir);
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
|
-
});
|
|
99
|
-
}
|
|
42
|
+
upgradeWsServer({
|
|
43
|
+
serverName: 'PYRIGHT',
|
|
44
|
+
pathName: '/pyright',
|
|
45
|
+
server,
|
|
46
|
+
wss,
|
|
47
|
+
baseDir,
|
|
48
|
+
relativeDir
|
|
100
49
|
});
|
|
101
50
|
};
|
|
102
51
|
//# sourceMappingURL=main.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/server/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/server/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAErC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,WAAmB,EAAE,EAAE;IACpE,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,UAAS,GAAQ;QAC7C,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtD,IAAI,GAAG,CAAC,KAAK,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC5B;IACL,CAAC,CAAC,CAAC;IAEH,iCAAiC;IACjC,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IACtB,6CAA6C;IAC7C,MAAM,GAAG,GAAG,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/C,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,mBAAmB;IACnB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjC,wBAAwB;IACxB,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC;QAC5B,QAAQ,EAAE,IAAI;QACd,iBAAiB,EAAE,KAAK;QACxB,cAAc,EAAE,IAAI;QACpB,YAAY,EAAE,CACV,UAAqE,EACrE,QAAQ,EACV,EAAE;YACA,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;YAC9E,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC9D,IAAI,SAAS,KAAK,UAAU,EAAE;gBAC1B,iDAAiD;gBACjD,QAAQ,CAAC,IAAI,CAAC,CAAC;aAClB;iBAAM;gBACH,iDAAiD;gBACjD,QAAQ,CAAC,KAAK,CAAC,CAAC;aACnB;QACL,CAAC;KACJ,CAAC,CAAC;IACH,eAAe,CAAC;QACZ,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,UAAU;QACpB,MAAM;QACN,GAAG;QACH,OAAO;QACP,WAAW;KACd,CAAC,CAAC;AACP,CAAC,CAAC"}
|
package/dist/react/app.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import { createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../common.js';
|
|
5
|
+
import { createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../common/client-commons.js';
|
|
6
6
|
import React, { createRef, useEffect, useMemo, useRef } from 'react';
|
|
7
7
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
8
8
|
buildWorkerDefinition('../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
package/dist/react/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/react/app.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/react/app.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAEtH,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAErE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,qBAAqB,CAAC,wDAAwD,EAAE,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAE/H,IAAI,IAAI,GAAG,IAAI,CAAC;AAUhB,MAAM,CAAC,MAAM,iBAAiB,GAA0B,CAAC,EACrD,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,SAAS,EACZ,EAAE,EAAE;IACD,MAAM,SAAS,GAAG,MAAM,EAAgC,CAAC;IACzD,MAAM,GAAG,GAAG,SAAS,EAAkB,CAAC;IACxC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACnF,IAAI,YAAuB,CAAC;IAE5B,SAAS,CAAC,GAAG,EAAE;QACX,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC;QAExC,IAAI,GAAG,CAAC,OAAO,IAAI,IAAI,EAAE;YACrB,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;gBACrB,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM,gBAAgB,CAAC;oBACnB,WAAW,EAAE,GAAG,CAAC,OAAQ;oBACzB,OAAO,EAAE,WAAW;iBACvB,CAAC,CAAC;gBACH,IAAI,IAAI,EAAE;oBACN,IAAI,GAAG,KAAK,CAAC;iBAChB;gBACD,YAAY,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC;YACtD,CAAC,CAAC;YACF,KAAK,EAAE,CAAC;YAER,OAAO,GAAG,EAAE;gBACR,aAAa,EAAE,OAAO,EAAE,CAAC;YAC7B,CAAC,CAAC;SACL;QAED,MAAM,CAAC,cAAc,GAAG,GAAG,EAAE;YACzB,mDAAmD;YACnD,YAAY,EAAE,KAAK,EAAE,CAAC;QAC1B,CAAC,CAAC;QACF,OAAO,GAAG,EAAE;YACR,oDAAoD;YACpD,YAAY,EAAE,KAAK,EAAE,CAAC;QAC1B,CAAC,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACH,6BACI,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EACzB,SAAS,EAAE,SAAS,GACtB,CACL,CAAC;AACN,CAAC,CAAC"}
|
package/dist/react/main.js
CHANGED
|
@@ -11,6 +11,6 @@ export const startReactJsonClient = () => {
|
|
|
11
11
|
"line_endings": "unix"
|
|
12
12
|
}`;
|
|
13
13
|
const root = ReactDOM.createRoot(document.getElementById('root'));
|
|
14
|
-
root.render(React.createElement(ReactMonacoEditor, { defaultCode: defaultCode, hostname: 'localhost', path: '/sampleServer', port:
|
|
14
|
+
root.render(React.createElement(ReactMonacoEditor, { defaultCode: defaultCode, hostname: 'localhost', path: '/sampleServer', port: 30000 }));
|
|
15
15
|
};
|
|
16
16
|
//# sourceMappingURL=main.js.map
|
package/dist/react/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/react/main.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACrC,MAAM,WAAW,GAAG;;;EAGtB,CAAC;IAEC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAE,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,CAAC,oBAAC,iBAAiB,IAC1B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/react/main.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACrC,MAAM,WAAW,GAAG;;;EAGtB,CAAC;IAEC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAE,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,CAAC,oBAAC,iBAAiB,IAC1B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,KAAK,GAAI,CAAC,CAAC;AACzB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "monaco-languageclient-examples",
|
|
3
|
-
"version": "6.5.3-next.
|
|
3
|
+
"version": "6.5.3-next.1",
|
|
4
4
|
"description": "Monaco Language client examples",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "TypeFox GmbH",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"langium": "~2.0.2",
|
|
57
57
|
"langium-statemachine-dsl": "~2.0.0",
|
|
58
58
|
"monaco-editor-workers": "~0.43.0",
|
|
59
|
-
"monaco-languageclient": "~6.5.3-next.
|
|
59
|
+
"monaco-languageclient": "~6.5.3-next.1",
|
|
60
60
|
"pyright": "~1.1.330",
|
|
61
61
|
"react": "~18.2.0",
|
|
62
62
|
"react-dom": "~18.2.0",
|
package/src/browser/main.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { languages, workspace, TextDocument as VsCodeTextDocument } from 'vscode
|
|
|
6
6
|
import { getLanguageService, TextDocument } from 'vscode-json-languageservice';
|
|
7
7
|
import { createConverter as createCodeConverter } from 'vscode-languageclient/lib/common/codeConverter.js';
|
|
8
8
|
import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js';
|
|
9
|
-
import { createDefaultJsonContent, createJsonEditor, performInit } from '../common.js';
|
|
9
|
+
import { createDefaultJsonContent, createJsonEditor, performInit } from '../common/client-commons.js';
|
|
10
10
|
import '@codingame/monaco-vscode-theme-defaults-default-extension';
|
|
11
11
|
import '@codingame/monaco-vscode-json-default-extension';
|
|
12
12
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
/* --------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
* ------------------------------------------------------------------------------------------ */
|
|
5
|
+
import { resolve } from 'path';
|
|
6
|
+
import { WebSocketServer } from 'ws';
|
|
7
|
+
import { IncomingMessage, Server } from 'http';
|
|
8
|
+
import { URL } from 'url';
|
|
9
|
+
import { Socket } from 'net';
|
|
10
|
+
import { IWebSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
11
|
+
import { createConnection, createServerProcess, forward } from 'vscode-ws-jsonrpc/server';
|
|
12
|
+
import { Message, InitializeRequest, InitializeParams } from 'vscode-languageserver';
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* start the language server inside the current process
|
|
16
|
+
*/
|
|
17
|
+
export const launchLanguageServer = (serverName: string, socket: IWebSocket, baseDir: string, relativeDir: string) => {
|
|
18
|
+
// start the language server as an external process
|
|
19
|
+
const ls = resolve(baseDir, relativeDir);
|
|
20
|
+
const serverConnection = createServerProcess(serverName, 'node', [ls, '--stdio']);
|
|
21
|
+
|
|
22
|
+
const reader = new WebSocketMessageReader(socket);
|
|
23
|
+
const writer = new WebSocketMessageWriter(socket);
|
|
24
|
+
const socketConnection = createConnection(reader, writer, () => socket.dispose());
|
|
25
|
+
if (serverConnection) {
|
|
26
|
+
forward(socketConnection, serverConnection, message => {
|
|
27
|
+
if (Message.isRequest(message)) {
|
|
28
|
+
console.log(`${serverName} Server received:`);
|
|
29
|
+
console.log(message);
|
|
30
|
+
if (message.method === InitializeRequest.type.method) {
|
|
31
|
+
const initializeParams = message.params as InitializeParams;
|
|
32
|
+
initializeParams.processId = process.pid;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
if (Message.isResponse(message)) {
|
|
36
|
+
console.log(`${serverName} Server sent:`);
|
|
37
|
+
console.log(message);
|
|
38
|
+
}
|
|
39
|
+
return message;
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
export const upgradeWsServer = (config: {
|
|
45
|
+
serverName: string,
|
|
46
|
+
pathName: string,
|
|
47
|
+
server: Server,
|
|
48
|
+
wss: WebSocketServer,
|
|
49
|
+
baseDir: string,
|
|
50
|
+
relativeDir: string
|
|
51
|
+
}) => {
|
|
52
|
+
config.server.on('upgrade', (request: IncomingMessage, socket: Socket, head: Buffer) => {
|
|
53
|
+
const baseURL = `http://${request.headers.host}/`;
|
|
54
|
+
const pathName = request.url ? new URL(request.url, baseURL).pathname : undefined;
|
|
55
|
+
if (pathName === config.pathName) {
|
|
56
|
+
config.wss.handleUpgrade(request, socket, head, webSocket => {
|
|
57
|
+
const socket: IWebSocket = {
|
|
58
|
+
send: content => webSocket.send(content, error => {
|
|
59
|
+
if (error) {
|
|
60
|
+
throw error;
|
|
61
|
+
}
|
|
62
|
+
}),
|
|
63
|
+
onMessage: cb => webSocket.on('message', (data) => {
|
|
64
|
+
console.log(data.toString());
|
|
65
|
+
cb(data);
|
|
66
|
+
}),
|
|
67
|
+
onError: cb => webSocket.on('error', cb),
|
|
68
|
+
onClose: cb => webSocket.on('close', cb),
|
|
69
|
+
dispose: () => webSocket.close()
|
|
70
|
+
};
|
|
71
|
+
// launch the server when the web socket is opened
|
|
72
|
+
if (webSocket.readyState === webSocket.OPEN) {
|
|
73
|
+
launchLanguageServer(config.serverName, socket, config.baseDir, config.relativeDir);
|
|
74
|
+
} else {
|
|
75
|
+
webSocket.on('open', () => {
|
|
76
|
+
launchLanguageServer(config.serverName, socket, config.baseDir, config.relativeDir);
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
};
|
package/src/index.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
export * from './common.js';
|
|
6
|
+
export * from './common/client-commons.js';
|
|
7
7
|
export * from './browser/main.js';
|
|
8
8
|
export * from './json/client/main.js';
|
|
9
9
|
export * from './langium/statemachineClient.js';
|
package/src/json/client/main.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
-
import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../../common.js';
|
|
6
|
+
import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../../common/client-commons.js';
|
|
7
7
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
8
8
|
buildWorkerDefinition('../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
|
9
9
|
|
|
@@ -15,6 +15,6 @@ export const startJsonClient = async () => {
|
|
|
15
15
|
content: createDefaultJsonContent()
|
|
16
16
|
});
|
|
17
17
|
|
|
18
|
-
const url = createUrl('localhost',
|
|
18
|
+
const url = createUrl('localhost', 30000, '/sampleServer');
|
|
19
19
|
createWebSocketAndStartClient(url);
|
|
20
20
|
};
|
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
+
import { resolve } from 'path';
|
|
5
6
|
import { runJsonServer } from './main.js';
|
|
7
|
+
import { getLocalDirectory } from '../../utils/fs-utils.js';
|
|
6
8
|
|
|
7
|
-
|
|
9
|
+
const baseDir = resolve(getLocalDirectory(import.meta.url));
|
|
10
|
+
const relativeDir = '../../../dist/json/server/json-server.js';
|
|
11
|
+
runJsonServer(baseDir, relativeDir);
|
|
@@ -6,7 +6,7 @@ import { readFile } from 'fs';
|
|
|
6
6
|
import requestLight from 'request-light';
|
|
7
7
|
import * as URI from 'vscode-uri';
|
|
8
8
|
import 'vscode-ws-jsonrpc';
|
|
9
|
-
import { _Connection, TextDocuments, DocumentSymbolParams } from 'vscode-languageserver/lib/node/main.js';
|
|
9
|
+
import { createConnection, _Connection, TextDocuments, DocumentSymbolParams, ProposedFeatures } from 'vscode-languageserver/lib/node/main.js';
|
|
10
10
|
import {
|
|
11
11
|
Diagnostic, Command, CompletionList, CompletionItem, Hover,
|
|
12
12
|
SymbolInformation, TextEdit, FoldingRange, ColorInformation, ColorPresentation
|
|
@@ -256,3 +256,7 @@ export class JsonServer {
|
|
|
256
256
|
return this.jsonService.parseJSONDocument(document);
|
|
257
257
|
}
|
|
258
258
|
}
|
|
259
|
+
|
|
260
|
+
const connection = createConnection(ProposedFeatures.all);
|
|
261
|
+
const ls = new JsonServer(connection);
|
|
262
|
+
ls.start();
|
package/src/json/server/main.ts
CHANGED
|
@@ -3,28 +3,12 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
import { WebSocketServer } from 'ws';
|
|
6
|
-
import {
|
|
7
|
-
import { URL } from 'url';
|
|
8
|
-
import { Socket } from 'net';
|
|
6
|
+
import { Server } from 'http';
|
|
9
7
|
import express from 'express';
|
|
10
|
-
import { IWebSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
11
|
-
import { createConnection } from 'vscode-languageserver/lib/node/main.js';
|
|
12
8
|
import { getLocalDirectory } from '../../utils/fs-utils.js';
|
|
13
|
-
import {
|
|
9
|
+
import { upgradeWsServer } from '../../common/server-commons.js';
|
|
14
10
|
|
|
15
|
-
|
|
16
|
-
* start the language server inside the current process
|
|
17
|
-
*/
|
|
18
|
-
const launchLanguageServer = (socket: IWebSocket): JsonServer => {
|
|
19
|
-
const reader = new WebSocketMessageReader(socket);
|
|
20
|
-
const writer = new WebSocketMessageWriter(socket);
|
|
21
|
-
const connection = createConnection(reader, writer);
|
|
22
|
-
const server = new JsonServer(connection);
|
|
23
|
-
server.start();
|
|
24
|
-
return server;
|
|
25
|
-
};
|
|
26
|
-
|
|
27
|
-
export const runJsonServer = () => {
|
|
11
|
+
export const runJsonServer = (baseDir: string, relativeDir: string) => {
|
|
28
12
|
process.on('uncaughtException', function(err: any) {
|
|
29
13
|
console.error('Uncaught Exception: ', err.toString());
|
|
30
14
|
if (err.stack) {
|
|
@@ -38,38 +22,18 @@ export const runJsonServer = () => {
|
|
|
38
22
|
const dir = getLocalDirectory(import.meta.url);
|
|
39
23
|
app.use(express.static(dir));
|
|
40
24
|
// start the server
|
|
41
|
-
const server = app.listen(
|
|
25
|
+
const server: Server = app.listen(30000);
|
|
42
26
|
// create the web socket
|
|
43
27
|
const wss = new WebSocketServer({
|
|
44
28
|
noServer: true,
|
|
45
29
|
perMessageDeflate: false
|
|
46
30
|
});
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (error) {
|
|
55
|
-
throw error;
|
|
56
|
-
}
|
|
57
|
-
}),
|
|
58
|
-
onMessage: cb => webSocket.on('message', (data) => {
|
|
59
|
-
console.log(data.toString());
|
|
60
|
-
cb(data);
|
|
61
|
-
}),
|
|
62
|
-
onError: cb => webSocket.on('error', cb),
|
|
63
|
-
onClose: cb => webSocket.on('close', cb),
|
|
64
|
-
dispose: () => webSocket.close()
|
|
65
|
-
};
|
|
66
|
-
// launch the server when the web socket is opened
|
|
67
|
-
if (webSocket.readyState === webSocket.OPEN) {
|
|
68
|
-
launchLanguageServer(socket);
|
|
69
|
-
} else {
|
|
70
|
-
webSocket.on('open', () => launchLanguageServer(socket));
|
|
71
|
-
}
|
|
72
|
-
});
|
|
73
|
-
}
|
|
31
|
+
upgradeWsServer({
|
|
32
|
+
serverName: 'JSON',
|
|
33
|
+
pathName: '/sampleServer',
|
|
34
|
+
server,
|
|
35
|
+
wss,
|
|
36
|
+
baseDir,
|
|
37
|
+
relativeDir
|
|
74
38
|
});
|
|
75
39
|
};
|
package/src/node.ts
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
5
|
|
|
6
|
+
export * from './common/server-commons.js';
|
|
6
7
|
export * from './json/server/json-server.js';
|
|
7
8
|
export * from './json/server/main.js';
|
|
8
9
|
export * from './python/server/main.js';
|
|
@@ -19,7 +19,7 @@ import { CloseAction, ErrorAction, MessageTransports } from 'vscode-languageclie
|
|
|
19
19
|
import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode-ws-jsonrpc';
|
|
20
20
|
import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
|
|
21
21
|
import { Uri } from 'vscode';
|
|
22
|
-
import { createUrl } from '../../common.js';
|
|
22
|
+
import { createUrl } from '../../common/client-commons.js';
|
|
23
23
|
|
|
24
24
|
import { buildWorkerDefinition } from 'monaco-editor-workers';
|
|
25
25
|
buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false);
|
|
@@ -140,7 +140,7 @@ export const startPythonClient = async () => {
|
|
|
140
140
|
registerFileSystemOverlay(1, fileSystemProvider);
|
|
141
141
|
|
|
142
142
|
// create the web socket and configure to start the language client on open, can add extra parameters to the url if needed.
|
|
143
|
-
createWebSocket(createUrl('localhost',
|
|
143
|
+
createWebSocket(createUrl('localhost', 30001, '/pyright', {
|
|
144
144
|
// Used to parse an auth token or additional parameters such as import IDs to the language server
|
|
145
145
|
authorization: 'UserAuth'
|
|
146
146
|
// By commenting above line out and commenting below line in, connection to language server will be denied.
|
|
@@ -5,41 +5,9 @@
|
|
|
5
5
|
import { WebSocketServer } from 'ws';
|
|
6
6
|
import { IncomingMessage } from 'http';
|
|
7
7
|
import { URL } from 'url';
|
|
8
|
-
import { Socket } from 'net';
|
|
9
8
|
import express from 'express';
|
|
10
|
-
import { resolve } from 'path';
|
|
11
|
-
import { IWebSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc';
|
|
12
|
-
import { createConnection, createServerProcess, forward } from 'vscode-ws-jsonrpc/server';
|
|
13
|
-
import { Message, InitializeRequest, InitializeParams } from 'vscode-languageserver';
|
|
14
9
|
import { getLocalDirectory } from '../../utils/fs-utils.js';
|
|
15
|
-
|
|
16
|
-
const launchLanguageServer = (socket: IWebSocket, baseDir: string, relativeDir: string) => {
|
|
17
|
-
const serverName = 'PYRIGHT';
|
|
18
|
-
// start the language server as an external process
|
|
19
|
-
const ls = resolve(baseDir, relativeDir);
|
|
20
|
-
const serverConnection = createServerProcess(serverName, 'node', [ls, '--stdio']);
|
|
21
|
-
|
|
22
|
-
const reader = new WebSocketMessageReader(socket);
|
|
23
|
-
const writer = new WebSocketMessageWriter(socket);
|
|
24
|
-
const socketConnection = createConnection(reader, writer, () => socket.dispose());
|
|
25
|
-
if (serverConnection) {
|
|
26
|
-
forward(socketConnection, serverConnection, message => {
|
|
27
|
-
if (Message.isRequest(message)) {
|
|
28
|
-
console.log(`${serverName} Server received:`);
|
|
29
|
-
console.log(message);
|
|
30
|
-
if (message.method === InitializeRequest.type.method) {
|
|
31
|
-
const initializeParams = message.params as InitializeParams;
|
|
32
|
-
initializeParams.processId = process.pid;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
if (Message.isResponse(message)) {
|
|
36
|
-
console.log(`${serverName} Server sent:`);
|
|
37
|
-
console.log(message);
|
|
38
|
-
}
|
|
39
|
-
return message;
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
};
|
|
10
|
+
import { upgradeWsServer } from '../../common/server-commons.js';
|
|
43
11
|
|
|
44
12
|
export const runPythonServer = (baseDir: string, relativeDir: string) => {
|
|
45
13
|
process.on('uncaughtException', function(err: any) {
|
|
@@ -55,7 +23,7 @@ export const runPythonServer = (baseDir: string, relativeDir: string) => {
|
|
|
55
23
|
const dir = getLocalDirectory(import.meta.url);
|
|
56
24
|
app.use(express.static(dir));
|
|
57
25
|
// start the server
|
|
58
|
-
const server = app.listen(
|
|
26
|
+
const server = app.listen(30001);
|
|
59
27
|
// create the web socket
|
|
60
28
|
const wss = new WebSocketServer({
|
|
61
29
|
noServer: true,
|
|
@@ -76,34 +44,12 @@ export const runPythonServer = (baseDir: string, relativeDir: string) => {
|
|
|
76
44
|
}
|
|
77
45
|
}
|
|
78
46
|
});
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
send: content => webSocket.send(content, error => {
|
|
87
|
-
if (error) {
|
|
88
|
-
throw error;
|
|
89
|
-
}
|
|
90
|
-
}),
|
|
91
|
-
onMessage: cb => webSocket.on('message', (data) => {
|
|
92
|
-
cb(data);
|
|
93
|
-
}),
|
|
94
|
-
onError: cb => webSocket.on('error', cb),
|
|
95
|
-
onClose: cb => webSocket.on('close', cb),
|
|
96
|
-
dispose: () => webSocket.close()
|
|
97
|
-
};
|
|
98
|
-
// launch the server when the web socket is opened
|
|
99
|
-
if (webSocket.readyState === webSocket.OPEN) {
|
|
100
|
-
launchLanguageServer(socket, baseDir, relativeDir);
|
|
101
|
-
} else {
|
|
102
|
-
webSocket.on('open', () => {
|
|
103
|
-
launchLanguageServer(socket, baseDir, relativeDir);
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
});
|
|
107
|
-
}
|
|
47
|
+
upgradeWsServer({
|
|
48
|
+
serverName: 'PYRIGHT',
|
|
49
|
+
pathName: '/pyright',
|
|
50
|
+
server,
|
|
51
|
+
wss,
|
|
52
|
+
baseDir,
|
|
53
|
+
relativeDir
|
|
108
54
|
});
|
|
109
55
|
};
|
package/src/react/app.tsx
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
* ------------------------------------------------------------------------------------------ */
|
|
5
|
-
import { createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../common.js';
|
|
5
|
+
import { createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from '../common/client-commons.js';
|
|
6
6
|
import { editor } from 'monaco-editor';
|
|
7
7
|
import React, { createRef, useEffect, useMemo, useRef } from 'react';
|
|
8
8
|
|
package/src/react/main.tsx
CHANGED
package/dist/common.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAa,MAAM,eAAe,CAAC;AAClD,OAAO,EAAgD,UAAU,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAC/G,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAKzD,OAAO,EAAgB,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAA4B,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAEpF,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,eAAO,MAAM,oBAAoB,eAAgB,iBAAiB,KAAG,oBAmBpE,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,MAAM,QAAQ,MAAM,QAAQ,MAAM,iBAAgB,OAAO,MAAM,EAAE,GAAG,CAAC,WAAe,OAAO,KAAoC,MAclK,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAS,MAAM,KAAG,SAc3D,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAO,MAK3C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,qBAAqB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,QAAQ,EAAE,UAAU,CAAC,oBAAoB,CAAC,CAAC;CAC9C,CAAA;AAED,eAAO,MAAM,WAAW,kBAAyB,OAAO,kBAoBvD,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAkB;IAC3C,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAA;CAClB,+BAsBA,CAAC"}
|
package/dist/common.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":"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"}
|