@volcengine/tls-observer-cursor-install 0.0.5 → 0.0.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @volcengine/tls-observer-cursor-install
 
+## 0.0.6
+
+### Patch Changes
+
+- 兼容 windows 发布
+
 ## 0.0.5
 
 ### Patch Changes

package/dist/index.js

@@ -1,12 +1,105 @@
-import { execFile, execFileSync, spawn } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import { homedir, tmpdir } from "node:os";
 import { pathToFileURL } from "node:url";
-import { promisify } from "node:util";
 import promises from "node:readline/promises";
 import { randomInt } from "node:crypto";
+import * as __rspack_external_cross_spawn_96b24ecb from "cross-spawn";
 import * as __rspack_external_node_fs_promises_153e37e0 from "node:fs/promises";
 import * as __rspack_external_node_path_c5b9b54f from "node:path";
-const execFileAsync = promisify(execFile);
+var __webpack_modules__ = {};
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+__webpack_require__.m = __webpack_modules__;
+(()=>{
+    __webpack_require__.add = function(modules) {
+        Object.assign(__webpack_require__.m, modules);
+    };
+})();
+__webpack_require__.add({
+    "cross-spawn" (module) {
+        module.exports = __rspack_external_cross_spawn_96b24ecb;
+    },
+    "../tls-observer-shared/src/cross-platform-spawn.cjs" (__unused_rspack_module, exports, __webpack_require__) {
+        const crossSpawnModule = __webpack_require__("cross-spawn");
+        const crossSpawn = crossSpawnModule.default ?? crossSpawnModule;
+        const DEFAULT_MAX_BUFFER = 1048576;
+        function outputTooLargeError(command, maxBuffer) {
+            const error = new Error(`${command} output exceeded ${maxBuffer} bytes`);
+            error.code = 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER';
+            return error;
+        }
+        async function runCommand(command, args, options = {}) {
+            return new Promise((resolve, reject)=>{
+                const child = crossSpawn(command, args, {
+                    cwd: options.cwd,
+                    env: options.env,
+                    stdio: 'inherit' === options.stdio ? 'inherit' : [
+                        'ignore',
+                        'pipe',
+                        'pipe'
+                    ],
+                    windowsHide: true
+                });
+                const maxBuffer = options.maxBuffer ?? DEFAULT_MAX_BUFFER;
+                let stdout = '';
+                let stderr = '';
+                let outputBytes = 0;
+                let settled = false;
+                let timer;
+                const finish = (error)=>{
+                    if (settled) return;
+                    settled = true;
+                    if (timer) clearTimeout(timer);
+                    if (error) {
+                        error.stdout ??= stdout;
+                        error.stderr ??= stderr;
+                        reject(error);
+                    } else resolve({
+                        stdout,
+                        stderr
+                    });
+                };
+                const appendOutput = (target, chunk)=>{
+                    const text = String(chunk);
+                    outputBytes += Buffer.byteLength(text);
+                    if (outputBytes > maxBuffer) {
+                        child.kill();
+                        finish(outputTooLargeError(command, maxBuffer));
+                        return;
+                    }
+                    if ('stdout' === target) stdout += text;
+                    else stderr += text;
+                };
+                child.stdout?.on('data', (chunk)=>appendOutput('stdout', chunk));
+                child.stderr?.on('data', (chunk)=>appendOutput('stderr', chunk));
+                child.once('error', finish);
+                child.once('close', (code, signal)=>{
+                    if (0 === code) return void finish();
+                    const detail = signal ? `signal ${signal}` : `code ${code}`;
+                    const error = new Error(`${command} exited with ${detail}`);
+                    error.code = code;
+                    finish(error);
+                });
+                if (options.timeoutMs && options.timeoutMs > 0) timer = setTimeout(()=>{
+                    child.kill();
+                    const error = new Error(`${command} timed out after ${options.timeoutMs}ms`);
+                    error.code = 'ETIMEDOUT';
+                    finish(error);
+                }, options.timeoutMs);
+            });
+        }
+        exports.d = runCommand;
+    }
+});
+const cross_platform_spawn = __webpack_require__("../tls-observer-shared/src/cross-platform-spawn.cjs");
 const PLUGIN_NAME = 'tls-observer-cursor';
 const PLUGIN_PACKAGE_NAME = '@volcengine/tls-observer-cursor';
 const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
@@ -487,7 +580,6 @@ function pluginPackageSpec(options) {
 async function installPluginPackageToTemp(options) {
     const root = await __rspack_external_node_fs_promises_153e37e0.mkdtemp(__rspack_external_node_path_c5b9b54f.join(tmpdir(), 'tls-observer-cursor-plugin-'));
     const packageSpec = pluginPackageSpec(options);
-    const npm = 'win32' === process.platform ? 'npm.cmd' : 'npm';
     const args = [
         'install',
         '--prefix',
@@ -501,8 +593,8 @@ async function installPluginPackageToTemp(options) {
         packageSpec
     ];
     try {
-        await execFileAsync(npm, args, {
-            timeout: 120000
+        await (0, cross_platform_spawn.d)('npm', args, {
+            timeoutMs: 120000
         });
     } catch (error) {
         const detail = error && 'object' == typeof error && 'stderr' in error ? String(error.stderr || '') : error instanceof Error ? error.message : String(error);
@@ -573,30 +665,20 @@ async function installPlugin(options) {
             recursive: true
         });
         await writeHookWrapper(options);
-        const npm = 'win32' === process.platform ? 'npm.cmd' : 'npm';
         console.log('插件依赖安装中，请稍后...');
         try {
-            await new Promise((resolve, reject)=>{
-                const child = spawn(npm, [
-                    'install',
-                    '--omit=dev',
-                    "--ignore-scripts",
-                    '--no-audit',
-                    '--no-fund'
-                ], {
-                    cwd: options.pluginTarget,
-                    stdio: 'inherit'
-                });
-                const timer = setTimeout(()=>{
-                    child.kill();
-                    reject(new Error("npm install timed out after 120s"));
-                }, 120000);
-                child.on('exit', (code)=>{
-                    clearTimeout(timer);
-                    if (0 === code) resolve();
-                    else reject(new Error(`npm install exited with code ${code}`));
-                });
-                child.on('error', reject);
+            await (0, cross_platform_spawn.d)('npm', [
+                'install',
+                '--omit=dev',
+                "--ignore-scripts",
+                '--no-audit',
+                '--no-fund',
+                '--registry',
+                options.registry
+            ], {
+                cwd: options.pluginTarget,
+                stdio: 'inherit',
+                timeoutMs: 120000
             });
         } catch (error) {
             const detail = error && 'object' == typeof error && 'stderr' in error ? String(error.stderr || '') : error instanceof Error ? error.message : String(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volcengine/tls-observer-cursor-install",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "One-step installer for the TLS Observer Cursor plugin.",
   "type": "module",
   "bin": {
@@ -19,13 +19,15 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@volcengine/openapi": "^1.36.1"
+    "@volcengine/openapi": "^1.36.1",
+    "cross-spawn": "7.0.6"
   },
   "devDependencies": {
     "@rslib/core": "^0.21.5",
     "@types/node": "^24.10.9",
     "prettier": "^3.4.2",
-    "typescript": "^6.0.3"
+    "typescript": "^6.0.3",
+    "@volcengine/tls-observer-shared": "0.0.1"
   },
   "publishConfig": {
     "access": "public"

package/src/installer/installer-runner.ts

@@ -1,11 +1,11 @@
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { execFile, execFileSync, spawn } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 import { homedir, tmpdir } from 'node:os';
 import { pathToFileURL } from 'node:url';
-import { promisify } from 'node:util';
 import readline from 'node:readline/promises';
 import { randomInt } from 'node:crypto';
+import { runCommand } from '@volcengine/tls-observer-shared/cross-platform-spawn';
 
 type AnyRecord = Record<string, any>;
 
@@ -66,7 +66,6 @@ type PluginInstallResult = {
   version?: string;
 };
 
-const execFileAsync = promisify(execFile);
 const PLUGIN_NAME = 'tls-observer-cursor';
 const PLUGIN_PACKAGE_NAME = '@volcengine/tls-observer-cursor';
 const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
@@ -623,7 +622,6 @@ async function installPluginPackageToTemp(options: InstallOptions): Promise<{
 }> {
   const root = await fs.mkdtemp(path.join(tmpdir(), 'tls-observer-cursor-plugin-'));
   const packageSpec = pluginPackageSpec(options);
-  const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
   const args = [
     'install',
     '--prefix',
@@ -638,7 +636,7 @@ async function installPluginPackageToTemp(options: InstallOptions): Promise<{
   ];
 
   try {
-    await execFileAsync(npm, args, { timeout: 120_000 });
+    await runCommand('npm', args, { timeoutMs: 120_000 });
   } catch (error) {
     const detail =
       error && typeof error === 'object' && 'stderr' in error
@@ -709,25 +707,25 @@ async function installPlugin(options: InstallOptions): Promise<PluginInstallResu
       await fs.cp(path.join(source, entry), path.join(options.pluginTarget, entry), { recursive: true });
     }
     await writeHookWrapper(options);
-    const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
     console.log('插件依赖安装中，请稍后...');
     try {
-      await new Promise<void>((resolve, reject) => {
-        const child = spawn(npm, ['install', '--omit=dev', '--ignore-scripts', '--no-audit', '--no-fund'], {
+      await runCommand(
+        'npm',
+        [
+          'install',
+          '--omit=dev',
+          '--ignore-scripts',
+          '--no-audit',
+          '--no-fund',
+          '--registry',
+          options.registry,
+        ],
+        {
           cwd: options.pluginTarget,
           stdio: 'inherit',
-        });
-        const timer = setTimeout(() => {
-          child.kill();
-          reject(new Error(`npm install timed out after 120s`));
-        }, 120_000);
-        child.on('exit', (code) => {
-          clearTimeout(timer);
-          if (code === 0) resolve();
-          else reject(new Error(`npm install exited with code ${code}`));
-        });
-        child.on('error', reject);
-      });
+          timeoutMs: 120_000,
+        },
+      );
     } catch (error) {
       const detail =
         error && typeof error === 'object' && 'stderr' in error