Hotswap on SIGUSR1

2020-08-13 17:39:22 -05:00
5 changed files with 428 additions and 189 deletions
--- a/ci/dev/vscode.patch
+++ b/ci/dev/vscode.patch
--- a/lib/vscode
+++ b/lib/vscode
--- a/src/browser/pages/vscode.html
+++ b/src/browser/pages/vscode.html
@@ -2,12 +2,13 @@
 <!DOCTYPE html>
 <html>
  <head>
    <script>
      globalThis.MonacoPerformanceMarks = globalThis.MonacoPerformanceMarks || [];
      globalThis.MonacoPerformanceMarks.push('renderer/started', Date.now());
    </script>
    <meta charset="utf-8" />
    <meta
      http-equiv="Content-Security-Policy"
      content="font-src 'self' data:; connect-src ws: wss: 'self' https:; default-src ws: wss: 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; manifest-src 'self'; img-src 'self' data: https:;"
    />
    <!-- Disable pinch zooming -->
    <meta
      name="viewport"
@@ -69,7 +70,6 @@
    }
    self.require = {
      baseUrl: "{{CS_STATIC_BASE}}/lib/vscode/out",
      recordStats: true,
      paths: {
        "vscode-textmate": `../node_modules/vscode-textmate/release/main`,
        "vscode-oniguruma": `../node_modules/vscode-oniguruma/release/main`,
@@ -86,9 +86,6 @@
  </script>
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/register.js"></script>
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/loader.js"></script>
  <script>
    globalThis.MonacoPerformanceMarks.push('willLoadWorkbenchMain', Date.now());
  </script>
  <!-- PROD_ONLY
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.nls.js"></script>
  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/workbench/workbench.web.api.js"></script>
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -125,11 +125,7 @@ const options: Options<Required<Args>> = {
  "extra-builtin-extensions-dir": { type: "string[]", path: true },
  "list-extensions": { type: "boolean", description: "List installed VS Code extensions." },
  force: { type: "boolean", description: "Avoid prompts when installing VS Code extensions." },
-  "install-extension": {
+  "install-extension": { type: "string[]", description: "Install or update a VS Code extension by id or vsix." },
    type: "string[]",
    description:
      "Install or update a VS Code extension by id or vsix. The identifier of an extension is `${publisher}.${name}`. To install a specific version provide `@${version}`. For example: 'vscode.csharp@1.2.3'.",
  },
  "uninstall-extension": { type: "string[]", description: "Uninstall a VS Code extension by id." },
  "show-versions": { type: "boolean", description: "Show VS Code extension versions." },
  "proxy-domain": { type: "string[]", description: "Domain used for proxying ports." },
--- a/src/node/wrapper.ts
+++ b/src/node/wrapper.ts
@@ -32,7 +32,7 @@ export class IpcMain {
  public readonly onMessage = this._onMessage.event
  private readonly _onDispose = new Emitter<NodeJS.Signals | undefined>()
  public readonly onDispose = this._onDispose.event
-  public readonly exit: (code?: number) => never
+  public readonly processExit: (code?: number) => never
  public constructor(public readonly parentPid?: number) {
    process.on("SIGINT", () => this._onDispose.emit("SIGINT"))
@@ -40,7 +40,7 @@ export class IpcMain {
    process.on("exit", () => this._onDispose.emit(undefined))
    // Ensure we control when the process exits.
-    this.exit = process.exit
+    this.processExit = process.exit
    process.exit = function (code?: number) {
      logger.warn(`process.exit() was prevented: ${code || "unknown code"}.`)
    } as (code?: number) => never
@@ -71,6 +71,14 @@ export class IpcMain {
    }
  }
  public exit(error?: number | ProcessError): never {
    if (error && typeof error !== "number") {
      this.processExit(typeof error.code === "number" ? error.code : 1)
    } else {
      this.processExit(error)
    }
  }
  public handshake(child?: cp.ChildProcess): Promise<void> {
    return new Promise((resolve, reject) => {
      const target = child || process
@@ -161,28 +169,37 @@ export class WrapperProcess {
      }
    })
-    ipcMain().onMessage(async (message) => {
+    ipcMain().onMessage((message) => {
      switch (message.type) {
        case "relaunch":
          logger.info(`Relaunching: ${this.currentVersion} -> ${message.version}`)
          this.currentVersion = message.version
-          this.started = undefined
+          this.relaunch()
          if (this.process) {
            this.process.removeAllListeners()
            this.process.kill()
          }
          try {
            await this.start()
          } catch (error) {
            logger.error(error.message)
            ipcMain().exit(typeof error.code === "number" ? error.code : 1)
          }
          break
        default:
          logger.error(`Unrecognized message ${message}`)
          break
      }
    })
    process.on("SIGUSR1", async () => {
      logger.info("Received SIGUSR1; hotswapping")
      this.relaunch()
    })
  }
  private async relaunch(): Promise<void> {
    this.started = undefined
    if (this.process) {
      this.process.removeAllListeners()
      this.process.kill()
    }
    try {
      await this.start()
    } catch (error) {
      logger.error(error.message)
      ipcMain().exit(typeof error.code === "number" ? error.code : 1)
    }
  }
  public start(): Promise<void> {
@@ -244,13 +261,13 @@ export const wrap = (fn: () => Promise<void>): void => {
      .then(() => fn())
      .catch((error: ProcessError): void => {
        logger.error(error.message)
-        ipcMain().exit(typeof error.code === "number" ? error.code : 1)
+        ipcMain().exit(error)
      })
  } else {
    const wrapper = new WrapperProcess(require("../../package.json").version)
    wrapper.start().catch((error) => {
      logger.error(error.message)
-      ipcMain().exit(typeof error.code === "number" ? error.code : 1)
+      ipcMain().exit(error)
    })
  }
 }