@boxes-dev/dvb 1.0.33 → 1.0.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bin/dvb.cjs +43 -47
- package/dist/bin/dvb.cjs.map +1 -1
- package/dist/bin/dvbd.cjs +5 -5
- package/dist/devbox/commands/setup.d.ts +1 -0
- package/dist/devbox/commands/setup.d.ts.map +1 -1
- package/dist/devbox/commands/setup.js +27 -27
- package/dist/devbox/commands/setup.js.map +1 -1
- package/dist/devbox/controlPlane.js +1 -1
- package/dist/scripts/fix-bashrc.sh +2 -1
- package/package.json +1 -1
package/dist/bin/dvbd.cjs
CHANGED
|
@@ -88604,8 +88604,8 @@ var init_otel = __esm({
|
|
|
88604
88604
|
return trimmed && trimmed.length > 0 ? trimmed : void 0;
|
|
88605
88605
|
};
|
|
88606
88606
|
readBuildMetadata = () => {
|
|
88607
|
-
const rawPackageVersion = "1.0.
|
|
88608
|
-
const rawGitSha = "
|
|
88607
|
+
const rawPackageVersion = "1.0.35";
|
|
88608
|
+
const rawGitSha = "f3556e7e62d92e3775dcf9005933b49b6f735161";
|
|
88609
88609
|
const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
|
|
88610
88610
|
const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
|
|
88611
88611
|
return { packageVersion, gitSha };
|
|
@@ -120522,9 +120522,9 @@ var init_sentry = __esm({
|
|
|
120522
120522
|
sentryEnabled = false;
|
|
120523
120523
|
uncaughtExceptionMonitorInstalled = false;
|
|
120524
120524
|
readBuildMetadata2 = () => {
|
|
120525
|
-
const rawPackageVersion = "1.0.
|
|
120526
|
-
const rawGitSha = "
|
|
120527
|
-
const rawSentryRelease = "boxes-dev-dvb@1.0.
|
|
120525
|
+
const rawPackageVersion = "1.0.35";
|
|
120526
|
+
const rawGitSha = "f3556e7e62d92e3775dcf9005933b49b6f735161";
|
|
120527
|
+
const rawSentryRelease = "boxes-dev-dvb@1.0.35+f3556e7e62d92e3775dcf9005933b49b6f735161";
|
|
120528
120528
|
const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
|
|
120529
120529
|
const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
|
|
120530
120530
|
const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/devbox/commands/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/devbox/commands/setup.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,yBAAyB,GACpC,OAAO,MAAM,KACZ,MAAM,GAAG,SASX,CAAC;AAgJF,eAAO,MAAM,QAAQ,GAAU,MAAM,MAAM,EAAE,kBAyG5C,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import readline from "node:readline/promises";
|
|
3
2
|
import { resolveSocketInfo } from "@boxes-dev/core";
|
|
4
3
|
import { createSecretStore, loadConfig, resolveConfigPath, resolveDevboxDir, resolveSecretsPath, resolveSpritesApiUrl, saveConfig, } from "@boxes-dev/core";
|
|
5
4
|
import { ensureSpritesToken } from "../auth.js";
|
|
@@ -10,6 +9,26 @@ import { renderTerminalQr } from "../ui/qr.js";
|
|
|
10
9
|
import { createStatusLine } from "../ui/statusLine.js";
|
|
11
10
|
import { maybeOfferCompletionsInstall } from "../completions/index.js";
|
|
12
11
|
const trim = (value) => value.trim().replace(/\r/g, "");
|
|
12
|
+
const normalizeOrgSlug = (value) => {
|
|
13
|
+
const trimmed = value.trim();
|
|
14
|
+
if (!trimmed)
|
|
15
|
+
return undefined;
|
|
16
|
+
if (!/^[a-z0-9][a-z0-9-]*$/i.test(trimmed))
|
|
17
|
+
return undefined;
|
|
18
|
+
return trimmed;
|
|
19
|
+
};
|
|
20
|
+
export const extractOrgFromSpriteToken = (token) => {
|
|
21
|
+
const trimmed = token.trim();
|
|
22
|
+
if (!trimmed)
|
|
23
|
+
return undefined;
|
|
24
|
+
const normalized = trimmed.toLowerCase().startsWith("bearer ")
|
|
25
|
+
? trimmed.slice("bearer ".length).trim()
|
|
26
|
+
: trimmed;
|
|
27
|
+
const slashIndex = normalized.indexOf("/");
|
|
28
|
+
if (slashIndex <= 0)
|
|
29
|
+
return undefined;
|
|
30
|
+
return normalizeOrgSlug(normalized.slice(0, slashIndex));
|
|
31
|
+
};
|
|
13
32
|
const normalizeSiteUrl = (raw) => {
|
|
14
33
|
const trimmed = trim(raw);
|
|
15
34
|
if (!trimmed)
|
|
@@ -86,18 +105,6 @@ const parseSetupArgs = (args) => {
|
|
|
86
105
|
}
|
|
87
106
|
return parsed;
|
|
88
107
|
};
|
|
89
|
-
const promptForValue = async (label) => {
|
|
90
|
-
if (!process.stdin.isTTY) {
|
|
91
|
-
throw new Error(`Missing ${label} (non-interactive)`);
|
|
92
|
-
}
|
|
93
|
-
const rl = readline.createInterface({
|
|
94
|
-
input: process.stdin,
|
|
95
|
-
output: process.stdout,
|
|
96
|
-
});
|
|
97
|
-
const answer = await rl.question(`${label}: `);
|
|
98
|
-
rl.close();
|
|
99
|
-
return answer.trim();
|
|
100
|
-
};
|
|
101
108
|
const splitQrLines = (qr) => qr ? qr.trimEnd().split("\n") : [];
|
|
102
109
|
const printMobileDownloadQr = () => {
|
|
103
110
|
const link = MOBILE_DOWNLOAD_LINK;
|
|
@@ -148,9 +155,9 @@ const probeSpritesAccess = async (apiBaseUrl, token) => {
|
|
|
148
155
|
const payload = (await response.json());
|
|
149
156
|
const orgs = new Set();
|
|
150
157
|
for (const sprite of payload.sprites ?? []) {
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
158
|
+
const org = normalizeOrgSlug(sprite.org_slug ?? sprite.organization ?? "");
|
|
159
|
+
if (org)
|
|
160
|
+
orgs.add(org);
|
|
154
161
|
}
|
|
155
162
|
return { orgs: [...orgs] };
|
|
156
163
|
};
|
|
@@ -173,23 +180,16 @@ export const runSetup = async (args) => {
|
|
|
173
180
|
const token = tokenResult.token;
|
|
174
181
|
const tokenSource = tokenResult.source;
|
|
175
182
|
let org = tokenSource === "flag" ? (parsed.org ?? existingConfig?.org) : undefined;
|
|
183
|
+
if (!org && tokenSource === "flag" && parsed.token) {
|
|
184
|
+
org = extractOrgFromSpriteToken(parsed.token);
|
|
185
|
+
}
|
|
176
186
|
if (parsed.verify) {
|
|
177
187
|
status.stage("Verifying token");
|
|
178
188
|
const { orgs } = await probeSpritesAccess(apiBaseUrl, token);
|
|
179
189
|
if (tokenSource === "flag") {
|
|
180
|
-
if (!org && orgs.length
|
|
190
|
+
if (!org && orgs.length > 0) {
|
|
181
191
|
org = orgs[0];
|
|
182
192
|
}
|
|
183
|
-
else if (!org && orgs.length > 1) {
|
|
184
|
-
status.stop();
|
|
185
|
-
org = await promptForValue("Sprites org slug");
|
|
186
|
-
}
|
|
187
|
-
else if (!org && orgs.length === 0) {
|
|
188
|
-
status.stop();
|
|
189
|
-
org = await promptForValue("Sprites org slug (optional)");
|
|
190
|
-
if (org.length === 0)
|
|
191
|
-
org = undefined;
|
|
192
|
-
}
|
|
193
193
|
}
|
|
194
194
|
}
|
|
195
195
|
status.stage("Saving config");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/devbox/commands/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/devbox/commands/setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,8 @@ if old in data:
|
|
|
49
49
|
data = data.replace(old, new, 1)
|
|
50
50
|
|
|
51
51
|
if history_block_pattern.search(data):
|
|
52
|
-
|
|
52
|
+
# Use a function replacement so backslashes in bind strings are literal.
|
|
53
|
+
data = history_block_pattern.sub(lambda _match: canonical_history_block, data, count=1)
|
|
53
54
|
else:
|
|
54
55
|
data = history_line_pattern.sub("", data)
|
|
55
56
|
marker = "\n# Basic aliases"
|