@boxes-dev/dvb 1.0.32 → 1.0.33

package/dist/bin/dvb.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 "use strict";
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="1ca4f1c5-c6fc-5436-8e08-a600d5ee41ad")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="cd199da5-5299-508f-a0e3-01c6aff7017e")}catch(e){}}();
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -88634,8 +88634,8 @@ var init_otel = __esm({
       return trimmed && trimmed.length > 0 ? trimmed : void 0;
     };
     readBuildMetadata = () => {
-      const rawPackageVersion = "1.0.32";
-      const rawGitSha = "88e830e75f1877cc78e3b9e21c3f17965fbc2ebe";
+      const rawPackageVersion = "1.0.33";
+      const rawGitSha = "fa907b87a93b04d34b7fc28eae6436ee11a6a456";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       return { packageVersion, gitSha };
@@ -120623,9 +120623,9 @@ var init_sentry = __esm({
     sentryEnabled = false;
     uncaughtExceptionMonitorInstalled = false;
     readBuildMetadata2 = () => {
-      const rawPackageVersion = "1.0.32";
-      const rawGitSha = "88e830e75f1877cc78e3b9e21c3f17965fbc2ebe";
-      const rawSentryRelease = "boxes-dev-dvb@1.0.32+88e830e75f1877cc78e3b9e21c3f17965fbc2ebe";
+      const rawPackageVersion = "1.0.33";
+      const rawGitSha = "fa907b87a93b04d34b7fc28eae6436ee11a6a456";
+      const rawSentryRelease = "boxes-dev-dvb@1.0.33+fa907b87a93b04d34b7fc28eae6436ee11a6a456";
       const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
       const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
       const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
@@ -153919,7 +153919,7 @@ var init_qr = __esm({
 });
 
 // src/devbox/commands/setup.ts
-var import_node_crypto11, import_promises31, trim, normalizeSiteUrl, resolveSiteUrl, MOBILE_DOWNLOAD_LINK, parseSetupArgs, promptForValue, splitQrLines, printMobileDownloadQr, printFirstSetupCompleteMessage, listSprites2, runSetup;
+var import_node_crypto11, import_promises31, trim, normalizeSiteUrl, resolveSiteUrl, MOBILE_DOWNLOAD_LINK, parseSetupArgs, promptForValue, splitQrLines, printMobileDownloadQr, printFirstSetupCompleteMessage, probeSpritesAccess, runSetup;
 var init_setup = __esm({
   "src/devbox/commands/setup.ts"() {
     "use strict";
@@ -153995,6 +153995,9 @@ var init_setup = __esm({
         }
         throw new Error(`Unknown setup flag: ${arg}`);
       }
+      if (parsed.org && !parsed.token) {
+        throw new Error("--org requires --token or --sprite-token");
+      }
       return parsed;
     };
     promptForValue = async (label) => {
@@ -154033,7 +154036,7 @@ var init_setup = __esm({
       console.log("");
       console.log(nextStep);
     };
-    listSprites2 = async (apiBaseUrl, token) => {
+    probeSpritesAccess = async (apiBaseUrl, token) => {
       const requestId = (0, import_node_crypto11.randomUUID)();
       const url = new URL("/v1/sprites", apiBaseUrl);
       url.searchParams.set("max_results", "1");
@@ -154058,7 +154061,9 @@ var init_setup = __esm({
       const payload = await response.json();
       const orgs = /* @__PURE__ */ new Set();
       for (const sprite of payload.sprites ?? []) {
-        if (sprite.org_slug) orgs.add(sprite.org_slug);
+        if (typeof sprite.org_slug === "string" && sprite.org_slug.length > 0) {
+          orgs.add(sprite.org_slug);
+        }
       }
       return { orgs: [...orgs] };
     };
@@ -154082,19 +154087,21 @@ var init_setup = __esm({
         );
         const token = tokenResult.token;
         const tokenSource = tokenResult.source;
-        let org = parsed.org ?? existingConfig?.org;
+        let org = tokenSource === "flag" ? parsed.org ?? existingConfig?.org : void 0;
         if (parsed.verify) {
           status.stage("Verifying token");
-          const { orgs } = await listSprites2(apiBaseUrl, token);
-          if (!org && orgs.length === 1) {
-            org = orgs[0];
-          } else if (!org && orgs.length > 1) {
-            status.stop();
-            org = await promptForValue("Sprites org slug");
-          } else if (!org && orgs.length === 0) {
-            status.stop();
-            org = await promptForValue("Sprites org slug (optional)");
-            if (org.length === 0) org = void 0;
+          const { orgs } = await probeSpritesAccess(apiBaseUrl, token);
+          if (tokenSource === "flag") {
+            if (!org && orgs.length === 1) {
+              org = orgs[0];
+            } else if (!org && orgs.length > 1) {
+              status.stop();
+              org = await promptForValue("Sprites org slug");
+            } else if (!org && orgs.length === 0) {
+              status.stop();
+              org = await promptForValue("Sprites org slug (optional)");
+              if (org.length === 0) org = void 0;
+            }
           }
         }
         status.stage("Saving config");
@@ -154104,7 +154111,7 @@ var init_setup = __esm({
           tokenStore: store.kind,
           tokenUpdatedAt: (/* @__PURE__ */ new Date()).toISOString(),
           lastSetupAt: (/* @__PURE__ */ new Date()).toISOString(),
-          ...org ? { org } : {}
+          ...tokenSource === "flag" && org ? { org } : {}
         };
         await saveConfig(config3, configOptions);
         status.stage("Starting dvbd");
@@ -154132,7 +154139,9 @@ var init_setup = __esm({
         }
         console.log(`config: ${resolveConfigPath(homeDir)}`);
         console.log(`secrets: ${resolveSecretsPath(homeDir)}`);
-        if (org) console.log(`org: ${org}`);
+        if (tokenSource === "flag" && org) {
+          console.log(`org: ${org}`);
+        }
         console.log(`token store: ${store.kind}`);
         console.log(`token source: ${tokenSource}`);
         console.log(`daemon: pid ${daemon.pid}`);
@@ -155766,4 +155775,4 @@ smol-toml/dist/index.js:
 */
 //# sourceMappingURL=dvb.cjs.map
 
-//# debugId=1ca4f1c5-c6fc-5436-8e08-a600d5ee41ad
+//# debugId=cd199da5-5299-508f-a0e3-01c6aff7017e