OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Hook up shared process sorta

Browse Source
This commit is contained in:
Asher
2019-01-18 18:04:24 -06:00
committed by Kyle Carberry
parent d827015b40
commit 811260cc80
15 changed files with 198 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/server/src/cli.ts
View File

@ -117,9 +117,11 @@ export class Entry extends Command {
app.wss.on("connection", (ws, req) => {
const id = clientId++;
if (sharedProcess.state === SharedProcessState.Ready) {
sendSharedProcessReady(ws);
}
ws.on("open", () => {
if (sharedProcess.state === SharedProcessState.Ready) {
sendSharedProcessReady(ws);
}
});
logger.info(`WebSocket opened \u001B[0m${req.url}`, field("client", id), field("ip", req.socket.remoteAddress));

8
packages/server/src/server.ts
View File

@ -25,12 +25,6 @@ export const createApp = (registerMiddleware?: (app: express.Application) => voi
};
wss.on("connection", (ws: WebSocket, req) => {
const spm = (<any>req).sharedProcessInit as SharedProcessInitMessage;
if (!spm) {
ws.close();
return;
}
const connection: ReadWriteConnection = {
onMessage: (cb): void => {
ws.addEventListener("message", (event) => cb(event.data));
@ -44,7 +38,7 @@ export const createApp = (registerMiddleware?: (app: express.Application) => voi
...options,
forkProvider: (message: NewSessionMessage): ChildProcess => {
let proc: ChildProcess;
if (message.getIsBootstrapFork()) {
proc = forkModule(message.getCommand());
} else {