@jsonstudio/rcc 0.89.2202 → 0.90.1
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 +27 -0
- package/dist/build-info.js +2 -2
- package/dist/build-info.js.map +1 -1
- package/dist/cli/commands/claude.js +1 -0
- package/dist/cli/commands/claude.js.map +1 -1
- package/dist/cli/commands/codex.js +1 -0
- package/dist/cli/commands/codex.js.map +1 -1
- package/dist/cli/commands/guardian-daemon.d.ts +2 -0
- package/dist/cli/commands/guardian-daemon.js +299 -0
- package/dist/cli/commands/guardian-daemon.js.map +1 -0
- package/dist/cli/commands/init/camoufox.js +1 -1
- package/dist/cli/commands/init/camoufox.js.map +1 -1
- package/dist/cli/commands/init.js +15 -1
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/launcher/types.d.ts +6 -0
- package/dist/cli/commands/launcher-kernel.js +456 -109
- package/dist/cli/commands/launcher-kernel.js.map +1 -1
- package/dist/cli/commands/port.js +28 -8
- package/dist/cli/commands/port.js.map +1 -1
- package/dist/cli/commands/restart.d.ts +4 -0
- package/dist/cli/commands/restart.js +91 -42
- package/dist/cli/commands/restart.js.map +1 -1
- package/dist/cli/commands/start-types.d.ts +4 -0
- package/dist/cli/commands/start.js +112 -68
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/commands/stop.d.ts +3 -0
- package/dist/cli/commands/stop.js +30 -63
- package/dist/cli/commands/stop.js.map +1 -1
- package/dist/cli/config/init-config.js +15 -1
- package/dist/cli/config/init-config.js.map +1 -1
- package/dist/cli/config/init-provider-catalog.js +13 -5
- package/dist/cli/config/init-provider-catalog.js.map +1 -1
- package/dist/cli/guardian/client.d.ts +38 -0
- package/dist/cli/guardian/client.js +237 -0
- package/dist/cli/guardian/client.js.map +1 -0
- package/dist/cli/guardian/paths.d.ts +7 -0
- package/dist/cli/guardian/paths.js +13 -0
- package/dist/cli/guardian/paths.js.map +1 -0
- package/dist/cli/guardian/types.d.ts +30 -0
- package/dist/cli/guardian/types.js +2 -0
- package/dist/cli/guardian/types.js.map +1 -0
- package/dist/cli/register/guardian-daemon-command.d.ts +2 -0
- package/dist/cli/register/guardian-daemon-command.js +5 -0
- package/dist/cli/register/guardian-daemon-command.js.map +1 -0
- package/dist/cli/server/port-utils.js +57 -1
- package/dist/cli/server/port-utils.js.map +1 -1
- package/dist/cli.js +48 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/oauth.js +6 -6
- package/dist/commands/oauth.js.map +1 -1
- package/dist/commands/provider-update.js +12 -0
- package/dist/commands/provider-update.js.map +1 -1
- package/dist/config/routecodex-config-loader.js +66 -1
- package/dist/config/routecodex-config-loader.js.map +1 -1
- package/dist/config/virtual-router-builder.js +18 -0
- package/dist/config/virtual-router-builder.js.map +1 -1
- package/dist/config/virtual-router-types.js +20 -5
- package/dist/config/virtual-router-types.js.map +1 -1
- package/dist/daemon-admin-ui/assets/index-C8vP_c5E.js +15 -0
- package/dist/daemon-admin-ui/assets/index-DjIoHmNv.css +1 -0
- package/dist/daemon-admin-ui/index.html +13 -0
- package/dist/docs/daemon-admin-ui.html +328 -57
- package/dist/index.d.ts +9 -0
- package/dist/index.js +268 -10
- package/dist/index.js.map +1 -1
- package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.d.ts +1 -0
- package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.js +36 -0
- package/dist/manager/modules/quota/provider-quota-daemon.error-helpers.js.map +1 -1
- package/dist/manager/modules/quota/provider-quota-daemon.events.js +50 -1
- package/dist/manager/modules/quota/provider-quota-daemon.events.js.map +1 -1
- package/dist/providers/auth/antigravity-user-agent.js +78 -31
- package/dist/providers/auth/antigravity-user-agent.js.map +1 -1
- package/dist/providers/auth/gemini-cli-userinfo-helper.js +94 -63
- package/dist/providers/auth/gemini-cli-userinfo-helper.js.map +1 -1
- package/dist/providers/auth/iflow-userinfo-helper.js +1 -1
- package/dist/providers/auth/iflow-userinfo-helper.js.map +1 -1
- package/dist/providers/auth/oauth-error-message.d.ts +1 -0
- package/dist/providers/auth/oauth-error-message.js +44 -0
- package/dist/providers/auth/oauth-error-message.js.map +1 -0
- package/dist/providers/auth/oauth-lifecycle/error-detection.js +42 -8
- package/dist/providers/auth/oauth-lifecycle/error-detection.js.map +1 -1
- package/dist/providers/auth/oauth-lifecycle/token-io.d.ts +1 -0
- package/dist/providers/auth/oauth-lifecycle/token-io.js +12 -0
- package/dist/providers/auth/oauth-lifecycle/token-io.js.map +1 -1
- package/dist/providers/auth/oauth-lifecycle.js +502 -87
- package/dist/providers/auth/oauth-lifecycle.js.map +1 -1
- package/dist/providers/auth/oauth-repair-cooldown.js +2 -7
- package/dist/providers/auth/oauth-repair-cooldown.js.map +1 -1
- package/dist/providers/auth/oauth-repair-env.js +3 -5
- package/dist/providers/auth/oauth-repair-env.js.map +1 -1
- package/dist/providers/auth/oauth-utils/error-extraction.js +42 -8
- package/dist/providers/auth/oauth-utils/error-extraction.js.map +1 -1
- package/dist/providers/auth/qwen-userinfo-helper.js +18 -3
- package/dist/providers/auth/qwen-userinfo-helper.js.map +1 -1
- package/dist/providers/auth/tokenfile-auth.d.ts +1 -0
- package/dist/providers/auth/tokenfile-auth.js +15 -9
- package/dist/providers/auth/tokenfile-auth.js.map +1 -1
- package/dist/providers/core/config/camoufox-actions.d.ts +31 -0
- package/dist/providers/core/config/camoufox-actions.js +461 -0
- package/dist/providers/core/config/camoufox-actions.js.map +1 -0
- package/dist/providers/core/config/camoufox-launcher.d.ts +3 -0
- package/dist/providers/core/config/camoufox-launcher.js +518 -160
- package/dist/providers/core/config/camoufox-launcher.js.map +1 -1
- package/dist/providers/core/config/oauth-flows.js +6 -44
- package/dist/providers/core/config/oauth-flows.js.map +1 -1
- package/dist/providers/core/config/provider-oauth-configs.js +51 -7
- package/dist/providers/core/config/provider-oauth-configs.js.map +1 -1
- package/dist/providers/core/config/service-profiles.js +13 -4
- package/dist/providers/core/config/service-profiles.js.map +1 -1
- package/dist/providers/core/runtime/http-transport-provider.d.ts +1 -0
- package/dist/providers/core/runtime/http-transport-provider.js +60 -1
- package/dist/providers/core/runtime/http-transport-provider.js.map +1 -1
- package/dist/providers/core/runtime/provider-error-classifier.js +32 -15
- package/dist/providers/core/runtime/provider-error-classifier.js.map +1 -1
- package/dist/providers/core/runtime/provider-family-profile-utils.js +1 -1
- package/dist/providers/core/runtime/provider-family-profile-utils.js.map +1 -1
- package/dist/providers/core/runtime/provider-response-postprocessor.js +61 -14
- package/dist/providers/core/runtime/provider-response-postprocessor.js.map +1 -1
- package/dist/providers/core/strategies/oauth-auth-code-flow.d.ts +1 -0
- package/dist/providers/core/strategies/oauth-auth-code-flow.js +124 -19
- package/dist/providers/core/strategies/oauth-auth-code-flow.js.map +1 -1
- package/dist/providers/core/strategies/oauth-device-flow.js +6 -3
- package/dist/providers/core/strategies/oauth-device-flow.js.map +1 -1
- package/dist/providers/profile/families/iflow-profile.js +83 -10
- package/dist/providers/profile/families/iflow-profile.js.map +1 -1
- package/dist/providers/profile/families/qwen-profile.js +203 -0
- package/dist/providers/profile/families/qwen-profile.js.map +1 -1
- package/dist/scripts/camoufox/launch-auth.mjs +112 -5
- package/dist/server/handlers/config-admin-handler.js +9 -2
- package/dist/server/handlers/config-admin-handler.js.map +1 -1
- package/dist/server/handlers/handler-utils.js +3 -14
- package/dist/server/handlers/handler-utils.js.map +1 -1
- package/dist/server/handlers/logging.js +3 -4
- package/dist/server/handlers/logging.js.map +1 -1
- package/dist/server/runtime/http-server/clock-client-reaper.d.ts +1 -0
- package/dist/server/runtime/http-server/clock-client-reaper.js +21 -15
- package/dist/server/runtime/http-server/clock-client-reaper.js.map +1 -1
- package/dist/server/runtime/http-server/clock-client-registry-utils.d.ts +4 -0
- package/dist/server/runtime/http-server/clock-client-registry-utils.js +74 -16
- package/dist/server/runtime/http-server/clock-client-registry-utils.js.map +1 -1
- package/dist/server/runtime/http-server/clock-client-registry.d.ts +15 -0
- package/dist/server/runtime/http-server/clock-client-registry.js +300 -6
- package/dist/server/runtime/http-server/clock-client-registry.js.map +1 -1
- package/dist/server/runtime/http-server/clock-client-routes.js +49 -19
- package/dist/server/runtime/http-server/clock-client-routes.js.map +1 -1
- package/dist/server/runtime/http-server/clock-daemon-log-throttle.d.ts +16 -0
- package/dist/server/runtime/http-server/clock-daemon-log-throttle.js +49 -0
- package/dist/server/runtime/http-server/clock-daemon-log-throttle.js.map +1 -1
- package/dist/server/runtime/http-server/clock-scope-resolution.d.ts +14 -0
- package/dist/server/runtime/http-server/clock-scope-resolution.js +212 -0
- package/dist/server/runtime/http-server/clock-scope-resolution.js.map +1 -0
- package/dist/server/runtime/http-server/daemon-admin/auth-handler.js +5 -3
- package/dist/server/runtime/http-server/daemon-admin/auth-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/control-handler.js +104 -15
- package/dist/server/runtime/http-server/daemon-admin/control-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js +2 -2
- package/dist/server/runtime/http-server/daemon-admin/credentials-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.d.ts +24 -0
- package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.js +316 -70
- package/dist/server/runtime/http-server/daemon-admin/providers-handler-routing-utils.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/providers-handler.js +190 -1
- package/dist/server/runtime/http-server/daemon-admin/providers-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/routing-policy.js +18 -29
- package/dist/server/runtime/http-server/daemon-admin/routing-policy.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/stats-handler.js +2 -0
- package/dist/server/runtime/http-server/daemon-admin/stats-handler.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin-routes.d.ts +8 -1
- package/dist/server/runtime/http-server/daemon-admin-routes.js +30 -0
- package/dist/server/runtime/http-server/daemon-admin-routes.js.map +1 -1
- package/dist/server/runtime/http-server/executor/client-injection-flow.d.ts +14 -0
- package/dist/server/runtime/http-server/executor/client-injection-flow.js +287 -0
- package/dist/server/runtime/http-server/executor/client-injection-flow.js.map +1 -0
- package/dist/server/runtime/http-server/executor/index.d.ts +1 -1
- package/dist/server/runtime/http-server/executor/index.js +1 -1
- package/dist/server/runtime/http-server/executor/index.js.map +1 -1
- package/dist/server/runtime/http-server/executor/provider-response-converter.js +236 -62
- package/dist/server/runtime/http-server/executor/provider-response-converter.js.map +1 -1
- package/dist/server/runtime/http-server/executor/provider-response-utils.js +5 -0
- package/dist/server/runtime/http-server/executor/provider-response-utils.js.map +1 -1
- package/dist/server/runtime/http-server/executor/request-executor-core-utils.d.ts +2 -0
- package/dist/server/runtime/http-server/executor/request-executor-core-utils.js +60 -0
- package/dist/server/runtime/http-server/executor/request-executor-core-utils.js.map +1 -1
- package/dist/server/runtime/http-server/executor/request-retry-helpers.js +20 -8
- package/dist/server/runtime/http-server/executor/request-retry-helpers.js.map +1 -1
- package/dist/server/runtime/http-server/executor/sse-error-handler.d.ts +1 -0
- package/dist/server/runtime/http-server/executor/sse-error-handler.js +13 -2
- package/dist/server/runtime/http-server/executor/sse-error-handler.js.map +1 -1
- package/dist/server/runtime/http-server/executor/usage-aggregator.d.ts +0 -12
- package/dist/server/runtime/http-server/executor/usage-aggregator.js +84 -88
- package/dist/server/runtime/http-server/executor/usage-aggregator.js.map +1 -1
- package/dist/server/runtime/http-server/executor-metadata.js +328 -7
- package/dist/server/runtime/http-server/executor-metadata.js.map +1 -1
- package/dist/server/runtime/http-server/executor-response.d.ts +1 -0
- package/dist/server/runtime/http-server/executor-response.js +52 -50
- package/dist/server/runtime/http-server/executor-response.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-bootstrap.js +55 -6
- package/dist/server/runtime/http-server/http-server-bootstrap.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-clock-daemon.d.ts +1 -0
- package/dist/server/runtime/http-server/http-server-clock-daemon.js +199 -44
- package/dist/server/runtime/http-server/http-server-clock-daemon.js.map +1 -1
- package/dist/server/runtime/http-server/http-server-lifecycle.js +4 -4
- package/dist/server/runtime/http-server/http-server-lifecycle.js.map +1 -1
- package/dist/server/runtime/http-server/hub-shadow-compare.js +1 -1
- package/dist/server/runtime/http-server/hub-shadow-compare.js.map +1 -1
- package/dist/server/runtime/http-server/index.d.ts +1 -0
- package/dist/server/runtime/http-server/index.js +1 -0
- package/dist/server/runtime/http-server/index.js.map +1 -1
- package/dist/server/runtime/http-server/middleware.js +82 -4
- package/dist/server/runtime/http-server/middleware.js.map +1 -1
- package/dist/server/runtime/http-server/request-executor.js +26 -7
- package/dist/server/runtime/http-server/request-executor.js.map +1 -1
- package/dist/server/runtime/http-server/routes.d.ts +2 -1
- package/dist/server/runtime/http-server/routes.js +4 -2
- package/dist/server/runtime/http-server/routes.js.map +1 -1
- package/dist/server/runtime/http-server/session-dir.js +12 -1
- package/dist/server/runtime/http-server/session-dir.js.map +1 -1
- package/dist/server/runtime/http-server/stats-manager.d.ts +35 -0
- package/dist/server/runtime/http-server/stats-manager.js +269 -21
- package/dist/server/runtime/http-server/stats-manager.js.map +1 -1
- package/dist/server/runtime/http-server/stopmessage-scope-rebind.d.ts +13 -0
- package/dist/server/runtime/http-server/stopmessage-scope-rebind.js +168 -0
- package/dist/server/runtime/http-server/stopmessage-scope-rebind.js.map +1 -0
- package/dist/server/runtime/http-server/tmux-session-probe.d.ts +10 -0
- package/dist/server/runtime/http-server/tmux-session-probe.js +97 -0
- package/dist/server/runtime/http-server/tmux-session-probe.js.map +1 -1
- package/dist/server-lifecycle/port-utils.d.ts +2 -1
- package/dist/server-lifecycle/port-utils.js +84 -4
- package/dist/server-lifecycle/port-utils.js.map +1 -1
- package/dist/token-daemon/index.d.ts +1 -0
- package/dist/token-daemon/index.js +17 -12
- package/dist/token-daemon/index.js.map +1 -1
- package/dist/utils/clock-client-token.d.ts +2 -1
- package/dist/utils/clock-client-token.js +52 -8
- package/dist/utils/clock-client-token.js.map +1 -1
- package/dist/utils/clock-scope-trace.d.ts +11 -0
- package/dist/utils/clock-scope-trace.js +41 -0
- package/dist/utils/clock-scope-trace.js.map +1 -0
- package/dist/utils/llms-engine-shadow.js +1 -1
- package/dist/utils/llms-engine-shadow.js.map +1 -1
- package/docs/DAEMON_CONTROL_PLANE.md +1 -0
- package/docs/ROUTING_POLICY_SCHEMA.md +4 -2
- package/docs/daemon-admin-ui.html +328 -57
- package/docs/design/servertool-stopmessage-lifecycle.md +109 -0
- package/docs/exec-command-guard-policy.example.v1.json +7 -1
- package/docs/providers/antigravity-gemini-provider-compat.md +2 -2
- package/package.json +23 -6
- package/scripts/build-core.mjs +12 -0
- package/scripts/camoufox/launch-auth.mjs +112 -5
- package/scripts/ci/repo-sanity.mjs +1 -0
- package/scripts/cleanup-stale-server-pids.mjs +142 -0
- package/scripts/install-global.sh +8 -0
- package/scripts/install-verify.mjs +33 -16
- package/scripts/run-bg.sh +226 -43
- package/scripts/run-fg-gtimeout.sh +158 -14
- package/scripts/tests/blackbox-rcc-vs-routecodex-antigravity.mjs +3 -3
- package/scripts/tests/ci-jest.mjs +9 -1
- package/scripts/triage-errorsamples.mjs +216 -0
- package/scripts/verify-codex-error-samples.mjs +92 -15
- package/scripts/verify-e2e-toolcall.mjs +12 -1
- package/scripts/verify-install-e2e.mjs +69 -28
|
@@ -1,9 +1,212 @@
|
|
|
1
|
+
const DEFAULT_QWEN_CODE_UA_VERSION = '0.10.3';
|
|
2
|
+
const QWEN_OAUTH_AUTH_TYPE = 'qwen-oauth';
|
|
3
|
+
const QWEN_OAUTH_CODER_MODEL = 'coder-model';
|
|
4
|
+
const QWEN_OAUTH_VISION_MODEL = 'vision-model';
|
|
5
|
+
const QWEN_WEB_SEARCH_ENDPOINT = '/api/v1/indices/plugin/web_search';
|
|
6
|
+
function resolveQwenCodeUserAgentVersion() {
|
|
7
|
+
const fromEnv = process.env.ROUTECODEX_QWEN_UA_VERSION ||
|
|
8
|
+
process.env.RCC_QWEN_UA_VERSION ||
|
|
9
|
+
process.env.ROUTECODEX_QWEN_CODE_UA_VERSION ||
|
|
10
|
+
process.env.RCC_QWEN_CODE_UA_VERSION;
|
|
11
|
+
const normalized = typeof fromEnv === 'string' ? fromEnv.trim() : '';
|
|
12
|
+
return normalized || DEFAULT_QWEN_CODE_UA_VERSION;
|
|
13
|
+
}
|
|
14
|
+
function buildQwenCodeUserAgent() {
|
|
15
|
+
const version = resolveQwenCodeUserAgentVersion();
|
|
16
|
+
return `QwenCode/${version} (${process.platform}; ${process.arch})`;
|
|
17
|
+
}
|
|
18
|
+
function assignHeader(headers, target, value) {
|
|
19
|
+
const normalizedValue = typeof value === 'string' ? value.trim() : '';
|
|
20
|
+
if (!normalizedValue) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const lowered = target.toLowerCase();
|
|
24
|
+
for (const key of Object.keys(headers)) {
|
|
25
|
+
if (key.toLowerCase() === lowered) {
|
|
26
|
+
headers[key] = normalizedValue;
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
headers[target] = normalizedValue;
|
|
31
|
+
}
|
|
32
|
+
function findHeaderValue(headers, target) {
|
|
33
|
+
const lowered = target.toLowerCase();
|
|
34
|
+
for (const [key, value] of Object.entries(headers)) {
|
|
35
|
+
if (key.toLowerCase() === lowered) {
|
|
36
|
+
return typeof value === 'string' ? value : undefined;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
function deleteHeaderInsensitive(headers, target) {
|
|
42
|
+
const lowered = target.toLowerCase();
|
|
43
|
+
for (const key of Object.keys(headers)) {
|
|
44
|
+
if (key.toLowerCase() === lowered) {
|
|
45
|
+
delete headers[key];
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
function resolveDashScopeAuthType(input) {
|
|
50
|
+
const fromEnv = (process.env.ROUTECODEX_QWEN_DASHSCOPE_AUTH_TYPE || process.env.RCC_QWEN_DASHSCOPE_AUTH_TYPE || '').trim();
|
|
51
|
+
if (fromEnv) {
|
|
52
|
+
return fromEnv;
|
|
53
|
+
}
|
|
54
|
+
const runtimeAuthType = input.runtimeMetadata && typeof input.runtimeMetadata.authType === 'string'
|
|
55
|
+
? input.runtimeMetadata.authType.trim()
|
|
56
|
+
: '';
|
|
57
|
+
if (runtimeAuthType) {
|
|
58
|
+
return runtimeAuthType;
|
|
59
|
+
}
|
|
60
|
+
return 'qwen-oauth';
|
|
61
|
+
}
|
|
1
62
|
function hasConfiguredOAuthClient(auth) {
|
|
2
63
|
return !!auth.clientId || !!auth.tokenUrl || !!auth.deviceCodeUrl;
|
|
3
64
|
}
|
|
65
|
+
function isRecord(value) {
|
|
66
|
+
return !!value && typeof value === 'object' && !Array.isArray(value);
|
|
67
|
+
}
|
|
68
|
+
function getRequestMetadata(request) {
|
|
69
|
+
if (!isRecord(request)) {
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
return isRecord(request.metadata) ? request.metadata : undefined;
|
|
73
|
+
}
|
|
74
|
+
function isQwenWebSearchRequest(input) {
|
|
75
|
+
const metadata = getRequestMetadata(input.request);
|
|
76
|
+
return metadata?.qwenWebSearch === true;
|
|
77
|
+
}
|
|
78
|
+
function normalizeQwenWebSearchEndpoint(value) {
|
|
79
|
+
if (typeof value !== 'string') {
|
|
80
|
+
return QWEN_WEB_SEARCH_ENDPOINT;
|
|
81
|
+
}
|
|
82
|
+
const trimmed = value.trim();
|
|
83
|
+
if (!trimmed.startsWith('/')) {
|
|
84
|
+
return QWEN_WEB_SEARCH_ENDPOINT;
|
|
85
|
+
}
|
|
86
|
+
const lowered = trimmed.toLowerCase();
|
|
87
|
+
if (lowered.includes('/indices/plugin/web_search')) {
|
|
88
|
+
return trimmed;
|
|
89
|
+
}
|
|
90
|
+
return QWEN_WEB_SEARCH_ENDPOINT;
|
|
91
|
+
}
|
|
92
|
+
function toPositiveInt(value, fallback) {
|
|
93
|
+
if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
|
|
94
|
+
return Math.trunc(value);
|
|
95
|
+
}
|
|
96
|
+
if (typeof value === 'string') {
|
|
97
|
+
const parsed = Number(value.trim());
|
|
98
|
+
if (Number.isFinite(parsed) && parsed > 0) {
|
|
99
|
+
return Math.trunc(parsed);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return fallback;
|
|
103
|
+
}
|
|
104
|
+
function buildQwenWebSearchBody(input) {
|
|
105
|
+
const sourceBody = isRecord(input.request) && isRecord(input.request.data)
|
|
106
|
+
? input.request.data
|
|
107
|
+
: isRecord(input.defaultBody)
|
|
108
|
+
? input.defaultBody
|
|
109
|
+
: {};
|
|
110
|
+
const body = { ...sourceBody };
|
|
111
|
+
const queryRaw = typeof body.uq === 'string' && body.uq.trim()
|
|
112
|
+
? body.uq.trim()
|
|
113
|
+
: typeof body.query === 'string' && body.query.trim()
|
|
114
|
+
? body.query.trim()
|
|
115
|
+
: '';
|
|
116
|
+
body.uq = queryRaw;
|
|
117
|
+
body.page = toPositiveInt(body.page, 1);
|
|
118
|
+
body.rows = toPositiveInt(body.rows ?? body.count, 10);
|
|
119
|
+
delete body.query;
|
|
120
|
+
delete body.count;
|
|
121
|
+
delete body.metadata;
|
|
122
|
+
delete body.qwenWebSearch;
|
|
123
|
+
delete body.entryEndpoint;
|
|
124
|
+
delete body.model;
|
|
125
|
+
delete body.messages;
|
|
126
|
+
delete body.tools;
|
|
127
|
+
delete body.stream;
|
|
128
|
+
delete body.max_tokens;
|
|
129
|
+
delete body.maxTokens;
|
|
130
|
+
return body;
|
|
131
|
+
}
|
|
132
|
+
function extractAuthType(input) {
|
|
133
|
+
const runtimeType = input.runtimeMetadata && typeof input.runtimeMetadata.authType === 'string'
|
|
134
|
+
? input.runtimeMetadata.authType
|
|
135
|
+
: '';
|
|
136
|
+
if (runtimeType.trim()) {
|
|
137
|
+
return runtimeType.trim().toLowerCase();
|
|
138
|
+
}
|
|
139
|
+
const metadataNode = isRecord(input.request) && isRecord(input.request.metadata) ? input.request.metadata : undefined;
|
|
140
|
+
const metadataType = typeof metadataNode?.authType === 'string' ? metadataNode.authType : '';
|
|
141
|
+
return metadataType.trim().toLowerCase();
|
|
142
|
+
}
|
|
143
|
+
function isQwenOAuthAuthType(authType) {
|
|
144
|
+
const normalized = authType.trim().toLowerCase();
|
|
145
|
+
return normalized === QWEN_OAUTH_AUTH_TYPE || normalized === 'oauth';
|
|
146
|
+
}
|
|
147
|
+
function resolveQwenOAuthModel(requestedModel) {
|
|
148
|
+
const normalized = requestedModel.trim().toLowerCase();
|
|
149
|
+
if (normalized === QWEN_OAUTH_VISION_MODEL) {
|
|
150
|
+
return QWEN_OAUTH_VISION_MODEL;
|
|
151
|
+
}
|
|
152
|
+
if (normalized === QWEN_OAUTH_CODER_MODEL) {
|
|
153
|
+
return QWEN_OAUTH_CODER_MODEL;
|
|
154
|
+
}
|
|
155
|
+
if (normalized.includes('vision') || normalized.includes('-vl')) {
|
|
156
|
+
return QWEN_OAUTH_VISION_MODEL;
|
|
157
|
+
}
|
|
158
|
+
return QWEN_OAUTH_CODER_MODEL;
|
|
159
|
+
}
|
|
4
160
|
export const qwenFamilyProfile = {
|
|
5
161
|
id: 'qwen/default',
|
|
6
162
|
providerFamily: 'qwen',
|
|
163
|
+
resolveEndpoint(input) {
|
|
164
|
+
if (!isQwenWebSearchRequest(input)) {
|
|
165
|
+
return undefined;
|
|
166
|
+
}
|
|
167
|
+
const metadata = getRequestMetadata(input.request);
|
|
168
|
+
return normalizeQwenWebSearchEndpoint(metadata?.entryEndpoint);
|
|
169
|
+
},
|
|
170
|
+
buildRequestBody(input) {
|
|
171
|
+
if (isQwenWebSearchRequest(input)) {
|
|
172
|
+
return buildQwenWebSearchBody(input);
|
|
173
|
+
}
|
|
174
|
+
const authType = extractAuthType(input);
|
|
175
|
+
if (authType && !isQwenOAuthAuthType(authType)) {
|
|
176
|
+
return undefined;
|
|
177
|
+
}
|
|
178
|
+
const body = input.defaultBody;
|
|
179
|
+
if (!body || typeof body !== 'object') {
|
|
180
|
+
return undefined;
|
|
181
|
+
}
|
|
182
|
+
const requestBody = body;
|
|
183
|
+
const rawModel = typeof requestBody.model === 'string' ? requestBody.model.trim() : '';
|
|
184
|
+
if (!rawModel) {
|
|
185
|
+
return body;
|
|
186
|
+
}
|
|
187
|
+
const resolvedModel = resolveQwenOAuthModel(rawModel);
|
|
188
|
+
if (resolvedModel && resolvedModel !== rawModel) {
|
|
189
|
+
requestBody.model = resolvedModel;
|
|
190
|
+
}
|
|
191
|
+
return body;
|
|
192
|
+
},
|
|
193
|
+
resolveUserAgent(input) {
|
|
194
|
+
return input.uaFromConfig ?? input.uaFromService ?? buildQwenCodeUserAgent();
|
|
195
|
+
},
|
|
196
|
+
applyRequestHeaders(input) {
|
|
197
|
+
const headers = { ...(input.headers || {}) };
|
|
198
|
+
const resolvedUserAgent = findHeaderValue(headers, 'User-Agent') ||
|
|
199
|
+
buildQwenCodeUserAgent();
|
|
200
|
+
assignHeader(headers, 'User-Agent', resolvedUserAgent);
|
|
201
|
+
// Keep request headers consistent with Qwen Code DashScope-compatible client behavior.
|
|
202
|
+
assignHeader(headers, 'X-DashScope-CacheControl', 'enable');
|
|
203
|
+
assignHeader(headers, 'X-DashScope-UserAgent', resolvedUserAgent);
|
|
204
|
+
assignHeader(headers, 'X-DashScope-AuthType', resolveDashScopeAuthType(input));
|
|
205
|
+
// Remove legacy Gemini-style metadata headers for qwen requests.
|
|
206
|
+
deleteHeaderInsensitive(headers, 'X-Goog-Api-Client');
|
|
207
|
+
deleteHeaderInsensitive(headers, 'Client-Metadata');
|
|
208
|
+
return headers;
|
|
209
|
+
},
|
|
7
210
|
resolveOAuthTokenFileMode(input) {
|
|
8
211
|
if (input.oauthProviderId !== 'qwen') {
|
|
9
212
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qwen-profile.js","sourceRoot":"","sources":["../../../../src/providers/profile/families/qwen-profile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"qwen-profile.js","sourceRoot":"","sources":["../../../../src/providers/profile/families/qwen-profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,30 @@ function isTruthy(value) {
|
|
|
13
13
|
return v === '1' || v === 'true' || v === 'yes' || v === 'on';
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
+
function isFalsy(value) {
|
|
17
|
+
if (!value) return false;
|
|
18
|
+
const v = String(value).trim().toLowerCase();
|
|
19
|
+
return v === '0' || v === 'false' || v === 'no' || v === 'off';
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
function resolveIflowHeadlessMode(devMode) {
|
|
23
|
+
if (devMode) {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
const raw = String(
|
|
27
|
+
process.env.ROUTECODEX_CAMOUFOX_IFLOW_HEADLESS ||
|
|
28
|
+
process.env.RCC_CAMOUFOX_IFLOW_HEADLESS ||
|
|
29
|
+
''
|
|
30
|
+
).trim();
|
|
31
|
+
if (!raw) {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
if (isFalsy(raw)) {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
return isTruthy(raw);
|
|
38
|
+
}
|
|
39
|
+
|
|
16
40
|
function parseArgs(argv) {
|
|
17
41
|
const args = { profile: 'default', url: '', autoMode: '', devMode: false };
|
|
18
42
|
const list = argv.slice(2);
|
|
@@ -260,13 +284,44 @@ function cleanupExistingCamoufox(profileDir) {
|
|
|
260
284
|
if (!profileDir) {
|
|
261
285
|
return;
|
|
262
286
|
}
|
|
263
|
-
|
|
264
|
-
|
|
287
|
+
// 清理已知进程,不使用 pkill 普杀
|
|
288
|
+
// 使用 pgrep 查找匹配的进程,然后逐个验证后终止
|
|
265
289
|
try {
|
|
266
|
-
spawnSync('
|
|
290
|
+
const probe = spawnSync('pgrep', ['-f', profileDir], {
|
|
291
|
+
encoding: 'utf8',
|
|
292
|
+
stdio: ['ignore', 'pipe', 'ignore']
|
|
293
|
+
});
|
|
294
|
+
|
|
295
|
+
if (probe.status === 0 && probe.stdout) {
|
|
296
|
+
const selfPid = process.pid;
|
|
297
|
+
const lines = String(probe.stdout).split(/\r?\n/).filter(Boolean);
|
|
298
|
+
|
|
299
|
+
for (const line of lines) {
|
|
300
|
+
const pid = Number.parseInt(line.trim(), 10);
|
|
301
|
+
if (!Number.isFinite(pid) || pid <= 0 || pid === selfPid) {
|
|
302
|
+
continue;
|
|
303
|
+
}
|
|
304
|
+
// 验证进程命令包含 camoufox
|
|
305
|
+
try {
|
|
306
|
+
const cmdProbe = spawnSync('ps', ['-p', String(pid), '-o', 'command='], { encoding: 'utf8' });
|
|
307
|
+
const cmd = String(cmdProbe.stdout || '').toLowerCase();
|
|
308
|
+
if (cmd.includes('camoufox')) {
|
|
309
|
+
console.log(`[camoufox-launch-auth] Stopping known Camoufox process PID ${pid}`);
|
|
310
|
+
try {
|
|
311
|
+
process.kill(pid, 'SIGTERM');
|
|
312
|
+
} catch {
|
|
313
|
+
// 忽略终止失败
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
} catch {
|
|
317
|
+
// 忽略 ps 查询失败
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
}
|
|
267
321
|
} catch {
|
|
268
|
-
//
|
|
322
|
+
// pgrep 可能不存在,忽略
|
|
269
323
|
}
|
|
324
|
+
console.log('[camoufox-launch-auth] Ensuring Camoufox profile is clean before launch...');
|
|
270
325
|
const lockNames = ['.parentlock', 'parent.lock', 'lock'];
|
|
271
326
|
for (const name of lockNames) {
|
|
272
327
|
const target = path.join(profileDir, name);
|
|
@@ -754,7 +809,9 @@ async function runIflowAutoFlow({ url, profileDir, profileId, camoufoxBinary, de
|
|
|
754
809
|
);
|
|
755
810
|
}
|
|
756
811
|
|
|
757
|
-
|
|
812
|
+
// iFlow OAuth has poor reliability under headless mode (often returns anti-bot/garbled pages).
|
|
813
|
+
// Keep default headed to match camo CLI behavior; allow opt-in headless via env.
|
|
814
|
+
const headless = resolveIflowHeadlessMode(devMode);
|
|
758
815
|
const timeoutMs = Number(process.env.ROUTECODEX_CAMOUFOX_IFLOW_TIMEOUT_MS || 300_000);
|
|
759
816
|
console.log(`[camoufox-launch-auth] Launching Camoufox in ${headless ? 'headless' : 'headed'} mode...`);
|
|
760
817
|
cleanupExistingCamoufox(profileDir);
|
|
@@ -1172,6 +1229,8 @@ async function runQwenAutoFlow({ url, profileDir, camoufoxBinary, devMode }) {
|
|
|
1172
1229
|
}
|
|
1173
1230
|
|
|
1174
1231
|
const timeoutMs = Number(process.env.ROUTECODEX_CAMOUFOX_QWEN_TIMEOUT_MS || 120_000);
|
|
1232
|
+
const accountPreference = (process.env.ROUTECODEX_CAMOUFOX_ACCOUNT_TEXT || '').trim();
|
|
1233
|
+
const accountWaitMs = Number(process.env.ROUTECODEX_CAMOUFOX_QWEN_ACCOUNT_TIMEOUT_MS || 15_000);
|
|
1175
1234
|
cleanupExistingCamoufox(profileDir);
|
|
1176
1235
|
const context = await firefox.launchPersistentContext(profileDir, {
|
|
1177
1236
|
executablePath: camoufoxBinary,
|
|
@@ -1231,6 +1290,54 @@ async function runQwenAutoFlow({ url, profileDir, camoufoxBinary, devMode }) {
|
|
|
1231
1290
|
await authPage.waitForLoadState('domcontentloaded', { timeout: pageLoadTimeoutMs }).catch(() => {});
|
|
1232
1291
|
}
|
|
1233
1292
|
|
|
1293
|
+
const qwenAccountSelectors = [
|
|
1294
|
+
'div.yAlK0b[jsname="bQIQze"]',
|
|
1295
|
+
'div.pGzURd[jsname="V1ur5d"]',
|
|
1296
|
+
'span.accountName--ZKlffRBc',
|
|
1297
|
+
'span[class^="accountName--"]',
|
|
1298
|
+
'span[class*="accountName--"]',
|
|
1299
|
+
'.account-item',
|
|
1300
|
+
'[class*="account-item"]',
|
|
1301
|
+
'[class*="accountItem"]',
|
|
1302
|
+
'[data-testid*="account"]',
|
|
1303
|
+
'[data-test*="account"]'
|
|
1304
|
+
];
|
|
1305
|
+
const accountResult = await waitForAnyElementInPages(context, qwenAccountSelectors, accountWaitMs);
|
|
1306
|
+
if (accountResult) {
|
|
1307
|
+
let targetAccount = accountResult.locator.first();
|
|
1308
|
+
if (accountPreference) {
|
|
1309
|
+
const preferred = accountResult.locator.filter({ hasText: accountPreference });
|
|
1310
|
+
if (await preferred.count()) {
|
|
1311
|
+
console.log(`[camoufox-launch-auth] Qwen selecting account matching preference "${accountPreference}"`);
|
|
1312
|
+
targetAccount = preferred.first();
|
|
1313
|
+
} else {
|
|
1314
|
+
console.warn(
|
|
1315
|
+
`[camoufox-launch-auth] Qwen preferred account text "${accountPreference}" not found; falling back to first account`
|
|
1316
|
+
);
|
|
1317
|
+
}
|
|
1318
|
+
}
|
|
1319
|
+
await targetAccount.scrollIntoViewIfNeeded().catch(() => {});
|
|
1320
|
+
await targetAccount.hover({ force: true }).catch(() => {});
|
|
1321
|
+
const handle = await targetAccount.elementHandle();
|
|
1322
|
+
const accountText = await targetAccount.innerText().catch(() => '');
|
|
1323
|
+
if (handle) {
|
|
1324
|
+
console.log(
|
|
1325
|
+
`[camoufox-launch-auth] Qwen account element detected (${accountText || 'unknown label'}), clicking...`
|
|
1326
|
+
);
|
|
1327
|
+
await accountResult.page.evaluate((el) => {
|
|
1328
|
+
const events = ['mouseenter', 'mouseover', 'mousemove', 'mousedown', 'mouseup', 'click'];
|
|
1329
|
+
for (const type of events) {
|
|
1330
|
+
el.dispatchEvent(new MouseEvent(type, { bubbles: true, cancelable: true, view: window }));
|
|
1331
|
+
}
|
|
1332
|
+
}, handle);
|
|
1333
|
+
} else {
|
|
1334
|
+
await targetAccount.click({ timeout: Math.min(timeoutMs, 10_000) }).catch(() => {});
|
|
1335
|
+
}
|
|
1336
|
+
await accountResult.page.waitForLoadState('domcontentloaded', { timeout: Math.min(timeoutMs, 15_000) }).catch(() => {});
|
|
1337
|
+
} else {
|
|
1338
|
+
console.log('[camoufox-launch-auth] Qwen account selector not detected; proceeding to confirm step...');
|
|
1339
|
+
}
|
|
1340
|
+
|
|
1234
1341
|
console.log('[camoufox-launch-auth] Qwen authorize page loaded, waiting for confirm button...');
|
|
1235
1342
|
const confirmSelector = 'button.qwen-confirm-btn';
|
|
1236
1343
|
const confirmResult = await waitForElementInPages(context, confirmSelector, timeoutMs);
|
|
@@ -268,14 +268,16 @@ function validateUserConfig(config) {
|
|
|
268
268
|
errors.push('Configuration must be an object');
|
|
269
269
|
return errors;
|
|
270
270
|
}
|
|
271
|
+
const v2Mode = resolveVirtualRouterMode(config) === 'v2';
|
|
271
272
|
const providers = resolveProviders(config);
|
|
272
273
|
const routing = resolveRouting(config);
|
|
273
|
-
if (!Object.keys(providers).length) {
|
|
274
|
+
if (!Object.keys(providers).length && !v2Mode) {
|
|
274
275
|
errors.push('virtualrouter.providers (or providers) must include at least one provider entry');
|
|
275
276
|
}
|
|
276
277
|
if (!Object.keys(routing).length) {
|
|
277
278
|
errors.push('virtualrouter.routing (or routing) must define at least one route');
|
|
278
279
|
}
|
|
280
|
+
const shouldValidateProviderRefs = Object.keys(providers).length > 0;
|
|
279
281
|
for (const [routeName, entries] of Object.entries(routing)) {
|
|
280
282
|
if (!Array.isArray(entries) || !entries.length) {
|
|
281
283
|
errors.push(`Route "${routeName}" must list at least one provider key`);
|
|
@@ -287,13 +289,18 @@ function validateUserConfig(config) {
|
|
|
287
289
|
continue;
|
|
288
290
|
}
|
|
289
291
|
const providerId = key.split('.')[0];
|
|
290
|
-
if (!providers[providerId]) {
|
|
292
|
+
if (shouldValidateProviderRefs && !providers[providerId]) {
|
|
291
293
|
errors.push(`Route "${routeName}" references unknown provider "${providerId}"`);
|
|
292
294
|
}
|
|
293
295
|
}
|
|
294
296
|
}
|
|
295
297
|
return errors;
|
|
296
298
|
}
|
|
299
|
+
function resolveVirtualRouterMode(config) {
|
|
300
|
+
const raw = config.virtualrouterMode;
|
|
301
|
+
const mode = typeof raw === 'string' ? raw.trim().toLowerCase() : '';
|
|
302
|
+
return mode === 'v2' ? 'v2' : 'v1';
|
|
303
|
+
}
|
|
297
304
|
function resolveProviders(config) {
|
|
298
305
|
const virtualRouter = getVirtualRouter(config);
|
|
299
306
|
if (virtualRouter?.providers && isRecord(virtualRouter.providers)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-admin-handler.js","sourceRoot":"","sources":["../../../src/server/handlers/config-admin-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config-admin-handler.js","sourceRoot":"","sources":["../../../src/server/handlers/config-admin-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,11 +57,9 @@ export function logRequestStart(endpoint, requestId, meta) {
|
|
|
57
57
|
if (!SHOULD_LOG_HTTP_EVENTS) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
const suffix = formatMeta(meta);
|
|
64
|
-
console.log(`➡️ [${endpoint}] request ${formatRequestId(displayId)}${suffix}`);
|
|
60
|
+
void endpoint;
|
|
61
|
+
void requestId;
|
|
62
|
+
void meta;
|
|
65
63
|
}
|
|
66
64
|
export function logRequestComplete(endpoint, requestId, status) {
|
|
67
65
|
if (!SHOULD_LOG_HTTP_EVENTS) {
|
|
@@ -210,13 +208,4 @@ function normalizeError(error, requestId, endpoint) {
|
|
|
210
208
|
}
|
|
211
209
|
return enriched;
|
|
212
210
|
}
|
|
213
|
-
function formatMeta(meta) {
|
|
214
|
-
if (!meta || typeof meta !== 'object') {
|
|
215
|
-
return '';
|
|
216
|
-
}
|
|
217
|
-
const entries = Object.entries(meta)
|
|
218
|
-
.filter(([_, value]) => value !== undefined && value !== null && value !== '')
|
|
219
|
-
.map(([key, value]) => `${key}=${typeof value === 'object' ? JSON.stringify(value) : value}`);
|
|
220
|
-
return entries.length ? ` (${entries.join(', ')})` : '';
|
|
221
|
-
}
|
|
222
211
|
//# sourceMappingURL=handler-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler-utils.js","sourceRoot":"","sources":["../../../src/server/handlers/handler-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,iEAAiE;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAwB,MAAM,6BAA6B,CAAC;AAExG,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACrC,MAAM;IACN,YAAY;IACZ,gBAAgB;IAChB,iBAAiB;IACjB,eAAe;IACf,qBAAqB;IACrB,WAAW;IACX,sBAAsB;IACtB,qBAAqB;IACrB,SAAS;IACT,QAAQ;IACR,SAAS;IACT,IAAI;CACL,CAAC,CAAC;AAIH,MAAM,sBAAsB,GAAG,SAAS,CAAC,IAAI,KAAK,SAAS;OACtD,OAAO,CAAC,GAAG,CAAC,2BAA2B,KAAK,GAAG,CAAC;AAErD,SAAS,kBAAkB,CAAC,KAAyB,EAAE,QAAiB;IACtE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAC/F,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QAChG,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,sBAAsB;IAC7B,OAAO,kBAAkB,CACvB,OAAO,CAAC,GAAG,CAAC,8BAA8B;WACrC,OAAO,CAAC,GAAG,CAAC,uBAAuB;WACnC,OAAO,CAAC,GAAG,CAAC,wBAAwB;WACpC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAClC,KAAK,CACN,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,SAAmB,EACnB,IAAsE;IAEtE,OAAO,0BAA0B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,SAAmB,EACnB,IAAsE;IAEtE,OAAO,0BAA0B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,iBAAiB,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,SAAiB,EAAE,IAAqB;IACxF,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"handler-utils.js","sourceRoot":"","sources":["../../../src/server/handlers/handler-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,iEAAiE;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EAC1B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAwB,MAAM,6BAA6B,CAAC;AAExG,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACrC,MAAM;IACN,YAAY;IACZ,gBAAgB;IAChB,iBAAiB;IACjB,eAAe;IACf,qBAAqB;IACrB,WAAW;IACX,sBAAsB;IACtB,qBAAqB;IACrB,SAAS;IACT,QAAQ;IACR,SAAS;IACT,IAAI;CACL,CAAC,CAAC;AAIH,MAAM,sBAAsB,GAAG,SAAS,CAAC,IAAI,KAAK,SAAS;OACtD,OAAO,CAAC,GAAG,CAAC,2BAA2B,KAAK,GAAG,CAAC;AAErD,SAAS,kBAAkB,CAAC,KAAyB,EAAE,QAAiB;IACtE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAC/F,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;QAChG,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,sBAAsB;IAC7B,OAAO,kBAAkB,CACvB,OAAO,CAAC,GAAG,CAAC,8BAA8B;WACrC,OAAO,CAAC,GAAG,CAAC,uBAAuB;WACnC,OAAO,CAAC,GAAG,CAAC,wBAAwB;WACpC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAClC,KAAK,CACN,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,SAAmB,EACnB,IAAsE;IAEtE,OAAO,0BAA0B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,SAAmB,EACnB,IAAsE;IAEtE,OAAO,0BAA0B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,iBAAiB,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,SAAiB,EAAE,IAAqB;IACxF,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,KAAK,QAAQ,CAAC;IACd,KAAK,SAAS,CAAC;IACf,KAAK,IAAI,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB,EAAE,SAAiB,EAAE,MAAc;IACpF,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,MAAM,QAAQ,aAAa,eAAe,CAAC,SAAS,CAAC,sBAAsB,MAAM,GAAG,CAAC,CAAC;AACpG,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,SAAiB,EAAE,KAAc;IACjF,MAAM,UAAU,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,EAAE,eAAe,IAAI,SAAS,CAAC,IAAI,CAAC;IAC3D,MAAM,UAAU,GAAG,OAAO,KAAK,EAAE,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC;IACvG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,QAAQ,aAAa,UAAU,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC;IACtF,IAAI,OAAO,IAAI,sBAAsB,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG;YACd,SAAS,EAAE,UAAU;YACrB,QAAQ;YACR,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,OAAO;SACpD,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,KAAgC,CAAC;IAC7C,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,MAAM,eAAe,GAAG,OAAO,GAAG,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;IAClG,IAAI,CAAC,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,GAAa,EACb,GAAmB,EACnB,KAAc,EACd,aAAqB,EACrB,SAAiB,EACjB,OAAgC;IAEhC,MAAM,kBAAkB,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;IACtD,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;IACjF,MAAM,YAAY,GAAsB;QACtC,IAAI,EAAE,OAAQ,eAA2C,CAAC,IAAI,KAAK,QAAQ;YACzE,CAAC,CAAC,MAAM,CAAE,eAA2C,CAAC,IAAI,CAAC;YAC3D,CAAC,CAAC,oBAAoB;QACxB,OAAO,EAAE,eAAe,CAAC,OAAO;QAChC,MAAM,EAAE,gBAAgB,aAAa,EAAE;QACvC,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,QAAQ;QAClB,SAAS,EAAE,kBAAkB;QAC7B,QAAQ,EAAE,aAAa;QACvB,WAAW,EAAG,eAA2C,CAAC,WAAiC;QAC3F,YAAY,EAAG,eAA2C,CAAC,YAAkC;QAC7F,SAAS,EAAG,eAA2C,CAAC,SAA+B;QACvF,OAAO,EAAE;YACP,GAAI,eAA2C;YAC/C,QAAQ,EAAE,aAAa;SACxB;QACD,aAAa,EAAE,eAAe;KAC/B,CAAC;IACF,IAAI,MAAM,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,YAAY,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;QACnF,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,yBAAyB;IAC3B,CAAC;IACD,IAAI,kBAAkB,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,kBAAkB,CAAC;IACpD,CAAC;IACD,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACtB,0FAA0F;QAC1F,sGAAsG;QACtG,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,KAAK;YAChC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE;YACpE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QACjE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1B,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kCAAkC,CAAC,CAAC;QAClE,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,wBAAwB,CAAC,CAAC;QACzD,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,GAAG,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC;QAAC,MAAM,CAAC;YACP,6BAA6B;QAC/B,CAAC;QACD,IAAI,CAAC;YACH,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC;QAAC,MAAM,CAAC;YACP,oBAAoB;QACtB,CAAC;QACD,IAAI,qBAAqB,EAAE,EAAE,CAAC;YAC5B,KAAK,mBAAmB,CAAC;gBACvB,KAAK,EAAE,uBAAuB;gBAC9B,SAAS,EAAE,kBAAkB;gBAC7B,aAAa;gBACb,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE;aACtD,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACrB,CAAC;QACD,OAAO;IACT,CAAC;IACD,IAAI,qBAAqB,EAAE,EAAE,CAAC;QAC5B,KAAK,mBAAmB,CAAC;YACvB,KAAK,EAAE,uBAAuB;YAC9B,SAAS,EAAE,kBAAkB;YAC7B,aAAa;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;SACjE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACrB,CAAC;IACD,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAwC;IAC3E,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,SAAS;QACX,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,SAAS;QACX,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,KAAc,EAAE,SAAiB,EAAE,QAAgB;IACzE,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,eAAe,CAAC,CAAC,CAAC;IACzF,MAAM,QAAQ,GAAG,GAAsC,CAAC;IACxD,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACxB,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IACjC,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACvB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC/B,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import { resolveEffectiveRequestId } from '../utils/request-id-manager.js';
|
|
3
|
-
const chalkRequest = typeof chalk?.greenBright === 'function' ? chalk.greenBright : (value) => value;
|
|
4
3
|
const chalkSuccess = typeof chalk?.blueBright === 'function' ? chalk.blueBright : (value) => value;
|
|
5
4
|
const chalkError = typeof chalk?.redBright === 'function' ? chalk.redBright : (value) => value;
|
|
6
5
|
export function logRequestStart(endpoint, requestId, meta) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
6
|
+
void endpoint;
|
|
7
|
+
void requestId;
|
|
8
|
+
void meta;
|
|
10
9
|
}
|
|
11
10
|
export function logRequestComplete(endpoint, requestId, status, meta) {
|
|
12
11
|
const suffix = formatMeta(meta);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/server/handlers/logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAI3E,MAAM,YAAY,GAAG,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/server/handlers/logging.ts"],"names":[],"mappings":"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"}
|