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

Fix spdlog and node-pty in binary

Browse Source
This commit is contained in:
Asher
2019-02-25 15:18:44 -06:00
parent 1e55736c69
commit eaea947318
11 changed files with 58 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
packages/protocol/src/common/helpers.ts
View File

@ -1,3 +1,4 @@
/// <reference path="../../../../lib/vscode/src/typings/spdlog.d.ts" />
import { ChildProcess, SpawnOptions, ForkOptions } from "child_process";
import { EventEmitter } from "events";
import { Socket } from "net";
@ -7,9 +8,6 @@ import { logger } from "@coder/logger";
// tslint:disable no-any
declare var __non_webpack_require__: typeof require;
declare var __webpack_require__: typeof require;
export type ForkProvider = (modulePath: string, args: string[], options: ForkOptions) => ChildProcess;
export interface Disposer extends IDisposable {
@ -26,6 +24,19 @@ interface ActiveEvalEmitter {
* Helper class for server-side evaluations.
*/
export class EvalHelper {
// For any non-external modules that are not built in, we need to require and
// access them here. A require on the client-side won't work since that code
// won't exist on the server (and bloat the client with an unused import), and
// we can't manually import on the server-side and then call
// `__webpack_require__` on the client-side because Webpack stores modules by
// their paths which would require us to hard-code the path. These aren't
// required immediately so we have a chance to unpack the .node files and set
// their locations.
public modules = {
spdlog: require("spdlog") as typeof import("spdlog"),
pty: require("node-pty") as typeof import("node-pty"),
};
/**
* Some spawn code tries to preserve the env (the debug adapter for instance)
* but the env is mostly blank (since we're in the browser), so we'll just
@ -38,29 +49,6 @@ export class EvalHelper {
options.env = { ...process.env, ...options.env };
}
}
/**
* Try a non-webpack require, then a webpack require if that fails.
*/
public require(modulePath: string): any {
logger.info(`Attempting to require ${modulePath}`);
try {
return __non_webpack_require__(modulePath);
} catch (error) { /* Nothing. */ }
logger.warn(`Non-webpack require failed for ${modulePath}`);
try {
return __webpack_require__(modulePath);
} catch (error) { /* Nothing. */ }
logger.warn(`Webpack require failed for ${modulePath}`);
try {
return require(modulePath);
} catch (error) {
logger.error(`Failed to require ${modulePath}`);
throw error;
}
}
}
/**
@ -125,20 +113,17 @@ export class ActiveEvalHelper implements ActiveEvalEmitter {
* Helper class for server-side active evaluations.
*/
export class ServerActiveEvalHelper extends ActiveEvalHelper implements EvalHelper {
private readonly evalHelper: EvalHelper;
private readonly evalHelper = new EvalHelper();
public modules = this.evalHelper.modules;
public constructor(emitter: ActiveEvalEmitter, public readonly fork: ForkProvider) {
super(emitter);
this.evalHelper = new EvalHelper();
}
public preserveEnv(options: SpawnOptions | ForkOptions): void {
this.evalHelper.preserveEnv(options);
}
public require(modulePath: string): any {
return this.evalHelper.require(modulePath);
}
/**
* If there is a callback ID, return a function that emits the callback event
* on the active evaluation with that ID and all arguments passed to it.