@jsonstudio/rcc 0.89.168 → 0.89.333
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 +18 -15
- package/dist/build-info.js +2 -2
- package/dist/cli.js +32 -0
- package/dist/cli.js.map +1 -1
- package/dist/client/gemini-cli/gemini-cli-protocol-client.js +28 -5
- package/dist/client/gemini-cli/gemini-cli-protocol-client.js.map +1 -1
- package/dist/error-handling/quiet-error-handling-center.d.ts +9 -0
- package/dist/error-handling/quiet-error-handling-center.js +141 -0
- package/dist/error-handling/quiet-error-handling-center.js.map +1 -0
- package/dist/error-handling/route-error-hub.js +8 -2
- package/dist/error-handling/route-error-hub.js.map +1 -1
- package/dist/modules/pipeline/utils/colored-logger.d.ts +2 -0
- package/dist/modules/pipeline/utils/colored-logger.js +20 -3
- package/dist/modules/pipeline/utils/colored-logger.js.map +1 -1
- package/dist/providers/auth/antigravity-userinfo-helper.d.ts +10 -0
- package/dist/providers/auth/antigravity-userinfo-helper.js +140 -0
- package/dist/providers/auth/antigravity-userinfo-helper.js.map +1 -0
- package/dist/providers/auth/oauth-lifecycle.js +140 -8
- package/dist/providers/auth/oauth-lifecycle.js.map +1 -1
- package/dist/providers/auth/token-scanner/index.d.ts +32 -0
- package/dist/providers/auth/token-scanner/index.js +86 -0
- package/dist/providers/auth/token-scanner/index.js.map +1 -0
- package/dist/providers/auth/tokenfile-auth.d.ts +17 -0
- package/dist/providers/auth/tokenfile-auth.js +27 -5
- package/dist/providers/auth/tokenfile-auth.js.map +1 -1
- package/dist/providers/core/api/provider-types.d.ts +10 -0
- package/dist/providers/core/config/oauth-flows.d.ts +2 -0
- package/dist/providers/core/config/oauth-flows.js.map +1 -1
- package/dist/providers/core/config/provider-oauth-configs.js +85 -0
- package/dist/providers/core/config/provider-oauth-configs.js.map +1 -1
- package/dist/providers/core/runtime/base-provider.d.ts +2 -0
- package/dist/providers/core/runtime/base-provider.js +135 -15
- package/dist/providers/core/runtime/base-provider.js.map +1 -1
- package/dist/providers/core/runtime/gemini-cli-http-provider.d.ts +8 -3
- package/dist/providers/core/runtime/gemini-cli-http-provider.js +262 -64
- package/dist/providers/core/runtime/gemini-cli-http-provider.js.map +1 -1
- package/dist/providers/core/runtime/http-transport-provider.d.ts +25 -0
- package/dist/providers/core/runtime/http-transport-provider.js +305 -67
- package/dist/providers/core/runtime/http-transport-provider.js.map +1 -1
- package/dist/providers/core/runtime/provider-error-classifier.d.ts +2 -2
- package/dist/providers/core/runtime/provider-error-classifier.js +14 -4
- package/dist/providers/core/runtime/provider-error-classifier.js.map +1 -1
- package/dist/providers/core/runtime/provider-factory.d.ts +1 -0
- package/dist/providers/core/runtime/provider-factory.js +37 -8
- package/dist/providers/core/runtime/provider-factory.js.map +1 -1
- package/dist/providers/core/runtime/responses-provider.d.ts +3 -3
- package/dist/providers/core/runtime/responses-provider.js +48 -114
- package/dist/providers/core/runtime/responses-provider.js.map +1 -1
- package/dist/providers/core/strategies/oauth-auth-code-flow.js +11 -3
- package/dist/providers/core/strategies/oauth-auth-code-flow.js.map +1 -1
- package/dist/providers/core/utils/http-client.d.ts +5 -0
- package/dist/providers/core/utils/http-client.js +29 -3
- package/dist/providers/core/utils/http-client.js.map +1 -1
- package/dist/providers/core/utils/provider-error-reporter.js +8 -2
- package/dist/providers/core/utils/provider-error-reporter.js.map +1 -1
- package/dist/providers/core/utils/snapshot-writer.js +5 -1
- package/dist/providers/core/utils/snapshot-writer.js.map +1 -1
- package/dist/providers/profile/provider-profile-loader.js +8 -4
- package/dist/providers/profile/provider-profile-loader.js.map +1 -1
- package/dist/runtime/runtime-flags.d.ts +4 -0
- package/dist/runtime/runtime-flags.js +32 -0
- package/dist/runtime/runtime-flags.js.map +1 -0
- package/dist/server/handlers/handler-utils.js +29 -2
- package/dist/server/handlers/handler-utils.js.map +1 -1
- package/dist/server/handlers/messages-handler.js +27 -26
- package/dist/server/handlers/messages-handler.js.map +1 -1
- package/dist/server/handlers/responses-handler.js +35 -1
- package/dist/server/handlers/responses-handler.js.map +1 -1
- package/dist/server/runtime/http-server/index.d.ts +1 -0
- package/dist/server/runtime/http-server/index.js +39 -4
- package/dist/server/runtime/http-server/index.js.map +1 -1
- package/dist/server/runtime/http-server/request-executor.d.ts +4 -0
- package/dist/server/runtime/http-server/request-executor.js +99 -4
- package/dist/server/runtime/http-server/request-executor.js.map +1 -1
- package/dist/server/utils/sse-request-parser.d.ts +1 -0
- package/dist/server/utils/sse-request-parser.js +17 -6
- package/dist/server/utils/sse-request-parser.js.map +1 -1
- package/dist/server/utils/warmup-detector.d.ts +7 -0
- package/dist/server/utils/warmup-detector.js +125 -0
- package/dist/server/utils/warmup-detector.js.map +1 -0
- package/dist/server/utils/warmup-storm-tracker.d.ts +9 -0
- package/dist/server/utils/warmup-storm-tracker.js +61 -0
- package/dist/server/utils/warmup-storm-tracker.js.map +1 -0
- package/dist/utils/debug-utils.js +14 -0
- package/dist/utils/debug-utils.js.map +1 -1
- package/dist/utils/error-handler-registry.js +6 -5
- package/dist/utils/error-handler-registry.js.map +1 -1
- package/dist/utils/error-handling-utils.js +4 -3
- package/dist/utils/error-handling-utils.js.map +1 -1
- package/dist/utils/log-helpers.d.ts +6 -0
- package/dist/utils/log-helpers.js +90 -0
- package/dist/utils/log-helpers.js.map +1 -0
- package/dist/utils/logger.d.ts +8 -0
- package/dist/utils/logger.js +55 -2
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/snapshot-writer.js +2 -6
- package/dist/utils/snapshot-writer.js.map +1 -1
- package/node_modules/@jsonstudio/llms/dist/conversion/codecs/gemini-openai-codec.js +15 -1
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/auto-thinking.d.ts +6 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/auto-thinking.js +25 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/field-mapping.d.ts +14 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/field-mapping.js +155 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/glm-tool-extraction.d.ts +2 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/glm-tool-extraction.js +264 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/qwen-transform.d.ts +3 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/qwen-transform.js +209 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/request-rules.d.ts +24 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/request-rules.js +63 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/response-blacklist.d.ts +14 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/response-blacklist.js +85 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/response-normalize.d.ts +5 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/response-normalize.js +121 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/response-validate.d.ts +5 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/response-validate.js +76 -0
- package/{dist/providers/compat/utils/snapshot-writer.d.ts → node_modules/@jsonstudio/llms/dist/conversion/compat/actions/snapshot.d.ts} +2 -2
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/snapshot.js +21 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/actions/tool-schema.d.ts +6 -0
- package/{dist/providers/compat/glm/utils/tool-schema-helpers.js → node_modules/@jsonstudio/llms/dist/conversion/compat/actions/tool-schema.js} +6 -1
- package/{dist/providers/compat/filters → node_modules/@jsonstudio/llms/dist/conversion/compat/actions}/universal-shape-filter.d.ts +17 -22
- package/{dist/providers/compat/filters → node_modules/@jsonstudio/llms/dist/conversion/compat/actions}/universal-shape-filter.js +35 -99
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/profiles/chat-glm.json +187 -13
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/profiles/chat-iflow.json +177 -9
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/profiles/chat-lmstudio.json +10 -2
- package/node_modules/@jsonstudio/llms/dist/conversion/compat/profiles/chat-qwen.json +14 -10
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/compat/compat-engine.d.ts +7 -2
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/compat/compat-engine.js +5 -665
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/compat/compat-pipeline-executor.d.ts +9 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/compat/compat-pipeline-executor.js +845 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/compat/compat-types.d.ts +47 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/hub-pipeline.d.ts +2 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/hub-pipeline.js +35 -1
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/stages/req_outbound/req_outbound_stage3_compat/index.js +2 -2
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/pipeline/target-utils.js +3 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/hub/response/response-runtime.js +19 -2
- package/node_modules/@jsonstudio/llms/dist/conversion/responses/responses-host-policy.d.ts +6 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/responses/responses-host-policy.js +14 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/responses/responses-openai-bridge.js +51 -2
- package/node_modules/@jsonstudio/llms/dist/conversion/shared/anthropic-message-utils.js +6 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/shared/responses-reasoning-registry.d.ts +4 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/shared/responses-reasoning-registry.js +62 -1
- package/node_modules/@jsonstudio/llms/dist/conversion/shared/responses-response-utils.js +23 -1
- package/node_modules/@jsonstudio/llms/dist/conversion/shared/tool-canonicalizer.d.ts +2 -0
- package/node_modules/@jsonstudio/llms/dist/conversion/shared/tool-filter-pipeline.js +11 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/bootstrap.js +251 -12
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/classifier.js +11 -4
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/context-advisor.d.ts +21 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/context-advisor.js +76 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/engine.d.ts +11 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/engine.js +187 -28
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/features.js +22 -457
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/health-manager.js +2 -7
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/message-utils.d.ts +7 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/message-utils.js +66 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/provider-registry.js +6 -2
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/token-estimator.d.ts +2 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/token-estimator.js +16 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/token-file-scanner.d.ts +15 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/token-file-scanner.js +56 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/tool-signals.d.ts +13 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/tool-signals.js +403 -0
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/types.d.ts +21 -1
- package/node_modules/@jsonstudio/llms/dist/router/virtual-router/types.js +1 -0
- package/node_modules/@jsonstudio/llms/package.json +2 -2
- package/package.json +11 -10
- package/scripts/README.md +26 -12
- package/scripts/auth-antigravity-token.mjs +64 -0
- package/scripts/auth-gemini-cli-token.mjs +96 -0
- package/scripts/auth-iflow-manual.mjs +81 -0
- package/scripts/auth-iflow-token-direct.mjs +87 -0
- package/scripts/auth-iflow-token.mjs +77 -0
- package/scripts/copy-compat-assets.mjs +3 -15
- package/scripts/install-verify.mjs +1 -0
- package/scripts/replay-codex-sample.mjs +13 -8
- package/scripts/tests/chat-pipeline-blackbox.mjs +1 -1
- package/scripts/tools/capture-provider-goldens.mjs +8 -7
- package/scripts/verify-client-headers.mjs +224 -0
- package/dist/providers/compat/base-compatibility.d.ts +0 -27
- package/dist/providers/compat/base-compatibility.js +0 -143
- package/dist/providers/compat/base-compatibility.js.map +0 -1
- package/dist/providers/compat/compat-directory-loader.d.ts +0 -4
- package/dist/providers/compat/compat-directory-loader.js +0 -85
- package/dist/providers/compat/compat-directory-loader.js.map +0 -1
- package/dist/providers/compat/compatibility-adapter.d.ts +0 -18
- package/dist/providers/compat/compatibility-adapter.js +0 -104
- package/dist/providers/compat/compatibility-adapter.js.map +0 -1
- package/dist/providers/compat/compatibility-factory.d.ts +0 -57
- package/dist/providers/compat/compatibility-factory.js +0 -155
- package/dist/providers/compat/compatibility-factory.js.map +0 -1
- package/dist/providers/compat/compatibility-interface.d.ts +0 -35
- package/dist/providers/compat/compatibility-interface.js +0 -2
- package/dist/providers/compat/compatibility-interface.js.map +0 -1
- package/dist/providers/compat/compatibility-manager.d.ts +0 -85
- package/dist/providers/compat/compatibility-manager.js +0 -368
- package/dist/providers/compat/compatibility-manager.js.map +0 -1
- package/dist/providers/compat/config/config-compatibility.d.ts +0 -28
- package/dist/providers/compat/config/config-compatibility.js +0 -95
- package/dist/providers/compat/config/config-compatibility.js.map +0 -1
- package/dist/providers/compat/field-mapping.d.ts +0 -102
- package/dist/providers/compat/field-mapping.js +0 -447
- package/dist/providers/compat/field-mapping.js.map +0 -1
- package/dist/providers/compat/filters/blacklist-sanitizer.d.ts +0 -45
- package/dist/providers/compat/filters/blacklist-sanitizer.js +0 -133
- package/dist/providers/compat/filters/blacklist-sanitizer.js.map +0 -1
- package/dist/providers/compat/filters/response-blacklist-sanitizer.d.ts +0 -28
- package/dist/providers/compat/filters/response-blacklist-sanitizer.js +0 -138
- package/dist/providers/compat/filters/response-blacklist-sanitizer.js.map +0 -1
- package/dist/providers/compat/filters/universal-shape-filter.js.map +0 -1
- package/dist/providers/compat/glm/config/blacklist-rules.json +0 -22
- package/dist/providers/compat/glm/config/field-mappings.json +0 -92
- package/dist/providers/compat/glm/config/response-blacklist.json +0 -7
- package/dist/providers/compat/glm/config/shape-filters.json +0 -37
- package/dist/providers/compat/glm/field-mapping/field-mapping-processor.d.ts +0 -28
- package/dist/providers/compat/glm/field-mapping/field-mapping-processor.js +0 -306
- package/dist/providers/compat/glm/field-mapping/field-mapping-processor.js.map +0 -1
- package/dist/providers/compat/glm/functions/glm-processor.d.ts +0 -50
- package/dist/providers/compat/glm/functions/glm-processor.js +0 -134
- package/dist/providers/compat/glm/functions/glm-processor.js.map +0 -1
- package/dist/providers/compat/glm/glm-compatibility.d.ts +0 -34
- package/dist/providers/compat/glm/glm-compatibility.js +0 -117
- package/dist/providers/compat/glm/glm-compatibility.js.map +0 -1
- package/dist/providers/compat/glm/hooks/base-hook.d.ts +0 -21
- package/dist/providers/compat/glm/hooks/base-hook.js +0 -53
- package/dist/providers/compat/glm/hooks/base-hook.js.map +0 -1
- package/dist/providers/compat/glm/hooks/glm-request-validation-hook.d.ts +0 -24
- package/dist/providers/compat/glm/hooks/glm-request-validation-hook.js +0 -268
- package/dist/providers/compat/glm/hooks/glm-request-validation-hook.js.map +0 -1
- package/dist/providers/compat/glm/hooks/glm-response-normalization-hook.d.ts +0 -21
- package/dist/providers/compat/glm/hooks/glm-response-normalization-hook.js +0 -171
- package/dist/providers/compat/glm/hooks/glm-response-normalization-hook.js.map +0 -1
- package/dist/providers/compat/glm/hooks/glm-response-validation-hook.d.ts +0 -25
- package/dist/providers/compat/glm/hooks/glm-response-validation-hook.js +0 -236
- package/dist/providers/compat/glm/hooks/glm-response-validation-hook.js.map +0 -1
- package/dist/providers/compat/glm/hooks/glm-tool-cleaning-hook.d.ts +0 -26
- package/dist/providers/compat/glm/hooks/glm-tool-cleaning-hook.js +0 -186
- package/dist/providers/compat/glm/hooks/glm-tool-cleaning-hook.js.map +0 -1
- package/dist/providers/compat/glm/index.d.ts +0 -24
- package/dist/providers/compat/glm/index.js +0 -29
- package/dist/providers/compat/glm/index.js.map +0 -1
- package/dist/providers/compat/glm/utils/tool-schema-helpers.d.ts +0 -3
- package/dist/providers/compat/glm/utils/tool-schema-helpers.js.map +0 -1
- package/dist/providers/compat/iflow/config/field-mappings.json +0 -92
- package/dist/providers/compat/iflow/config/shape-filters.json +0 -37
- package/dist/providers/compat/iflow/field-mapping/iflow-field-mapping-processor.d.ts +0 -34
- package/dist/providers/compat/iflow/field-mapping/iflow-field-mapping-processor.js +0 -386
- package/dist/providers/compat/iflow/field-mapping/iflow-field-mapping-processor.js.map +0 -1
- package/dist/providers/compat/iflow/functions/iflow-processor.d.ts +0 -53
- package/dist/providers/compat/iflow/functions/iflow-processor.js +0 -215
- package/dist/providers/compat/iflow/functions/iflow-processor.js.map +0 -1
- package/dist/providers/compat/iflow/hooks/base-hook.d.ts +0 -23
- package/dist/providers/compat/iflow/hooks/base-hook.js +0 -59
- package/dist/providers/compat/iflow/hooks/base-hook.js.map +0 -1
- package/dist/providers/compat/iflow/hooks/iflow-request-validation-hook.d.ts +0 -23
- package/dist/providers/compat/iflow/hooks/iflow-request-validation-hook.js +0 -279
- package/dist/providers/compat/iflow/hooks/iflow-request-validation-hook.js.map +0 -1
- package/dist/providers/compat/iflow/hooks/iflow-response-normalization-hook.d.ts +0 -20
- package/dist/providers/compat/iflow/hooks/iflow-response-normalization-hook.js +0 -180
- package/dist/providers/compat/iflow/hooks/iflow-response-normalization-hook.js.map +0 -1
- package/dist/providers/compat/iflow/hooks/iflow-response-validation-hook.d.ts +0 -23
- package/dist/providers/compat/iflow/hooks/iflow-response-validation-hook.js +0 -232
- package/dist/providers/compat/iflow/hooks/iflow-response-validation-hook.js.map +0 -1
- package/dist/providers/compat/iflow/hooks/iflow-tool-cleaning-hook.d.ts +0 -25
- package/dist/providers/compat/iflow/hooks/iflow-tool-cleaning-hook.js +0 -216
- package/dist/providers/compat/iflow/hooks/iflow-tool-cleaning-hook.js.map +0 -1
- package/dist/providers/compat/iflow/iflow-compatibility.d.ts +0 -24
- package/dist/providers/compat/iflow/iflow-compatibility.js +0 -94
- package/dist/providers/compat/iflow/iflow-compatibility.js.map +0 -1
- package/dist/providers/compat/index.d.ts +0 -59
- package/dist/providers/compat/index.js +0 -83
- package/dist/providers/compat/index.js.map +0 -1
- package/dist/providers/compat/lmstudio-compatibility.d.ts +0 -44
- package/dist/providers/compat/lmstudio-compatibility.js +0 -193
- package/dist/providers/compat/lmstudio-compatibility.js.map +0 -1
- package/dist/providers/compat/passthrough-compatibility.d.ts +0 -29
- package/dist/providers/compat/passthrough-compatibility.js +0 -83
- package/dist/providers/compat/passthrough-compatibility.js.map +0 -1
- package/dist/providers/compat/profiles/chat/glm/index.d.ts +0 -6
- package/dist/providers/compat/profiles/chat/glm/index.js +0 -6
- package/dist/providers/compat/profiles/chat/glm/index.js.map +0 -1
- package/dist/providers/compat/profiles/chat/iflow/index.d.ts +0 -6
- package/dist/providers/compat/profiles/chat/iflow/index.js +0 -6
- package/dist/providers/compat/profiles/chat/iflow/index.js.map +0 -1
- package/dist/providers/compat/profiles/chat/lmstudio/index.d.ts +0 -6
- package/dist/providers/compat/profiles/chat/lmstudio/index.js +0 -6
- package/dist/providers/compat/profiles/chat/lmstudio/index.js.map +0 -1
- package/dist/providers/compat/profiles/chat/qwen/index.d.ts +0 -6
- package/dist/providers/compat/profiles/chat/qwen/index.js +0 -6
- package/dist/providers/compat/profiles/chat/qwen/index.js.map +0 -1
- package/dist/providers/compat/profiles/compat/passthrough/index.d.ts +0 -6
- package/dist/providers/compat/profiles/compat/passthrough/index.js +0 -6
- package/dist/providers/compat/profiles/compat/passthrough/index.js.map +0 -1
- package/dist/providers/compat/profiles/responses/c4m/index.d.ts +0 -6
- package/dist/providers/compat/profiles/responses/c4m/index.js +0 -6
- package/dist/providers/compat/profiles/responses/c4m/index.js.map +0 -1
- package/dist/providers/compat/profiles/responses/default/index.d.ts +0 -6
- package/dist/providers/compat/profiles/responses/default/index.js +0 -6
- package/dist/providers/compat/profiles/responses/default/index.js.map +0 -1
- package/dist/providers/compat/profiles/responses/fai/index.d.ts +0 -6
- package/dist/providers/compat/profiles/responses/fai/index.js +0 -6
- package/dist/providers/compat/profiles/responses/fai/index.js.map +0 -1
- package/dist/providers/compat/profiles/responses/fc/index.d.ts +0 -6
- package/dist/providers/compat/profiles/responses/fc/index.js +0 -6
- package/dist/providers/compat/profiles/responses/fc/index.js.map +0 -1
- package/dist/providers/compat/qwen/index.d.ts +0 -4
- package/dist/providers/compat/qwen/index.js +0 -6
- package/dist/providers/compat/qwen/index.js.map +0 -1
- package/dist/providers/compat/qwen-compatibility.d.ts +0 -52
- package/dist/providers/compat/qwen-compatibility.js +0 -330
- package/dist/providers/compat/qwen-compatibility.js.map +0 -1
- package/dist/providers/compat/register-compat-module.d.ts +0 -8
- package/dist/providers/compat/register-compat-module.js +0 -53
- package/dist/providers/compat/register-compat-module.js.map +0 -1
- package/dist/providers/compat/responses/c4m-responses-compatibility.d.ts +0 -27
- package/dist/providers/compat/responses/c4m-responses-compatibility.js +0 -197
- package/dist/providers/compat/responses/c4m-responses-compatibility.js.map +0 -1
- package/dist/providers/compat/standard-compatibility-utils.d.ts +0 -1
- package/dist/providers/compat/standard-compatibility-utils.js +0 -77
- package/dist/providers/compat/standard-compatibility-utils.js.map +0 -1
- package/dist/providers/compat/standard-compatibility.d.ts +0 -31
- package/dist/providers/compat/standard-compatibility.js +0 -118
- package/dist/providers/compat/standard-compatibility.js.map +0 -1
- package/dist/providers/compat/utils/snapshot-writer.js +0 -62
- package/dist/providers/compat/utils/snapshot-writer.js.map +0 -1
- package/scripts/check-glm-compat.mjs +0 -47
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OAuth Token Scanner
|
|
3
|
+
* 自动扫描auth目录下符合命名规范的token文件
|
|
4
|
+
* 命名规范: <provider>-oauth-<序号>-<alias>.json
|
|
5
|
+
* 例如: iflow-oauth-1-work.json, iflow-oauth-2-personal.json
|
|
6
|
+
*/
|
|
7
|
+
import fs from 'fs/promises';
|
|
8
|
+
import path from 'path';
|
|
9
|
+
import { homedir } from 'os';
|
|
10
|
+
const AUTH_DIR = path.join(homedir(), '.routecodex', 'auth');
|
|
11
|
+
/**
|
|
12
|
+
* 匹配token文件名的正则
|
|
13
|
+
* 格式: <provider>-oauth-<序号>-<alias>.json
|
|
14
|
+
* 例如: iflow-oauth-1-work.json -> provider=iflow, sequence=1, alias=work
|
|
15
|
+
*/
|
|
16
|
+
const TOKEN_FILE_PATTERN = /^(.+)-oauth-(\d+)(?:-(.+))?\.json$/;
|
|
17
|
+
/**
|
|
18
|
+
* 扫描auth目录下指定provider的所有token文件
|
|
19
|
+
*/
|
|
20
|
+
export async function scanProviderTokenFiles(provider) {
|
|
21
|
+
try {
|
|
22
|
+
const entries = await fs.readdir(AUTH_DIR);
|
|
23
|
+
const matches = [];
|
|
24
|
+
for (const entry of entries) {
|
|
25
|
+
if (!entry.endsWith('.json')) {
|
|
26
|
+
continue;
|
|
27
|
+
}
|
|
28
|
+
const match = entry.match(TOKEN_FILE_PATTERN);
|
|
29
|
+
if (!match) {
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
const [, providerPrefix, sequenceStr, alias] = match;
|
|
33
|
+
if (providerPrefix.toLowerCase() !== provider.toLowerCase()) {
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
const sequence = parseInt(sequenceStr, 10);
|
|
37
|
+
if (isNaN(sequence) || sequence <= 0) {
|
|
38
|
+
continue;
|
|
39
|
+
}
|
|
40
|
+
matches.push({
|
|
41
|
+
filePath: path.join(AUTH_DIR, entry),
|
|
42
|
+
providerPrefix,
|
|
43
|
+
sequence,
|
|
44
|
+
alias: alias || 'default'
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
// 按序号排序
|
|
48
|
+
matches.sort((a, b) => a.sequence - b.sequence);
|
|
49
|
+
return matches;
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
// 目录不存在或读取失败,返回空列表
|
|
53
|
+
return [];
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* 获取指定provider的所有token文件路径(有序)
|
|
58
|
+
*/
|
|
59
|
+
export async function getProviderTokenFilePaths(provider) {
|
|
60
|
+
const matches = await scanProviderTokenFiles(provider);
|
|
61
|
+
return matches.map((m) => m.filePath);
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* 获取指定provider的token文件信息(用于调试)
|
|
65
|
+
*/
|
|
66
|
+
export async function getProviderTokenFileInfo(provider) {
|
|
67
|
+
return scanProviderTokenFiles(provider);
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* 从文件路径提取序号
|
|
71
|
+
* 返回: { sequence: number, alias: string } 或 null
|
|
72
|
+
*/
|
|
73
|
+
export function parseTokenSequenceFromPath(filePath) {
|
|
74
|
+
const basename = path.basename(filePath);
|
|
75
|
+
const match = basename.match(TOKEN_FILE_PATTERN);
|
|
76
|
+
if (!match) {
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
const [, , sequenceStr, alias] = match;
|
|
80
|
+
const sequence = parseInt(sequenceStr, 10);
|
|
81
|
+
if (isNaN(sequence) || sequence <= 0) {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
return { sequence, alias: alias || 'default' };
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/providers/auth/token-scanner/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,16 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import type { IAuthProvider, AuthStatus } from './auth-interface.js';
|
|
11
11
|
import type { OAuthAuth } from '../core/api/provider-config.js';
|
|
12
|
+
import type { UnknownObject } from '../../modules/pipeline/types/common-types.js';
|
|
13
|
+
type TokenPayload = UnknownObject & {
|
|
14
|
+
access_token?: string;
|
|
15
|
+
AccessToken?: string;
|
|
16
|
+
token?: string;
|
|
17
|
+
api_key?: string;
|
|
18
|
+
APIKey?: string;
|
|
19
|
+
expires_at?: number | string;
|
|
20
|
+
ExpiresAt?: number | string;
|
|
21
|
+
};
|
|
12
22
|
export declare class TokenFileAuthProvider implements IAuthProvider {
|
|
13
23
|
readonly type: "oauth";
|
|
14
24
|
private readonly config;
|
|
@@ -21,6 +31,12 @@ export declare class TokenFileAuthProvider implements IAuthProvider {
|
|
|
21
31
|
validateCredentials(): Promise<boolean>;
|
|
22
32
|
cleanup(): Promise<void>;
|
|
23
33
|
getStatus(): AuthStatus;
|
|
34
|
+
/**
|
|
35
|
+
* 返回当前缓存的 token 内容快照。
|
|
36
|
+
* 会尝试与磁盘上的最新内容同步一次,但不会抛出异常。
|
|
37
|
+
* 主要用于需要从 token 中读取附加字段(如 project_id)的 Provider。
|
|
38
|
+
*/
|
|
39
|
+
getTokenPayload(): TokenPayload | null;
|
|
24
40
|
private resolveTokenFile;
|
|
25
41
|
private expandHome;
|
|
26
42
|
private readJson;
|
|
@@ -31,3 +47,4 @@ export declare class TokenFileAuthProvider implements IAuthProvider {
|
|
|
31
47
|
private extractExpiresAt;
|
|
32
48
|
private updateStatus;
|
|
33
49
|
}
|
|
50
|
+
export {};
|
|
@@ -42,13 +42,17 @@ export class TokenFileAuthProvider {
|
|
|
42
42
|
this.updateStatus(ok, ok, ok ? undefined : 'missing_access_token_or_api_key');
|
|
43
43
|
}
|
|
44
44
|
buildHeaders() {
|
|
45
|
-
//
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
45
|
+
// Always attempt to reload token from disk to pick up refreshed credentials
|
|
46
|
+
const file = this.resolveTokenFile();
|
|
47
|
+
if (file) {
|
|
48
|
+
const latest = this.readJson(file);
|
|
49
|
+
if (latest) {
|
|
50
|
+
this.token = latest;
|
|
50
51
|
}
|
|
51
52
|
}
|
|
53
|
+
else if (!this.token) {
|
|
54
|
+
this.token = null;
|
|
55
|
+
}
|
|
52
56
|
if (!this.isInitialized || !this.token) {
|
|
53
57
|
throw new Error('TokenFileAuthProvider not initialized');
|
|
54
58
|
}
|
|
@@ -78,6 +82,24 @@ export class TokenFileAuthProvider {
|
|
|
78
82
|
this.updateStatus(false, false, 'cleanup');
|
|
79
83
|
}
|
|
80
84
|
getStatus() { return { ...this.status }; }
|
|
85
|
+
/**
|
|
86
|
+
* 返回当前缓存的 token 内容快照。
|
|
87
|
+
* 会尝试与磁盘上的最新内容同步一次,但不会抛出异常。
|
|
88
|
+
* 主要用于需要从 token 中读取附加字段(如 project_id)的 Provider。
|
|
89
|
+
*/
|
|
90
|
+
getTokenPayload() {
|
|
91
|
+
const file = this.resolveTokenFile();
|
|
92
|
+
if (file) {
|
|
93
|
+
const latest = this.readJson(file);
|
|
94
|
+
if (latest) {
|
|
95
|
+
this.token = latest;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (!this.isInitialized && !this.token) {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
return this.token ? { ...this.token } : null;
|
|
102
|
+
}
|
|
81
103
|
// ---- helpers ----
|
|
82
104
|
resolveTokenFile() {
|
|
83
105
|
// Prefer explicit tokenFile from config
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenfile-auth.js","sourceRoot":"","sources":["../../../src/providers/auth/tokenfile-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAexB,SAAS,cAAc,CAAC,KAAc;IACpC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC;AAED,MAAM,OAAO,qBAAqB;IACvB,IAAI,GAAG,OAAgB,CAAC;IAEhB,MAAM,CAAY;IAC3B,MAAM,CAAa;IACnB,aAAa,GAAG,KAAK,CAAC;IACtB,KAAK,GAAwB,IAAI,CAAC;IAE1C,YAAY,MAAiB;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,sFAAsF;YACtF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC;IAChF,CAAC;IAED,YAAY;QACV,
|
|
1
|
+
{"version":3,"file":"tokenfile-auth.js","sourceRoot":"","sources":["../../../src/providers/auth/tokenfile-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAexB,SAAS,cAAc,CAAC,KAAc;IACpC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC;AAED,MAAM,OAAO,qBAAqB;IACvB,IAAI,GAAG,OAAgB,CAAC;IAEhB,MAAM,CAAY;IAC3B,MAAM,CAAa;IACnB,aAAa,GAAG,KAAK,CAAC;IACtB,KAAK,GAAwB,IAAI,CAAC;IAE1C,YAAY,MAAiB;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,sFAAsF;YACtF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAAC;YACzD,OAAO;QACT,CAAC;QACD,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC;IAChF,CAAC;IAED,YAAY;QACV,4EAA4E;QAC5E,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;YACtB,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,sCAAsC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE,CAAC;QAC/C,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;QACrF,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,EAAE,GAAG,GAAG,KAAK,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;QAC5D,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED,SAAS,KAAiB,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAEtD;;;;OAIG;IACI,eAAe;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrC,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;YACtB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/C,CAAC;IAED,oBAAoB;IACZ,gBAAgB;QACtB,wCAAwC;QACxC,MAAM,EAAE,GAAG,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,IAAI,EAAE,EAAE,CAAC;YACP,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,kBAAkB;QAClB,mCAAmC;QACnC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,aAAa,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAAC;QAC3F,IAAI,CAAC;YACH,IAAI,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;gBACtB,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QACxB,2BAA2B;QAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,UAAU,CAAC,CAAS;QAC1B,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAEO,QAAQ,CAAC,CAAS;QACxB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,CAAY,CAAC;YAClE,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,GAAwB;QAC7C,OAAO,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAEO,SAAS,CAAC,GAAwB;QACxC,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAEO,kBAAkB,CAAC,GAAwB;QACjD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,KAAK,CAAC;QAC9D,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,aAAa,CAAC,GAAwB;QAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC;QACvC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,gBAAgB,CAAC,GAAwB;QAC/C,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,SAAS,CAAC;QAC5C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpD,OAAO,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC;QACjD,CAAC;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5B,OAAO,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC;YAC1D,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,YAAY,CAAC,eAAwB,EAAE,OAAgB,EAAE,OAAgB;QAC/E,IAAI,CAAC,MAAM,GAAG;YACZ,eAAe;YACf,OAAO;YACP,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;YACzB,KAAK,EAAE,OAAO;SACf,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -118,6 +118,16 @@ export interface ProviderRuntimeProfile {
|
|
|
118
118
|
compatibilityProfile?: string;
|
|
119
119
|
outboundProfile?: string;
|
|
120
120
|
defaultModel?: string;
|
|
121
|
+
streaming?: 'auto' | 'always' | 'never';
|
|
122
|
+
modelStreaming?: Record<string, 'auto' | 'always' | 'never'>;
|
|
123
|
+
modelContextTokens?: Record<string, number>;
|
|
124
|
+
defaultContextTokens?: number;
|
|
125
|
+
maxContextTokens?: number;
|
|
126
|
+
responsesConfig?: {
|
|
127
|
+
toolCallIdStyle?: string;
|
|
128
|
+
streaming?: 'auto' | 'always' | 'never';
|
|
129
|
+
instructionsMode?: 'default' | 'inline';
|
|
130
|
+
};
|
|
121
131
|
}
|
|
122
132
|
/**
|
|
123
133
|
* Provider上下文
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-flows.js","sourceRoot":"","sources":["../../../../src/providers/core/config/oauth-flows.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAUtC;;GAEG;AACH,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,YAAY;IACZ,4CAA2B,CAAA;IAC3B,YAAY;IACZ,0DAAyC,CAAA;IACzC,4BAA4B;IAC5B,kCAAiB,CAAA;AACnB,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAED;;GAEG;AACH,MAAM,CAAN,IAAY,mBAOX;AAPD,WAAY,mBAAmB;IAC7B,cAAc;IACd,oDAA6B,CAAA;IAC7B,WAAW;IACX,wCAAiB,CAAA;IACjB,aAAa;IACb,wCAAiB,CAAA;AACnB,CAAC,EAPW,mBAAmB,KAAnB,mBAAmB,QAO9B;
|
|
1
|
+
{"version":3,"file":"oauth-flows.js","sourceRoot":"","sources":["../../../../src/providers/core/config/oauth-flows.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,6 +135,91 @@ function registerProviderOAuthConfigs() {
|
|
|
135
135
|
customState: false
|
|
136
136
|
}
|
|
137
137
|
});
|
|
138
|
+
// Gemini CLI OAuth 配置 - 对齐 CLIProxyAPI / Gemini CLI 登录行为
|
|
139
|
+
// 使用标准 Google OAuth 2.0 授权码流程,后续通过 gemini-cli-userinfo-helper 获取项目列表。
|
|
140
|
+
OAuthFlowConfigManager.registerDefaultConfig('gemini-cli', {
|
|
141
|
+
flowType: OAuthFlowType.AUTHORIZATION_CODE,
|
|
142
|
+
activationType: OAuthActivationType.AUTO_BROWSER,
|
|
143
|
+
endpoints: {
|
|
144
|
+
authorizationUrl: 'https://accounts.google.com/o/oauth2/v2/auth',
|
|
145
|
+
tokenUrl: 'https://oauth2.googleapis.com/token',
|
|
146
|
+
userInfoUrl: 'https://www.googleapis.com/oauth2/v2/userinfo',
|
|
147
|
+
// 使用标准设备码端点以满足配置校验要求,实际流程仍以授权码为主
|
|
148
|
+
deviceCodeUrl: 'https://oauth2.googleapis.com/device/code'
|
|
149
|
+
},
|
|
150
|
+
client: {
|
|
151
|
+
// 复用 CLIProxyAPI 中的公开客户端配置
|
|
152
|
+
clientId: '681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com',
|
|
153
|
+
clientSecret: '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',
|
|
154
|
+
scopes: [
|
|
155
|
+
'https://www.googleapis.com/auth/cloud-platform',
|
|
156
|
+
'https://www.googleapis.com/auth/userinfo.email',
|
|
157
|
+
'https://www.googleapis.com/auth/userinfo.profile'
|
|
158
|
+
],
|
|
159
|
+
redirectUri: `${HTTP_PROTOCOLS.HTTP}${LOCAL_HOSTS.LOCALHOST}:${DEFAULT_CONFIG.OAUTH_CALLBACK_PORT}${API_PATHS.OAUTH_CALLBACK}`
|
|
160
|
+
},
|
|
161
|
+
headers: {
|
|
162
|
+
'Accept': 'application/json'
|
|
163
|
+
},
|
|
164
|
+
polling: {
|
|
165
|
+
interval: 5000,
|
|
166
|
+
maxAttempts: 60,
|
|
167
|
+
timeout: 300000
|
|
168
|
+
},
|
|
169
|
+
retry: {
|
|
170
|
+
maxAttempts: 3,
|
|
171
|
+
backoffMs: 1000
|
|
172
|
+
},
|
|
173
|
+
features: {
|
|
174
|
+
supportsPKCE: true,
|
|
175
|
+
supportsApiKeyExchange: false,
|
|
176
|
+
requireHttpsCallback: true,
|
|
177
|
+
customState: true
|
|
178
|
+
}
|
|
179
|
+
});
|
|
180
|
+
// Antigravity OAuth 配置 - 复用 gcli2api 中的 Antigravity 客户端配置
|
|
181
|
+
// 仅用于本地开发 / 调试场景,通过独立 providerId 实现与 gemini-cli 的 OAuth 隔离。
|
|
182
|
+
OAuthFlowConfigManager.registerDefaultConfig('antigravity', {
|
|
183
|
+
flowType: OAuthFlowType.AUTHORIZATION_CODE,
|
|
184
|
+
activationType: OAuthActivationType.AUTO_BROWSER,
|
|
185
|
+
endpoints: {
|
|
186
|
+
authorizationUrl: 'https://accounts.google.com/o/oauth2/v2/auth',
|
|
187
|
+
tokenUrl: 'https://oauth2.googleapis.com/token',
|
|
188
|
+
userInfoUrl: 'https://www.googleapis.com/oauth2/v2/userinfo',
|
|
189
|
+
deviceCodeUrl: 'https://oauth2.googleapis.com/device/code'
|
|
190
|
+
},
|
|
191
|
+
client: {
|
|
192
|
+
clientId: '1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com',
|
|
193
|
+
clientSecret: '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',
|
|
194
|
+
scopes: [
|
|
195
|
+
'https://www.googleapis.com/auth/cloud-platform',
|
|
196
|
+
'https://www.googleapis.com/auth/userinfo.email',
|
|
197
|
+
'https://www.googleapis.com/auth/userinfo.profile',
|
|
198
|
+
'https://www.googleapis.com/auth/cclog',
|
|
199
|
+
'https://www.googleapis.com/auth/experimentsandconfigs'
|
|
200
|
+
],
|
|
201
|
+
redirectUri: `${HTTP_PROTOCOLS.HTTP}${LOCAL_HOSTS.LOCALHOST}:${DEFAULT_CONFIG.OAUTH_CALLBACK_PORT}${API_PATHS.OAUTH_CALLBACK}`
|
|
202
|
+
},
|
|
203
|
+
headers: {
|
|
204
|
+
'Accept': 'application/json'
|
|
205
|
+
},
|
|
206
|
+
polling: {
|
|
207
|
+
interval: 5000,
|
|
208
|
+
maxAttempts: 60,
|
|
209
|
+
timeout: 300000
|
|
210
|
+
},
|
|
211
|
+
retry: {
|
|
212
|
+
maxAttempts: 3,
|
|
213
|
+
backoffMs: 1000
|
|
214
|
+
},
|
|
215
|
+
features: {
|
|
216
|
+
supportsPKCE: true,
|
|
217
|
+
supportsApiKeyExchange: false,
|
|
218
|
+
requireHttpsCallback: true,
|
|
219
|
+
customState: true,
|
|
220
|
+
requestOfflineAccess: true
|
|
221
|
+
}
|
|
222
|
+
});
|
|
138
223
|
}
|
|
139
224
|
/**
|
|
140
225
|
* 初始化OAuth配置系统
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-oauth-configs.js","sourceRoot":"","sources":["../../../../src/providers/core/config/provider-oauth-configs.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provider-oauth-configs.js","sourceRoot":"","sources":["../../../../src/providers/core/config/provider-oauth-configs.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,12 +60,14 @@ export declare abstract class BaseProvider implements IProviderV2 {
|
|
|
60
60
|
protected abstract sendRequestInternal(request: UnknownObject): Promise<unknown>;
|
|
61
61
|
protected performHealthCheck(_url: string): Promise<boolean>;
|
|
62
62
|
protected getCurrentRuntimeMetadata(): ProviderRuntimeMetadata | undefined;
|
|
63
|
+
private extractUsageTokensFromResponse;
|
|
63
64
|
private createContext;
|
|
64
65
|
private reattachRuntimeMetadata;
|
|
65
66
|
private handleRequestError;
|
|
66
67
|
private unwrapRequestPayload;
|
|
67
68
|
protected hasDataEnvelope(value: UnknownObject): value is RequestEnvelope;
|
|
68
69
|
private hasTools;
|
|
70
|
+
private getRateLimitBucketKey;
|
|
69
71
|
private registerRateLimitFailure;
|
|
70
72
|
private resetRateLimitCounter;
|
|
71
73
|
private forceRateLimitFailure;
|
|
@@ -7,6 +7,26 @@ import { attachProviderRuntimeMetadata, extractProviderRuntimeMetadata } from '.
|
|
|
7
7
|
import { emitProviderError, buildRuntimeFromProviderContext } from '../utils/provider-error-reporter.js';
|
|
8
8
|
import { normalizeProviderFamily, normalizeProviderType, providerTypeToProtocol } from '../utils/provider-type-utils.js';
|
|
9
9
|
import { classifyProviderError } from './provider-error-classifier.js';
|
|
10
|
+
import * as LlmsCore from '@jsonstudio/llms';
|
|
11
|
+
function getStatsCenterSafe() {
|
|
12
|
+
const anyLlms = LlmsCore;
|
|
13
|
+
try {
|
|
14
|
+
if (anyLlms && typeof anyLlms.getStatsCenter === 'function') {
|
|
15
|
+
const center = anyLlms.getStatsCenter();
|
|
16
|
+
if (center && typeof center.recordProviderUsage === 'function') {
|
|
17
|
+
return center;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
// fall through to no-op
|
|
23
|
+
}
|
|
24
|
+
return {
|
|
25
|
+
recordProviderUsage: () => {
|
|
26
|
+
// stats center not available in this @jsonstudio/llms build
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
}
|
|
10
30
|
/**
|
|
11
31
|
* 基础Provider抽象类
|
|
12
32
|
*
|
|
@@ -77,9 +97,10 @@ export class BaseProvider {
|
|
|
77
97
|
const response = await this.sendRequest(processedRequest);
|
|
78
98
|
// 后处理响应
|
|
79
99
|
const finalResponse = await this.postprocessResponse(response, context);
|
|
100
|
+
const endTime = Date.now();
|
|
80
101
|
this.dependencies.logger?.logProviderRequest(this.id, 'request-success', {
|
|
81
102
|
requestId: context.requestId,
|
|
82
|
-
responseTime:
|
|
103
|
+
responseTime: endTime - context.startTime
|
|
83
104
|
});
|
|
84
105
|
this.resetRateLimitCounter(context.providerKey);
|
|
85
106
|
return finalResponse;
|
|
@@ -100,6 +121,7 @@ export class BaseProvider {
|
|
|
100
121
|
}
|
|
101
122
|
const context = this.createContext(request);
|
|
102
123
|
const runtimeMetadata = context.runtimeMetadata;
|
|
124
|
+
const stats = getStatsCenterSafe();
|
|
103
125
|
try {
|
|
104
126
|
this.requestCount++;
|
|
105
127
|
this.lastActivity = Date.now();
|
|
@@ -110,11 +132,53 @@ export class BaseProvider {
|
|
|
110
132
|
const response = await this.sendRequestInternal(processedRequest);
|
|
111
133
|
// 后处理响应
|
|
112
134
|
const finalResponse = await this.postprocessResponse(response, context);
|
|
135
|
+
const endTime = Date.now();
|
|
113
136
|
this.resetRateLimitCounter(context.providerKey);
|
|
137
|
+
try {
|
|
138
|
+
const usage = this.extractUsageTokensFromResponse(finalResponse);
|
|
139
|
+
const event = {
|
|
140
|
+
requestId: context.requestId,
|
|
141
|
+
timestamp: endTime,
|
|
142
|
+
providerKey: context.providerKey || runtimeMetadata?.providerKey || this.getRuntimeProfile()?.providerKey || this.providerType,
|
|
143
|
+
runtimeKey: this.getRuntimeProfile()?.runtimeKey,
|
|
144
|
+
providerType: context.providerType,
|
|
145
|
+
modelId: context.model,
|
|
146
|
+
routeName: context.routeName,
|
|
147
|
+
entryEndpoint: typeof context.metadata?.entryEndpoint === 'string' ? context.metadata.entryEndpoint : undefined,
|
|
148
|
+
success: true,
|
|
149
|
+
latencyMs: endTime - context.startTime,
|
|
150
|
+
promptTokens: usage.promptTokens,
|
|
151
|
+
completionTokens: usage.completionTokens,
|
|
152
|
+
totalTokens: usage.totalTokens
|
|
153
|
+
};
|
|
154
|
+
stats.recordProviderUsage(event);
|
|
155
|
+
}
|
|
156
|
+
catch {
|
|
157
|
+
// ignore stats errors
|
|
158
|
+
}
|
|
114
159
|
return finalResponse;
|
|
115
160
|
}
|
|
116
161
|
catch (error) {
|
|
117
162
|
this.errorCount++;
|
|
163
|
+
const endTime = Date.now();
|
|
164
|
+
try {
|
|
165
|
+
const event = {
|
|
166
|
+
requestId: context.requestId,
|
|
167
|
+
timestamp: endTime,
|
|
168
|
+
providerKey: context.providerKey || runtimeMetadata?.providerKey || this.getRuntimeProfile()?.providerKey || this.providerType,
|
|
169
|
+
runtimeKey: this.getRuntimeProfile()?.runtimeKey,
|
|
170
|
+
providerType: context.providerType,
|
|
171
|
+
modelId: context.model,
|
|
172
|
+
routeName: context.routeName,
|
|
173
|
+
entryEndpoint: typeof context.metadata?.entryEndpoint === 'string' ? context.metadata.entryEndpoint : undefined,
|
|
174
|
+
success: false,
|
|
175
|
+
latencyMs: endTime - context.startTime
|
|
176
|
+
};
|
|
177
|
+
stats.recordProviderUsage(event);
|
|
178
|
+
}
|
|
179
|
+
catch {
|
|
180
|
+
// ignore stats errors
|
|
181
|
+
}
|
|
118
182
|
this.handleRequestError(error, context);
|
|
119
183
|
throw error;
|
|
120
184
|
}
|
|
@@ -170,6 +234,46 @@ export class BaseProvider {
|
|
|
170
234
|
getCurrentRuntimeMetadata() {
|
|
171
235
|
return this.lastRuntimeMetadata;
|
|
172
236
|
}
|
|
237
|
+
extractUsageTokensFromResponse(finalResponse) {
|
|
238
|
+
if (!finalResponse || typeof finalResponse !== 'object') {
|
|
239
|
+
return {};
|
|
240
|
+
}
|
|
241
|
+
const container = finalResponse;
|
|
242
|
+
const meta = (container.metadata && typeof container.metadata === 'object')
|
|
243
|
+
? container.metadata
|
|
244
|
+
: undefined;
|
|
245
|
+
const usageNode = meta && meta.usage && typeof meta.usage === 'object'
|
|
246
|
+
? meta.usage
|
|
247
|
+
: (container.usage && typeof container.usage === 'object'
|
|
248
|
+
? container.usage
|
|
249
|
+
: undefined);
|
|
250
|
+
if (!usageNode) {
|
|
251
|
+
return {};
|
|
252
|
+
}
|
|
253
|
+
const readNumber = (value) => {
|
|
254
|
+
if (typeof value !== 'number') {
|
|
255
|
+
return undefined;
|
|
256
|
+
}
|
|
257
|
+
if (!Number.isFinite(value)) {
|
|
258
|
+
return undefined;
|
|
259
|
+
}
|
|
260
|
+
return value;
|
|
261
|
+
};
|
|
262
|
+
const promptTokens = readNumber(usageNode.prompt_tokens) ??
|
|
263
|
+
readNumber(usageNode.promptTokens) ??
|
|
264
|
+
readNumber(usageNode.input_tokens) ??
|
|
265
|
+
readNumber(usageNode.inputTokens);
|
|
266
|
+
const completionTokens = readNumber(usageNode.completion_tokens) ??
|
|
267
|
+
readNumber(usageNode.completionTokens) ??
|
|
268
|
+
readNumber(usageNode.output_tokens) ??
|
|
269
|
+
readNumber(usageNode.outputTokens);
|
|
270
|
+
let totalTokens = readNumber(usageNode.total_tokens) ??
|
|
271
|
+
readNumber(usageNode.totalTokens);
|
|
272
|
+
if (totalTokens === undefined && (promptTokens !== undefined || completionTokens !== undefined)) {
|
|
273
|
+
totalTokens = (promptTokens ?? 0) + (completionTokens ?? 0);
|
|
274
|
+
}
|
|
275
|
+
return { promptTokens, completionTokens, totalTokens };
|
|
276
|
+
}
|
|
173
277
|
createContext(request) {
|
|
174
278
|
const runtimeMetadata = extractProviderRuntimeMetadata(request);
|
|
175
279
|
this.lastRuntimeMetadata = runtimeMetadata;
|
|
@@ -230,8 +334,10 @@ export class BaseProvider {
|
|
|
230
334
|
const upstreamMessage = classification.upstreamMessage;
|
|
231
335
|
const providerKey = context.providerKey || runtimeProfile?.providerKey;
|
|
232
336
|
if (!classification.isRateLimit && providerKey) {
|
|
233
|
-
this.resetRateLimitCounter(providerKey);
|
|
337
|
+
this.resetRateLimitCounter(providerKey, context.model);
|
|
234
338
|
}
|
|
339
|
+
const affectsHealth = classification.affectsHealth;
|
|
340
|
+
const recoverable = classification.forceFatalRateLimit ? false : classification.recoverable;
|
|
235
341
|
this.dependencies.logger?.logModule(this.id, 'request-error', {
|
|
236
342
|
requestId: context.requestId,
|
|
237
343
|
error: msg,
|
|
@@ -282,8 +388,8 @@ export class BaseProvider {
|
|
|
282
388
|
runtime: buildRuntimeFromProviderContext(context),
|
|
283
389
|
dependencies: this.dependencies,
|
|
284
390
|
statusCode,
|
|
285
|
-
recoverable
|
|
286
|
-
affectsHealth
|
|
391
|
+
recoverable,
|
|
392
|
+
affectsHealth,
|
|
287
393
|
details: enrichedDetails
|
|
288
394
|
});
|
|
289
395
|
}
|
|
@@ -303,37 +409,51 @@ export class BaseProvider {
|
|
|
303
409
|
}
|
|
304
410
|
return Boolean(tools);
|
|
305
411
|
}
|
|
306
|
-
|
|
412
|
+
getRateLimitBucketKey(providerKey, model) {
|
|
307
413
|
if (!providerKey) {
|
|
414
|
+
return undefined;
|
|
415
|
+
}
|
|
416
|
+
const runtimeProfile = this.getRuntimeProfile();
|
|
417
|
+
const providerId = runtimeProfile?.providerId || this.config.config.providerId;
|
|
418
|
+
if (providerId === 'antigravity' && model) {
|
|
419
|
+
return `${providerKey}::${model}`;
|
|
420
|
+
}
|
|
421
|
+
return providerKey;
|
|
422
|
+
}
|
|
423
|
+
registerRateLimitFailure(providerKey, model) {
|
|
424
|
+
const bucketKey = this.getRateLimitBucketKey(providerKey, model);
|
|
425
|
+
if (!bucketKey) {
|
|
308
426
|
return false;
|
|
309
427
|
}
|
|
310
|
-
const current = BaseProvider.rateLimitFailures.get(
|
|
428
|
+
const current = BaseProvider.rateLimitFailures.get(bucketKey) ?? 0;
|
|
311
429
|
const next = current + 1;
|
|
312
|
-
BaseProvider.rateLimitFailures.set(
|
|
430
|
+
BaseProvider.rateLimitFailures.set(bucketKey, next);
|
|
313
431
|
// 调试:记录当前 key 的第几次 429 命中,方便观察是否触发熔断
|
|
314
432
|
if (this.dependencies.logger) {
|
|
315
433
|
this.dependencies.logger.logModule(this.id, 'rate-limit-429', {
|
|
316
|
-
providerKey,
|
|
434
|
+
providerKey: bucketKey,
|
|
317
435
|
hitCount: next
|
|
318
436
|
});
|
|
319
437
|
}
|
|
320
438
|
if (next >= BaseProvider.RATE_LIMIT_THRESHOLD) {
|
|
321
|
-
BaseProvider.rateLimitFailures.set(
|
|
439
|
+
BaseProvider.rateLimitFailures.set(bucketKey, 0);
|
|
322
440
|
return true;
|
|
323
441
|
}
|
|
324
442
|
return false;
|
|
325
443
|
}
|
|
326
|
-
resetRateLimitCounter(providerKey) {
|
|
327
|
-
|
|
444
|
+
resetRateLimitCounter(providerKey, model) {
|
|
445
|
+
const bucketKey = this.getRateLimitBucketKey(providerKey, model);
|
|
446
|
+
if (!bucketKey) {
|
|
328
447
|
return;
|
|
329
448
|
}
|
|
330
|
-
BaseProvider.rateLimitFailures.delete(
|
|
449
|
+
BaseProvider.rateLimitFailures.delete(bucketKey);
|
|
331
450
|
}
|
|
332
|
-
forceRateLimitFailure(providerKey) {
|
|
333
|
-
|
|
451
|
+
forceRateLimitFailure(providerKey, model) {
|
|
452
|
+
const bucketKey = this.getRateLimitBucketKey(providerKey, model);
|
|
453
|
+
if (!bucketKey) {
|
|
334
454
|
return;
|
|
335
455
|
}
|
|
336
|
-
BaseProvider.rateLimitFailures.set(
|
|
456
|
+
BaseProvider.rateLimitFailures.set(bucketKey, BaseProvider.RATE_LIMIT_THRESHOLD);
|
|
337
457
|
}
|
|
338
458
|
isDailyLimitRateLimit(messageLower, upstreamLower) {
|
|
339
459
|
const haystack = `${messageLower} ${upstreamLower ?? ''}`;
|