refactor: do not destructure when importing global Node modules

Author: northword

src/cli.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import process, { env, exit } from "node:process";
+import process from "node:process";
 import { Command } from "@commander-js/extra-typings";
 import pkg from "../package.json" with { type: "json" };
 import { Build, Config, Release, Serve, Test } from "./index.js";
@@ -14,7 +14,7 @@ export default async function main() {
 
   // Env variables are initialized to dev, but can be overridden by each command
   // For example, "zotero-plugin build" overrides them to "production"
-  env.NODE_ENV ??= "development";
+  process.env.NODE_ENV ??= "development";
 
   const cli = new Command();
 
@@ -29,7 +29,7 @@ export default async function main() {
     .option("--dev", "Builds the plugin in dev mode")
     .option("--dist <dir>", "The relative path for the new output directory (default: build)")
     .action((options) => {
-      env.NODE_ENV = options.dev ? "development" : "production";
+      process.env.NODE_ENV = options.dev ? "development" : "production";
       Config.loadConfig({
         dist: options.dist,
       }).then(ctx => new Build(ctx).run());
@@ -56,7 +56,7 @@ export default async function main() {
     .option("--abort-on-fail", "Abort the test suite on first failure")
     .option("--exit-on-finish", "Exit the test suite after all tests have run")
     .action((options) => {
-      env.NODE_ENV = "test";
+      process.env.NODE_ENV = "test";
 
       Config.loadConfig({}).then((ctx) => {
         if (options.abortOnFail) {
@@ -84,7 +84,7 @@ export default async function main() {
     .option("--preid <preid>", "ID for prerelease")
     .option("-y, --yes", "Skip confirmation")
     .action(async (version, options) => {
-      env.NODE_ENV = "production";
+      process.env.NODE_ENV = "production";
       Config.loadConfig({
         release: {
           bumpp: {
@@ -115,5 +115,5 @@ process.on("uncaughtException", onError);
 
 function onError(err: Error) {
   logger.error(err);
-  exit(1);
+  process.exit(1);
 }

src/core/builder.ts

@@ -3,7 +3,7 @@ import type { Manifest } from "../types/manifest.js";
 import type { UpdateJSON } from "../types/update-json.js";
 import { readFile, writeFile } from "node:fs/promises";
 import { basename, dirname } from "node:path";
-import { env } from "node:process";
+import process from "node:process";
 import AdmZip from "adm-zip";
 import chalk from "chalk";
 import { toMerged } from "es-toolkit";
@@ -19,7 +19,7 @@ export default class Build extends Base {
   private isPreRelease: boolean;
   constructor(ctx: Context) {
     super(ctx);
-    env.NODE_ENV ??= "production";
+    process.env.NODE_ENV ??= "production";
     this.buildTime = "";
     this.isPreRelease = this.ctx.version.includes("-");
   }
@@ -33,7 +33,7 @@ export default class Build extends Base {
     const t = new Date();
     this.buildTime = dateFormat("YYYY-mm-dd HH:MM:SS", t);
     this.logger.info(
-      `Building version ${chalk.blue(version)} to ${chalk.blue(dist)} at ${chalk.blue(this.buildTime)} in ${chalk.blue(env.NODE_ENV)} mode.`,
+      `Building version ${chalk.blue(version)} to ${chalk.blue(dist)} at ${chalk.blue(this.buildTime)} in ${chalk.blue(process.env.NODE_ENV)} mode.`,
     );
     await this.ctx.hooks.callHook("build:init", this.ctx);
 
@@ -58,7 +58,7 @@ export default class Build extends Base {
 
     /** ======== build resolved =========== */
 
-    if (env.NODE_ENV === "production") {
+    if (process.env.NODE_ENV === "production") {
       this.logger.tip("Packing plugin");
       await this.pack();
       await this.ctx.hooks.callHook("build:pack", this.ctx);

src/core/releaser/github.ts

@@ -1,7 +1,7 @@
 import type { Context } from "../../types/index.js";
 import { readFile, stat } from "node:fs/promises";
 import { basename, join } from "node:path";
-import { env } from "node:process";
+import process from "node:process";
 import mime from "mime";
 import { Octokit } from "octokit";
 import { glob } from "tinyglobby";
@@ -172,10 +172,10 @@ export default class GitHub extends ReleaseBase {
   }
 
   getClient(): Octokit {
-    if (!env.GITHUB_TOKEN)
+    if (!process.env.GITHUB_TOKEN)
       throw new Error("No GITHUB_TOKEN.");
     const client = new Octokit({
-      auth: env.GITHUB_TOKEN,
+      auth: process.env.GITHUB_TOKEN,
       userAgent: "zotero-plugin-scaffold",
     });
 

src/core/server.ts

@@ -1,7 +1,7 @@
 import type { Context } from "../types/index.js";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import process, { env, exit } from "node:process";
+import process from "node:process";
 import chokidar from "chokidar";
 import { debounce } from "es-toolkit";
 import { ZoteroRunner } from "../utils/zotero-runner.js";
@@ -118,14 +118,14 @@ export default class Serve extends Base {
 
   private onZoteroExit = (_code?: number | null, _signal?: any) => {
     this.logger.info(`Zotero terminated.`);
-    exit();
+    process.exit();
   };
 
   get zoteroBinPath() {
     if (this._zoteroBinPath)
       return this._zoteroBinPath;
 
-    this._zoteroBinPath = env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH;
+    this._zoteroBinPath = process.env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH;
     if (!this._zoteroBinPath || !existsSync(this._zoteroBinPath))
       throw new Error("The Zotero binary not found.");
 
@@ -136,14 +136,14 @@ export default class Serve extends Base {
     if (this._profilePath)
       return this._profilePath;
 
-    this._profilePath = env.ZOTERO_PLUGIN_PROFILE_PATH;
+    this._profilePath = process.env.ZOTERO_PLUGIN_PROFILE_PATH;
     if (!this._profilePath || !existsSync(this._profilePath))
       throw new Error("The Zotero profile not found.");
 
     return this._profilePath;
   }
 
   get dataDir() {
-    return env.ZOTERO_PLUGIN_DATA_DIR ?? "";
+    return process.env.ZOTERO_PLUGIN_DATA_DIR ?? "";
   }
 }

src/core/tester.ts

@@ -1,7 +1,7 @@
 import type { Context } from "../types/index.js";
 import http from "node:http";
 import { join, resolve } from "node:path";
-import process, { cwd, env, exit } from "node:process";
+import process, { cwd } from "node:process";
 import { build } from "esbuild";
 import { copy, emptyDir, outputFile, outputJSON, pathExists } from "fs-extra/esm";
 import { isCI } from "std-env";
@@ -22,7 +22,7 @@ export default class Test extends Base {
 
   constructor(ctx: Context) {
     super(ctx);
-    env.NODE_ENV ??= "test";
+    process.env.NODE_ENV ??= "test";
 
     this.builder = new Build(ctx);
 
@@ -552,7 +552,7 @@ export default class Test extends Base {
     await installZoteroLinux();
 
     // Set Environment Variable for Zotero Bin Path
-    env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH = `${cwd()}/Zotero_linux-x86_64/zotero`;
+    process.env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH = `${cwd()}/Zotero_linux-x86_64/zotero`;
 
     const xvfb = new Xvfb({
       timeout: 2000,
@@ -589,22 +589,22 @@ export default class Test extends Base {
 
     if (code === 1) {
       this.logger.error("Test run failed");
-      exit(1);
+      process.exit(1);
     }
     else if (code === "SIGINT") {
       this.logger.info("Tester shutdown by user request");
-      exit();
+      process.exit();
     }
     else {
       this.logger.success("Test run completed successfully");
-      exit();
+      process.exit();
     }
   };
 
   private get zoteroBinPath() {
-    if (!env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH)
+    if (!process.env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH)
       throw new Error("No Zotero Found.");
-    return env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH;
+    return process.env.ZOTERO_PLUGIN_ZOTERO_BIN_PATH;
   }
 
   private get profilePath() {

src/utils/headless.ts

@@ -1,13 +1,13 @@
 import { execSync } from "node:child_process";
-import { exit } from "node:process";
+import process from "node:process";
 import { isLinux } from "std-env";
 import { logger } from "./log.js";
 
 export async function installXvfb() {
   logger.debug("Installing xvfb...");
   if (!isLinux) {
     logger.error("Unsupported platform. Please install Xvfb manually.");
-    exit(1);
+    process.exit(1);
   }
   try {
     execSync("which xvfb", { stdio: "ignore" });
@@ -30,7 +30,7 @@ export async function installXvfb() {
     }
     catch (error) {
       logger.error("Failed to install Xvfb:", error);
-      exit(1);
+      process.exit(1);
     }
   }
 }

src/utils/log.ts

@@ -1,4 +1,4 @@
-import process, { env } from "node:process";
+import process from "node:process";
 import readline from "node:readline";
 import chalk from "chalk";
 import { isPlainObject } from "es-toolkit";
@@ -26,8 +26,8 @@ export class Log {
   constructor(level?: LOG_LEVEL) {
     if (isDebug)
       this.logLevel = LOG_LEVEL.trace;
-    else if (env.ZOTERO_PLUGIN_LOG_LEVEL)
-      this.logLevel = LOG_LEVEL[env.ZOTERO_PLUGIN_LOG_LEVEL as LogLevelType];
+    else if (process.env.ZOTERO_PLUGIN_LOG_LEVEL)
+      this.logLevel = LOG_LEVEL[process.env.ZOTERO_PLUGIN_LOG_LEVEL as LogLevelType];
     else if (level)
       this.logLevel = level;
     else

src/utils/process.ts

@@ -1,9 +1,9 @@
 import { execSync } from "node:child_process";
-import { platform } from "node:process";
+import process from "node:process";
 
 export function isRunning(query: string) {
   let cmd = "";
-  switch (platform) {
+  switch (process.platform) {
     case "win32":
       cmd = `tasklist`;
       break;
@@ -27,3 +27,12 @@ export function isRunning(query: string) {
 }
 
 export const ExitSignals = ["exit", "SIGABRT", "SIGALRM", "SIGHUP", "SIGINT", "SIGTERM"];
+
+export function whenExit(cb: (_code: number, _signal: string) => any) {
+  ExitSignals.forEach((signal) => {
+    process.once(
+      signal,
+      (_code, _signal) => cb(_code, _signal),
+    );
+  });
+}

src/utils/zotero-runner.ts

@@ -2,7 +2,7 @@ import type { ChildProcessWithoutNullStreams } from "node:child_process";
 import { execSync, spawn } from "node:child_process";
 import { readFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
-import { env } from "node:process";
+import process from "node:process";
 import { delay } from "es-toolkit";
 import { outputFile, outputJSON, pathExists, readJSON, remove } from "fs-extra/esm";
 import { isLinux, isMacOS, isWindows } from "std-env";
@@ -117,19 +117,15 @@ export class ZoteroRunner {
     const remotePort = await findFreeTcpPort();
     args.push("-start-debugger-server", String(remotePort));
 
-    const defaultFirefoxEnv = {
+    const env = {
+      ...process.env,
       XPCOM_DEBUG_BREAK: "stack",
       NS_TRACE_MALLOC_DISABLE_STACKS: "1",
     };
 
     // Using `spawn` so we can stream logging as they come in, rather than
     // buffer them up until the end, which can easily hit the max buffer size.
-    this.zotero = spawn(this.options.binaryPath, args, {
-      env: {
-        ...env,
-        ...defaultFirefoxEnv,
-      },
-    });
+    this.zotero = spawn(this.options.binaryPath, args, { env });
 
     // Handle Zotero log, necessary on macOS
     this.zotero.stdout?.on("data", (_data) => {});
@@ -287,8 +283,8 @@ export class ZoteroRunner {
 export function killZotero() {
   function kill() {
     try {
-      if (env.ZOTERO_PLUGIN_KILL_COMMAND) {
-        execSync(env.ZOTERO_PLUGIN_KILL_COMMAND);
+      if (process.env.ZOTERO_PLUGIN_KILL_COMMAND) {
+        execSync(process.env.ZOTERO_PLUGIN_KILL_COMMAND);
       }
       else if (isWindows) {
         execSync("taskkill /f /im zotero.exe");