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

Get forked watcher & searcher working

Browse Source
This commit is contained in:
Asher
2019-01-23 13:43:20 -06:00
committed by Kyle Carberry
parent 4cd6bed8d2
commit 5cb657b415
6 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/server/src/vscode/bootstrapFork.ts
View File

@ -2,9 +2,20 @@ import * as cp from "child_process";
import * as fs from "fs";
import * as net from "net";
import * as path from "path";
import { logger, field } from "@coder/logger/src";
import { Logger, logger, field } from "@coder/logger/src";
declare var __non_webpack_require__: typeof require;
const getChildLogger = (modulePath: string): Logger => {
const basename = modulePath.split("/").pop()!;
let i = 0;
for (; i < basename.length; i++) {
const character = basename.charAt(i);
if (character === character.toUpperCase()) {
break;
}
}
return logger.named(basename.substring(0, i));
};
export const requireModule = (modulePath: string): void => {
process.env.AMD_ENTRYPOINT = modulePath;
@ -16,6 +27,7 @@ export const requireModule = (modulePath: string): void => {
process.emit("message", JSON.parse(data.toString()), undefined);
});
// tslint:disable-next-line no-any
process.send = (message: any): void => {
socket.write(JSON.stringify(message));
};
@ -28,22 +40,13 @@ export const requireModule = (modulePath: string): void => {
/**
* Uses the internal bootstrap-fork.js to load a module
* @example
* const cp = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain", true);
* const cp = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain");
* cp.stdout.on("data", (data) => console.log(data.toString("utf8")));
* cp.stderr.on("data", (data) => console.log(data.toString("utf8")));
* @param modulePath Path of the VS Code module to load.
* @param stdio Whether to use stdio (spawn) or send/onMessage (fork).
*/
export const forkModule = (modulePath: string, stdio?: boolean): cp.ChildProcess => {
const basename = modulePath.split("/").pop()!;
let i = 0;
for (; i < basename.length; i++) {
const character = basename.charAt(i);
if (character === character.toUpperCase()) {
break;
}
}
const childLogger = logger.named(basename.substring(0, i));
export const forkModule = (modulePath: string): cp.ChildProcess => {
const childLogger = getChildLogger(modulePath);
childLogger.debug("Forking...", field("module", modulePath));
let proc: cp.ChildProcess | undefined;
@ -53,27 +56,11 @@ export const forkModule = (modulePath: string, stdio?: boolean): cp.ChildProcess
stdio: [null, null, null, "pipe"],
};
if (process.env.CLI === "true") {
proc = stdio ? cp.spawn(process.execPath, args, options) : cp.fork(process.execPath, args, options);
proc = cp.spawn(process.execPath, args, options);
} else {
proc = cp.spawn(process.execArgv[0], ["-r", "tsconfig-paths/register", process.argv[1], ...args], options);
}
proc.stdout.on("data", (message) => {
childLogger.debug("stdout", field("message", message.toString().trim()));
});
proc.stderr.on("data", (message) => {
childLogger.debug("stderr", field("message", message.toString().trim()));
});
proc.stdin.on("data", (message) => {
childLogger.debug("stdin", field("message", message.toString().trim()));
});
proc.on("message", (message) => {
childLogger.debug("message", field("message", message.toString().trim()));
});
proc.on("exit", (exitCode) => {
childLogger.debug(`Exited with ${exitCode}`);
});