@blaxel/core 0.2.87-preview.169 → 0.2.87-preview.171
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/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/authentication/credentials.js +11 -1
- package/dist/cjs/authentication/index.js +3 -1
- package/dist/cjs/common/credentials.test.js +71 -0
- package/dist/cjs/common/errors.js +15 -0
- package/dist/cjs/common/h2fetch.js +55 -52
- package/dist/cjs/common/settings.js +40 -2
- package/dist/cjs/common/settings.test.js +10 -1
- package/dist/cjs/types/authentication/credentials.d.ts +9 -0
- package/dist/cjs/types/common/credentials.test.d.ts +1 -0
- package/dist/cjs/types/common/errors.d.ts +10 -0
- package/dist/cjs/types/common/h2fetch.d.ts +9 -4
- package/dist/cjs/types/common/settings.d.ts +9 -0
- package/dist/cjs-browser/.tsbuildinfo +1 -1
- package/dist/cjs-browser/authentication/credentials.js +11 -1
- package/dist/cjs-browser/authentication/index.js +3 -1
- package/dist/cjs-browser/common/credentials.test.js +71 -0
- package/dist/cjs-browser/common/errors.js +15 -0
- package/dist/cjs-browser/common/settings.js +40 -2
- package/dist/cjs-browser/common/settings.test.js +10 -1
- package/dist/cjs-browser/types/authentication/credentials.d.ts +9 -0
- package/dist/cjs-browser/types/common/credentials.test.d.ts +1 -0
- package/dist/cjs-browser/types/common/errors.d.ts +10 -0
- package/dist/cjs-browser/types/common/h2fetch.d.ts +9 -4
- package/dist/cjs-browser/types/common/settings.d.ts +9 -0
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/authentication/credentials.js +9 -0
- package/dist/esm/authentication/index.js +4 -2
- package/dist/esm/common/credentials.test.js +69 -0
- package/dist/esm/common/errors.js +13 -0
- package/dist/esm/common/h2fetch.js +55 -52
- package/dist/esm/common/settings.js +40 -2
- package/dist/esm/common/settings.test.js +10 -1
- package/dist/esm-browser/.tsbuildinfo +1 -1
- package/dist/esm-browser/authentication/credentials.js +9 -0
- package/dist/esm-browser/authentication/index.js +4 -2
- package/dist/esm-browser/common/credentials.test.js +69 -0
- package/dist/esm-browser/common/errors.js +13 -0
- package/dist/esm-browser/common/settings.js +40 -2
- package/dist/esm-browser/common/settings.test.js +10 -1
- package/package.json +1 -1
|
@@ -11,3 +11,12 @@ export class Credentials {
|
|
|
11
11
|
return "";
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Marker returned by `authentication()` when no usable Blaxel credentials were
|
|
16
|
+
* resolved (no env vars, no matching config workspace). Construction is
|
|
17
|
+
* side-effect free so importing `@blaxel/core` never fails; the actionable
|
|
18
|
+
* error is raised when an authenticated request is actually attempted
|
|
19
|
+
* (see `Settings.assertCredentials`).
|
|
20
|
+
*/
|
|
21
|
+
export class MissingCredentials extends Credentials {
|
|
22
|
+
}
|
|
@@ -3,7 +3,7 @@ import { env } from "../common/env.js";
|
|
|
3
3
|
import { fs, os, path } from "../common/node.js";
|
|
4
4
|
import { ApiKey } from "./apikey.js";
|
|
5
5
|
import { ClientCredentials } from "./clientcredentials.js";
|
|
6
|
-
import { Credentials } from "./credentials.js";
|
|
6
|
+
import { Credentials, MissingCredentials } from "./credentials.js";
|
|
7
7
|
import { DeviceMode } from "./deviceMode.js";
|
|
8
8
|
function getCredentials() {
|
|
9
9
|
if (env.BL_API_KEY) {
|
|
@@ -45,7 +45,9 @@ function getCredentials() {
|
|
|
45
45
|
export function authentication() {
|
|
46
46
|
const credentials = getCredentials();
|
|
47
47
|
if (!credentials) {
|
|
48
|
-
|
|
48
|
+
// Never silently fall back to empty headers: a marker that triggers a
|
|
49
|
+
// clear CredentialsError when an authenticated request is attempted.
|
|
50
|
+
return new MissingCredentials();
|
|
49
51
|
}
|
|
50
52
|
if (credentials.apiKey) {
|
|
51
53
|
return new ApiKey(credentials);
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
2
|
+
import { ApiKey } from '../authentication/apikey.js';
|
|
3
|
+
import { MissingCredentials } from '../authentication/credentials.js';
|
|
4
|
+
import { authentication } from '../authentication/index.js';
|
|
5
|
+
import { CredentialsError } from './errors.js';
|
|
6
|
+
import { settings } from './settings.js';
|
|
7
|
+
/**
|
|
8
|
+
* ENG-2698: missing / partial BL_WORKSPACE / BL_API_KEY must fail fast with a
|
|
9
|
+
* clear, actionable error instead of silently sending empty headers and
|
|
10
|
+
* surfacing the server's misleading "workspace is required".
|
|
11
|
+
*
|
|
12
|
+
* `env` reads through to `process.env`, so env state is controlled there.
|
|
13
|
+
*/
|
|
14
|
+
describe('credential validation', () => {
|
|
15
|
+
const AUTH_ENV = ['BL_API_KEY', 'BL_WORKSPACE', 'BL_CLIENT_CREDENTIALS'];
|
|
16
|
+
let savedEnv;
|
|
17
|
+
let savedCredentials;
|
|
18
|
+
let savedConfig;
|
|
19
|
+
beforeEach(() => {
|
|
20
|
+
savedEnv = {};
|
|
21
|
+
for (const key of AUTH_ENV) {
|
|
22
|
+
savedEnv[key] = process.env[key];
|
|
23
|
+
delete process.env[key];
|
|
24
|
+
}
|
|
25
|
+
savedCredentials = settings.credentials;
|
|
26
|
+
savedConfig = settings.config;
|
|
27
|
+
settings.config = { proxy: '', apikey: '', workspace: '' };
|
|
28
|
+
});
|
|
29
|
+
afterEach(() => {
|
|
30
|
+
for (const key of AUTH_ENV) {
|
|
31
|
+
if (savedEnv[key] === undefined)
|
|
32
|
+
delete process.env[key];
|
|
33
|
+
else
|
|
34
|
+
process.env[key] = savedEnv[key];
|
|
35
|
+
}
|
|
36
|
+
settings.credentials = savedCredentials;
|
|
37
|
+
settings.config = savedConfig;
|
|
38
|
+
});
|
|
39
|
+
it('API key without workspace throws a clear BL_WORKSPACE error from headers', () => {
|
|
40
|
+
settings.credentials = new ApiKey({ apiKey: 'test-key' });
|
|
41
|
+
expect(() => settings.headers).toThrow(CredentialsError);
|
|
42
|
+
expect(() => settings.headers).toThrow(/BL_WORKSPACE/);
|
|
43
|
+
});
|
|
44
|
+
it('API key without workspace rejects from authenticate()', async () => {
|
|
45
|
+
settings.credentials = new ApiKey({ apiKey: 'test-key' });
|
|
46
|
+
await expect(settings.authenticate()).rejects.toThrow(/BL_WORKSPACE/);
|
|
47
|
+
});
|
|
48
|
+
it('workspace set but no API key names the missing API key', () => {
|
|
49
|
+
process.env.BL_WORKSPACE = 'my-workspace';
|
|
50
|
+
settings.credentials = new MissingCredentials();
|
|
51
|
+
expect(() => settings.headers).toThrow(/API key is missing/);
|
|
52
|
+
});
|
|
53
|
+
it('no credentials at all names both env vars', () => {
|
|
54
|
+
settings.credentials = new MissingCredentials();
|
|
55
|
+
expect(() => settings.headers).toThrow(CredentialsError);
|
|
56
|
+
expect(() => settings.headers).toThrow(/BL_API_KEY and BL_WORKSPACE/);
|
|
57
|
+
});
|
|
58
|
+
it('api key + workspace builds clean headers with no empty values', () => {
|
|
59
|
+
settings.credentials = new ApiKey({ apiKey: 'test-key', workspace: 'my-workspace' });
|
|
60
|
+
const headers = settings.headers;
|
|
61
|
+
expect(headers['x-blaxel-workspace']).toBe('my-workspace');
|
|
62
|
+
expect(headers['x-blaxel-authorization']).toBe('Bearer test-key');
|
|
63
|
+
expect(Object.values(headers)).not.toContain('');
|
|
64
|
+
});
|
|
65
|
+
it('authentication() returns a real ApiKey when BL_API_KEY is set', () => {
|
|
66
|
+
process.env.BL_API_KEY = 'test-key';
|
|
67
|
+
expect(authentication()).toBeInstanceOf(ApiKey);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Thrown when Blaxel credentials are missing or incomplete.
|
|
3
|
+
*
|
|
4
|
+
* Surfaced eagerly with an actionable message (which env var / login step is
|
|
5
|
+
* missing) instead of silently sending empty workspace/authorization headers
|
|
6
|
+
* and letting the user hit a misleading server-side "workspace is required".
|
|
7
|
+
*/
|
|
8
|
+
export class CredentialsError extends Error {
|
|
9
|
+
constructor(message) {
|
|
10
|
+
super(message);
|
|
11
|
+
this.name = "CredentialsError";
|
|
12
|
+
}
|
|
13
|
+
}
|
|
1
14
|
export function handleDynamicImportError(err) {
|
|
2
15
|
if (err instanceof Error) {
|
|
3
16
|
// We check if it's module import error and retrieve package name from the error message with a regex
|
|
@@ -1,12 +1,29 @@
|
|
|
1
1
|
import yaml from 'yaml';
|
|
2
2
|
import { ApiKey } from "../authentication/apikey.js";
|
|
3
3
|
import { ClientCredentials } from "../authentication/clientcredentials.js";
|
|
4
|
+
import { MissingCredentials } from "../authentication/credentials.js";
|
|
4
5
|
import { authentication } from "../authentication/index.js";
|
|
5
6
|
import { env } from "../common/env.js";
|
|
7
|
+
import { CredentialsError } from "../common/errors.js";
|
|
6
8
|
import { fs, os, path } from "../common/node.js";
|
|
9
|
+
/**
|
|
10
|
+
* Build an actionable "credentials missing" message naming exactly which piece
|
|
11
|
+
* is absent, based on the env vars currently set.
|
|
12
|
+
*/
|
|
13
|
+
function missingCredentialsMessage() {
|
|
14
|
+
const hasWorkspace = !!env.BL_WORKSPACE;
|
|
15
|
+
const hasApiKey = !!env.BL_API_KEY;
|
|
16
|
+
if (hasWorkspace && !hasApiKey) {
|
|
17
|
+
return "Blaxel API key is missing. Set the BL_API_KEY environment variable, or run `bl login`, to authenticate (BL_WORKSPACE is already set).";
|
|
18
|
+
}
|
|
19
|
+
if (hasApiKey && !hasWorkspace) {
|
|
20
|
+
return "Blaxel workspace is missing. Set the BL_WORKSPACE environment variable, or run `bl login`, to authenticate (BL_API_KEY is already set).";
|
|
21
|
+
}
|
|
22
|
+
return "No Blaxel credentials found. Set the BL_API_KEY and BL_WORKSPACE environment variables, or run `bl login`.";
|
|
23
|
+
}
|
|
7
24
|
// Build info - these placeholders are replaced at build time by build:replace-imports
|
|
8
|
-
const BUILD_VERSION = "0.2.87-preview.
|
|
9
|
-
const BUILD_COMMIT = "
|
|
25
|
+
const BUILD_VERSION = "0.2.87-preview.171";
|
|
26
|
+
const BUILD_COMMIT = "06530fbea3b8ff89d51d0b834de6725ad5ad80ee";
|
|
10
27
|
const BUILD_SENTRY_DSN = "https://fd5e60e1c9820e1eef5ccebb84a07127@o4508714045276160.ingest.us.sentry.io/4510465864564736";
|
|
11
28
|
const BLAXEL_API_VERSION = "2026-04-16";
|
|
12
29
|
// Cache for config.yaml tracking value
|
|
@@ -167,6 +184,7 @@ class Settings {
|
|
|
167
184
|
return env.BL_API_VERSION || BLAXEL_API_VERSION;
|
|
168
185
|
}
|
|
169
186
|
get headers() {
|
|
187
|
+
this.assertCredentials();
|
|
170
188
|
const osArch = getOsArch();
|
|
171
189
|
return {
|
|
172
190
|
"x-blaxel-authorization": this.authorization,
|
|
@@ -252,7 +270,27 @@ class Settings {
|
|
|
252
270
|
}
|
|
253
271
|
return 0;
|
|
254
272
|
}
|
|
273
|
+
/**
|
|
274
|
+
* Fail fast with a clear, actionable error when credentials are missing or
|
|
275
|
+
* incomplete, instead of sending empty workspace/authorization headers and
|
|
276
|
+
* surfacing a misleading server-side "workspace is required". Skipped for
|
|
277
|
+
* `forceUrl` sandbox sessions, which carry their own headers and never read
|
|
278
|
+
* `settings.headers`. Leaves `workspace` itself non-throwing so telemetry
|
|
279
|
+
* tagging stays safe.
|
|
280
|
+
*/
|
|
281
|
+
assertCredentials() {
|
|
282
|
+
const hasConfigCredentials = !!(this.config.apikey ||
|
|
283
|
+
this.config.apiKey ||
|
|
284
|
+
this.config.clientCredentials);
|
|
285
|
+
if (!hasConfigCredentials && this.credentials instanceof MissingCredentials) {
|
|
286
|
+
throw new CredentialsError(missingCredentialsMessage());
|
|
287
|
+
}
|
|
288
|
+
if (!this.workspace) {
|
|
289
|
+
throw new CredentialsError("Blaxel workspace is missing. Set the BL_WORKSPACE environment variable, or run `bl login`, to authenticate your requests.");
|
|
290
|
+
}
|
|
291
|
+
}
|
|
255
292
|
async authenticate() {
|
|
293
|
+
this.assertCredentials();
|
|
256
294
|
await this.credentials.authenticate();
|
|
257
295
|
}
|
|
258
296
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
2
|
+
import { ApiKey } from '../authentication/apikey.js';
|
|
2
3
|
import { env } from './env.js';
|
|
3
4
|
describe('Settings.apiVersion', () => {
|
|
4
5
|
beforeEach(() => {
|
|
@@ -15,6 +16,14 @@ describe('Settings.apiVersion', () => {
|
|
|
15
16
|
it('headers include Blaxel-Version set to the default', async () => {
|
|
16
17
|
delete env.BL_API_VERSION;
|
|
17
18
|
const { settings } = await import('./settings.js');
|
|
18
|
-
|
|
19
|
+
// headers now requires resolvable credentials; run in an authenticated context
|
|
20
|
+
const previous = settings.credentials;
|
|
21
|
+
settings.credentials = new ApiKey({ apiKey: 'test-key', workspace: 'test-ws' });
|
|
22
|
+
try {
|
|
23
|
+
expect(settings.headers['Blaxel-Version']).toBe('2026-04-16');
|
|
24
|
+
}
|
|
25
|
+
finally {
|
|
26
|
+
settings.credentials = previous;
|
|
27
|
+
}
|
|
19
28
|
});
|
|
20
29
|
});
|