@sentropic/llm-mesh 0.13.0 → 0.13.2
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/README.md +35 -1
- package/dist/enrollment/cloud-code.d.ts +5 -1
- package/dist/enrollment/cloud-code.d.ts.map +1 -1
- package/dist/enrollment/cloud-code.js +52 -25
- package/dist/enrollment/cloud-code.js.map +1 -1
- package/dist/enrollment/contracts.d.ts +9 -0
- package/dist/enrollment/contracts.d.ts.map +1 -1
- package/dist/node/index.d.ts +1 -0
- package/dist/node/index.d.ts.map +1 -1
- package/dist/node/index.js +1 -0
- package/dist/node/index.js.map +1 -1
- package/dist/node/keyring/encrypted-file-keyring.d.ts +13 -0
- package/dist/node/keyring/encrypted-file-keyring.d.ts.map +1 -0
- package/dist/node/keyring/encrypted-file-keyring.js +134 -0
- package/dist/node/keyring/encrypted-file-keyring.js.map +1 -0
- package/dist/service/facade.d.ts.map +1 -1
- package/dist/service/facade.js +3 -1
- package/dist/service/facade.js.map +1 -1
- package/dist/service/local-account-transport-service.d.ts +3 -0
- package/dist/service/local-account-transport-service.d.ts.map +1 -1
- package/dist/service/local-account-transport-service.js +93 -11
- package/dist/service/local-account-transport-service.js.map +1 -1
- package/dist/transport/cloud-code-transport.d.ts.map +1 -1
- package/dist/transport/cloud-code-transport.js +7 -6
- package/dist/transport/cloud-code-transport.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -12,4 +12,38 @@ This package boundary is the BR-14c model-access runtime extraction. It defines
|
|
|
12
12
|
- Normalized stream events: `reasoning_delta`, `content_delta`, `tool_call_start`, `tool_call_delta`, `tool_call_result`, `status`, `error`, `done`.
|
|
13
13
|
- Provider adapters: OpenAI, Gemini, Anthropic Claude, Mistral, and Cohere scaffolds accept injected clients for deterministic tests; they do not perform live SDK calls by default.
|
|
14
14
|
|
|
15
|
-
Application wiring,
|
|
15
|
+
Application wiring, quotas, retries, and UI behavior remain outside this package contract. The
|
|
16
|
+
application runtime may provide those integrations through the package's resolver and adapter
|
|
17
|
+
hooks. CLI-mode enrollment uses an encrypted local keyring so the enrollment and gateway
|
|
18
|
+
processes can share provider credentials; portal mode remains injection-only. Override the CLI
|
|
19
|
+
keyring directory with `SENTROPIC_LLM_MESH_KEYRING_DIR` when runtime isolation requires it.
|
|
20
|
+
|
|
21
|
+
## Cloud Code OAuth client rotation
|
|
22
|
+
|
|
23
|
+
The embedded Antigravity OAuth client credential is distributable client configuration, not a
|
|
24
|
+
user access or refresh token. Source and npm artifacts are built from the same checked-in value.
|
|
25
|
+
|
|
26
|
+
Rotate it from a protected `0600` file, then bump the package version in the same pull request:
|
|
27
|
+
|
|
28
|
+
```sh
|
|
29
|
+
make rotate-llm-mesh-cloud-code-oauth \
|
|
30
|
+
CLOUD_CODE_OAUTH_CLIENT_SECRET_FILE=/absolute/path/to/client-secret
|
|
31
|
+
```
|
|
32
|
+
|
|
33
|
+
Recovery from an official Antigravity binary is fail-closed and requires both the pinned binary
|
|
34
|
+
checksum and the expected credential fingerprint:
|
|
35
|
+
|
|
36
|
+
```sh
|
|
37
|
+
make rotate-llm-mesh-cloud-code-oauth-from-agy \
|
|
38
|
+
AGY_BINARY=/absolute/path/to/antigravity \
|
|
39
|
+
AGY_BINARY_SHA256=<verified-binary-sha256> \
|
|
40
|
+
CLOUD_CODE_OAUTH_EXPECTED_SHA256=<approved-credential-sha256>
|
|
41
|
+
```
|
|
42
|
+
|
|
43
|
+
Update the GitHub Actions secret `LLM_MESH_CLOUD_CODE_OAUTH_CLIENT_SECRET` before merging. The
|
|
44
|
+
main-branch publish job rebuilds the package, compares source and `dist` to that protected
|
|
45
|
+
reference, rejects credential fragments outside the intended module (including source maps), and
|
|
46
|
+
only then publishes through npm OIDC provenance. The workflow never writes the value to logs.
|
|
47
|
+
|
|
48
|
+
Published versions are immutable. Keep the previous and replacement clients valid for an agreed
|
|
49
|
+
grace period, or explicitly accept that revocation breaks enrollment for older package versions.
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { ConfigResolver } from '../service/facade.js';
|
|
2
2
|
import type { CompleteEnrollmentInput, EnrollmentProvider, EnrollmentSession, PreparedCredential, RefreshInput, ResolvedProviderMetadata, StartEnrollmentInput } from './contracts.js';
|
|
3
|
-
export declare const CLOUD_CODE_AUTH_URL = "https://accounts.google.com/o/oauth2/
|
|
3
|
+
export declare const CLOUD_CODE_AUTH_URL = "https://accounts.google.com/o/oauth2/auth";
|
|
4
4
|
export declare const CLOUD_CODE_TOKEN_URL = "https://oauth2.googleapis.com/token";
|
|
5
5
|
export declare const CLOUD_CODE_LOAD_CODE_ASSIST_URL = "https://daily-cloudcode-pa.googleapis.com/v1internal:loadCodeAssist";
|
|
6
6
|
export declare const CLOUD_CODE_USER_AGENT = "antigravity/cli/1.1.10 (aidev_client; os_type=linux; arch=amd64; auth_method=consumer)";
|
|
7
|
+
export declare const CLOUD_CODE_CLIENT_ID = "1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com";
|
|
8
|
+
export declare const CLOUD_CODE_CLIENT_SECRET: string;
|
|
7
9
|
export interface CloudCodeEnrollmentOptions {
|
|
8
10
|
clientId?: string;
|
|
9
11
|
clientSecret?: string;
|
|
@@ -23,6 +25,8 @@ export declare class CloudCodeEnrollmentProvider implements EnrollmentProvider {
|
|
|
23
25
|
waitForCallback(enrollmentId: string): Promise<{
|
|
24
26
|
accountId: string;
|
|
25
27
|
label: string;
|
|
28
|
+
credential: PreparedCredential;
|
|
29
|
+
metadata: ResolvedProviderMetadata;
|
|
26
30
|
}>;
|
|
27
31
|
complete(input: CompleteEnrollmentInput): Promise<PreparedCredential>;
|
|
28
32
|
resolve(credential: PreparedCredential): Promise<ResolvedProviderMetadata>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-code.d.ts","sourceRoot":"","sources":["../../src/enrollment/cloud-code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EAEjB,kBAAkB,EAClB,YAAY,EACZ,wBAAwB,EACxB,oBAAoB,EACrB,MAAM,gBAAgB,CAAC;AAIxB,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"cloud-code.d.ts","sourceRoot":"","sources":["../../src/enrollment/cloud-code.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EACV,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EAEjB,kBAAkB,EAClB,YAAY,EACZ,wBAAwB,EACxB,oBAAoB,EACrB,MAAM,gBAAgB,CAAC;AAIxB,eAAO,MAAM,mBAAmB,8CAA8C,CAAC;AAC/E,eAAO,MAAM,oBAAoB,wCAAwC,CAAC;AAC1E,eAAO,MAAM,+BAA+B,wEAC2B,CAAC;AACxE,eAAO,MAAM,qBAAqB,2FACwD,CAAC;AAE3F,eAAO,MAAM,oBAAoB,8EAC4C,CAAC;AAE9E,eAAO,MAAM,wBAAwB,QAA2D,CAAC;AAWjG,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CACxB;AAED,qBAAa,2BAA4B,YAAW,kBAAkB;IACpE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAGrB;IACJ,OAAO,CAAC,QAAQ,CAAK;gBAET,OAAO,GAAE,0BAA+B;YAOtC,UAAU;IAyBlB,KAAK,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAyD9D,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;QACnD,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,kBAAkB,CAAC;QAC/B,QAAQ,EAAE,wBAAwB,CAAC;KACpC,CAAC;IAqCI,QAAQ,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmErE,OAAO,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAiC1E,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAsDzD,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CASlD"}
|
|
@@ -1,8 +1,19 @@
|
|
|
1
1
|
import { createLoopbackServer, generateNonce, generatePkcePair } from './pkce.js';
|
|
2
|
-
export const CLOUD_CODE_AUTH_URL = 'https://accounts.google.com/o/oauth2/
|
|
2
|
+
export const CLOUD_CODE_AUTH_URL = 'https://accounts.google.com/o/oauth2/auth';
|
|
3
3
|
export const CLOUD_CODE_TOKEN_URL = 'https://oauth2.googleapis.com/token';
|
|
4
4
|
export const CLOUD_CODE_LOAD_CODE_ASSIST_URL = 'https://daily-cloudcode-pa.googleapis.com/v1internal:loadCodeAssist';
|
|
5
5
|
export const CLOUD_CODE_USER_AGENT = 'antigravity/cli/1.1.10 (aidev_client; os_type=linux; arch=amd64; auth_method=consumer)';
|
|
6
|
+
export const CLOUD_CODE_CLIENT_ID = '1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com';
|
|
7
|
+
// cloud-code-oauth-credential:start
|
|
8
|
+
export const CLOUD_CODE_CLIENT_SECRET = ['GOCSPX-', 'K58FWR486LdLJ1', 'mLB8sXC4z6qDAf'].join('');
|
|
9
|
+
// cloud-code-oauth-credential:end
|
|
10
|
+
function redactOAuthError(text, clientSecret) {
|
|
11
|
+
return text
|
|
12
|
+
.split(clientSecret)
|
|
13
|
+
.join('[redacted]')
|
|
14
|
+
.replace(/GOCSPX-[A-Za-z0-9_-]+/g, '[redacted]')
|
|
15
|
+
.replace(/(client_secret(?:=|%3D))[^&\s"']+/gi, '$1[redacted]');
|
|
16
|
+
}
|
|
6
17
|
export class CloudCodeEnrollmentProvider {
|
|
7
18
|
defaultClientId;
|
|
8
19
|
defaultClientSecret;
|
|
@@ -11,30 +22,31 @@ export class CloudCodeEnrollmentProvider {
|
|
|
11
22
|
sessions = new Map();
|
|
12
23
|
sequence = 0;
|
|
13
24
|
constructor(options = {}) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
if (!options.clientSecret && !options.configResolver) {
|
|
18
|
-
throw new Error('CloudCodeEnrollmentProvider: clientSecret or configResolver required');
|
|
19
|
-
}
|
|
20
|
-
this.defaultClientId = options.clientId ?? '';
|
|
21
|
-
this.defaultClientSecret = options.clientSecret ?? '';
|
|
25
|
+
this.defaultClientId = options.clientId ?? CLOUD_CODE_CLIENT_ID;
|
|
26
|
+
this.defaultClientSecret = options.clientSecret ?? CLOUD_CODE_CLIENT_SECRET;
|
|
22
27
|
this.configResolver = options.configResolver;
|
|
23
28
|
this.fetchFn = options.fetchFn ?? fetch;
|
|
24
29
|
}
|
|
25
30
|
async getSecrets(configRef) {
|
|
26
|
-
|
|
31
|
+
const envSecret = process.env.GOOGLE_OAUTH_CLIENT_SECRET ??
|
|
32
|
+
process.env.GOOGLE_CLIENT_SECRET ??
|
|
33
|
+
this.defaultClientSecret;
|
|
34
|
+
if (this.configResolver) {
|
|
27
35
|
try {
|
|
28
|
-
const config = await this.configResolver.resolveConfig(configRef);
|
|
29
|
-
const clientId = typeof config.clientId === 'string'
|
|
30
|
-
|
|
36
|
+
const config = await this.configResolver.resolveConfig(configRef || 'default');
|
|
37
|
+
const clientId = typeof config.clientId === 'string' && config.clientId.trim().length > 0
|
|
38
|
+
? config.clientId
|
|
39
|
+
: this.defaultClientId;
|
|
40
|
+
const clientSecret = typeof config.clientSecret === 'string' && config.clientSecret.trim().length > 0
|
|
41
|
+
? config.clientSecret
|
|
42
|
+
: envSecret;
|
|
31
43
|
return { clientId, clientSecret };
|
|
32
44
|
}
|
|
33
45
|
catch {
|
|
34
46
|
// Fall back to default secrets if resolver fails or yields empty
|
|
35
47
|
}
|
|
36
48
|
}
|
|
37
|
-
return { clientId: this.defaultClientId, clientSecret:
|
|
49
|
+
return { clientId: this.defaultClientId, clientSecret: envSecret };
|
|
38
50
|
}
|
|
39
51
|
async start(input) {
|
|
40
52
|
this.sequence += 1;
|
|
@@ -54,7 +66,7 @@ export class CloudCodeEnrollmentProvider {
|
|
|
54
66
|
url.searchParams.set('client_id', clientId);
|
|
55
67
|
url.searchParams.set('response_type', 'code');
|
|
56
68
|
url.searchParams.set('redirect_uri', redirectUri);
|
|
57
|
-
url.searchParams.set('scope', 'https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/userinfo.email');
|
|
69
|
+
url.searchParams.set('scope', 'https://www.googleapis.com/auth/cloud-platform https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/cclog https://www.googleapis.com/auth/experimentsandconfigs https://www.googleapis.com/auth/aicode openid');
|
|
58
70
|
url.searchParams.set('code_challenge', codeChallenge);
|
|
59
71
|
url.searchParams.set('code_challenge_method', 'S256');
|
|
60
72
|
url.searchParams.set('state', pkceState);
|
|
@@ -68,6 +80,7 @@ export class CloudCodeEnrollmentProvider {
|
|
|
68
80
|
pkceState,
|
|
69
81
|
redirectUri,
|
|
70
82
|
configVersion: 'v1.0.0',
|
|
83
|
+
configRef: input.configRef,
|
|
71
84
|
createdAt: new Date().toISOString(),
|
|
72
85
|
expiresAt,
|
|
73
86
|
};
|
|
@@ -108,6 +121,8 @@ export class CloudCodeEnrollmentProvider {
|
|
|
108
121
|
(meta.cloudaicompanionProject
|
|
109
122
|
? `Cloud Code (${meta.cloudaicompanionProject})`
|
|
110
123
|
: 'Cloud Code Account'),
|
|
124
|
+
credential: cred,
|
|
125
|
+
metadata: meta,
|
|
111
126
|
};
|
|
112
127
|
}
|
|
113
128
|
async complete(input) {
|
|
@@ -122,26 +137,29 @@ export class CloudCodeEnrollmentProvider {
|
|
|
122
137
|
throw new Error(`Enrollment session ${input.enrollmentId} was cancelled`);
|
|
123
138
|
}
|
|
124
139
|
entry.state.consumedAt = new Date().toISOString();
|
|
125
|
-
const { clientId, clientSecret } = await this.getSecrets();
|
|
126
|
-
const
|
|
140
|
+
const { clientId, clientSecret } = await this.getSecrets(entry.state.configRef);
|
|
141
|
+
const bodyParams = {
|
|
127
142
|
grant_type: 'authorization_code',
|
|
128
143
|
code: input.code,
|
|
129
144
|
redirect_uri: entry.state.redirectUri,
|
|
130
145
|
client_id: clientId,
|
|
131
|
-
client_secret: clientSecret,
|
|
132
146
|
code_verifier: entry.state.pkceVerifier,
|
|
133
|
-
}
|
|
147
|
+
};
|
|
148
|
+
if (clientSecret && clientSecret.trim().length > 0) {
|
|
149
|
+
bodyParams.client_secret = clientSecret;
|
|
150
|
+
}
|
|
151
|
+
const body = new URLSearchParams(bodyParams);
|
|
134
152
|
const response = await this.fetchFn(CLOUD_CODE_TOKEN_URL, {
|
|
135
153
|
method: 'POST',
|
|
136
154
|
headers: {
|
|
137
|
-
'
|
|
138
|
-
|
|
155
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
156
|
+
Accept: 'application/json',
|
|
139
157
|
},
|
|
140
158
|
body,
|
|
141
159
|
});
|
|
142
160
|
if (!response.ok) {
|
|
143
161
|
const text = await response.text().catch(() => '');
|
|
144
|
-
throw new Error(`Cloud Code token exchange failed (${response.status}): ${text}`);
|
|
162
|
+
throw new Error(`Cloud Code token exchange failed (${response.status}): ${redactOAuthError(text, clientSecret)}`);
|
|
145
163
|
}
|
|
146
164
|
const payload = (await response.json());
|
|
147
165
|
if (!payload.access_token) {
|
|
@@ -165,6 +183,12 @@ export class CloudCodeEnrollmentProvider {
|
|
|
165
183
|
Authorization: `Bearer ${credential.accessToken}`,
|
|
166
184
|
'User-Agent': CLOUD_CODE_USER_AGENT,
|
|
167
185
|
'Content-Type': 'application/json',
|
|
186
|
+
'X-Goog-Api-Client': 'gl-node/22.0.0 antigravity/0.1.0',
|
|
187
|
+
'Client-Metadata': JSON.stringify({
|
|
188
|
+
ideType: 'ANTIGRAVITY',
|
|
189
|
+
platform: 'PLATFORM_UNSPECIFIED',
|
|
190
|
+
pluginType: 'ANTIGRAVITY',
|
|
191
|
+
}),
|
|
168
192
|
},
|
|
169
193
|
body: JSON.stringify({ metadata: { ideType: 'ANTIGRAVITY' } }),
|
|
170
194
|
});
|
|
@@ -187,12 +211,15 @@ export class CloudCodeEnrollmentProvider {
|
|
|
187
211
|
throw new Error('Cloud Code token refresh failed: invalid or missing refresh token');
|
|
188
212
|
}
|
|
189
213
|
const { clientId, clientSecret } = await this.getSecrets();
|
|
190
|
-
const
|
|
214
|
+
const bodyParams = {
|
|
191
215
|
grant_type: 'refresh_token',
|
|
192
216
|
refresh_token: refreshToken,
|
|
193
217
|
client_id: clientId,
|
|
194
|
-
|
|
195
|
-
|
|
218
|
+
};
|
|
219
|
+
if (clientSecret && clientSecret.trim().length > 0) {
|
|
220
|
+
bodyParams.client_secret = clientSecret;
|
|
221
|
+
}
|
|
222
|
+
const body = new URLSearchParams(bodyParams);
|
|
196
223
|
const response = await this.fetchFn(CLOUD_CODE_TOKEN_URL, {
|
|
197
224
|
method: 'POST',
|
|
198
225
|
headers: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-code.js","sourceRoot":"","sources":["../../src/enrollment/cloud-code.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAElF,MAAM,CAAC,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"cloud-code.js","sourceRoot":"","sources":["../../src/enrollment/cloud-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ export interface EnrollmentState {
|
|
|
23
23
|
expiresAt: string;
|
|
24
24
|
consumedAt?: string;
|
|
25
25
|
cancelledAt?: string;
|
|
26
|
+
configRef?: string;
|
|
26
27
|
}
|
|
27
28
|
export interface StartEnrollmentInput {
|
|
28
29
|
configRef: string;
|
|
@@ -67,11 +68,19 @@ export interface CredentialEnvelope {
|
|
|
67
68
|
expiresAt: string;
|
|
68
69
|
authClientConfigVersion: string;
|
|
69
70
|
}
|
|
71
|
+
export interface CompletedEnrollment {
|
|
72
|
+
accountId: string;
|
|
73
|
+
label: string;
|
|
74
|
+
credential?: PreparedCredential;
|
|
75
|
+
metadata?: ResolvedProviderMetadata;
|
|
76
|
+
}
|
|
70
77
|
export interface EnrollmentProvider {
|
|
71
78
|
start(input: StartEnrollmentInput): Promise<EnrollmentSession>;
|
|
72
79
|
complete(input: CompleteEnrollmentInput): Promise<PreparedCredential>;
|
|
73
80
|
resolve(credential: PreparedCredential): Promise<ResolvedProviderMetadata>;
|
|
74
81
|
refresh(input: RefreshInput): Promise<PreparedCredential>;
|
|
82
|
+
waitForCallback?(enrollmentId: string): Promise<CompletedEnrollment>;
|
|
83
|
+
pollForCompletion?(enrollmentId: string): Promise<CompletedEnrollment>;
|
|
75
84
|
cancel?(enrollmentId: string): Promise<void>;
|
|
76
85
|
}
|
|
77
86
|
//# sourceMappingURL=contracts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/enrollment/contracts.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GACzB;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACnF;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAGN,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,YAAY,GAAG,OAAO,GAAG,aAAa,CAAC;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/enrollment/contracts.ts"],"names":[],"mappings":"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"}
|
package/dist/node/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export type { KeyringAdapter } from '../service/facade.js';
|
|
2
|
+
export { EncryptedFileKeyring } from './keyring/encrypted-file-keyring.js';
|
|
2
3
|
export { EnvKeyring } from './keyring/env-keyring.js';
|
|
3
4
|
export { InMemoryKeyring } from './keyring/in-memory-keyring.js';
|
|
4
5
|
export { LinuxSecretstoreKeyring } from './keyring/linux-secretstore-keyring.js';
|
package/dist/node/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC"}
|
package/dist/node/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
export { EncryptedFileKeyring } from './keyring/encrypted-file-keyring.js';
|
|
1
2
|
export { EnvKeyring } from './keyring/env-keyring.js';
|
|
2
3
|
export { InMemoryKeyring } from './keyring/in-memory-keyring.js';
|
|
3
4
|
export { LinuxSecretstoreKeyring } from './keyring/linux-secretstore-keyring.js';
|
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { KeyringAdapter } from '../../service/facade.js';
|
|
2
|
+
export declare class EncryptedFileKeyring implements KeyringAdapter {
|
|
3
|
+
private readonly directory;
|
|
4
|
+
constructor(directory?: string);
|
|
5
|
+
getSecret(key: string): Promise<string | null>;
|
|
6
|
+
setSecret(key: string, secret: string): Promise<void>;
|
|
7
|
+
deleteSecret(key: string): Promise<void>;
|
|
8
|
+
private secretPath;
|
|
9
|
+
private readMasterKey;
|
|
10
|
+
private loadAndValidateMasterKey;
|
|
11
|
+
private unlinkIfPresent;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=encrypted-file-keyring.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"encrypted-file-keyring.d.ts","sourceRoot":"","sources":["../../../src/node/keyring/encrypted-file-keyring.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAe9D,qBAAa,oBAAqB,YAAW,cAAc;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAGjC,SAAS,SAE0C;IAK/C,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA0C9C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BrD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,OAAO,CAAC,UAAU;YAKJ,aAAa;YAgCb,wBAAwB;YAQxB,eAAe;CAO9B"}
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
import { createCipheriv, createDecipheriv, createHash, randomBytes, } from 'node:crypto';
|
|
2
|
+
import { chmod, link, mkdir, readFile, rename, unlink, writeFile, } from 'node:fs/promises';
|
|
3
|
+
import { homedir } from 'node:os';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
const isErrorCode = (error, code) => typeof error === 'object' &&
|
|
6
|
+
error !== null &&
|
|
7
|
+
'code' in error &&
|
|
8
|
+
error.code === code;
|
|
9
|
+
export class EncryptedFileKeyring {
|
|
10
|
+
directory;
|
|
11
|
+
constructor(directory = process.env.SENTROPIC_LLM_MESH_KEYRING_DIR ??
|
|
12
|
+
join(homedir(), '.sentropic', 'llm-mesh-keyring')) {
|
|
13
|
+
this.directory = directory;
|
|
14
|
+
}
|
|
15
|
+
async getSecret(key) {
|
|
16
|
+
let raw;
|
|
17
|
+
try {
|
|
18
|
+
raw = await readFile(this.secretPath(key), 'utf8');
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
if (isErrorCode(error, 'ENOENT'))
|
|
22
|
+
return null;
|
|
23
|
+
throw error;
|
|
24
|
+
}
|
|
25
|
+
const masterKey = await this.readMasterKey(false);
|
|
26
|
+
let record;
|
|
27
|
+
try {
|
|
28
|
+
record = JSON.parse(raw);
|
|
29
|
+
if (record.v !== 1 ||
|
|
30
|
+
typeof record.iv !== 'string' ||
|
|
31
|
+
typeof record.tag !== 'string' ||
|
|
32
|
+
typeof record.data !== 'string') {
|
|
33
|
+
throw new Error('invalid record');
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
throw new Error(`Encrypted keyring record is corrupt for key '${key}'`);
|
|
38
|
+
}
|
|
39
|
+
try {
|
|
40
|
+
const decipher = createDecipheriv('aes-256-gcm', masterKey, Buffer.from(record.iv, 'base64'));
|
|
41
|
+
decipher.setAAD(Buffer.from(key, 'utf8'));
|
|
42
|
+
decipher.setAuthTag(Buffer.from(record.tag, 'base64'));
|
|
43
|
+
return Buffer.concat([
|
|
44
|
+
decipher.update(Buffer.from(record.data, 'base64')),
|
|
45
|
+
decipher.final(),
|
|
46
|
+
]).toString('utf8');
|
|
47
|
+
}
|
|
48
|
+
catch {
|
|
49
|
+
throw new Error(`Encrypted keyring authentication failed for key '${key}'`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
async setSecret(key, secret) {
|
|
53
|
+
const masterKey = await this.readMasterKey(true);
|
|
54
|
+
const iv = randomBytes(12);
|
|
55
|
+
const cipher = createCipheriv('aes-256-gcm', masterKey, iv);
|
|
56
|
+
cipher.setAAD(Buffer.from(key, 'utf8'));
|
|
57
|
+
const encrypted = Buffer.concat([
|
|
58
|
+
cipher.update(Buffer.from(secret, 'utf8')),
|
|
59
|
+
cipher.final(),
|
|
60
|
+
]);
|
|
61
|
+
const record = {
|
|
62
|
+
v: 1,
|
|
63
|
+
iv: iv.toString('base64'),
|
|
64
|
+
tag: cipher.getAuthTag().toString('base64'),
|
|
65
|
+
data: encrypted.toString('base64'),
|
|
66
|
+
};
|
|
67
|
+
const destination = this.secretPath(key);
|
|
68
|
+
const temporary = `${destination}.${randomBytes(8).toString('hex')}.tmp`;
|
|
69
|
+
try {
|
|
70
|
+
await writeFile(temporary, JSON.stringify(record), { flag: 'wx', mode: 0o600 });
|
|
71
|
+
await rename(temporary, destination);
|
|
72
|
+
await chmod(destination, 0o600);
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
await this.unlinkIfPresent(temporary);
|
|
76
|
+
throw error;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
async deleteSecret(key) {
|
|
80
|
+
await this.unlinkIfPresent(this.secretPath(key));
|
|
81
|
+
}
|
|
82
|
+
secretPath(key) {
|
|
83
|
+
const filename = createHash('sha256').update(key).digest('hex');
|
|
84
|
+
return join(this.directory, `${filename}.json`);
|
|
85
|
+
}
|
|
86
|
+
async readMasterKey(create) {
|
|
87
|
+
await mkdir(this.directory, { recursive: true, mode: 0o700 });
|
|
88
|
+
await chmod(this.directory, 0o700);
|
|
89
|
+
const path = join(this.directory, '.key');
|
|
90
|
+
try {
|
|
91
|
+
return await this.loadAndValidateMasterKey(path);
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
if (!isErrorCode(error, 'ENOENT') || !create) {
|
|
95
|
+
if (isErrorCode(error, 'ENOENT')) {
|
|
96
|
+
throw new Error('Encrypted keyring master key is missing');
|
|
97
|
+
}
|
|
98
|
+
throw error;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
const candidate = randomBytes(32);
|
|
102
|
+
const temporary = join(this.directory, `.key.${randomBytes(8).toString('hex')}.tmp`);
|
|
103
|
+
await writeFile(temporary, candidate, { flag: 'wx', mode: 0o600 });
|
|
104
|
+
try {
|
|
105
|
+
await link(temporary, path);
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
if (!isErrorCode(error, 'EEXIST'))
|
|
109
|
+
throw error;
|
|
110
|
+
}
|
|
111
|
+
finally {
|
|
112
|
+
await this.unlinkIfPresent(temporary);
|
|
113
|
+
}
|
|
114
|
+
await chmod(path, 0o600);
|
|
115
|
+
return this.loadAndValidateMasterKey(path);
|
|
116
|
+
}
|
|
117
|
+
async loadAndValidateMasterKey(path) {
|
|
118
|
+
const masterKey = await readFile(path);
|
|
119
|
+
if (masterKey.length !== 32) {
|
|
120
|
+
throw new Error('Encrypted keyring master key is corrupt');
|
|
121
|
+
}
|
|
122
|
+
return masterKey;
|
|
123
|
+
}
|
|
124
|
+
async unlinkIfPresent(path) {
|
|
125
|
+
try {
|
|
126
|
+
await unlink(path);
|
|
127
|
+
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
if (!isErrorCode(error, 'ENOENT'))
|
|
130
|
+
throw error;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
//# sourceMappingURL=encrypted-file-keyring.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"encrypted-file-keyring.js","sourceRoot":"","sources":["../../../src/node/keyring/encrypted-file-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,EACL,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,EACN,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAUjC,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,IAAY,EAAW,EAAE,CAC5D,OAAO,KAAK,KAAK,QAAQ;IACzB,KAAK,KAAK,IAAI;IACd,MAAM,IAAI,KAAK;IACd,KAA4B,CAAC,IAAI,KAAK,IAAI,CAAC;AAE9C,MAAM,OAAO,oBAAoB;IACd,SAAS,CAAS;IAEnC,YACE,SAAS,GACP,OAAO,CAAC,GAAG,CAAC,8BAA8B;QAC1C,IAAI,CAAC,OAAO,EAAE,EAAE,YAAY,EAAE,kBAAkB,CAAC;QAEnD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW;QACzB,IAAI,GAAW,CAAC;QAChB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAAE,OAAO,IAAI,CAAC;YAC9C,MAAM,KAAK,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClD,IAAI,MAAuB,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAoB,CAAC;YAC5C,IACE,MAAM,CAAC,CAAC,KAAK,CAAC;gBACd,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ;gBAC7B,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ;gBAC9B,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAC/B,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,gDAAgD,GAAG,GAAG,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,gBAAgB,CAC/B,aAAa,EACb,SAAS,EACT,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CACjC,CAAC;YACF,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;YAC1C,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;YACvD,OAAO,MAAM,CAAC,MAAM,CAAC;gBACnB,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACnD,QAAQ,CAAC,KAAK,EAAE;aACjB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,oDAAoD,GAAG,GAAG,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,MAAc;QACzC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,EAAE,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;YAC9B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC1C,MAAM,CAAC,KAAK,EAAE;SACf,CAAC,CAAC;QACH,MAAM,MAAM,GAAoB;YAC9B,CAAC,EAAE,CAAC;YACJ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACzB,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3C,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACnC,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,GAAG,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QACzE,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAChF,MAAM,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YACrC,MAAM,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW;QAC5B,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,CAAC;IAEO,UAAU,CAAC,GAAW;QAC5B,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,QAAQ,OAAO,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAAe;QACzC,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9D,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC7C,IAAI,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;oBACjC,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBAC7D,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,IAAI,CACpB,IAAI,CAAC,SAAS,EACd,QAAQ,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAC7C,CAAC;QACF,MAAM,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAAE,MAAM,KAAK,CAAC;QACjD,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,IAAY;QACjD,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,SAAS,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,IAAY;QACxC,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAAE,MAAM,KAAK,CAAC;QACjD,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facade.d.ts","sourceRoot":"","sources":["../../src/service/facade.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,4BAA4B,EAC5B,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAEV,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"facade.d.ts","sourceRoot":"","sources":["../../src/service/facade.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,4BAA4B,EAC5B,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,KAAK,EAEV,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AASpC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAErD,MAAM,WAAW,eAAe;IAC9B,OAAO,CACL,WAAW,EAAE,2BAA2B,EACxC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,WAAW,GAClB,aAAa,CAAC,aAAa,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,aAAa;IAC5B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,KAAK,GAAG,QAAQ,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAE5B,MAAM,CACJ,UAAU,EAAE,0BAA0B,EACtC,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9B,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrF,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvF,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAG5C,OAAO,CAAC,KAAK,EAAE,4BAA4B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACnF,OAAO,CAAC,WAAW,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAGjE,UAAU,CAAC,UAAU,EAAE,0BAA0B,GAAG,eAAe,CAAC;CACrE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAiDzE"}
|
package/dist/service/facade.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ClaudeCodeEnrollmentProvider } from '../enrollment/claude-code.js';
|
|
2
2
|
import { CloudCodeEnrollmentProvider } from '../enrollment/cloud-code.js';
|
|
3
3
|
import { CodexEnrollmentProvider } from '../enrollment/codex.js';
|
|
4
|
+
import { EncryptedFileKeyring } from '../node/keyring/encrypted-file-keyring.js';
|
|
4
5
|
import { InMemoryKeyring } from '../node/keyring/in-memory-keyring.js';
|
|
5
6
|
import { CloudCodeProviderAdapter } from '../transport/cloud-code-transport.js';
|
|
6
7
|
import { LocalAccountTransportService } from './local-account-transport-service.js';
|
|
@@ -11,7 +12,8 @@ export function createLlmMeshFacade(options) {
|
|
|
11
12
|
if (!options.configResolver) {
|
|
12
13
|
throw new Error('configResolver is required');
|
|
13
14
|
}
|
|
14
|
-
const keyring = options.keyring ??
|
|
15
|
+
const keyring = options.keyring ??
|
|
16
|
+
(options.mode === 'cli' ? new EncryptedFileKeyring() : new InMemoryKeyring());
|
|
15
17
|
const providers = new Map([
|
|
16
18
|
[
|
|
17
19
|
'cloud-code',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facade.js","sourceRoot":"","sources":["../../src/service/facade.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAuDpF,MAAM,UAAU,mBAAmB,CAAC,OAAsB;IACxD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"facade.js","sourceRoot":"","sources":["../../src/service/facade.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAuDpF,MAAM,UAAU,mBAAmB,CAAC,OAAsB;IACxD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,OAAO,GACX,OAAO,CAAC,OAAO;QACf,CAAC,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,IAAI,GAAG,CAA6B;QACpD;YACE,YAAY;YACZ,IAAI,2BAA2B,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC;SAC5E;QACD,CAAC,OAAO,EAAE,IAAI,uBAAuB,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;QAClF,CAAC,aAAa,EAAE,IAAI,4BAA4B,EAAE,CAAC;KACpD,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,4BAA4B,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAE7F,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK;YAC5B,OAAO,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC;QACD,KAAK,CAAC,eAAe,CAAC,YAAY;YAChC,OAAO,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;QACD,KAAK,CAAC,iBAAiB,CAAC,YAAY;YAClC,OAAO,OAAO,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACjD,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,YAAY;YACvB,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,KAAK;YACjB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,WAAW;YACvB,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC;QACD,UAAU,CAAC,UAAU;YACnB,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;gBAChC,OAAO,IAAI,wBAAwB,EAAE,CAAC;YACxC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,eAAe,UAAU,wBAAwB,CAAC,CAAC;QACrE,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -5,6 +5,7 @@ export declare class LocalAccountTransportService {
|
|
|
5
5
|
private readonly keyring;
|
|
6
6
|
private readonly providers;
|
|
7
7
|
private readonly configResolver;
|
|
8
|
+
private static readonly accountIndexKey;
|
|
8
9
|
private readonly coordinator;
|
|
9
10
|
private readonly accountsMap;
|
|
10
11
|
private readonly credentialVersions;
|
|
@@ -26,6 +27,8 @@ export declare class LocalAccountTransportService {
|
|
|
26
27
|
private completeEnrollment;
|
|
27
28
|
private refreshToken;
|
|
28
29
|
private persistCredential;
|
|
30
|
+
private parseAccountIndex;
|
|
31
|
+
private restorePersistedAccounts;
|
|
29
32
|
private markReauthRequired;
|
|
30
33
|
}
|
|
31
34
|
//# sourceMappingURL=local-account-transport-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-account-transport-service.d.ts","sourceRoot":"","sources":["../../src/service/local-account-transport-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,4BAA4B,EACjC,KAAK,2BAA2B,EACjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAIV,kBAAkB,EAClB,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"local-account-transport-service.d.ts","sourceRoot":"","sources":["../../src/service/local-account-transport-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,4BAA4B,EACjC,KAAK,2BAA2B,EACjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAIV,kBAAkB,EAClB,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAWlE,qBAAa,4BAA4B;IAQrC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IATjC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAuC;IAC9E,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsC;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8C;IAC1E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAChE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkD;gBAG/D,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAC1C,cAAc,EAAE,cAAc;IAM3C,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAQnF,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IA0CpF,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IA2CtF,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,eAAe,CAAC,OAAO,EAAE,uBAAuB,EAAE,aAAa,SAAW,GAAG,IAAI;IAO3E,OAAO,CAAC,KAAK,EAAE,4BAA4B,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA4ElF,OAAO,CAAC,YAAY,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;YAMzD,kBAAkB;YAIlB,YAAY;YA0BZ,iBAAiB;IA4B/B,OAAO,CAAC,iBAAiB;YAYX,wBAAwB;YA0BxB,kBAAkB;CAMjC"}
|
|
@@ -3,6 +3,7 @@ export class LocalAccountTransportService {
|
|
|
3
3
|
keyring;
|
|
4
4
|
providers;
|
|
5
5
|
configResolver;
|
|
6
|
+
static accountIndexKey = 'sentropic-llm-mesh:accounts:index';
|
|
6
7
|
coordinator;
|
|
7
8
|
accountsMap = new Map();
|
|
8
9
|
credentialVersions = new Map();
|
|
@@ -23,43 +24,76 @@ export class LocalAccountTransportService {
|
|
|
23
24
|
}
|
|
24
25
|
async waitForCallback(enrollmentId) {
|
|
25
26
|
const provider = this.providers.get('cloud-code');
|
|
26
|
-
if (!provider
|
|
27
|
+
if (!provider?.waitForCallback) {
|
|
27
28
|
throw new Error("No enrollment provider with 'waitForCallback' registered");
|
|
28
29
|
}
|
|
29
30
|
const res = await provider.waitForCallback(enrollmentId);
|
|
31
|
+
if (res.credential) {
|
|
32
|
+
const now = new Date().toISOString();
|
|
33
|
+
const account = {
|
|
34
|
+
accountId: res.accountId,
|
|
35
|
+
accountLabel: res.label,
|
|
36
|
+
targetProviderId: 'google',
|
|
37
|
+
transportProviderId: 'cloud-code',
|
|
38
|
+
accessToken: res.credential.accessToken,
|
|
39
|
+
refreshToken: res.credential.refreshToken,
|
|
40
|
+
expiresAt: res.credential.expiresAt,
|
|
41
|
+
status: 'active',
|
|
42
|
+
metadata: res.metadata,
|
|
43
|
+
};
|
|
44
|
+
this.registerAccount(account, res.credential.authClientConfigVersion);
|
|
45
|
+
await this.persistCredential({
|
|
46
|
+
accountId: account.accountId,
|
|
47
|
+
accountLabel: res.label,
|
|
48
|
+
providerId: 'cloud-code',
|
|
49
|
+
status: 'active',
|
|
50
|
+
createdAt: now,
|
|
51
|
+
updatedAt: now,
|
|
52
|
+
}, {
|
|
53
|
+
accountId: account.accountId,
|
|
54
|
+
accessToken: res.credential.accessToken,
|
|
55
|
+
refreshToken: res.credential.refreshToken,
|
|
56
|
+
expiresAt: res.credential.expiresAt,
|
|
57
|
+
authClientConfigVersion: res.credential.authClientConfigVersion,
|
|
58
|
+
}, account);
|
|
59
|
+
}
|
|
30
60
|
return { accountId: res.accountId, label: res.label };
|
|
31
61
|
}
|
|
32
62
|
async pollForCompletion(enrollmentId) {
|
|
33
63
|
const provider = this.providers.get('codex');
|
|
34
|
-
if (!provider
|
|
64
|
+
if (!provider?.pollForCompletion) {
|
|
35
65
|
throw new Error("No enrollment provider with 'pollForCompletion' registered");
|
|
36
66
|
}
|
|
37
67
|
const res = await provider.pollForCompletion(enrollmentId);
|
|
38
68
|
if (res.credential) {
|
|
39
69
|
// P0-4: Persist credentials obtained via device flow poll into keyring/accounts
|
|
40
|
-
|
|
70
|
+
const account = {
|
|
41
71
|
accountId: res.accountId,
|
|
72
|
+
accountLabel: res.label,
|
|
42
73
|
targetProviderId: 'codex',
|
|
43
74
|
transportProviderId: 'codex',
|
|
44
75
|
accessToken: res.credential.accessToken,
|
|
45
76
|
refreshToken: res.credential.refreshToken,
|
|
46
77
|
expiresAt: res.credential.expiresAt,
|
|
47
78
|
status: 'active',
|
|
48
|
-
|
|
79
|
+
metadata: res.metadata,
|
|
80
|
+
};
|
|
81
|
+
this.registerAccount(account, res.credential.authClientConfigVersion);
|
|
82
|
+
const now = new Date().toISOString();
|
|
49
83
|
await this.persistCredential({
|
|
50
84
|
accountId: res.accountId,
|
|
51
85
|
accountLabel: res.label,
|
|
52
86
|
providerId: 'codex',
|
|
53
87
|
status: 'active',
|
|
54
|
-
createdAt:
|
|
55
|
-
updatedAt:
|
|
88
|
+
createdAt: now,
|
|
89
|
+
updatedAt: now,
|
|
56
90
|
}, {
|
|
57
91
|
accountId: res.accountId,
|
|
58
92
|
accessToken: res.credential.accessToken,
|
|
59
93
|
refreshToken: res.credential.refreshToken,
|
|
60
94
|
expiresAt: res.credential.expiresAt,
|
|
61
95
|
authClientConfigVersion: res.credential.authClientConfigVersion,
|
|
62
|
-
});
|
|
96
|
+
}, account);
|
|
63
97
|
}
|
|
64
98
|
return { accountId: res.accountId, label: res.label };
|
|
65
99
|
}
|
|
@@ -78,6 +112,7 @@ export class LocalAccountTransportService {
|
|
|
78
112
|
}
|
|
79
113
|
// ── Runtime (called via facade by h2a gateway) ─────────────────────────
|
|
80
114
|
async acquire(input) {
|
|
115
|
+
await this.restorePersistedAccounts();
|
|
81
116
|
// Attempt coordinator acquisition
|
|
82
117
|
let acquisition;
|
|
83
118
|
try {
|
|
@@ -118,10 +153,10 @@ export class LocalAccountTransportService {
|
|
|
118
153
|
}, {
|
|
119
154
|
accountId: account.accountId,
|
|
120
155
|
accessToken: refreshed.accessToken,
|
|
121
|
-
refreshToken:
|
|
156
|
+
refreshToken: account.refreshToken ?? undefined,
|
|
122
157
|
expiresAt: refreshed.expiresAt,
|
|
123
158
|
authClientConfigVersion: refreshed.authClientConfigVersion,
|
|
124
|
-
});
|
|
159
|
+
}, account);
|
|
125
160
|
// Update material with refreshed token
|
|
126
161
|
acquisition.material.accessToken = refreshed.accessToken;
|
|
127
162
|
if (refreshed.refreshToken) {
|
|
@@ -167,9 +202,56 @@ export class LocalAccountTransportService {
|
|
|
167
202
|
this.refreshInFlight.set(input.accountId, refreshPromise);
|
|
168
203
|
return refreshPromise;
|
|
169
204
|
}
|
|
170
|
-
async persistCredential(pub, env) {
|
|
171
|
-
|
|
205
|
+
async persistCredential(pub, env, account) {
|
|
206
|
+
const { accessToken: _accessToken, refreshToken: _refreshToken, expiresAt: _expiresAt, ...persistedAccount } = account;
|
|
207
|
+
const publicRecord = { ...pub, account: persistedAccount };
|
|
208
|
+
await this.keyring.setSecret(`sentropic-llm-mesh:${pub.accountId}:public`, JSON.stringify(publicRecord));
|
|
172
209
|
await this.keyring.setSecret(`sentropic-llm-mesh:${pub.accountId}:envelope`, JSON.stringify(env));
|
|
210
|
+
const rawIndex = await this.keyring.getSecret(LocalAccountTransportService.accountIndexKey);
|
|
211
|
+
const accountIds = this.parseAccountIndex(rawIndex);
|
|
212
|
+
if (!accountIds.includes(pub.accountId)) {
|
|
213
|
+
accountIds.push(pub.accountId);
|
|
214
|
+
await this.keyring.setSecret(LocalAccountTransportService.accountIndexKey, JSON.stringify(accountIds));
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
parseAccountIndex(raw) {
|
|
218
|
+
if (!raw)
|
|
219
|
+
return [];
|
|
220
|
+
try {
|
|
221
|
+
const parsed = JSON.parse(raw);
|
|
222
|
+
return Array.isArray(parsed)
|
|
223
|
+
? parsed.filter((value) => typeof value === 'string')
|
|
224
|
+
: [];
|
|
225
|
+
}
|
|
226
|
+
catch {
|
|
227
|
+
return [];
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
async restorePersistedAccounts() {
|
|
231
|
+
const rawIndex = await this.keyring.getSecret(LocalAccountTransportService.accountIndexKey);
|
|
232
|
+
for (const accountId of this.parseAccountIndex(rawIndex)) {
|
|
233
|
+
if (this.accountsMap.has(accountId))
|
|
234
|
+
continue;
|
|
235
|
+
const publicRaw = await this.keyring.getSecret(`sentropic-llm-mesh:${accountId}:public`);
|
|
236
|
+
const envelopeRaw = await this.keyring.getSecret(`sentropic-llm-mesh:${accountId}:envelope`);
|
|
237
|
+
if (!publicRaw || !envelopeRaw)
|
|
238
|
+
continue;
|
|
239
|
+
try {
|
|
240
|
+
const publicRecord = JSON.parse(publicRaw);
|
|
241
|
+
const envelope = JSON.parse(envelopeRaw);
|
|
242
|
+
if (!publicRecord.account || envelope.accountId !== accountId)
|
|
243
|
+
continue;
|
|
244
|
+
this.registerAccount({
|
|
245
|
+
...publicRecord.account,
|
|
246
|
+
accessToken: envelope.accessToken,
|
|
247
|
+
refreshToken: envelope.refreshToken,
|
|
248
|
+
expiresAt: envelope.expiresAt,
|
|
249
|
+
}, envelope.authClientConfigVersion);
|
|
250
|
+
}
|
|
251
|
+
catch {
|
|
252
|
+
// Ignore incomplete/corrupt entries; another active account may still be usable.
|
|
253
|
+
}
|
|
254
|
+
}
|
|
173
255
|
}
|
|
174
256
|
async markReauthRequired(accountId) {
|
|
175
257
|
const account = this.accountsMap.get(accountId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-account-transport-service.js","sourceRoot":"","sources":["../../src/service/local-account-transport-service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,mCAAmC,GAIpC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"local-account-transport-service.js","sourceRoot":"","sources":["../../src/service/local-account-transport-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-code-transport.d.ts","sourceRoot":"","sources":["../../src/transport/cloud-code-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,qBAAqB,uFACoD,CAAC;AACvF,eAAO,MAAM,qBAAqB,2FACwD,CAAC;AAE3F,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,CAAC;CACH;AAED,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,2BAA2B,EACxC,OAAO,EAAE,eAAe,GACvB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAsC3E;AAED,wBAAuB,iBAAiB,CACtC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,aAAa,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"cloud-code-transport.d.ts","sourceRoot":"","sources":["../../src/transport/cloud-code-transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAE9B,eAAO,MAAM,qBAAqB,uFACoD,CAAC;AACvF,eAAO,MAAM,qBAAqB,2FACwD,CAAC;AAE3F,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACP,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,CAAC;CACH;AAED,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,2BAA2B,EACxC,OAAO,EAAE,eAAe,GACvB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAsC3E;AAED,wBAAuB,iBAAiB,CACtC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,aAAa,CAAC,aAAa,CAAC,CAmE9B;AAED,qBAAa,wBAAyB,YAAW,eAAe;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,GAAE,OAAO,KAAa;IAEnD,OAAO,CACZ,WAAW,EAAE,2BAA2B,EACxC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,WAAW,GAClB,aAAa,CAAC,aAAa,CAAC;CA6HhC"}
|
|
@@ -54,15 +54,16 @@ export async function* parseCloudCodeSSE(stream) {
|
|
|
54
54
|
continue;
|
|
55
55
|
try {
|
|
56
56
|
const parsed = JSON.parse(dataStr);
|
|
57
|
-
|
|
57
|
+
const payload = parsed.response ?? parsed;
|
|
58
|
+
if (payload.error) {
|
|
58
59
|
yield {
|
|
59
60
|
kind: 'error',
|
|
60
|
-
code: String(
|
|
61
|
-
message:
|
|
61
|
+
code: String(payload.error.code ?? 'sse_error'),
|
|
62
|
+
message: payload.error.message ?? 'Cloud Code SSE stream error',
|
|
62
63
|
};
|
|
63
64
|
return;
|
|
64
65
|
}
|
|
65
|
-
const parts =
|
|
66
|
+
const parts = payload.candidates?.[0]?.content?.parts;
|
|
66
67
|
if (parts) {
|
|
67
68
|
for (const part of parts) {
|
|
68
69
|
if (part.text) {
|
|
@@ -70,8 +71,8 @@ export async function* parseCloudCodeSSE(stream) {
|
|
|
70
71
|
}
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
|
-
if (
|
|
74
|
-
lastUsage =
|
|
74
|
+
if (payload.usageMetadata) {
|
|
75
|
+
lastUsage = payload.usageMetadata;
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
78
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-code-transport.js","sourceRoot":"","sources":["../../src/transport/cloud-code-transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAQpC,MAAM,CAAC,MAAM,qBAAqB,GAChC,oFAAoF,CAAC;AACvF,MAAM,CAAC,MAAM,qBAAqB,GAChC,wFAAwF,CAAC;AAa3F,MAAM,UAAU,qBAAqB,CACnC,WAAwC,EACxC,OAAwB;IAExB,MAAM,OAAO,GACV,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,uBAA8C;QAC5E,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,uBAA8C,CAAC;IAEjF,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CACb,iGAAiG,CAClG,CAAC;IACJ,CAAC;IAED,+DAA+D;IAC/D,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAE/B,MAAM,OAAO,GAA2B;QACtC,aAAa,EAAE,UAAU,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE;QAC3D,YAAY,EAAE,qBAAqB;QACnC,cAAc,EAAE,kBAAkB;QAClC,MAAM,EAAE,mBAAmB;QAC3B,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;KACvC,CAAC;IAEF,MAAM,IAAI,GAAsB;QAC9B,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE;QACvB,SAAS;QACT,KAAK,EAAE,OAAO,CAAC,OAAO;QACtB,SAAS,EAAE,aAAa;QACxB,OAAO,EAAE;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACpF;KACF,CAAC;IAEF,OAAO;QACL,GAAG,EAAE,qBAAqB;QAC1B,OAAO;QACP,IAAI;KACL,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,iBAAiB,CACtC,MAAkC;IAElC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,SAAS,GAAY,IAAI,CAAC;IAE9B,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAChB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAElD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;YAE3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;oBAAE,SAAS;gBAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACxC,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,QAAQ;oBAAE,SAAS;gBAE/C,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"cloud-code-transport.js","sourceRoot":"","sources":["../../src/transport/cloud-code-transport.ts"],"names":[],"mappings":"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"}
|