tiny-http-mcp-server 0.1.57 → 0.1.59
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/composition.json +1 -1
- package/node_modules/mcp-oauth/README.md +8 -0
- package/node_modules/mcp-oauth/dist/client/auth-store-session-store.js +10 -0
- package/node_modules/mcp-oauth/dist/client/default-oauth-client-provider.js +14 -14
- package/node_modules/mcp-oauth/dist/client/types.d.ts +1 -0
- package/node_modules/tiny-mcp-client/dist/index.d.ts +1 -0
- package/node_modules/tiny-mcp-client/dist/index.js +28 -14
- package/package.json +1 -1
package/dist/composition.json
CHANGED
|
@@ -57,6 +57,14 @@ const verifier = createJwksTokenVerifier({
|
|
|
57
57
|
- `authStore` optional `auth-store` backend config for the default session store
|
|
58
58
|
- `now()` optional clock override
|
|
59
59
|
|
|
60
|
+
The default provider captures client, interaction, callback, landing-page and
|
|
61
|
+
lock policies when created. Create a new provider to change those settings.
|
|
62
|
+
Selected callbacks, stores, clocks and AbortSignals remain live host dependencies;
|
|
63
|
+
aborting the original signal still cancels authorization.
|
|
64
|
+
Native session and client persistence factories also capture file paths, salts,
|
|
65
|
+
Keychain identities, lock locations and selected filesystem/command handles.
|
|
66
|
+
Mutating these settings cannot redirect a later read or write.
|
|
67
|
+
|
|
60
68
|
`createJwksTokenVerifier(options)` accepts:
|
|
61
69
|
|
|
62
70
|
| Option | Type | Default | Description |
|
|
@@ -12,6 +12,7 @@ const DEFAULT_CLIENT_KEYCHAIN_SERVICE = "poe-code-mcp-oauth-clients";
|
|
|
12
12
|
const MAX_JS_DATE_MS = 8_640_000_000_000_000;
|
|
13
13
|
export function createAuthStoreSessionStore(options = {}, namespace) {
|
|
14
14
|
assertPersistenceNamespace(namespace);
|
|
15
|
+
options = snapshotPersistenceOptions(options);
|
|
15
16
|
return {
|
|
16
17
|
async withLock(resource, operation, lockOptions) {
|
|
17
18
|
const store = createResourceSecretStore(resource, options, namespace);
|
|
@@ -49,6 +50,7 @@ export function createAuthStoreSessionStore(options = {}, namespace) {
|
|
|
49
50
|
}
|
|
50
51
|
export function createAuthStoreClientStore(options, namespace) {
|
|
51
52
|
assertPersistenceNamespace(namespace);
|
|
53
|
+
options = snapshotPersistenceOptions(options);
|
|
52
54
|
return {
|
|
53
55
|
async load(issuer) {
|
|
54
56
|
const store = createIssuerSecretStore(issuer, options, namespace);
|
|
@@ -79,6 +81,14 @@ export function createAuthStoreClientStore(options, namespace) {
|
|
|
79
81
|
}
|
|
80
82
|
};
|
|
81
83
|
}
|
|
84
|
+
function snapshotPersistenceOptions(options) {
|
|
85
|
+
return {
|
|
86
|
+
...options,
|
|
87
|
+
...(options.fileStore === undefined ? {} : { fileStore: { ...options.fileStore } }),
|
|
88
|
+
...(options.keychainStore === undefined ? {} : { keychainStore: { ...options.keychainStore,
|
|
89
|
+
...(options.keychainStore.lock === undefined ? {} : { lock: { ...options.keychainStore.lock } }) } })
|
|
90
|
+
};
|
|
91
|
+
}
|
|
82
92
|
export function createNamedSecretStore(key, options, defaults, namespace) {
|
|
83
93
|
const hash = crypto.createHash("sha256").update(namespace === undefined ? key : JSON.stringify([namespace, key])).digest("hex");
|
|
84
94
|
const configuredFilePath = options.fileStore?.filePath;
|
|
@@ -20,7 +20,12 @@ export function createOAuthClientProvider(options) {
|
|
|
20
20
|
return createDefaultOAuthClientProvider(options);
|
|
21
21
|
}
|
|
22
22
|
export function createDefaultOAuthClientProvider(options) {
|
|
23
|
-
|
|
23
|
+
const browser = { ...options.browser,
|
|
24
|
+
...(options.browser.landingPage === undefined ? {} : { landingPage: { ...options.browser.landingPage } }) };
|
|
25
|
+
const clientMode = options.client.mode;
|
|
26
|
+
const interactiveEnabled = options.allowInteractive !== false;
|
|
27
|
+
const sessionLockTimeoutMs = options.sessionLockTimeoutMs;
|
|
28
|
+
loopbackTarget(browser);
|
|
24
29
|
assertPersistenceNamespace(options.persistenceNamespace);
|
|
25
30
|
const clientMetadata = getClientMetadata(options.client);
|
|
26
31
|
const requestedScope = clientMetadata?.scope;
|
|
@@ -187,7 +192,7 @@ export function createDefaultOAuthClientProvider(options) {
|
|
|
187
192
|
if (forceRefresh && rejectedTokens !== undefined && (rejectedTokens === null || session?.tokens === undefined || !sameTokenGrant(session.tokens, rejectedTokens)))
|
|
188
193
|
forceRefresh = false;
|
|
189
194
|
const sessionDiscovery = resolveDiscovery(discovery, session);
|
|
190
|
-
if ((
|
|
195
|
+
if ((clientMode === "static" || configuredClient !== null || initialGrant !== undefined) && session !== null && (session.tokens !== undefined || session.refreshState === "pending")) {
|
|
191
196
|
const configured = configuredClient;
|
|
192
197
|
if (configured === null || configured.clientId !== session.client.clientId || configured.clientSecret !== session.client.clientSecret)
|
|
193
198
|
throw new Error("Stored session belongs to a different OAuth client; use separate persistence or explicitly reset it");
|
|
@@ -198,7 +203,7 @@ export function createDefaultOAuthClientProvider(options) {
|
|
|
198
203
|
(session.client.tokenEndpointAuthMethod ?? (session.client.clientSecret === undefined ? "none" : "client_secret_post")) !== configuredTokenMethod)
|
|
199
204
|
throw new Error("Stored session does not match the requested OAuth token endpoint authentication; select separate persistence or reset it");
|
|
200
205
|
if (session?.refreshState === "pending") {
|
|
201
|
-
if (!allowInteractive ||
|
|
206
|
+
if (!allowInteractive || !interactiveEnabled || sessionDiscovery === undefined)
|
|
202
207
|
throw new Error("OAuth refresh outcome is unknown; authorize again before using this resource");
|
|
203
208
|
return authorizeSession(canonicalResource, clearSessionTokens(session), sessionDiscovery, fetch, signal);
|
|
204
209
|
}
|
|
@@ -209,7 +214,7 @@ export function createDefaultOAuthClientProvider(options) {
|
|
|
209
214
|
sessionDiscovery !== undefined &&
|
|
210
215
|
(forceRefresh || isExpired(session.tokens, now))) {
|
|
211
216
|
if (hasExpiredClientSecret(session.client, now)) {
|
|
212
|
-
if (!allowInteractive ||
|
|
217
|
+
if (!allowInteractive || !interactiveEnabled || clientMode === "static" || configuredClient?.registration !== undefined)
|
|
213
218
|
throw new Error("OAuth client secret has expired; authorize again or update the imported registration");
|
|
214
219
|
return authorizeSession(canonicalResource, clearSessionTokens(session), sessionDiscovery, fetch, signal);
|
|
215
220
|
}
|
|
@@ -225,10 +230,10 @@ export function createDefaultOAuthClientProvider(options) {
|
|
|
225
230
|
if (!allowInteractive || sessionDiscovery === undefined) {
|
|
226
231
|
return session;
|
|
227
232
|
}
|
|
228
|
-
if (
|
|
233
|
+
if (!interactiveEnabled)
|
|
229
234
|
throw new Error("OAuth interactive authorization is disabled");
|
|
230
235
|
return authorizeSession(canonicalResource, session, sessionDiscovery, fetch, signal);
|
|
231
|
-
}, { signal, timeoutMs:
|
|
236
|
+
}, { signal, timeoutMs: sessionLockTimeoutMs });
|
|
232
237
|
}
|
|
233
238
|
async function refreshSession(resource, session, discovery, fetch, signal) {
|
|
234
239
|
signal?.throwIfAborted();
|
|
@@ -303,13 +308,8 @@ export function createDefaultOAuthClientProvider(options) {
|
|
|
303
308
|
let reRegistrationAttempted = false;
|
|
304
309
|
while (true) {
|
|
305
310
|
const loopback = await createLoopbackAuthorizationSession({
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
createServer: options.browser.createServer,
|
|
309
|
-
landingPage: options.browser.landingPage,
|
|
310
|
-
redirectUri: options.browser.redirectUri,
|
|
311
|
-
signal: options.browser.signal === undefined ? signal : signal === undefined ? options.browser.signal : AbortSignal.any([signal, options.browser.signal]),
|
|
312
|
-
timeoutMs: options.browser.timeoutMs
|
|
311
|
+
...browser,
|
|
312
|
+
signal: browser.signal === undefined ? signal : signal === undefined ? browser.signal : AbortSignal.any([signal, browser.signal])
|
|
313
313
|
});
|
|
314
314
|
let resolvedClient = null;
|
|
315
315
|
try {
|
|
@@ -379,7 +379,7 @@ export function createDefaultOAuthClientProvider(options) {
|
|
|
379
379
|
}
|
|
380
380
|
async function resolveClient(existingSession, discovery, redirectUri, fetch, parentSignal) {
|
|
381
381
|
parentSignal?.throwIfAborted();
|
|
382
|
-
if (
|
|
382
|
+
if (clientMode === "static" || configuredClient?.registration !== undefined) {
|
|
383
383
|
if (configuredClient === null) {
|
|
384
384
|
throw new Error("OAuth client_id must not be blank");
|
|
385
385
|
}
|
|
@@ -134,6 +134,7 @@ export interface OAuthSessionStore {
|
|
|
134
134
|
timeoutMs: number;
|
|
135
135
|
}): Promise<T>;
|
|
136
136
|
}
|
|
137
|
+
/** Configuration values are captured at creation; selected host dependencies remain live. */
|
|
137
138
|
export interface DefaultOAuthClientProviderOptions {
|
|
138
139
|
client: {
|
|
139
140
|
mode: "dynamic";
|
|
@@ -237,6 +237,7 @@ interface OAuthSessionStore {
|
|
|
237
237
|
timeoutMs: number;
|
|
238
238
|
}): Promise<T>;
|
|
239
239
|
}
|
|
240
|
+
/** Configuration values are captured at creation; selected host dependencies remain live. */
|
|
240
241
|
interface DefaultOAuthClientProviderOptions {
|
|
241
242
|
client: {
|
|
242
243
|
mode: "dynamic";
|
|
@@ -4572,6 +4572,7 @@ var DEFAULT_CLIENT_KEYCHAIN_SERVICE = "poe-code-mcp-oauth-clients";
|
|
|
4572
4572
|
var MAX_JS_DATE_MS = 864e13;
|
|
4573
4573
|
function createAuthStoreSessionStore(options = {}, namespace) {
|
|
4574
4574
|
assertPersistenceNamespace(namespace);
|
|
4575
|
+
options = snapshotPersistenceOptions(options);
|
|
4575
4576
|
return {
|
|
4576
4577
|
async withLock(resource, operation, lockOptions) {
|
|
4577
4578
|
const store = createResourceSecretStore(resource, options, namespace);
|
|
@@ -4608,6 +4609,7 @@ function createAuthStoreSessionStore(options = {}, namespace) {
|
|
|
4608
4609
|
}
|
|
4609
4610
|
function createAuthStoreClientStore(options, namespace) {
|
|
4610
4611
|
assertPersistenceNamespace(namespace);
|
|
4612
|
+
options = snapshotPersistenceOptions(options);
|
|
4611
4613
|
return {
|
|
4612
4614
|
async load(issuer) {
|
|
4613
4615
|
const store = createIssuerSecretStore(issuer, options, namespace);
|
|
@@ -4635,6 +4637,16 @@ function createAuthStoreClientStore(options, namespace) {
|
|
|
4635
4637
|
}
|
|
4636
4638
|
};
|
|
4637
4639
|
}
|
|
4640
|
+
function snapshotPersistenceOptions(options) {
|
|
4641
|
+
return {
|
|
4642
|
+
...options,
|
|
4643
|
+
...options.fileStore === void 0 ? {} : { fileStore: { ...options.fileStore } },
|
|
4644
|
+
...options.keychainStore === void 0 ? {} : { keychainStore: {
|
|
4645
|
+
...options.keychainStore,
|
|
4646
|
+
...options.keychainStore.lock === void 0 ? {} : { lock: { ...options.keychainStore.lock } }
|
|
4647
|
+
} }
|
|
4648
|
+
};
|
|
4649
|
+
}
|
|
4638
4650
|
function createNamedSecretStore(key2, options, defaults, namespace) {
|
|
4639
4651
|
const hash = crypto2.createHash("sha256").update(namespace === void 0 ? key2 : JSON.stringify([namespace, key2])).digest("hex");
|
|
4640
4652
|
const configuredFilePath = options.fileStore?.filePath;
|
|
@@ -5239,7 +5251,14 @@ function createOAuthClientProvider(options) {
|
|
|
5239
5251
|
return createDefaultOAuthClientProvider(options);
|
|
5240
5252
|
}
|
|
5241
5253
|
function createDefaultOAuthClientProvider(options) {
|
|
5242
|
-
|
|
5254
|
+
const browser = {
|
|
5255
|
+
...options.browser,
|
|
5256
|
+
...options.browser.landingPage === void 0 ? {} : { landingPage: { ...options.browser.landingPage } }
|
|
5257
|
+
};
|
|
5258
|
+
const clientMode = options.client.mode;
|
|
5259
|
+
const interactiveEnabled = options.allowInteractive !== false;
|
|
5260
|
+
const sessionLockTimeoutMs = options.sessionLockTimeoutMs;
|
|
5261
|
+
loopbackTarget(browser);
|
|
5243
5262
|
assertPersistenceNamespace(options.persistenceNamespace);
|
|
5244
5263
|
const clientMetadata = getClientMetadata(options.client);
|
|
5245
5264
|
const requestedScope = clientMetadata?.scope;
|
|
@@ -5398,7 +5417,7 @@ function createDefaultOAuthClientProvider(options) {
|
|
|
5398
5417
|
if (forceRefresh && rejectedTokens !== void 0 && (rejectedTokens === null || session?.tokens === void 0 || !sameTokenGrant(session.tokens, rejectedTokens)))
|
|
5399
5418
|
forceRefresh = false;
|
|
5400
5419
|
const sessionDiscovery = resolveDiscovery(discovery, session);
|
|
5401
|
-
if ((
|
|
5420
|
+
if ((clientMode === "static" || configuredClient !== null || initialGrant !== void 0) && session !== null && (session.tokens !== void 0 || session.refreshState === "pending")) {
|
|
5402
5421
|
const configured = configuredClient;
|
|
5403
5422
|
if (configured === null || configured.clientId !== session.client.clientId || configured.clientSecret !== session.client.clientSecret)
|
|
5404
5423
|
throw new Error("Stored session belongs to a different OAuth client; use separate persistence or explicitly reset it");
|
|
@@ -5408,7 +5427,7 @@ function createDefaultOAuthClientProvider(options) {
|
|
|
5408
5427
|
if (configuredTokenMethod !== void 0 && session !== null && (session.tokens !== void 0 || session.refreshState === "pending") && (session.client.tokenEndpointAuthMethod ?? (session.client.clientSecret === void 0 ? "none" : "client_secret_post")) !== configuredTokenMethod)
|
|
5409
5428
|
throw new Error("Stored session does not match the requested OAuth token endpoint authentication; select separate persistence or reset it");
|
|
5410
5429
|
if (session?.refreshState === "pending") {
|
|
5411
|
-
if (!allowInteractive ||
|
|
5430
|
+
if (!allowInteractive || !interactiveEnabled || sessionDiscovery === void 0)
|
|
5412
5431
|
throw new Error("OAuth refresh outcome is unknown; authorize again before using this resource");
|
|
5413
5432
|
return authorizeSession(canonicalResource, clearSessionTokens(session), sessionDiscovery, fetch2, signal);
|
|
5414
5433
|
}
|
|
@@ -5417,7 +5436,7 @@ function createDefaultOAuthClientProvider(options) {
|
|
|
5417
5436
|
}
|
|
5418
5437
|
if (session?.tokens?.refreshToken !== void 0 && sessionDiscovery !== void 0 && (forceRefresh || isExpired(session.tokens, now))) {
|
|
5419
5438
|
if (hasExpiredClientSecret(session.client, now)) {
|
|
5420
|
-
if (!allowInteractive ||
|
|
5439
|
+
if (!allowInteractive || !interactiveEnabled || clientMode === "static" || configuredClient?.registration !== void 0)
|
|
5421
5440
|
throw new Error("OAuth client secret has expired; authorize again or update the imported registration");
|
|
5422
5441
|
return authorizeSession(canonicalResource, clearSessionTokens(session), sessionDiscovery, fetch2, signal);
|
|
5423
5442
|
}
|
|
@@ -5433,10 +5452,10 @@ function createDefaultOAuthClientProvider(options) {
|
|
|
5433
5452
|
if (!allowInteractive || sessionDiscovery === void 0) {
|
|
5434
5453
|
return session;
|
|
5435
5454
|
}
|
|
5436
|
-
if (
|
|
5455
|
+
if (!interactiveEnabled)
|
|
5437
5456
|
throw new Error("OAuth interactive authorization is disabled");
|
|
5438
5457
|
return authorizeSession(canonicalResource, session, sessionDiscovery, fetch2, signal);
|
|
5439
|
-
}, { signal, timeoutMs:
|
|
5458
|
+
}, { signal, timeoutMs: sessionLockTimeoutMs });
|
|
5440
5459
|
}
|
|
5441
5460
|
async function refreshSession(resource, session, discovery, fetch2, signal) {
|
|
5442
5461
|
signal?.throwIfAborted();
|
|
@@ -5509,13 +5528,8 @@ function createDefaultOAuthClientProvider(options) {
|
|
|
5509
5528
|
let reRegistrationAttempted = false;
|
|
5510
5529
|
while (true) {
|
|
5511
5530
|
const loopback = await createLoopbackAuthorizationSession({
|
|
5512
|
-
|
|
5513
|
-
|
|
5514
|
-
createServer: options.browser.createServer,
|
|
5515
|
-
landingPage: options.browser.landingPage,
|
|
5516
|
-
redirectUri: options.browser.redirectUri,
|
|
5517
|
-
signal: options.browser.signal === void 0 ? signal : signal === void 0 ? options.browser.signal : AbortSignal.any([signal, options.browser.signal]),
|
|
5518
|
-
timeoutMs: options.browser.timeoutMs
|
|
5531
|
+
...browser,
|
|
5532
|
+
signal: browser.signal === void 0 ? signal : signal === void 0 ? browser.signal : AbortSignal.any([signal, browser.signal])
|
|
5519
5533
|
});
|
|
5520
5534
|
let resolvedClient = null;
|
|
5521
5535
|
try {
|
|
@@ -5584,7 +5598,7 @@ function createDefaultOAuthClientProvider(options) {
|
|
|
5584
5598
|
}
|
|
5585
5599
|
async function resolveClient(existingSession, discovery, redirectUri, fetch2, parentSignal) {
|
|
5586
5600
|
parentSignal?.throwIfAborted();
|
|
5587
|
-
if (
|
|
5601
|
+
if (clientMode === "static" || configuredClient?.registration !== void 0) {
|
|
5588
5602
|
if (configuredClient === null) {
|
|
5589
5603
|
throw new Error("OAuth client_id must not be blank");
|
|
5590
5604
|
}
|