@tapi-dev/sdk 0.1.30 → 0.1.32

package/dist/cli.d.ts

@@ -60,6 +60,7 @@ export interface StudioCliOptions {
     silent: boolean;
     exePath?: string;
     installToken?: string;
+    installTokenSource?: "option" | "env" | "minted";
     workspace?: TapiWorkspace;
     workspaceRoot?: string;
     projectId?: string;
@@ -84,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;
@@ -113,7 +115,7 @@ export declare function getStudioExecutableCandidates(): string[];
 export declare function validateStudioManifest(input: unknown): StudioReleaseManifest;
 export declare function validateServiceReleaseManifest(input: unknown): ServiceReleaseManifest;
 export declare function compareVersions(left: string, right: string): number;
-export declare function memoizeStudioInstallToken(options: StudioCliOptions, installToken?: string): string;
+export declare function memoizeStudioInstallToken(options: StudioCliOptions, installToken?: string, source?: StudioCliOptions["installTokenSource"]): string;
 export declare function closeExistingPortableStudioServersForFreshLaunch(stopProcesses?: () => Promise<number>): Promise<{
     stopped: number;
     recordsRemoved: number;

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;
@@ -344,6 +346,8 @@ export function parseStudioOptions(args) {
         : `${downloadsBaseUrl.replace(/\/+$/, "")}/studio/channels/${channel}/latest.json`;
     const projectId = raw.projectId ?? envString("TAPI_PROJECT_ID") ?? workspace?.projectId;
     const projectSlug = raw.projectSlug ?? envString("TAPI_PROJECT_SLUG") ?? workspace?.projectSlug;
+    const envInstallToken = envString("TAPI_STUDIO_INSTALL_TOKEN");
+    const installToken = raw.installToken ?? envInstallToken;
     return {
         channel,
         apiBaseUrl,
@@ -354,7 +358,8 @@ export function parseStudioOptions(args) {
         downloadOnly: raw.downloadOnly ?? false,
         silent: raw.silent ?? false,
         exePath: raw.exePath ?? envString("TAPI_STUDIO_EXE"),
-        installToken: raw.installToken ?? envString("TAPI_STUDIO_INSTALL_TOKEN"),
+        installToken,
+        installTokenSource: raw.installToken ? "option" : installToken ? "env" : undefined,
         workspace,
         workspaceRoot: workspace?.root,
         projectId,
@@ -1348,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());
         }
@@ -1366,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;
     }
@@ -1390,7 +1395,7 @@ async function getServiceStatus() {
         "Bypass",
         "-Command",
         servicePowerShell("status"),
-    ]);
+    ], { timeoutMs: WINDOWS_SERVICE_STATUS_TIMEOUT_MS });
     try {
         const payload = JSON.parse(output.trim());
         return {
@@ -1433,7 +1438,7 @@ async function ensureServiceReadyForStudio(options) {
             "Bypass",
             "-Command",
             servicePowerShell("start"),
-        ]));
+        ], { timeoutMs: WINDOWS_SERVICE_COMMAND_TIMEOUT_MS }));
         if (output.trim()) {
             console.log(output.trim());
         }
@@ -1967,12 +1972,7 @@ async function installStudio(options) {
             throw new Error("Direct Studio manifest overrides are no longer supported for install. "
                 + "Use --channel with the protected install flow instead.");
         }
-        const installToken = await ensureStudioInstallTokenForRun(options, event, "Checking Studio install authorization");
-        await event.phase("manifest.fetch.start", {
-            apiBaseUrl: options.apiBaseUrl,
-            channel: options.channel,
-        });
-        const manifest = await withCliSpinner(`Fetching Tapi Studio ${options.channel} manifest`, () => fetchProtectedStudioManifest(options.apiBaseUrl, options.channel, installToken));
+        const manifest = await fetchStudioManifestForRun(options, event, "Checking Studio install authorization");
         await event.phase("manifest.fetch.success", {
             manifest: manifestEventSummary(manifest),
         });
@@ -2086,7 +2086,7 @@ async function obtainStudioInstallToken(options, event) {
     const issued = await requestStudioInstallToken(options.apiBaseUrl, options.channel, firebaseCreds.idToken);
     return issued.installToken;
 }
-export function memoizeStudioInstallToken(options, installToken) {
+export function memoizeStudioInstallToken(options, installToken, source = "minted") {
     const existing = options.installToken?.trim();
     if (existing) {
         options.installToken = existing;
@@ -2095,9 +2095,14 @@ export function memoizeStudioInstallToken(options, installToken) {
     const normalized = installToken?.trim() ?? "";
     if (normalized) {
         options.installToken = normalized;
+        options.installTokenSource = source;
     }
     return normalized;
 }
+function clearStudioInstallTokenForRun(options) {
+    options.installToken = undefined;
+    options.installTokenSource = undefined;
+}
 async function ensureStudioInstallTokenForRun(options, event, message) {
     const existing = memoizeStudioInstallToken(options);
     if (existing) {
@@ -2111,7 +2116,7 @@ async function ensureStudioInstallTokenForRun(options, event, message) {
         apiBaseUrl: options.apiBaseUrl,
         channel: options.channel,
     });
-    const installToken = memoizeStudioInstallToken(options, await withCliSpinner(message, () => obtainStudioInstallToken(options, event)));
+    const installToken = memoizeStudioInstallToken(options, await withCliSpinner(message, () => obtainStudioInstallToken(options, event)), "minted");
     await event.phase("auth.install_token.request.success", {
         apiBaseUrl: options.apiBaseUrl,
         channel: options.channel,
@@ -2119,6 +2124,39 @@ async function ensureStudioInstallTokenForRun(options, event, message) {
     });
     return installToken;
 }
+async function fetchStudioManifestForRun(options, event, authMessage) {
+    const installToken = await ensureStudioInstallTokenForRun(options, event, authMessage);
+    await event.phase("manifest.fetch.start", {
+        apiBaseUrl: options.apiBaseUrl,
+        channel: options.channel,
+    });
+    try {
+        return await withCliSpinner(`Fetching Tapi Studio ${options.channel} manifest`, () => fetchProtectedStudioManifest(options.apiBaseUrl, options.channel, installToken));
+    }
+    catch (error) {
+        if (!isExpiredStudioInstallTokenError(error) || options.installTokenSource === "option") {
+            throw error;
+        }
+        await event.phase("auth.install_token.expired", {
+            apiBaseUrl: options.apiBaseUrl,
+            channel: options.channel,
+            tokenSource: options.installTokenSource ?? "unknown",
+            error: errorDetails(error),
+        });
+        clearStudioInstallTokenForRun(options);
+        const refreshedToken = await ensureStudioInstallTokenForRun(options, event, "Refreshing Studio install authorization");
+        await event.phase("manifest.fetch.retry.start", {
+            apiBaseUrl: options.apiBaseUrl,
+            channel: options.channel,
+        });
+        return await withCliSpinner(`Retrying Tapi Studio ${options.channel} manifest`, () => fetchProtectedStudioManifest(options.apiBaseUrl, options.channel, refreshedToken));
+    }
+}
+function isExpiredStudioInstallTokenError(error) {
+    const message = formatError(error);
+    return (message.includes("Failed to fetch protected Studio manifest: HTTP 401")
+        && message.includes("Studio install token has expired"));
+}
 async function openStudio(options) {
     ensureWindowsHost();
     if (options.downloadOnly) {
@@ -2180,12 +2218,7 @@ async function ensurePortableStudioServer(options) {
         options: installEventOptions(options),
     });
     try {
-        const installToken = await ensureStudioInstallTokenForRun(options, event, "Checking Studio install authorization");
-        await event.phase("manifest.fetch.start", {
-            apiBaseUrl: options.apiBaseUrl,
-            channel: options.channel,
-        });
-        const manifest = await withCliSpinner(`Fetching Tapi Studio ${options.channel} manifest`, () => fetchProtectedStudioManifest(options.apiBaseUrl, options.channel, installToken));
+        const manifest = await fetchStudioManifestForRun(options, event, "Checking Studio install authorization");
         ensureCompatibleManifest(manifest);
         await event.phase("manifest.fetch.success", {
             manifest: manifestEventSummary(manifest),
@@ -3055,7 +3088,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"],
@@ -3063,21 +3096,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"}.`));
+                }
+            });
         });
     });
 }
@@ -3416,6 +3475,7 @@ function installEventOptions(options) {
         silent: options.silent,
         exePath: options.exePath,
         installTokenProvided: Boolean(options.installToken),
+        installTokenSource: options.installTokenSource,
     };
 }
 function serviceManifestEventSummary(manifest) {

package/package.json

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