@tapi-dev/sdk 0.1.31 → 0.1.33

package/dist/cli.d.ts

@@ -85,6 +85,7 @@ export declare function trySelectDevSessionInOpenStudio(session: TapiDevSession,
     baseUrl?: string;
     reason?: string;
 }>;
+export declare function servicePowerShell(action: string): string;
 export declare function installedServiceVersionFromPathName(pathName: string): string | undefined;
 export declare function serviceNeedsInstall(status: ServiceStatus, manifest: ServiceReleaseManifest): boolean;
 export declare function getDefaultStudioCacheDir(): string;

package/dist/cli.js

@@ -28,6 +28,8 @@ const DOWNLOAD_PROGRESS_LOG_BYTES = 50 * 1024 * 1024;
 const MAX_WIDE_EVENT_PROCESS_ROOTS = 5;
 const MAX_NONCURRENT_MANAGED_DOWNLOADS = 0;
 const MAX_NONCURRENT_MANAGED_RELEASES = 0;
+const WINDOWS_SERVICE_STATUS_TIMEOUT_MS = 8_000;
+const WINDOWS_SERVICE_COMMAND_TIMEOUT_MS = 30_000;
 const MANAGED_RELEASE_MARKER = ".tapi-managed-release";
 const MIN_EXTRACTION_REQUIRED_BYTES = 1024 * 1024 * 1024;
 const EXTRACTION_REQUIRED_MULTIPLIER = 3;
@@ -1351,7 +1353,7 @@ async function runServiceCommand(action, args = []) {
             return repairService(parseStudioOptions([]));
         }
         const command = servicePowerShell(normalized);
-        const output = await withCliSpinner(`Running tapi-service ${normalized}`, () => runProcessCapture("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", command]));
+        const output = await withCliSpinner(`Running tapi-service ${normalized}`, () => runProcessCapture("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", command], { timeoutMs: WINDOWS_SERVICE_COMMAND_TIMEOUT_MS }));
         if (output.trim()) {
             console.log(output.trim());
         }
@@ -1369,9 +1371,9 @@ async function repairService(options) {
     }
     return runServiceCommand("restart");
 }
-function servicePowerShell(action) {
+export function servicePowerShell(action) {
     const serviceName = "tapi-service";
-    const status = `$svc = Get-Service -Name '${serviceName}' -ErrorAction SilentlyContinue; if ($null -eq $svc) { [pscustomobject]@{ installed = $false; name = '${serviceName}'; status = 'not_installed'; pathName = '' } | ConvertTo-Json -Compress; exit 0 }; $cim = Get-CimInstance Win32_Service -Filter "Name='${serviceName}'" -ErrorAction SilentlyContinue; $pathName = if ($null -ne $cim) { [string]$cim.PathName } else { '' }; [pscustomobject]@{ installed = $true; name = $svc.Name; status = $svc.Status.ToString(); pathName = $pathName } | ConvertTo-Json -Compress`;
+    const status = `$svc = Get-Service -Name '${serviceName}' -ErrorAction SilentlyContinue; if ($null -eq $svc) { [pscustomobject]@{ installed = $false; name = '${serviceName}'; status = 'not_installed'; pathName = '' } | ConvertTo-Json -Compress; exit 0 }; $pathName = ''; try { $imagePath = (Get-ItemProperty -LiteralPath 'HKLM:\\SYSTEM\\CurrentControlSet\\Services\\${serviceName}' -Name ImagePath -ErrorAction SilentlyContinue).ImagePath; if ($null -ne $imagePath) { $pathName = [string]$imagePath } } catch {}; [pscustomobject]@{ installed = $true; name = $svc.Name; status = $svc.Status.ToString(); pathName = $pathName } | ConvertTo-Json -Compress`;
     if (action === "status") {
         return status;
     }
@@ -1393,7 +1395,7 @@ async function getServiceStatus() {
         "Bypass",
         "-Command",
         servicePowerShell("status"),
-    ]);
+    ], { timeoutMs: WINDOWS_SERVICE_STATUS_TIMEOUT_MS });
     try {
         const payload = JSON.parse(output.trim());
         return {
@@ -1436,7 +1438,7 @@ async function ensureServiceReadyForStudio(options) {
             "Bypass",
             "-Command",
             servicePowerShell("start"),
-        ]));
+        ], { timeoutMs: WINDOWS_SERVICE_COMMAND_TIMEOUT_MS }));
         if (output.trim()) {
             console.log(output.trim());
         }
@@ -2434,54 +2436,9 @@ async function isPortAvailable(port) {
     });
 }
 async function reapPortableStudioServersBlockingPorts(preferred, count) {
-    if (process.platform !== "win32") {
-        return 0;
-    }
-    const start = Math.max(1, Math.min(65535, Math.trunc(preferred)));
-    const end = Math.max(start, Math.min(65535, start + Math.max(1, Math.trunc(count)) - 1));
-    const script = `
-$ErrorActionPreference = 'SilentlyContinue'
-$ports = ${start}..${end}
-$connections = @(Get-NetTCPConnection -State Listen | Where-Object { $ports -contains $_.LocalPort })
-$owners = @{}
-foreach ($conn in $connections) {
-  $pidValue = [int]$conn.OwningProcess
-  if ($pidValue -le 0 -or $owners.ContainsKey($pidValue)) { continue }
-  $proc = Get-CimInstance Win32_Process -Filter "ProcessId=$pidValue"
-  if ($null -eq $proc) { continue }
-  $path = [string]$proc.ExecutablePath
-  $cmd = [string]$proc.CommandLine
-  $isPortableStudio = (
-    $path -match '\\\\Tapi\\\\Studio\\\\server\\\\releases\\\\' -or
-    $cmd -match 'tapi-studio-server'
-  )
-  if ($isPortableStudio) {
-    $owners[$pidValue] = $true
-  }
-}
-$stopped = 0
-foreach ($pidValue in $owners.Keys) {
-  try {
-    Stop-Process -Id $pidValue -Force -ErrorAction Stop
-    $stopped += 1
-  } catch {}
-}
-[pscustomobject]@{ stopped = $stopped } | ConvertTo-Json -Compress
-`;
-    try {
-        const output = await runProcessCapture("powershell.exe", [
-            "-NoProfile",
-            "-ExecutionPolicy",
-            "Bypass",
-            "-Command",
-            script,
-        ]);
-        const payload = JSON.parse(output.trim() || "{}");
-        return typeof payload.stopped === "number" ? payload.stopped : 0;
-    }
-    catch {
-        return 0;
-    }
+    void preferred;
+    void count;
+    return 0;
 }
 async function stopPortableStudioServerProcesses() {
     if (process.platform !== "win32") {
@@ -2490,26 +2447,24 @@ async function stopPortableStudioServerProcesses() {
     const script = `
 $ErrorActionPreference = 'SilentlyContinue'
 $currentPid = $PID
-$processes = @(Get-CimInstance Win32_Process | Where-Object {
-  $pidValue = [int]$_.ProcessId
+$processes = @(Get-Process -ErrorAction SilentlyContinue | Where-Object {
+  $pidValue = [int]$_.Id
   if ($pidValue -le 0 -or $pidValue -eq $currentPid) {
     $false
   } else {
-    $path = [string]$_.ExecutablePath
-    $cmd = [string]$_.CommandLine
-    $name = [string]$_.Name
+    $path = ''
+    try { $path = [string]$_.Path } catch {}
+    $name = [string]$_.ProcessName
     (
-      $name -ieq 'tapi-studio-server.exe' -or
-      $path -match '\\\\Tapi\\\\Studio\\\\server\\\\releases\\\\' -or
-      $cmd -match 'tapi-studio-server' -or
-      $cmd -match 'scripts[\\\\/]studio\\.py'
+      $name -ieq 'tapi-studio-server' -or
+      $path -match '\\\\Tapi\\\\Studio\\\\server\\\\releases\\\\'
     )
   }
 })
 $stopped = 0
 foreach ($process in $processes) {
   try {
-    Stop-Process -Id ([int]$process.ProcessId) -Force -ErrorAction Stop
+    Stop-Process -Id ([int]$process.Id) -Force -ErrorAction Stop
     $stopped += 1
   } catch {}
 }
@@ -2522,7 +2477,7 @@ foreach ($process in $processes) {
             "Bypass",
             "-Command",
             script,
-        ]);
+        ], { timeoutMs: WINDOWS_SERVICE_STATUS_TIMEOUT_MS });
         const payload = JSON.parse(output.trim() || "{}");
         return typeof payload.stopped === "number" ? payload.stopped : 0;
     }
@@ -3086,7 +3041,7 @@ async function runProcess(command, args) {
         });
     });
 }
-async function runProcessCapture(command, args) {
+async function runProcessCapture(command, args, options = {}) {
     return await new Promise((resolvePromise, rejectPromise) => {
         const child = spawn(command, args, {
             stdio: ["ignore", "pipe", "pipe"],
@@ -3094,21 +3049,47 @@ async function runProcessCapture(command, args) {
         });
         let stdout = "";
         let stderr = "";
+        let timedOut = false;
+        let settled = false;
+        const timeoutMs = Math.max(0, options.timeoutMs ?? 0);
+        const timeout = timeoutMs > 0
+            ? setTimeout(() => {
+                timedOut = true;
+                child.kill();
+            }, timeoutMs)
+            : undefined;
+        timeout?.unref?.();
+        const finish = (callback) => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            callback();
+        };
         child.stdout.on("data", (chunk) => {
             stdout += String(chunk);
         });
         child.stderr.on("data", (chunk) => {
             stderr += String(chunk);
         });
-        child.once("error", rejectPromise);
+        child.once("error", (error) => finish(() => rejectPromise(error)));
         child.once("exit", (code) => {
-            const err = stderr.trim();
-            if (code === 0) {
-                resolvePromise(stdout);
-            }
-            else {
-                rejectPromise(new Error(err || `Process exited with code ${code ?? "unknown"}.`));
-            }
+            finish(() => {
+                const err = stderr.trim();
+                if (timedOut) {
+                    rejectPromise(new Error(`Process timed out after ${timeoutMs} ms: ${command} ${args.join(" ")}`));
+                    return;
+                }
+                if (code === 0) {
+                    resolvePromise(stdout);
+                }
+                else {
+                    rejectPromise(new Error(err || `Process exited with code ${code ?? "unknown"}.`));
+                }
+            });
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapi-dev/sdk",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",