@tapi-dev/sdk 0.1.30 → 0.1.31

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;
@@ -113,7 +114,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

@@ -344,6 +344,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 +356,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,
@@ -1967,12 +1970,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 +2084,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 +2093,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 +2114,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 +2122,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 +2216,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),
@@ -3416,6 +3447,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.31",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",