Compare commits

..
42 Commits
Author SHA1 Message Date
Dot.L d725e9d896 Merge pull request #64 from xpack-ai/feature/mcp
Check if base_url is valid
2025-12-08 10:17:17 +08:00
riverLethe 68c4b2fcc2 Merge branch 'main' of https://github.com/xpack-ai/XPack-MCP-Market 2025-12-08 09:08:25 +08:00
riverLethe 96db00418c feat:Add more constraints for server name, server ID, and api endpoint. 2025-12-08 09:08:09 +08:00
Liujian 2def6457fe Merge remote-tracking branch 'origin/main' into feature/mcp 2025-12-07 15:54:19 +08:00
Liujian b9123d68a0 Check if base_url is valid 2025-12-07 15:51:32 +08:00
Dot.L ebbf9b22da Merge pull request #63 from xpack-ai/feature/mcp
Bug fixes and improved prompts
2025-12-07 14:09:15 +08:00
Liujian eace543d74 Check if the price is a positive number. 2025-12-07 14:03:32 +08:00
Liujian 73cd1a01a0 Fix: Issue where billing continued even after calling the mcp tool failed. 2025-12-07 13:46:21 +08:00
Liujian 8186b4c0b5 fix: User Dashboard - AuthKey Analytics: display Total spending discrepancy 2025-12-06 00:50:36 +09:00
Liujian 5023e4494c fix: The balance field has an incorrect data type; it should be Decimal. 2025-12-05 23:50:41 +09:00
Liujian e2d360d5de fix: Balance Doubled When Depositing Funds 2025-12-05 22:57:44 +09:00
Liujian 948046948a fix:Relate to transaction_id value when admin recharge for user 2025-12-05 21:50:48 +09:00
Liujian 4e3fd1afaf fix: login failed 2025-12-05 12:17:49 +09:00
Liujian e2ae502b48 fix bug:Admin upload image should support format GIF, SVG to update logo 2025-12-05 11:02:07 +09:00
Liujian 6561435a38 Merge remote-tracking branch 'origin/main' into feature/mcp 2025-12-05 10:59:48 +09:00
Liujian 1846aafc1e fix bug:
1. Service_type do not set after add server
2. Issue relate pricing when "Update from OpenAPI"
3. Failed to set SQLAlchemy cache for key Error
4. Request Body Logging in Internal Service
5. Deleted API Key Remains Valid for 5 Minutes
2025-12-05 10:27:19 +09:00
riverLethe 54654b386d feat: Upgrade Next.js and refine password/amount restrictions
This commit addresses several key updates and fixes:

1.  **Security Update:** Upgraded Next.js to fix the vulnerability identified as **CVE-2025-55182**.
2.  **Password Policy:** Globally adjusted the password requirement for "change password" operations to a minimum length of **6 characters**.
3.  **Validation Improvement:** Enhanced validation logic for amount fields during MCP (Multi-Currency Purchase/Payment, assuming this acronym) creation to ensure proper limits and constraints are applied.
2025-12-04 17:43:59 +08:00
Dot.L 755d48a2f8 Merge pull request #61 from xpack-ai/feature/mcp
Update client IP acquisition logic
2025-11-26 18:02:54 +08:00
Liujian 284880a170 Update client IP acquisition logic 2025-11-26 18:02:10 +08:00
Dot.L 950b516081 Merge pull request #60 from xpack-ai/feature/mcp
Email captcha rate limiting fix && CORS tightening via configuration
2025-11-26 17:08:41 +08:00
Liujian 0088a7b447 Merge remote-tracking branch 'origin/main' into feature/mcp 2025-11-26 17:00:29 +08:00
Liujian 19f646c318 Email captcha rate limiting fix && CORS tightening via configuration 2025-11-26 16:58:54 +08:00
Dot.L 115ac5caf7 Merge pull request #59 from xpack-ai/feature/mcp
repairing potential risks
2025-11-26 16:39:29 +08:00
Liujian 798082934e Merge remote-tracking branch 'origin/main' into feature/mcp 2025-11-26 16:21:40 +08:00
Liujian a017b0fa93 repairing potential risks 2025-11-26 16:16:23 +08:00
Liujian 877dbb6a4e MCP session keys use client fingerprints to distinguish requests from different clients. 2025-11-26 15:09:35 +08:00
Dot.L 523265e550 Merge pull request #58 from xpack-ai/feature/mcp
Payment information encryption and  wait for the initial connection to initialize successfully before processing the request
2025-11-14 18:11:01 +08:00
Liujian 5d2db84d75 update env example 2025-11-14 17:47:31 +08:00
Liujian 4826859152 Payment information encryption 2025-11-14 16:58:08 +08:00
Liujian 92f8b68f0e A new connection recovery mechanism has been added in the event of a network outage. 2025-11-14 15:50:39 +08:00
Liujian 87a4b6e2de Wait for the initial connection to initialize successfully before processing the request. 2025-11-14 15:50:00 +08:00
Dot.L 58d30344f5 Merge pull request #57 from xpack-ai/feature/mcp
Completed: OutputSchema functionality added to the MCP tools list.
2025-11-07 17:23:54 +08:00
Liujian a6064035bd Completed: OutputSchema functionality added to the MCP tools list. 2025-11-07 17:23:24 +08:00
Dot.L 141fb4758f Merge pull request #56 from xpack-ai/feature/mcp
fix bug: API enabled status error when updating service Swagger docum…
2025-11-07 16:56:07 +08:00
Liujian 5450027bbc fix bug: API enabled status error when updating service Swagger documentation 2025-11-07 16:53:25 +08:00
riverLethe 721a213bbf fix:hidden server length in marketpalce card panel 2025-11-07 14:03:38 +08:00
Dot.L 9ce81f5012 Merge pull request #55 from xpack-ai/feature/mcp
MCP tool list response adds outputSchema
2025-11-07 10:32:07 +08:00
Liujian a28f3bb680 MCP tool list response adds outputSchema 2025-11-07 10:31:29 +08:00
Dot.L 14e45235b4 Merge pull request #54 from xpack-ai/feature/synchronize_saas
update mcp session gc logic
2025-10-23 17:55:51 +08:00
Liujian 6a69d678fd update mcp session gc logic 2025-10-23 17:55:24 +08:00
Dot.L 48ba7ffd96 Merge pull request #53 from xpack-ai/feature/synchronize_saas
Translate Chinese into English
2025-10-22 23:21:23 +08:00
Liujian faa1f552e6 Translate Chinese into English 2025-10-22 23:20:57 +08:00
51 changed files with 1432 additions and 297 deletions

No files matched your search

+8 -2
View File
@@ -6,7 +6,7 @@ MYSQL_PASSWORD=mysql_ZTdhRB
MYSQL_DB=xpack
# 服务端口配置
API_PORT=8000
API_PORT=8002
ADMIN_PORT=8001
# 调试配置
@@ -24,4 +24,10 @@ RABBITMQ_HOST=xpack-rabbitmq
RABBITMQ_PORT=5672
RABBITMQ_USER=rabbitmq
RABBITMQ_PASSWORD=rabbitmq_Gs123dA
RABBITMQ_VHOST=/
RABBITMQ_VHOST=/
# Payment config encryption key (Base64-encoded 32-byte random value for AES-GCM)
# Quick generation: python -c "import os,base64; print(base64.b64encode(os.urandom(32)).decode())"
PAYMENT_CONFIG_SECRET_KEY=uyyhfMJ+xpEE+IC5mPigpscekkR2ucz6Sj7sHYLhJQA=
# Optional: key ID used to support key rotation identification
PAYMENT_CONFIG_KEY_ID=default
+1 -1
View File
@@ -32,7 +32,7 @@
"immer": "^10.0.3",
"lottie-react": "^2.4.1",
"lucide-react": "^0.475.0",
"next": "^15.3.4",
"next": "^15.3.6",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.49.3",
+416 -14
View File
@@ -63,8 +63,8 @@ importers:
specifier: ^0.475.0
version: 0.475.0(react@18.3.1)
next:
specifier: ^15.3.4
version: 15.3.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
specifier: ^15.3.6
version: 15.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
react:
specifier: ^18.2.0
version: 18.3.1
@@ -879,6 +879,9 @@ packages:
'@emnapi/runtime@1.4.3':
resolution: {integrity: sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==}
'@emnapi/runtime@1.7.1':
resolution: {integrity: sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==}
'@emnapi/wasi-threads@1.0.2':
resolution: {integrity: sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==}
@@ -1196,70 +1199,136 @@ packages:
'@iconify/types@2.0.0':
resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
'@img/colour@1.0.0':
resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
engines: {node: '>=18'}
'@img/sharp-darwin-arm64@0.34.2':
resolution: {integrity: sha512-OfXHZPppddivUJnqyKoi5YVeHRkkNE2zUFT2gbpKxp/JZCFYEYubnMg+gOp6lWfasPrTS+KPosKqdI+ELYVDtg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [darwin]
'@img/sharp-darwin-arm64@0.34.5':
resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [darwin]
'@img/sharp-darwin-x64@0.34.2':
resolution: {integrity: sha512-dYvWqmjU9VxqXmjEtjmvHnGqF8GrVjM2Epj9rJ6BUIXvk8slvNDJbhGFvIoXzkDhrJC2jUxNLz/GUjjvSzfw+g==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [darwin]
'@img/sharp-darwin-x64@0.34.5':
resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [darwin]
'@img/sharp-libvips-darwin-arm64@1.1.0':
resolution: {integrity: sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==}
cpu: [arm64]
os: [darwin]
'@img/sharp-libvips-darwin-arm64@1.2.4':
resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
cpu: [arm64]
os: [darwin]
'@img/sharp-libvips-darwin-x64@1.1.0':
resolution: {integrity: sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==}
cpu: [x64]
os: [darwin]
'@img/sharp-libvips-darwin-x64@1.2.4':
resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
cpu: [x64]
os: [darwin]
'@img/sharp-libvips-linux-arm64@1.1.0':
resolution: {integrity: sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==}
cpu: [arm64]
os: [linux]
libc: [glibc]
'@img/sharp-libvips-linux-arm64@1.2.4':
resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
cpu: [arm64]
os: [linux]
'@img/sharp-libvips-linux-arm@1.1.0':
resolution: {integrity: sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==}
cpu: [arm]
os: [linux]
libc: [glibc]
'@img/sharp-libvips-linux-arm@1.2.4':
resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
cpu: [arm]
os: [linux]
'@img/sharp-libvips-linux-ppc64@1.1.0':
resolution: {integrity: sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==}
cpu: [ppc64]
os: [linux]
libc: [glibc]
'@img/sharp-libvips-linux-ppc64@1.2.4':
resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
cpu: [ppc64]
os: [linux]
'@img/sharp-libvips-linux-riscv64@1.2.4':
resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
cpu: [riscv64]
os: [linux]
'@img/sharp-libvips-linux-s390x@1.1.0':
resolution: {integrity: sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==}
cpu: [s390x]
os: [linux]
libc: [glibc]
'@img/sharp-libvips-linux-s390x@1.2.4':
resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
cpu: [s390x]
os: [linux]
'@img/sharp-libvips-linux-x64@1.1.0':
resolution: {integrity: sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==}
cpu: [x64]
os: [linux]
libc: [glibc]
'@img/sharp-libvips-linux-x64@1.2.4':
resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
cpu: [x64]
os: [linux]
'@img/sharp-libvips-linuxmusl-arm64@1.1.0':
resolution: {integrity: sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==}
cpu: [arm64]
os: [linux]
libc: [musl]
'@img/sharp-libvips-linuxmusl-arm64@1.2.4':
resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
cpu: [arm64]
os: [linux]
'@img/sharp-libvips-linuxmusl-x64@1.1.0':
resolution: {integrity: sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==}
cpu: [x64]
os: [linux]
libc: [musl]
'@img/sharp-libvips-linuxmusl-x64@1.2.4':
resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
cpu: [x64]
os: [linux]
'@img/sharp-linux-arm64@0.34.2':
resolution: {integrity: sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1267,6 +1336,12 @@ packages:
os: [linux]
libc: [glibc]
'@img/sharp-linux-arm64@0.34.5':
resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [linux]
'@img/sharp-linux-arm@0.34.2':
resolution: {integrity: sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1274,6 +1349,24 @@ packages:
os: [linux]
libc: [glibc]
'@img/sharp-linux-arm@0.34.5':
resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm]
os: [linux]
'@img/sharp-linux-ppc64@0.34.5':
resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [ppc64]
os: [linux]
'@img/sharp-linux-riscv64@0.34.5':
resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [riscv64]
os: [linux]
'@img/sharp-linux-s390x@0.34.2':
resolution: {integrity: sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1281,6 +1374,12 @@ packages:
os: [linux]
libc: [glibc]
'@img/sharp-linux-s390x@0.34.5':
resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [s390x]
os: [linux]
'@img/sharp-linux-x64@0.34.2':
resolution: {integrity: sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1288,6 +1387,12 @@ packages:
os: [linux]
libc: [glibc]
'@img/sharp-linux-x64@0.34.5':
resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [linux]
'@img/sharp-linuxmusl-arm64@0.34.2':
resolution: {integrity: sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1295,6 +1400,12 @@ packages:
os: [linux]
libc: [musl]
'@img/sharp-linuxmusl-arm64@0.34.5':
resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [linux]
'@img/sharp-linuxmusl-x64@0.34.2':
resolution: {integrity: sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
@@ -1302,29 +1413,58 @@ packages:
os: [linux]
libc: [musl]
'@img/sharp-linuxmusl-x64@0.34.5':
resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [linux]
'@img/sharp-wasm32@0.34.2':
resolution: {integrity: sha512-/VI4mdlJ9zkaq53MbIG6rZY+QRN3MLbR6usYlgITEzi4Rpx5S6LFKsycOQjkOGmqTNmkIdLjEvooFKwww6OpdQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [wasm32]
'@img/sharp-wasm32@0.34.5':
resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [wasm32]
'@img/sharp-win32-arm64@0.34.2':
resolution: {integrity: sha512-cfP/r9FdS63VA5k0xiqaNaEoGxBg9k7uE+RQGzuK9fHt7jib4zAVVseR9LsE4gJcNWgT6APKMNnCcnyOtmSEUQ==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [win32]
'@img/sharp-win32-arm64@0.34.5':
resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [arm64]
os: [win32]
'@img/sharp-win32-ia32@0.34.2':
resolution: {integrity: sha512-QLjGGvAbj0X/FXl8n1WbtQ6iVBpWU7JO94u/P2M4a8CFYsvQi4GW2mRy/JqkRx0qpBzaOdKJKw8uc930EX2AHw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [ia32]
os: [win32]
'@img/sharp-win32-ia32@0.34.5':
resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [ia32]
os: [win32]
'@img/sharp-win32-x64@0.34.2':
resolution: {integrity: sha512-aUdT6zEYtDKCaxkofmmJDJYGCf0+pJg3eU9/oBuqvEeoB9dKI6ZLc/1iLJCTuJQDO4ptntAlkUmHgGjyuobZbw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [win32]
'@img/sharp-win32-x64@0.34.5':
resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
cpu: [x64]
os: [win32]
'@internationalized/date@3.6.0':
resolution: {integrity: sha512-+z6ti+CcJnRlLHok/emGEsWQhe7kfSmEW+/6qCzvKY67YPh7YOBfvc7+/+NXq+zJlbArg30tYpqLjNgcAYv2YQ==}
@@ -1384,6 +1524,9 @@ packages:
'@next/env@15.3.4':
resolution: {integrity: sha512-ZkdYzBseS6UjYzz6ylVKPOK+//zLWvD6Ta+vpoye8cW11AjiQjGYVibF0xuvT4L0iJfAPfZLFidaEzAOywyOAQ==}
'@next/env@15.5.7':
resolution: {integrity: sha512-4h6Y2NyEkIEN7Z8YxkA27pq6zTkS09bUSYC0xjd0NpwFxjnIKeZEeH591o5WECSmjpUhLn3H2QLJcDye3Uzcvg==}
'@next/eslint-plugin-next@15.0.3':
resolution: {integrity: sha512-3Ln/nHq2V+v8uIaxCR6YfYo7ceRgZNXfTd3yW1ukTaFbO+/I8jNakrjYWODvG9BuR2v5kgVtH/C8r0i11quOgw==}
@@ -1396,12 +1539,24 @@ packages:
cpu: [arm64]
os: [darwin]
'@next/swc-darwin-arm64@15.5.7':
resolution: {integrity: sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [darwin]
'@next/swc-darwin-x64@15.3.4':
resolution: {integrity: sha512-Z0FYJM8lritw5Wq+vpHYuCIzIlEMjewG2aRkc3Hi2rcbULknYL/xqfpBL23jQnCSrDUGAo/AEv0Z+s2bff9Zkw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [darwin]
'@next/swc-darwin-x64@15.5.7':
resolution: {integrity: sha512-UP6CaDBcqaCBuiq/gfCEJw7sPEoX1aIjZHnBWN9v9qYHQdMKvCKcAVs4OX1vIjeE+tC5EIuwDTVIoXpUes29lg==}
engines: {node: '>= 10'}
cpu: [x64]
os: [darwin]
'@next/swc-linux-arm64-gnu@15.3.4':
resolution: {integrity: sha512-l8ZQOCCg7adwmsnFm8m5q9eIPAHdaB2F3cxhufYtVo84pymwKuWfpYTKcUiFcutJdp9xGHC+F1Uq3xnFU1B/7g==}
engines: {node: '>= 10'}
@@ -1409,6 +1564,12 @@ packages:
os: [linux]
libc: [glibc]
'@next/swc-linux-arm64-gnu@15.5.7':
resolution: {integrity: sha512-NCslw3GrNIw7OgmRBxHtdWFQYhexoUCq+0oS2ccjyYLtcn1SzGzeM54jpTFonIMUjNbHmpKpziXnpxhSWLcmBA==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
'@next/swc-linux-arm64-musl@15.3.4':
resolution: {integrity: sha512-wFyZ7X470YJQtpKot4xCY3gpdn8lE9nTlldG07/kJYexCUpX1piX+MBfZdvulo+t1yADFVEuzFfVHfklfEx8kw==}
engines: {node: '>= 10'}
@@ -1416,6 +1577,12 @@ packages:
os: [linux]
libc: [musl]
'@next/swc-linux-arm64-musl@15.5.7':
resolution: {integrity: sha512-nfymt+SE5cvtTrG9u1wdoxBr9bVB7mtKTcj0ltRn6gkP/2Nu1zM5ei8rwP9qKQP0Y//umK+TtkKgNtfboBxRrw==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
'@next/swc-linux-x64-gnu@15.3.4':
resolution: {integrity: sha512-gEbH9rv9o7I12qPyvZNVTyP/PWKqOp8clvnoYZQiX800KkqsaJZuOXkWgMa7ANCCh/oEN2ZQheh3yH8/kWPSEg==}
engines: {node: '>= 10'}
@@ -1423,6 +1590,12 @@ packages:
os: [linux]
libc: [glibc]
'@next/swc-linux-x64-gnu@15.5.7':
resolution: {integrity: sha512-hvXcZvCaaEbCZcVzcY7E1uXN9xWZfFvkNHwbe/n4OkRhFWrs1J1QV+4U1BN06tXLdaS4DazEGXwgqnu/VMcmqw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
'@next/swc-linux-x64-musl@15.3.4':
resolution: {integrity: sha512-Cf8sr0ufuC/nu/yQ76AnarbSAXcwG/wj+1xFPNbyNo8ltA6kw5d5YqO8kQuwVIxk13SBdtgXrNyom3ZosHAy4A==}
engines: {node: '>= 10'}
@@ -1430,18 +1603,36 @@ packages:
os: [linux]
libc: [musl]
'@next/swc-linux-x64-musl@15.5.7':
resolution: {integrity: sha512-4IUO539b8FmF0odY6/SqANJdgwn1xs1GkPO5doZugwZ3ETF6JUdckk7RGmsfSf7ws8Qb2YB5It33mvNL/0acqA==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
'@next/swc-win32-arm64-msvc@15.3.4':
resolution: {integrity: sha512-ay5+qADDN3rwRbRpEhTOreOn1OyJIXS60tg9WMYTWCy3fB6rGoyjLVxc4dR9PYjEdR2iDYsaF5h03NA+XuYPQQ==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
'@next/swc-win32-arm64-msvc@15.5.7':
resolution: {integrity: sha512-CpJVTkYI3ZajQkC5vajM7/ApKJUOlm6uP4BknM3XKvJ7VXAvCqSjSLmM0LKdYzn6nBJVSjdclx8nYJSa3xlTgQ==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
'@next/swc-win32-x64-msvc@15.3.4':
resolution: {integrity: sha512-4kDt31Bc9DGyYs41FTL1/kNpDeHyha2TC0j5sRRoKCyrhNcfZ/nRQkAUlF27mETwm8QyHqIjHJitfcza2Iykfg==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
'@next/swc-win32-x64-msvc@15.5.7':
resolution: {integrity: sha512-gMzgBX164I6DN+9/PGA+9dQiwmTkE4TloBNx8Kv9UiGARsr9Nba7IpcBRA1iTV9vwlYnrE3Uy6I7Aj6qLjQuqw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
'@nextui-org/accordion@2.2.7':
resolution: {integrity: sha512-jdobOwUxSi617m+LpxHFzg64UhDuOfDJI2CMk3MP+b2WBJ7SNW4hmN2NW5Scx5JiY+kyBGmlxJ4Y++jZpZgQjQ==}
deprecated: This package has been deprecated. Please use @heroui/accordion instead.
@@ -2732,28 +2923,24 @@ packages:
engines: {node: '>=10'}
cpu: [arm64]
os: [linux]
libc: [glibc]
'@swc/core-linux-arm64-musl@1.10.18':
resolution: {integrity: sha512-4rv+E4VLdgQw6zjbTAauCAEExxChvxMpBUMCiZweTNPKbJJ2dY6BX2WGJ1ea8+RcgqR/Xysj3AFbOz1LBz6dGA==}
engines: {node: '>=10'}
cpu: [arm64]
os: [linux]
libc: [musl]
'@swc/core-linux-x64-gnu@1.10.18':
resolution: {integrity: sha512-vTNmyRBVP+sZca+vtwygYPGTNudTU6Gl6XhaZZ7cEUTBr8xvSTgEmYXoK/2uzyXpaTUI4Bmtp1x81cGN0mMoLQ==}
engines: {node: '>=10'}
cpu: [x64]
os: [linux]
libc: [glibc]
'@swc/core-linux-x64-musl@1.10.18':
resolution: {integrity: sha512-1TZPReKhFCeX776XaT6wegknfg+g3zODve+r4oslFHI+g7cInfWlxoGNDS3niPKyuafgCdOjme2g3OF+zzxfsQ==}
engines: {node: '>=10'}
cpu: [x64]
os: [linux]
libc: [musl]
'@swc/core-win32-arm64-msvc@1.10.18':
resolution: {integrity: sha512-o/2CsaWSN3bkzVQ6DA+BiFKSVEYvhWGA1h+wnL2zWmIDs2Knag54sOEXZkCaf8YQyZesGeXJtPEy9hh/vjJgkA==}
@@ -3161,49 +3348,41 @@ packages:
resolution: {integrity: sha512-UYA0MA8ajkEDCFRQdng/FVx3F6szBvk3EPnkTTQuuO9lV1kPGuTB+V9TmbDxy5ikaEgyWKxa4CI3ySjklZ9lFA==}
cpu: [arm64]
os: [linux]
libc: [glibc]
'@unrs/resolver-binding-linux-arm64-musl@1.9.2':
resolution: {integrity: sha512-P/CO3ODU9YJIHFqAkHbquKtFst0COxdphc8TKGL5yCX75GOiVpGqd1d15ahpqu8xXVsqP4MGFP2C3LRZnnL5MA==}
cpu: [arm64]
os: [linux]
libc: [musl]
'@unrs/resolver-binding-linux-ppc64-gnu@1.9.2':
resolution: {integrity: sha512-uKStFlOELBxBum2s1hODPtgJhY4NxYJE9pAeyBgNEzHgTqTiVBPjfTlPFJkfxyTjQEuxZbbJlJnMCrRgD7ubzw==}
cpu: [ppc64]
os: [linux]
libc: [glibc]
'@unrs/resolver-binding-linux-riscv64-gnu@1.9.2':
resolution: {integrity: sha512-LkbNnZlhINfY9gK30AHs26IIVEZ9PEl9qOScYdmY2o81imJYI4IMnJiW0vJVtXaDHvBvxeAgEy5CflwJFIl3tQ==}
cpu: [riscv64]
os: [linux]
libc: [glibc]
'@unrs/resolver-binding-linux-riscv64-musl@1.9.2':
resolution: {integrity: sha512-vI+e6FzLyZHSLFNomPi+nT+qUWN4YSj8pFtQZSFTtmgFoxqB6NyjxSjAxEC1m93qn6hUXhIsh8WMp+fGgxCoRg==}
cpu: [riscv64]
os: [linux]
libc: [musl]
'@unrs/resolver-binding-linux-s390x-gnu@1.9.2':
resolution: {integrity: sha512-sSO4AlAYhSM2RAzBsRpahcJB1msc6uYLAtP6pesPbZtptF8OU/CbCPhSRW6cnYOGuVmEmWVW5xVboAqCnWTeHQ==}
cpu: [s390x]
os: [linux]
libc: [glibc]
'@unrs/resolver-binding-linux-x64-gnu@1.9.2':
resolution: {integrity: sha512-jkSkwch0uPFva20Mdu8orbQjv2A3G88NExTN2oPTI1AJ+7mZfYW3cDCTyoH6OnctBKbBVeJCEqh0U02lTkqD5w==}
cpu: [x64]
os: [linux]
libc: [glibc]
'@unrs/resolver-binding-linux-x64-musl@1.9.2':
resolution: {integrity: sha512-Uk64NoiTpQbkpl+bXsbeyOPRpUoMdcUqa+hDC1KhMW7aN1lfW8PBlBH4mJ3n3Y47dYE8qi0XTxy1mBACruYBaw==}
cpu: [x64]
os: [linux]
libc: [musl]
'@unrs/resolver-binding-wasm32-wasi@1.9.2':
resolution: {integrity: sha512-EpBGwkcjDicjR/ybC0g8wO5adPNdVuMrNalVgYcWi+gYtC1XYNuxe3rufcO7dA76OHGeVabcO6cSkPJKVcbCXQ==}
@@ -3818,6 +3997,10 @@ packages:
resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
engines: {node: '>=8'}
detect-libc@2.1.2:
resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
engines: {node: '>=8'}
devlop@1.1.0:
resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
@@ -5302,6 +5485,27 @@ packages:
sass:
optional: true
next@15.5.7:
resolution: {integrity: sha512-+t2/0jIJ48kUpGKkdlhgkv+zPTEOoXyr60qXe68eB/pl3CMJaLeIGjzp5D6Oqt25hCBiBTt8wEeeAzfJvUKnPQ==}
engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
hasBin: true
peerDependencies:
'@opentelemetry/api': ^1.1.0
'@playwright/test': ^1.51.1
babel-plugin-react-compiler: '*'
react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
sass: ^1.3.0
peerDependenciesMeta:
'@opentelemetry/api':
optional: true
'@playwright/test':
optional: true
babel-plugin-react-compiler:
optional: true
sass:
optional: true
no-case@2.3.2:
resolution: {integrity: sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==}
@@ -6022,6 +6226,11 @@ packages:
engines: {node: '>=10'}
hasBin: true
semver@7.7.3:
resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
engines: {node: '>=10'}
hasBin: true
sentence-case@2.1.1:
resolution: {integrity: sha512-ENl7cYHaK/Ktwk5OTD+aDbQ3uC8IByu/6Bkg+HDv8Mm+XnBnppVNalcfJTNsp1ibstKh030/JKQQWglDvtKwEQ==}
@@ -6048,6 +6257,10 @@ packages:
resolution: {integrity: sha512-lszvBmB9QURERtyKT2bNmsgxXK0ShJrL/fvqlonCo7e6xBF8nT8xU6pW+PMIbLsz0RxQk3rgH9kd8UmvOzlMJg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
sharp@0.34.5:
resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
shebang-command@2.0.0:
resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
engines: {node: '>=8'}
@@ -7003,6 +7216,11 @@ snapshots:
tslib: 2.8.1
optional: true
'@emnapi/runtime@1.7.1':
dependencies:
tslib: 2.8.1
optional: true
'@emnapi/wasi-threads@1.0.2':
dependencies:
tslib: 2.8.1
@@ -7320,87 +7538,184 @@ snapshots:
'@iconify/types@2.0.0': {}
'@img/colour@1.0.0':
optional: true
'@img/sharp-darwin-arm64@0.34.2':
optionalDependencies:
'@img/sharp-libvips-darwin-arm64': 1.1.0
optional: true
'@img/sharp-darwin-arm64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-darwin-arm64': 1.2.4
optional: true
'@img/sharp-darwin-x64@0.34.2':
optionalDependencies:
'@img/sharp-libvips-darwin-x64': 1.1.0
optional: true
'@img/sharp-darwin-x64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-darwin-x64': 1.2.4
optional: true
'@img/sharp-libvips-darwin-arm64@1.1.0':
optional: true
'@img/sharp-libvips-darwin-arm64@1.2.4':
optional: true
'@img/sharp-libvips-darwin-x64@1.1.0':
optional: true
'@img/sharp-libvips-darwin-x64@1.2.4':
optional: true
'@img/sharp-libvips-linux-arm64@1.1.0':
optional: true
'@img/sharp-libvips-linux-arm64@1.2.4':
optional: true
'@img/sharp-libvips-linux-arm@1.1.0':
optional: true
'@img/sharp-libvips-linux-arm@1.2.4':
optional: true
'@img/sharp-libvips-linux-ppc64@1.1.0':
optional: true
'@img/sharp-libvips-linux-ppc64@1.2.4':
optional: true
'@img/sharp-libvips-linux-riscv64@1.2.4':
optional: true
'@img/sharp-libvips-linux-s390x@1.1.0':
optional: true
'@img/sharp-libvips-linux-s390x@1.2.4':
optional: true
'@img/sharp-libvips-linux-x64@1.1.0':
optional: true
'@img/sharp-libvips-linux-x64@1.2.4':
optional: true
'@img/sharp-libvips-linuxmusl-arm64@1.1.0':
optional: true
'@img/sharp-libvips-linuxmusl-arm64@1.2.4':
optional: true
'@img/sharp-libvips-linuxmusl-x64@1.1.0':
optional: true
'@img/sharp-libvips-linuxmusl-x64@1.2.4':
optional: true
'@img/sharp-linux-arm64@0.34.2':
optionalDependencies:
'@img/sharp-libvips-linux-arm64': 1.1.0
optional: true
'@img/sharp-linux-arm64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linux-arm64': 1.2.4
optional: true
'@img/sharp-linux-arm@0.34.2':
optionalDependencies:
'@img/sharp-libvips-linux-arm': 1.1.0
optional: true
'@img/sharp-linux-arm@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linux-arm': 1.2.4
optional: true
'@img/sharp-linux-ppc64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linux-ppc64': 1.2.4
optional: true
'@img/sharp-linux-riscv64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linux-riscv64': 1.2.4
optional: true
'@img/sharp-linux-s390x@0.34.2':
optionalDependencies:
'@img/sharp-libvips-linux-s390x': 1.1.0
optional: true
'@img/sharp-linux-s390x@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linux-s390x': 1.2.4
optional: true
'@img/sharp-linux-x64@0.34.2':
optionalDependencies:
'@img/sharp-libvips-linux-x64': 1.1.0
optional: true
'@img/sharp-linux-x64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linux-x64': 1.2.4
optional: true
'@img/sharp-linuxmusl-arm64@0.34.2':
optionalDependencies:
'@img/sharp-libvips-linuxmusl-arm64': 1.1.0
optional: true
'@img/sharp-linuxmusl-arm64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linuxmusl-arm64': 1.2.4
optional: true
'@img/sharp-linuxmusl-x64@0.34.2':
optionalDependencies:
'@img/sharp-libvips-linuxmusl-x64': 1.1.0
optional: true
'@img/sharp-linuxmusl-x64@0.34.5':
optionalDependencies:
'@img/sharp-libvips-linuxmusl-x64': 1.2.4
optional: true
'@img/sharp-wasm32@0.34.2':
dependencies:
'@emnapi/runtime': 1.4.3
optional: true
'@img/sharp-wasm32@0.34.5':
dependencies:
'@emnapi/runtime': 1.7.1
optional: true
'@img/sharp-win32-arm64@0.34.2':
optional: true
'@img/sharp-win32-arm64@0.34.5':
optional: true
'@img/sharp-win32-ia32@0.34.2':
optional: true
'@img/sharp-win32-ia32@0.34.5':
optional: true
'@img/sharp-win32-x64@0.34.2':
optional: true
'@img/sharp-win32-x64@0.34.5':
optional: true
'@internationalized/date@3.6.0':
dependencies:
'@swc/helpers': 0.5.15
@@ -7475,6 +7790,8 @@ snapshots:
'@next/env@15.3.4': {}
'@next/env@15.5.7': {}
'@next/eslint-plugin-next@15.0.3':
dependencies:
fast-glob: 3.3.1
@@ -7486,27 +7803,51 @@ snapshots:
'@next/swc-darwin-arm64@15.3.4':
optional: true
'@next/swc-darwin-arm64@15.5.7':
optional: true
'@next/swc-darwin-x64@15.3.4':
optional: true
'@next/swc-darwin-x64@15.5.7':
optional: true
'@next/swc-linux-arm64-gnu@15.3.4':
optional: true
'@next/swc-linux-arm64-gnu@15.5.7':
optional: true
'@next/swc-linux-arm64-musl@15.3.4':
optional: true
'@next/swc-linux-arm64-musl@15.5.7':
optional: true
'@next/swc-linux-x64-gnu@15.3.4':
optional: true
'@next/swc-linux-x64-gnu@15.5.7':
optional: true
'@next/swc-linux-x64-musl@15.3.4':
optional: true
'@next/swc-linux-x64-musl@15.5.7':
optional: true
'@next/swc-win32-arm64-msvc@15.3.4':
optional: true
'@next/swc-win32-arm64-msvc@15.5.7':
optional: true
'@next/swc-win32-x64-msvc@15.3.4':
optional: true
'@next/swc-win32-x64-msvc@15.5.7':
optional: true
'@nextui-org/accordion@2.2.7(@nextui-org/system@2.4.6(@nextui-org/theme@2.4.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.10.18(@swc/helpers@0.5.15))(@types/node@20.19.1)(typescript@5.7.3))))(framer-motion@11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@nextui-org/theme@2.4.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.10.18(@swc/helpers@0.5.15))(@types/node@20.19.1)(typescript@5.7.3))))(framer-motion@11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
dependencies:
'@nextui-org/aria-utils': 2.2.7(@nextui-org/theme@2.4.5(tailwindcss@3.4.17(ts-node@10.9.2(@swc/core@1.10.18(@swc/helpers@0.5.15))(@types/node@20.19.1)(typescript@5.7.3))))(framer-motion@11.18.2(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -11917,6 +12258,9 @@ snapshots:
detect-libc@2.0.4:
optional: true
detect-libc@2.1.2:
optional: true
devlop@1.1.0:
dependencies:
dequal: 2.0.3
@@ -13998,6 +14342,29 @@ snapshots:
- '@babel/core'
- babel-plugin-macros
next@15.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
dependencies:
'@next/env': 15.5.7
'@swc/helpers': 0.5.15
caniuse-lite: 1.0.30001724
postcss: 8.4.31
react: 18.3.1
react-dom: 18.3.1(react@18.3.1)
styled-jsx: 5.1.6(react@18.3.1)
optionalDependencies:
'@next/swc-darwin-arm64': 15.5.7
'@next/swc-darwin-x64': 15.5.7
'@next/swc-linux-arm64-gnu': 15.5.7
'@next/swc-linux-arm64-musl': 15.5.7
'@next/swc-linux-x64-gnu': 15.5.7
'@next/swc-linux-x64-musl': 15.5.7
'@next/swc-win32-arm64-msvc': 15.5.7
'@next/swc-win32-x64-msvc': 15.5.7
sharp: 0.34.5
transitivePeerDependencies:
- '@babel/core'
- babel-plugin-macros
no-case@2.3.2:
dependencies:
lower-case: 1.1.4
@@ -14953,6 +15320,9 @@ snapshots:
semver@7.7.2: {}
semver@7.7.3:
optional: true
sentence-case@2.1.1:
dependencies:
no-case: 2.3.2
@@ -15013,6 +15383,38 @@ snapshots:
'@img/sharp-win32-x64': 0.34.2
optional: true
sharp@0.34.5:
dependencies:
'@img/colour': 1.0.0
detect-libc: 2.1.2
semver: 7.7.3
optionalDependencies:
'@img/sharp-darwin-arm64': 0.34.5
'@img/sharp-darwin-x64': 0.34.5
'@img/sharp-libvips-darwin-arm64': 1.2.4
'@img/sharp-libvips-darwin-x64': 1.2.4
'@img/sharp-libvips-linux-arm': 1.2.4
'@img/sharp-libvips-linux-arm64': 1.2.4
'@img/sharp-libvips-linux-ppc64': 1.2.4
'@img/sharp-libvips-linux-riscv64': 1.2.4
'@img/sharp-libvips-linux-s390x': 1.2.4
'@img/sharp-libvips-linux-x64': 1.2.4
'@img/sharp-libvips-linuxmusl-arm64': 1.2.4
'@img/sharp-libvips-linuxmusl-x64': 1.2.4
'@img/sharp-linux-arm': 0.34.5
'@img/sharp-linux-arm64': 0.34.5
'@img/sharp-linux-ppc64': 0.34.5
'@img/sharp-linux-riscv64': 0.34.5
'@img/sharp-linux-s390x': 0.34.5
'@img/sharp-linux-x64': 0.34.5
'@img/sharp-linuxmusl-arm64': 0.34.5
'@img/sharp-linuxmusl-x64': 0.34.5
'@img/sharp-wasm32': 0.34.5
'@img/sharp-win32-arm64': 0.34.5
'@img/sharp-win32-ia32': 0.34.5
'@img/sharp-win32-x64': 0.34.5
optional: true
shebang-command@2.0.0:
dependencies:
shebang-regex: 3.0.0
+8 -4
View File
@@ -380,7 +380,6 @@
"Enter your password": "Enter your password",
"Confirm your password": "Confirm your password",
"Passwords do not match": "Passwords do not match",
"Password must be at least 8 characters": "Password must be at least 8 characters",
"Registration successful": "Registration successful",
"Registration failed": "Registration failed",
"Email already exists": "Email already exists",
@@ -509,7 +508,7 @@
"API Key Header Name": "API Key Header Name",
"Secret Key format is incorrect, should start with sk_": "Secret Key format is incorrect, should start with sk_",
"Webhook Secret format is incorrect, should start with whsec_": "Webhook Secret format is incorrect, should start with whsec_",
"Password must be at least 8 characters long": "Password must be at least 8 characters long",
"Password must be at least 6 characters long": "Password must be at least 6 characters long",
"OAuth 2.0 Client Secret (optional, for server-side verification)": "OAuth 2.0 Client Secret (optional, for server-side verification)",
"Authorized redirect URI configured in Google Cloud Console": "Authorized redirect URI configured in Google Cloud Console",
"Webhook signing secret for verifying Stripe events": "Webhook signing secret for verifying Stripe events",
@@ -774,7 +773,7 @@
"Re-enter new password": "Re-enter new password",
"Confirm new password": "Confirm new password",
"New password and confirm password do not match": "New password and confirm password do not match",
"New password must be at least 8 characters long": "New password must be at least 8 characters long",
"New password must be at least 6 characters long": "New password must be at least 6 characters long",
"New password and confirm password must be the same": "New password and confirm password must be the same",
"New Password": "New Password",
"Confirm New Password": "Confirm New Password",
@@ -877,5 +876,10 @@
"Email is required": "Email is required",
"No servers available": "No servers available",
"(Deleted)": "(Deleted)",
"Transport Type": "Transport Type"
"Transport Type": "Transport Type",
"Server ID must be less than 256 characters": "Server ID must be less than 256 characters",
"Server Name must be less than 256 characters": "Server Name must be less than 256 characters",
"API Endpoint must be a valid HTTP/HTTPS URL": "API Endpoint must be a valid HTTP/HTTPS URL",
"Server ID is required": "Server ID is required",
"Short description is required": "Short description is required"
}
@@ -381,7 +381,6 @@
"Enter your password": "请输入密码",
"Confirm your password": "请确认密码",
"Passwords do not match": "密码不匹配",
"Password must be at least 8 characters": "密码至少需要8个字符",
"Registration successful": "注册成功",
"Registration failed": "注册失败",
"Email already exists": "邮箱已存在",
@@ -510,7 +509,7 @@
"API Key Header Name": "API密钥头部名称",
"Secret Key format is incorrect, should start with sk_": "密钥格式不正确,应以sk_开头",
"Webhook Secret format is incorrect, should start with whsec_": "Webhook密钥格式不正确,应以whsec_开头",
"Password must be at least 8 characters long": "密码至少需要8个字符",
"Password must be at least 6 characters long": "密码至少需要6个字符",
"OAuth 2.0 Client Secret (optional, for server-side verification)": "OAuth 2.0 客户端密钥(可选,用于服务端验证)",
"Authorized redirect URI configured in Google Cloud Console": "在Google Cloud Console中配置的授权重定向URI",
"Webhook signing secret for verifying Stripe events": "用于验证Stripe事件的Webhook签名密钥",
@@ -776,7 +775,7 @@
"Re-enter new password": "重新输入新密码",
"Confirm new password": "确认新密码",
"New password and confirm password do not match": "新密码和确认密码不匹配",
"New password must be at least 8 characters long": "新密码至少需要8个字符",
"New password must be at least 6 characters long": "新密码至少需要6个字符",
"New password and confirm password must be the same": "新密码和确认密码必须相同",
"New Password": "新密码",
"Confirm New Password": "确认新密码",
@@ -879,5 +878,10 @@
"Email is required": "邮箱为必填项",
"No servers available": "没有可用服务",
"(Deleted)": "(已删除)",
"Transport Type": "传输方式"
"Transport Type": "传输方式",
"Server ID must be less than 256 characters": "Server ID 必须少于256个字符",
"Server Name must be less than 256 characters": "Server Name 必须少于256个字符",
"API Endpoint must be a valid HTTP/HTTPS URL": "API Endpoint 必须是一个有效的HTTP/HTTPS URL",
"Server ID is required": "Server ID 为必填项",
"Short description is required": "简短描述为必填项"
}
@@ -48,8 +48,8 @@ export const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
return;
}
if (newPassword.length < 8) {
toast.error(t("Password must be at least 8 characters long"));
if (newPassword.length < 6) {
toast.error(t("Password must be at least 6 characters long"));
return;
}
@@ -73,7 +73,7 @@ export const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
newPassword.trim() !== "" &&
confirmPassword.trim() !== "" &&
newPassword === confirmPassword &&
newPassword.length >= 8;
newPassword.length >= 6;
return (
<Modal isOpen={isOpen} onClose={handleClose} size="md">
@@ -90,7 +90,7 @@ export const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
type={showNewPassword ? "text" : "password"}
value={newPassword}
onChange={(e) => setNewPassword(e.target.value)}
description={t("Password must be at least 8 characters long")}
description={t("Password must be at least 6 characters long")}
endContent={
<button
type="button"
@@ -14,12 +14,12 @@ const formSchema = z.object({
.string()
.min(1, "Password is required")
.max(100, "Password is too long")
.min(8, "Password must be at least 8 characters"),
.min(6, "Password must be at least 6 characters"),
confirmPassword: z
.string()
.min(1, "Confirm password is required")
.max(100, "Confirm password is too long")
.min(8, "Confirm password must be at least 8 characters"),
.min(6, "Confirm password must be at least 6 characters"),
});
type FormData = z.infer<typeof formSchema>;
@@ -61,7 +61,7 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({ onSave }) => {
{...field}
label={t("Administrator Password")}
placeholder={t("Enter administrator password")}
description={t("Password must be at least 8 characters long")}
description={t("Password must be at least 6 characters long")}
isInvalid={!!errors.password}
errorMessage={errors.password?.message}
type={showPassword ? "text" : "password"}
@@ -34,6 +34,45 @@ const _DefaultFormData: MCPServiceFormData = {
apis: [],
};
// Helper function to validate URL
const isValidUrl = (url: string) => {
if (!url) return false;
try {
const parsed = new URL(url);
return parsed.protocol === "http:" || parsed.protocol === "https:";
} catch {
return false;
}
};
const validateServiceForm = (data: MCPServiceFormData, t: any) => {
const errors: Record<string, string> = {};
if (!data.slug_name?.trim()) {
errors.slug_name = t("Server ID is required");
} else if (data.slug_name.length > 256) {
errors.slug_name = t("Server ID must be less than 256 characters");
}
if (!data.name?.trim()) {
errors.name = t("Server name is required");
} else if (data.name.length > 256) {
errors.name = t("Server Name must be less than 256 characters");
}
if (!data.base_url?.trim()) {
errors.base_url = t("API Endpoint is required");
} else if (!isValidUrl(data.base_url)) {
errors.base_url = t("API Endpoint must be a valid HTTP/HTTPS URL");
}
if (!data.short_description?.trim()) {
errors.short_description = t("Short description is required");
}
return errors;
};
interface ServiceEditPageProps {
serviceId?: string;
onSave: (data: MCPServiceFormData, isDraft?: boolean) => void;
@@ -193,24 +232,41 @@ const BaseServiceEditPage: React.FC<ServiceEditPageProps> = ({
}
};
// Helper function to validate price string
const isValidPrice = (priceStr: string | undefined): boolean => {
if (!priceStr || priceStr.trim() === "") {
return false;
}
const numValue = parseFloat(priceStr);
return !isNaN(numValue) && numValue >= 0;
};
const validationErrors = validateServiceForm(formData, t);
const isFormValid = () => {
const hasBasicInfo =
formData.name.trim() &&
formData.short_description?.trim() &&
formData.slug_name?.trim() &&
formData.base_url?.trim();
if (Object.keys(validationErrors).length > 0) {
return false;
}
// if free, no need to validate price
if (formData.charge_type === ChargeType.Free) {
return hasBasicInfo;
return true;
}
// if PerCall, validate price
if (formData.charge_type === ChargeType.PerCall) {
return isValidPrice(formData.price);
}
// if PerToken, validate both input and output token prices
if (formData.charge_type === ChargeType.PerToken) {
return (
isValidPrice(formData.input_token_price) &&
isValidPrice(formData.output_token_price)
);
}
// if paid, need to validate price
return (
hasBasicInfo &&
formData.price !== undefined &&
formData.price.trim() !== ""
);
return formData.price !== undefined && formData.price.trim() !== "";
};
return (
@@ -299,6 +355,7 @@ const BaseServiceEditPage: React.FC<ServiceEditPageProps> = ({
onInputChange={handleInputChange}
onAddTag={handleAddTag}
onRemoveTag={handleRemoveTag}
errors={validationErrors}
/>
</div>
<div className="w-[400px] max-w-[1/2]">
@@ -45,7 +45,7 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({
formData.username.trim() !== "" &&
formData.password?.trim() !== "" &&
formData.password === confirmPassword &&
formData.password?.length >= 8;
formData.password?.length >= 6;
const passwordsMatch = formData.password === confirmPassword;
@@ -86,7 +86,7 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({
<Input
label={t("Administrator Password")}
placeholder={t("Enter administrator password")}
description={t("Password must be at least 8 characters long")}
description={t("Password must be at least 6 characters long")}
value={formData.password}
onChange={(e) => handleInputChange("password", e.target.value)}
type={showPassword ? "text" : "password"}
@@ -106,13 +106,13 @@ export const AdminConfigForm: React.FC<AdminConfigFormProps> = ({
isRequired
autoComplete="new-password"
color={
formData.password?.length > 0 && formData.password?.length < 8
formData.password?.length > 0 && formData.password?.length < 6
? "danger"
: "default"
}
errorMessage={
formData.password?.length > 0 && formData.password?.length < 8
? t("Password must be at least 8 characters")
formData.password?.length > 0 && formData.password?.length < 6
? t("Password must be at least 6 characters")
: ""
}
/>
@@ -162,7 +162,7 @@ export const Home: React.FC<HomeProps> = ({
<CardBody className="p-4">
{/* Header */}
<div className="flex items-start justify-between mb-3">
<div className="flex items-center gap-2 w-full">
<div className="flex items-center gap-2 w-full overflow-hidden">
<div className="w-8 h-8 bg-slate-600 rounded-sm flex items-center justify-center">
<Star className="w-4 h-4 text-white" />
</div>
@@ -168,7 +168,7 @@ export const Home: React.FC<HomeProps> = ({
<CardBody className="p-4">
{/* Header */}
<div className="flex items-start justify-between mb-3">
<div className="flex items-center gap-2">
<div className="flex items-center gap-2 overflow-hidden">
<div className="w-8 h-8 bg-blue-100 rounded-lg flex items-center justify-center">
<Zap className="w-4 h-4 text-blue-600" />
</div>
@@ -13,6 +13,7 @@ interface BasicInfoTabProps {
onInputChange: (field: keyof MCPServiceFormData, value: any) => void;
onAddTag: () => void;
onRemoveTag: (tag: string) => void;
errors?: Record<string, string>;
}
export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
@@ -22,6 +23,7 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onInputChange,
onAddTag,
onRemoveTag,
errors,
}) => {
const { t } = useTranslation();
@@ -41,7 +43,9 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
)}
labelPlacement="outside"
isRequired
errorMessage={t("Server ID is required")}
maxLength={256}
isInvalid={!!errors?.slug_name}
errorMessage={errors?.slug_name || t("Server ID is required")}
/>
<Input
label={t("Server Name")}
@@ -50,7 +54,9 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onChange={(e) => onInputChange("name", e.target.value)}
isRequired
labelPlacement="outside"
errorMessage={t("Server name is required")}
maxLength={256}
isInvalid={!!errors?.name}
errorMessage={errors?.name || t("Server name is required")}
/>
<Input
label={t("Short Description")}
@@ -59,7 +65,10 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onChange={(e) => onInputChange("short_description", e.target.value)}
isRequired
labelPlacement="outside"
errorMessage={t("Short description is required")}
isInvalid={!!errors?.short_description}
errorMessage={
errors?.short_description || t("Short description is required")
}
/>
<Input
@@ -69,7 +78,8 @@ export const BasicInfoTab: React.FC<BasicInfoTabProps> = ({
onChange={(e) => onInputChange("base_url", e.target.value)}
isRequired
labelPlacement="outside"
errorMessage={t("API Endpoint is required")}
isInvalid={!!errors?.base_url}
errorMessage={errors?.base_url || t("API Endpoint is required")}
/>
{/* headers input fields */}
<HeadersManagementSettings
@@ -85,6 +85,7 @@ export const PricingTab: React.FC<PricingTabProps> = ({
</span>
}
labelPlacement="outside"
required
/>
<Input
type="number"
@@ -102,6 +103,7 @@ export const PricingTab: React.FC<PricingTabProps> = ({
</span>
}
labelPlacement="outside"
required
/>
</div>
) : (
@@ -118,6 +120,7 @@ export const PricingTab: React.FC<PricingTabProps> = ({
</span>
}
labelPlacement="outside"
required
/>
)}
</>
+2 -1
View File
@@ -15,4 +15,5 @@ google-auth>=2.0.0
google-auth-oauthlib>=1.0.0
fastapi_mcp
alipay-sdk-python>=3.0.0
wechatpayv3[async]
wechatpayv3[async]
cryptography>=41.0.0
+9 -3
View File
@@ -6,12 +6,12 @@ MYSQL_PASSWORD=mysql_ZTdhRB
MYSQL_DB=xpack
# 服务端口配置
API_PORT=8000
API_PORT=8002
ADMIN_PORT=8001
# 调试配置
DEBUG=false
LOG_LEVEL=INFO
LOG_LEVEL=DEBUG
# Redis 配置
REDIS_HOST=xpack-redis
@@ -24,4 +24,10 @@ RABBITMQ_HOST=xpack-rabbitmq
RABBITMQ_PORT=5672
RABBITMQ_USER=rabbitmq
RABBITMQ_PASSWORD=rabbitmq_Gs123dA
RABBITMQ_VHOST=/
RABBITMQ_VHOST=/
# Payment config encryption key (Base64-encoded 32-byte random value for AES-GCM)
# Quick generation: python -c "import os,base64; print(base64.b64encode(os.urandom(32)).decode())"
PAYMENT_CONFIG_SECRET_KEY=uyyhfMJ+xpEE+IC5mPigpscekkR2ucz6Sj7sHYLhJQA=
# Optional: key ID used to support key rotation identification
PAYMENT_CONFIG_KEY_ID=default
@@ -0,0 +1,81 @@
"""
One-time migration: encrypt plaintext payment channel configs at rest.
Usage:
python scripts/resource/migrate_encrypt_payment_configs.py [--dry-run] [--limit N] [--ids alipay,wechat,stripe]
Requirements:
- Environment variable PAYMENT_CONFIG_SECRET_KEY must be set to a base64-encoded 32-byte key.
- cryptography library installed.
"""
import argparse
import sys
from typing import List
from datetime import datetime, timezone
from services.common.database import SessionLocal
from services.common.models.payment_channel import PaymentChannel
from services.common.utils.secure_config import is_encrypted, decrypt_config, encrypt_config
def migrate_configs(dry_run: bool = False, limit: int = 0, only_ids: List[str] | None = None) -> int:
db = SessionLocal()
migrated = 0
try:
query = db.query(PaymentChannel)
if only_ids:
query = query.filter(PaymentChannel.id.in_(only_ids))
rows = query.all()
if limit and len(rows) > limit:
rows = rows[:limit]
for row in rows:
raw = row.config
if not raw:
continue
if is_encrypted(raw):
# already encrypted
continue
cfg = decrypt_config(raw)
if cfg is None:
# cannot parse plaintext json; skip but report
print(f"[WARN] Skip {row.id}: config not JSON or decrypt failed")
continue
try:
enc = encrypt_config(cfg)
except Exception as e:
print(f"[ERROR] Encrypt {row.id} failed: {e}")
continue
if dry_run:
print(f"[DRY-RUN] Would encrypt {row.id}")
else:
row.config = enc
row.updated_at = datetime.now(timezone.utc)
db.add(row)
migrated += 1
if not dry_run and migrated:
db.commit()
print(f"Done. Migrated {migrated} rows. Dry-run={dry_run}")
return migrated
finally:
db.close()
def main():
parser = argparse.ArgumentParser(description="Encrypt legacy payment channel configs")
parser.add_argument("--dry-run", action="store_true", help="Do not write changes, only report")
parser.add_argument("--limit", type=int, default=0, help="Limit number of rows to process")
parser.add_argument("--ids", type=str, default="", help="Comma-separated channel ids to process")
args = parser.parse_args()
only_ids = [x.strip() for x in args.ids.split(",") if x.strip()] if args.ids else None
try:
migrate_configs(dry_run=args.dry_run, limit=args.limit, only_ids=only_ids)
except Exception as e:
print(f"Migration failed: {e}")
sys.exit(1)
if __name__ == "__main__":
main()
+2 -2
View File
@@ -34,11 +34,11 @@ fi
# 初始化数据库
python ./init_db.py
nohup uvicorn services.admin_service.main:app --host 0.0.0.0 --port 8001 --reload > ${LOG_DIR}/admin_service.log 2>&1 &
nohup uvicorn services.admin_service.main:app --host 0.0.0.0 --port 8001 --reload --timeout-graceful-shutdown 2 --timeout-keep-alive 1 > ${LOG_DIR}/admin_service.log 2>&1 &
sleep 5s
nohup uvicorn services.api_service.main:app --host 0.0.0.0 --port 8002 --reload > ${LOG_DIR}/api_service.log 2>&1 &
nohup uvicorn services.api_service.main:app --host 0.0.0.0 --port 8002 --reload --timeout-graceful-shutdown 2 --timeout-keep-alive 1 > ${LOG_DIR}/api_service.log 2>&1 &
HOSTNAME=""
cd frontend/ && nohup node server.js> ${LOG_DIR}//frontend.log 2>&1 &
+2 -2
View File
@@ -1,11 +1,11 @@
{
"version": "v1.1",
"releaseDate": "2025-10-17",
"releaseDate": "2025-12-07",
"description": "This is the latest release of the application.",
"downloads": {
"program": {
"xpack_mcp_market": {
"version": "v1.1.0",
"version": "v1.1.5",
"docker": "xpackai/xpack-mcp-market",
"tar": "xpack-mcp-market.tar.gz",
"url": "https://public.eolinker.com/xpack/images/xpack-mcp-market.${VERSION}.${ARCH}.tar.gz"
@@ -5,12 +5,14 @@ import OpenAPI definitions, and query service info and lists.
"""
import uuid
import logging
from annotated_types import Not
from fastapi import APIRouter, Depends, Request, Body, UploadFile, File, HTTPException, Form
from pydantic import BaseModel, HttpUrl
from typing import Optional
from sqlalchemy.orm import Session
from services.common.database import get_db
from services.common.utils.response_utils import ResponseUtils
from services.common.utils.validation_utils import ValidationUtils
from services.admin_service.services.openapi_manager import openapi_manager
from services.admin_service.services.mcp_manager_service import McpManagerService, parse_tags_to_array
from services.common.utils.cache_utils import CacheUtils
@@ -58,6 +60,26 @@ def update_mcp_service_info(request: Request, body: dict = Body(...), mcp_manage
# Validate ID is required
if not body.get("id"):
return ResponseUtils.error(error_msg=error_msg.MISSING_PARAMETER)
# Validate price is a positive number if charge_type is per_token
if body.get("charge_type") == ChargeType.PER_CALL:
price = body.get("price")
if price is None or price < 0:
return ResponseUtils.error(error_msg=error_msg.INVALID_PRICE)
if body.get("charge_type") == ChargeType.PER_TOKEN:
input_token = body.get("input_token")
output_token = body.get("output_token")
if input_token is None or input_token < 0:
return ResponseUtils.error(error_msg=error_msg.INVALID_INPUT_TOKEN)
if output_token is None or output_token < 0:
return ResponseUtils.error(error_msg=error_msg.INVALID_OUTPUT_TOKEN)
base_url = body.get("base_url")
if base_url is not None:
try:
ValidationUtils.validate_url(base_url, "url")
except Exception:
return ResponseUtils.error(error_msg=error_msg.INVALID_URL)
try:
mcp_manager_service.update(body)
@@ -106,7 +128,8 @@ async def openapi_parse(
return ResponseUtils.success(data=result)
except HTTPException as e:
return ResponseUtils.error(message=f"Request failed: {e.detail}", code=e.status_code)
logger.error(f"Request failed: {e.detail}")
return ResponseUtils.error(message=f"Request failed, please contact the administrator.", code=e.status_code)
except Exception as e:
return ResponseUtils.error(error_msg=error_msg.INTERNAL_ERROR)
@@ -147,7 +170,8 @@ async def openapi_parse_update(
except ValueError as e:
return ResponseUtils.error(message=str(e))
except HTTPException as e:
return ResponseUtils.error(message=f"Request failed: {e.detail}", code=e.status_code)
logger.error(f"Request failed: {e.detail}")
return ResponseUtils.error(message=f"Request failed, please contact the administrator.", code=e.status_code)
except Exception as e:
logger.error(f"Failed to update service from OpenAPI: {str(e)}")
return ResponseUtils.error(error_msg=error_msg.INTERNAL_ERROR)
@@ -1,10 +1,11 @@
from fastapi import APIRouter, Depends, Query, Body
from pydantic import config
from sqlalchemy.orm import Session
from services.common.database import get_db
from services.common.utils.response_utils import ResponseUtils
from services.admin_service.services.payment_channel_service import PaymentChannelService
from services.common.utils.secure_config import decrypt_config, encrypt_config
from services.admin_service.tasks.order_monitor_task import OrderMonitorTask
import json
router = APIRouter()
@@ -27,10 +28,9 @@ async def payment_channel_list(
result = []
for item in list:
enable = item.status == 1
try:
cfg = json.loads(item.config)
except:
cfg = {}
cfg = {}
if item.config:
cfg = decrypt_config(item.config) or {}
result.append(
{
"id": item.id,
@@ -56,14 +56,16 @@ async def payment_channel_enable(
if data:
if id == "alipay":
from services.admin_service.tasks.alipay_order_monitor_task import AlipayOrderMonitorTask
alipay_monitor_task = AlipayOrderMonitorTask.get_instance()
alipay_monitor_task.start_monitor()
monitor = OrderMonitorTask.get_instance()
# Ensure monitor is running and enable Alipay client
monitor.start_monitor()
monitor.enable_client("alipay")
cfg = decrypt_config(data.config) if data.config else {}
return ResponseUtils.success(
{
"id": id,
"name": data.name,
"config": data.config,
"config": cfg or {},
"is_enabled": data.status == 1,
"updated_time": data.updated_at,
}
@@ -83,14 +85,15 @@ async def payment_channel_disable(
data = payment_channel_service.update_status(id, 0)
if data:
if id == "alipay":
from services.admin_service.tasks.alipay_order_monitor_task import AlipayOrderMonitorTask
alipay_monitor_task = AlipayOrderMonitorTask.get_instance()
alipay_monitor_task.stop_monitor()
monitor = OrderMonitorTask.get_instance()
# Disable Alipay client without stopping global monitor
monitor.disable_client("alipay")
cfg = decrypt_config(data.config) if data.config else {}
return ResponseUtils.success(
{
"id": id,
"name": data.name,
"config": data.config,
"config": cfg or {},
"is_enabled": data.status == 1,
"updated_time": data.updated_at,
}
@@ -109,8 +112,12 @@ async def payment_channel_config(
return ResponseUtils.error("Payment channel id cannot be empty")
config = body.get("config")
if config:
configStr = json.dumps(config)
data = payment_channel_service.update_config(id=id, config=configStr)
# Encrypt config before persisting to DB
try:
encrypted = encrypt_config(config)
except Exception as e:
return ResponseUtils.error(f"Failed to encrypt config: {str(e)}")
data = payment_channel_service.update_config(id=id, config=encrypted)
if data:
# Convert str to object
return ResponseUtils.success(
+11 -10
View File
@@ -31,27 +31,28 @@ async def upload(
filename = img.filename
if not filename:
return ResponseUtils.error(message="No filename provided", code=400)
# sanitize filename to prevent path traversal
filename = os.path.basename(filename)
# enforce content type and size limits
allowed_types = {"image/jpeg", "image/png", "image/webp", "image/gif", "image/svg+xml"}
if img.content_type not in allowed_types:
return ResponseUtils.error(message="Unsupported file type", code=400)
# 2. Calculate SHA256 of uploaded content
contents = await img.read()
max_size = 5 * 1024 * 1024
if len(contents) > max_size:
return ResponseUtils.error(message="File too large (max 5MB)", code=413)
file_hash = hashlib.sha256(contents).hexdigest()
# Reset file pointer for subsequent save
await img.seek(0)
# Verify provided SHA256 matches computed hash
if sha256 and file_hash != sha256:
return ResponseUtils.error(message="File SHA256 checksum mismatch", code=400)
# 3. Create directory based on current date
today = datetime.now()
date_dir = today.strftime("%Y%m%d")
# Create upload directory
upload_dir = os.path.join("uploads","images")
upload_dir = os.path.join(upload_dir, date_dir)
upload_dir = os.path.join("uploads","images", date_dir)
os.makedirs(upload_dir, exist_ok=True)
# Save file
file_path = os.path.join(upload_dir, filename)
with open(file_path, "wb") as f:
@@ -42,6 +42,7 @@ class UserWalletHistoryRepository:
amount=amount,
balance_after=0.00,
type=TransactionType.DEPOSIT,
transaction_id=transaction_id,
status=status,
created_at=now,
updated_at=now,
@@ -201,7 +202,7 @@ class UserWalletHistoryRepository:
return False
# Update wallet balance and order status
wallet.balance = float(wallet.balance) + float(obj.amount)
# wallet.balance = float(wallet.balance) + float(obj.amount)
obj.status = 1 # 1=completed
obj.balance_after = float(wallet.balance)
obj.transaction_id = transaction_id
+37 -15
View File
@@ -33,21 +33,36 @@ class AuthService:
def send_email_login_captcha(self, email: str) -> bool:
"""
Sends a login captcha code to the specified email address.
The function generates a random 6-digit captcha code, stores it in Redis cache for 10 minutes,
and sends the code to the user's email using HTML template.
Args:
email (str): The recipient's email address.
Returns:
bool: True if email was sent successfully, otherwise False.
Sends a login captcha code to the specified email address with simple rate limiting.
Limit: 5 sends per 10 minutes per email.
"""
# Rate limit
try:
from services.common.redis import redis_client
rate_key = f"email_login_rate:{email}"
current = redis_client.get(rate_key)
if current is None:
redis_client.set(rate_key, "1", ex=600)
count = 1
else:
try:
count = int(current) + 1
except Exception:
count = 1
ttl = redis_client.ttl(rate_key)
ttl = int(ttl) if isinstance(ttl, (int, str)) else 600
if ttl < 1:
ttl = 600
redis_client.set(rate_key, str(count), ex=ttl)
if count > 5:
logger.warning(f"Email send rate limited for: {email}")
return False
except Exception:
pass
# Generate random 6-digit verification code
captcha = str(random.randint(100000, 999999))
# Cache to redis
CacheUtils.set_cache(RedisKeys.email_login_captcha(email), captcha, 10 * 60)
# Send verification code using HTML email template
return EmailUtils.send_register_code_email(self.db, email, captcha)
def email_login_by_captcha(self, email: str, captcha: str) -> Optional[str]:
@@ -119,10 +134,17 @@ class AuthService:
def account_login(self, account: str, password: str) -> Optional[str]:
user = self.user_repository.get_by_account(account)
if user and user.password == password:
token = self.create_user_token(user.id)
if token:
return token
if user is None:
logger.warning(f"not found user, account: {account}")
return None
if user.password != password:
logger.warning(f"password not match, account: {account}, password: {password}, user password: {user.password}")
return None
token = self.create_user_token(user.id)
if token:
return token
logger.warning(f"Failed to create user token for user_id: {user.id}")
return None
def logout(self, token: str) -> bool:
@@ -2,7 +2,6 @@ import logging
import uuid
import json
import re
from datetime import datetime, timezone
from sqlalchemy.orm import Session
from typing import Optional, Tuple, List
from services.admin_service.repositories.mcp_service_repository import McpServiceRepository
@@ -143,10 +142,7 @@ class McpManagerService:
existing_service.short_description = temp_service.short_description
existing_service.long_description = temp_service.long_description
existing_service.headers = temp_service.headers
# existing_service.auth_method = AuthMethod(temp_service.auth_method.value)
existing_service.base_url = temp_service.base_url
# existing_service.auth_header = temp_service.auth_header
# existing_service.auth_token = temp_service.auth_token
existing_service.charge_type = ChargeType(temp_service.charge_type.value)
existing_service.price = temp_service.price
existing_service.input_token_price = temp_service.input_token_price
@@ -172,8 +168,8 @@ class McpManagerService:
new_api.response_examples = temp_api.response_examples
new_api.response_headers = temp_api.response_headers
new_api.operation_examples = temp_api.operation_examples
new_api.enabled = temp_api.enabled
new_api.is_deleted = temp_api.is_deleted
new_api.enabled = True
# new_api.is_deleted = temp_api.is_deleted
# Save new API record
self.mcp_tool_api_repository.create(new_api)
@@ -239,7 +235,8 @@ class McpManagerService:
else:
# If provided as string, store directly
existing_service.tags = body["tags"]
if not existing_service.service_type:
existing_service.service_type = "openapi"
# Commit changes
self.db.commit()
self.db.refresh(existing_service)
@@ -369,6 +366,7 @@ class McpManagerService:
mcp_service.charge_type = ChargeType.FREE # Default to free
mcp_service.price = 0.0
mcp_service.enabled = 0 # Default disabled, requires manual activation by user
mcp_service.service_type = "openapi"
# Save service
self.mcp_service_repository.create(mcp_service)
@@ -433,15 +431,13 @@ class McpManagerService:
temp_service.slug_name = existing_service.slug_name # Keep original slug_name
temp_service.short_description = openapi_data.description or existing_service.short_description
temp_service.long_description = openapi_data.description or existing_service.long_description
# temp_service.auth_method = TempAuthMethod(existing_service.auth_method.value) # Keep original auth method
temp_service.base_url = existing_service.base_url # Keep original base_url
# temp_service.auth_header = existing_service.auth_header
# temp_service.auth_token = existing_service.auth_token
temp_service.headers = existing_service.headers # Keep original headers
temp_service.charge_type = TempChargeType(existing_service.charge_type.value) # Keep original charge type
temp_service.price = existing_service.price # Keep original price
temp_service.enabled = existing_service.enabled # Keep original enabled status
temp_service.tags = existing_service.tags # Keep original tags
# temp_service.service_type = existing_service.service_type # Keep original service type
# Save temporary service record
self.temp_mcp_service_repository.create(temp_service)
@@ -488,18 +484,17 @@ class McpManagerService:
"headers": json.loads(temp_service.headers) if temp_service.headers else [],
"charge_type": temp_service.charge_type.value if temp_service.charge_type else None,
"price": str(float(temp_service.price)) if temp_service.price and temp_service.charge_type == ChargeType.PER_CALL else "0.00",
"input_token_price": str(float(temp_service.input_token_price)) if temp_service.input_token_price and temp_service.charge_type == ChargeType.PER_TOKEN else "0.00",
"input_token_price": str(float(temp_service.input_token_price)) if temp_service.input_token_price and temp_service.charge_type.value == ChargeType.PER_TOKEN else "0.00",
"output_token_price": str(float(temp_service.output_token_price)) if temp_service.output_token_price and temp_service.charge_type == ChargeType.PER_TOKEN else "0.00",
"enabled": temp_service.enabled,
"tags": parse_tags_to_array(temp_service.tags),
"apis": apis_list,
}
return result
except Exception as e:
logger.error(f"Failed to update service from OpenAPI: {str(e)}")
raise ValueError(f"Failed to update service from OpenAPI: {str(e)}")
raise ValueError(f"Failed to update service from OpenAPI.")
def get_public_services_paginated(self, keyword: str, page: int = 1, page_size: int = 10) -> Tuple[List[dict], int]:
"""Get public services list with pagination, returns formatted data with API info"""
@@ -6,6 +6,7 @@ from services.common.database import SessionLocal
from datetime import datetime
from services.admin_service.repositories.payment_channel_repository import PaymentChannelRepository
from services.common.models.payment_channel import PaymentChannel
from services.common.utils.secure_config import decrypt_config
logger = logging.getLogger(__name__)
@@ -35,13 +36,14 @@ class PaymentChannelService:
channel_config = self.payment_channel_repository.payment_channel_get(id)
if channel_config is None:
return None
# Support encrypted-at-rest config
config = {}
if channel_config.config is not None:
try:
config = json.loads(channel_config.config)
except json.JSONDecodeError as e:
logger.error(f"Failed to parse payment channel config JSON: {str(e)}")
if channel_config.config:
cfg = decrypt_config(channel_config.config)
if cfg is None:
logger.error("Failed to decrypt or parse payment channel config")
return None
config = cfg
config["enable"] = channel_config.status == 1
config["id"] = channel_config.id
return config
@@ -64,19 +66,17 @@ class PaymentChannelService:
logger.warning("Stripe payment channel config is empty")
return None
# Parse config JSON
try:
config = json.loads(stripe_channel.config)
# Validate required fields
if not config.get("secret") or not config.get("webhook_secret"):
logger.warning("Stripe config missing required fields: secret or webhook_secret")
return None
logger.info("Successfully retrieved Stripe config")
return config
except json.JSONDecodeError as e:
logger.error(f"Failed to parse Stripe config JSON: {str(e)}")
# Decrypt/parse config JSON
config = decrypt_config(stripe_channel.config)
if config is None:
logger.error("Failed to decrypt Stripe config")
return None
# Validate required fields
if not config.get("secret") or not config.get("webhook_secret"):
logger.warning("Stripe config missing required fields: secret or webhook_secret")
return None
logger.info("Successfully retrieved Stripe config")
return config
except Exception as e:
logger.error(f"Failed to get Stripe config: {str(e)}")
@@ -313,6 +313,7 @@ class PaymentService:
new_balance=new_balance,
expected_balance=current_wallet.balance
)
logger.info(f"Attempt {attempt + 1}: Balance update successful for user_id {user_id}, new balance: {new_balance},success:{success}")
if success:
self._delete_wallet_cache(user_id)
@@ -5,6 +5,8 @@ from services.common.models.user_apikey import UserApiKey
from services.common.database import SessionLocal
from datetime import datetime
from services.admin_service.repositories.user_apikey_repository import UserApiKeyRepository
from services.common.utils.cache_utils import CacheUtils
from services.common.redis_keys import RedisKeys
logger = logging.getLogger(__name__)
@@ -31,6 +33,10 @@ class UserApiKeyService:
if not user_apikey or user_apikey.user_id != user_id:
return None
self.user_apikey_repository.delete(id)
try:
CacheUtils.delete_cache(RedisKeys.user_apikey_key(user_apikey.apikey))
except Exception:
pass
return user_apikey
def get_by_user_id(self, user_id: str) -> List[UserApiKey]:
@@ -61,6 +61,7 @@ class UserStatsService:
UserApiKey.id == apikey_id,
func.date(McpCallLog.call_start_time) >= start_date,
func.date(McpCallLog.call_start_time) <= end_date,
McpCallLog.call_success == True,
)
)
.group_by(func.date(McpCallLog.call_start_time))
@@ -2,14 +2,6 @@ import os
import ssl
import urllib3
# Disable SSL certificate verification warnings
try:
_create_unverified_https_context = ssl._create_unverified_context
except AttributeError:
pass
else:
ssl._create_default_https_context = _create_unverified_https_context
from alipay.aop.api.AlipayClientConfig import AlipayClientConfig
from alipay.aop.api.DefaultAlipayClient import DefaultAlipayClient
from alipay.aop.api.domain.AlipayTradePagePayModel import AlipayTradePagePayModel
+200 -34
View File
@@ -9,6 +9,8 @@ from starlette.requests import Request
from starlette.responses import Response
import asyncio
import time
import hashlib
import re
from mcp.server.sse import SseServerTransport
from mcp.server.streamable_http import StreamableHTTPServerTransport
from mcp.server.lowlevel import Server
@@ -18,6 +20,7 @@ from services.api_service.repositories.user_apikey_repository import UserApiKeyR
from services.api_service.utils.connection_manager import connection_manager
from services.common.database import get_db
from services.common.config import Config
from services.api_service.utils.mcp_event_store import RedisEventStore
logger = get_logger(__name__)
@@ -27,12 +30,12 @@ class McpController:
def __init__(self):
self.sse = SseServerTransport("/messages/")
# StreamableHTTP 会话持久化:按 (service_id, user_id) 维度保存传输与服务器任务
# StreamableHTTP session persistence: store transport and server task keyed by (service_id, user_id)
self._http_transports: dict[str, StreamableHTTPServerTransport] = {}
self._http_server_tasks: dict[str, asyncio.Task] = {}
self._http_servers: dict[str, Server] = {}
self.server_factory = McpServerFactory()
# 会话回收:空闲时间记录与后台清理任务
# Session recycling: track idle time and run a background cleanup task
self._session_last_activity: dict[str, float] = {}
self._session_gc_task: Optional[asyncio.Task] = None
self._session_gc_stop_event = asyncio.Event()
@@ -42,7 +45,8 @@ class McpController:
async def handle_sse_connection(self, request: Request):
"""Handle MCP Streamable HTTP SSE connection with resume capability."""
# Get connection identification info
client_ip = request.client.host if request.client else "unknown"
x_real_ip = request.headers.get("x-real-ip") or request.headers.get("x-forwarded-for")
client_ip = (x_real_ip.split(",")[0].strip() if x_real_ip else (request.client.host if request.client else "unknown"))
user_agent = request.headers.get("user-agent", "unknown")
service_id = None
@@ -128,13 +132,14 @@ class McpController:
async def handle_sse_connection_asgi(self, request: Request):
"""Return an ASGI app that handles MCP SSE connections.
Starlette 的 Route 会传入一个 Request,然后将返回的可调用对象视为 ASGI 应用。
我们在返回的 ASGI 可调用中完成 SSE 握手,并运行 MCP 服务器。
Starlette Route passes a Request and treats the returned callable as an ASGI app.
The returned ASGI callable performs the SSE handshake and runs the MCP server.
"""
async def asgi(scope, receive, send):
req = Request(scope)
client_ip = req.client.host if req.client else "unknown"
x_real_ip = req.headers.get("x-real-ip") or req.headers.get("x-forwarded-for")
client_ip = (x_real_ip.split(",")[0].strip() if x_real_ip else (req.client.host if req.client else "unknown"))
user_agent = req.headers.get("user-agent", "unknown")
service_id = None
@@ -234,13 +239,15 @@ class McpController:
async def handle_streamable_http_asgi(self, request: Request):
"""Return an ASGI app that handles MCP Streamable HTTP (GET/POST/DELETE).
将请求交由StreamableHTTP的handle_request处理;同时使用持久化的transport与server,
让 GET/POST/DELETE 在同一会话中交互,保证工具/资源列表等请求能返回到相同的 SSE 流。
Delegate requests to StreamableHTTP's handle_request; use persistent transport and server
so GET/POST/DELETE interact within the same session, ensuring tools/resources queries
return to the same SSE stream.
"""
async def asgi(scope, receive, send):
req = Request(scope)
client_ip = req.client.host if req.client else "unknown"
x_real_ip = req.headers.get("x-real-ip") or req.headers.get("x-forwarded-for")
client_ip = (x_real_ip.split(",")[0].strip() if x_real_ip else (req.client.host if req.client else "unknown"))
user_agent = req.headers.get("user-agent", "unknown")
service_id = None
session_key = None
@@ -263,6 +270,69 @@ class McpController:
logger.info(f"Received StreamableHTTP request - Service ID: {service_id}, Client: {client_ip}, UA: {user_agent[:50]}...")
# Security: validate Origin to prevent DNS rebinding (MCP spec requirement)
origin = req.headers.get('origin')
if origin and not self._is_origin_allowed(origin, req):
logger.warning(f"Rejected by Origin validation - Origin: {origin}, Host: {req.url.scheme}://{req.url.netloc}")
response_body = b"Forbidden: invalid Origin"
await send({
'type': 'http.response.start',
'status': 403,
'headers': [
[b'content-type', b'text/plain'],
[b'content-length', str(len(response_body)).encode()],
],
})
await send({'type': 'http.response.body', 'body': response_body})
return
# Validate Accept & Content-Type headers according to MCP Streamable HTTP rules
accept = (req.headers.get('accept') or '').lower()
content_type = (req.headers.get('content-type') or '').lower()
if req.method == 'GET':
if 'text/event-stream' not in accept:
logger.warning("Missing Accept: text/event-stream for GET SSE")
response_body = b"Not Acceptable: require text/event-stream"
await send({
'type': 'http.response.start',
'status': 406,
'headers': [
[b'content-type', b'text/plain'],
[b'content-length', str(len(response_body)).encode()],
],
})
await send({'type': 'http.response.body', 'body': response_body})
return
elif req.method == 'POST':
# Client should list both application/json and text/event-stream
if not ('application/json' in accept and 'text/event-stream' in accept):
logger.warning("POST Accept must include application/json and text/event-stream")
response_body = b"Not Acceptable: require application/json and text/event-stream"
await send({
'type': 'http.response.start',
'status': 406,
'headers': [
[b'content-type', b'text/plain'],
[b'content-length', str(len(response_body)).encode()],
],
})
await send({'type': 'http.response.body', 'body': response_body})
return
# Body must be JSON-RPC payload
if 'application/json' not in content_type:
logger.warning("Unsupported Media Type for POST; require application/json")
response_body = b"Unsupported Media Type: require application/json"
await send({
'type': 'http.response.start',
'status': 415,
'headers': [
[b'content-type', b'text/plain'],
[b'content-length', str(len(response_body)).encode()],
],
})
await send({'type': 'http.response.body', 'body': response_body})
return
# Extract user ID (for billing) - must provide valid apikey
user_info = self._extract_user_info(req)
if not user_info:
@@ -279,30 +349,69 @@ class McpController:
return
user_id, apikey_id = user_info
session_key = f"{service_id}:{user_id}"
raw_client_id = req.headers.get('x-client-instance-id') or req.headers.get('x-client-id')
client_instance_id = (re.sub(r'[^a-zA-Z0-9._-]', '', raw_client_id)[:32]) if raw_client_id else None
ua = user_agent or ""
ua_hash = hashlib.sha1(ua.encode('utf-8')).hexdigest()[:8]
client_fingerprint = client_instance_id or f"{client_ip}:{ua_hash}"
session_key = f"{service_id}:{user_id}:{client_fingerprint}"
# Register connection to manager(便于统计与审计)
connection_key = connection_manager.register_connection(service_id, user_id, client_ip)
# Build connection key for lifecycle management
connection_key = f"{service_id}:{user_id}:{client_ip}"
try:
# 获取(或创建)持久化的 StreamableHTTP 传输与 MCP 服务器
# Get or create a persistent StreamableHTTP transport and MCP server
transport = await self._ensure_http_session(session_key, service_id, user_id, apikey_id)
# 记录会话活跃
logger.debug(f"method: {req.method}, content_type: {content_type}")
# Note session activity
self._note_session_activity(session_key)
# 将请求交由 transport 处理;若是 GET,将建立 SSE;若是 POST,将发送 JSON-RPC;DELETE 将终止会话
# Ensure transport is connected before delegating (avoid race on first request)
try:
await self._wait_transport_ready(transport, timeout_seconds=2.0)
except TimeoutError:
logger.error("Transport not ready within timeout; refusing request")
response_body = b"Service Unavailable: transport not ready"
await send({
'type': 'http.response.start',
'status': 503,
'headers': [
[b'content-type', b'text/plain'],
[b'content-length', str(len(response_body)).encode()],
],
})
await send({'type': 'http.response.body', 'body': response_body})
return
# Register only on GET (SSE handshake); POST just updates activity
if req.method == "GET":
connection_manager.register_connection(service_id, user_id, client_ip)
logger.debug(f'register connection successful.connection_key is {connection_key}')
elif req.method == "POST":
connection_manager.update_activity(connection_key)
# Delegate request to transport; GET establishes SSE; POST sends JSON-RPC; DELETE terminates the session
await transport.handle_request(scope, receive, send)
# 处理完成后更新活跃时间(避免长处理后的误清理)
# Update activity after handling (avoid cleaning long-running processing)
self._note_session_activity(session_key)
# 如果会话已经终止,立即清理资源
if transport.is_terminated or req.method == "DELETE":
# If the session has terminated, clean up and unregister
if transport.is_terminated:
await self._cleanup_http_session(session_key)
connection_manager.unregister_connection(connection_key)
# For explicit DELETE, ensure termination cleanup
if req.method == "DELETE" and not transport.is_terminated:
try:
await transport.terminate()
except Exception:
logger.exception("Error terminating transport on DELETE")
await self._cleanup_http_session(session_key)
connection_manager.unregister_connection(connection_key)
finally:
# Unregister connection(按请求粒度解除登记)
connection_manager.unregister_connection(connection_key)
# Unregister when SSE GET disconnects
if req.method == "GET":
connection_manager.unregister_connection(connection_key)
except ConnectionError as e:
logger.warning(f"Connection error - Service ID: {service_id or 'unknown'}, Client: {client_ip}: {str(e)}")
@@ -331,23 +440,74 @@ class McpController:
return asgi
async def _wait_transport_ready(self, transport: StreamableHTTPServerTransport, timeout_seconds: float = 2.0) -> None:
"""Wait until StreamableHTTP transport is connected and streams are initialized.
The underlying transport sets internal streams in connect(); POST/GET handling
requires these to exist. We poll briefly to avoid race on first request.
"""
deadline = time.time() + timeout_seconds
# Access internal attributes defensively; break once read writer is present
while True:
# If terminated, break early
if transport.is_terminated:
raise TimeoutError("Transport terminated during wait")
# Heuristic: writer/reader set once connect() started
has_read_writer = getattr(transport, "_read_stream_writer", None) is not None
has_write_reader = getattr(transport, "_write_stream_reader", None) is not None
if has_read_writer and has_write_reader:
return
if time.time() > deadline:
raise TimeoutError("Transport not ready")
await asyncio.sleep(0.01)
def _is_origin_allowed(self, origin: str, req: Request) -> bool:
"""Validate Origin header against request host to prevent DNS rebinding.
Policy:
- If Origin is present, it must match the scheme+host of the request URL.
- Allow common localhost variants (127.0.0.1, localhost) across http/https.
- If Origin is missing, treat as allowed (native clients may omit it).
"""
try:
if not origin:
return True
origin = origin.strip()
request_host = f"{req.url.scheme}://{req.url.netloc}"
if origin == request_host:
return True
allowed_local_origins = {
"http://127.0.0.1",
f"http://127.0.0.1:{req.url.port}" if req.url.port else "http://127.0.0.1",
"http://localhost",
f"http://localhost:{req.url.port}" if req.url.port else "http://localhost",
"https://127.0.0.1",
f"https://127.0.0.1:{req.url.port}" if req.url.port else "https://127.0.0.1",
"https://localhost",
f"https://localhost:{req.url.port}" if req.url.port else "https://localhost",
}
return origin in allowed_local_origins
except Exception:
logger.exception("Origin validation error")
return False
async def _ensure_http_session(self, session_key: str, service_id: str, user_id: str, apikey_id: str) -> StreamableHTTPServerTransport:
"""Ensure a persistent StreamableHTTP transport and MCP server exist for the session.
- 创建(或复用) transport
- 若尚未启动服务器,则在 transport.connect() 上启动 mcp_server.run()
- Create or reuse the transport
- If the server has not been started, start mcp_server.run() within transport.connect()
"""
if session_key in self._http_transports:
transport = self._http_transports[session_key]
# 启动回收任务(若未启动)
# Start GC task if not started
self._ensure_session_gc_task()
# 记录活跃
# Note activity
self._note_session_activity(session_key)
# 服务器任务存在且未结束,直接复用
# If the server task exists and is not finished, reuse it
task = self._http_server_tasks.get(session_key)
if task and not task.done():
return transport
# 没有任务或任务已结束,则重新启动
# If no task or the task is finished, restart
mcp_server = self._http_servers.get(session_key)
if mcp_server is None:
mcp_server = await self.server_factory.create_server(service_id, user_id, apikey_id)
@@ -368,8 +528,13 @@ class McpController:
self._http_server_tasks[session_key] = task
return transport
# 新建 transport 与 server
transport = StreamableHTTPServerTransport(mcp_session_id=None, is_json_response_enabled=False)
# Create transport and server
event_store = RedisEventStore(namespace=session_key, ttl_seconds=Config.MCP_SESSION_IDLE_TTL_SECONDS)
transport = StreamableHTTPServerTransport(
mcp_session_id=None,
is_json_response_enabled=False,
event_store=event_store,
)
mcp_server = await self.server_factory.create_server(service_id, user_id, apikey_id)
self._http_transports[session_key] = transport
self._http_servers[session_key] = mcp_server
@@ -378,7 +543,7 @@ class McpController:
init_options.server_name = f"mcp-service-{service_id}"
logger.info(f"StreamableHTTP session created - Service: {service_id}, User: {user_id}")
# 启动回收任务(若未启动)并记录活跃
# Start GC task if not started and note activity
self._ensure_session_gc_task()
self._note_session_activity(session_key)
@@ -403,7 +568,7 @@ class McpController:
if task and not task.done():
try:
# 终止 transport,促使服务器退出
# Terminate transport to prompt server exit
if transport and not transport.is_terminated:
await transport.terminate()
await task
@@ -500,8 +665,9 @@ class McpController:
return self.sse.handle_post_message
def get_streamable_http_handler(self):
# 不再返回持久化实例的 handler;如果确实需要,可改为在路由层调用 handle_streamable_http_asgi
# 这里保留占位以避免外部引用报错,但不使用。
# We no longer return a handler for a persistent instance; if needed, call
# handle_streamable_http_asgi at the routing layer. This placeholder is
# retained to avoid external references breaking, but it is not used.
raise NotImplementedError("Use handle_streamable_http_asgi for StreamableHTTP routes")
@@ -528,7 +694,7 @@ class McpController:
idle = (now - last) > self._session_idle_ttl
task = self._http_server_tasks.get(key)
active_task = task is not None and not task.done()
# 仅在无活动任务时才按TTL清理,避免中断活跃的SSE会话
# Only TTL-clean when there is no active task, to avoid killing active SSE sessions
if transport.is_terminated or (idle and not active_task):
stale_keys.append(key)
for key in stale_keys:
+4 -4
View File
@@ -100,11 +100,11 @@ app.add_middleware(ExceptionHandlingMiddleware)
# Add CORS middleware for MCP client cross-origin and reconnection support
app.add_middleware(
CORSMiddleware,
allow_origins=["*"], # MCP clients may come from different domains
allow_credentials=True,
allow_methods=["GET", "POST", "DELETE", "OPTIONS"], # 添加 DELETE 支持 StreamableHTTP 终止
allow_origins=Config.ALLOWED_ORIGINS,
allow_credentials=False,
allow_methods=["GET", "POST", "DELETE", "OPTIONS"],
allow_headers=["*"],
expose_headers=["*"], # Expose all response headers for SSE reconnection
expose_headers=["*"]
)
# Create MCP controller instance
@@ -16,7 +16,7 @@ class McpServiceRepository:
def get_by_id(self, service_id: str, force_update: bool = False) -> Optional[McpService]:
"""
Get single MCP service by service ID
Get single MCP service by service ID
"""
cache_key = f"xpack:mcp_service:id:{service_id}"
if not force_update:
@@ -57,13 +57,13 @@ class McpServerFactory:
# Register tool call handler
@app.call_tool()
async def call_tool(name: str, arguments: dict) -> List[types.Content]:
async def call_tool(name: str, arguments: dict) -> tuple[List[types.Content], dict]:
"""Execute specified tool"""
# user_id must exist, otherwise we shouldn't reach here
if not user_id:
error_msg = "Missing user authentication"
logger.error(error_msg)
return [types.TextContent(type="text", text=error_msg)]
return [types.TextContent(type="text", text=error_msg)], {}
return await self._handle_call_tool_with_billing(service_id, name, arguments, user_id, apikey_id)
@@ -102,7 +102,7 @@ class McpServerFactory:
finally:
db.close()
async def _handle_call_tool_with_billing(self, service_id: str, name: str, arguments: dict, user_id: str, apikey_id: Optional[str] = None) -> List[types.Content]:
async def _handle_call_tool_with_billing(self, service_id: str, name: str, arguments: dict, user_id: str, apikey_id: Optional[str] = None) -> tuple[List[types.Content], dict]:
"""
Handle tool call with billing logic
@@ -145,7 +145,7 @@ class McpServerFactory:
# If tool API id not found, skip sending billing message to avoid FK errors
if not api_id_for_log:
return [types.TextContent(type="text", text=error_msg)]
return [types.TextContent(type="text", text=error_msg)], {}
call_log = ApiCallLogInfo(
user_id=user_id,
@@ -163,7 +163,7 @@ class McpServerFactory:
)
await self.billing_service.send_billing_message(call_log, False, datetime.now(timezone.utc))
return [types.TextContent(type="text", text=error_msg)]
return [types.TextContent(type="text", text=error_msg)],{}
logger.info(f"Pre-deduction successful - User ID: {user_id}, Deduction amount: {pre_deduct_result.service_price}")
amount = pre_deduct_result.service_price
@@ -171,6 +171,7 @@ class McpServerFactory:
db = next(get_db())
call_success = False
result: List[types.ContentBlock] = []
response_data: dict = {}
# calculate input token amount
input_token_amount = Decimal("0")
output_token_amount = Decimal("0")
@@ -195,7 +196,7 @@ class McpServerFactory:
logger.error(error_msg)
# Close DB and return error without sending billing message to avoid FK violation
db.close()
return [types.TextContent(type="text", text=error_msg)]
return [types.TextContent(type="text", text=error_msg)],{}
try:
logger.info(f"Found tool configuration: {tool_config.name}")
@@ -205,12 +206,18 @@ class McpServerFactory:
logger.debug(f"Call params: {call_params}")
# Execute tool
result = await self.tool_service.execute_tool(tool_config, arguments, call_params)
call_success = True
result,response_data = await self.tool_service.execute_tool(tool_config, arguments, call_params)
validation_ok, validation_msg = self._validate_output_schema(tool_config, response_data)
if not validation_ok:
call_success = False
error_text = f"Response validation failed: {validation_msg}"
result = [types.TextContent(type="text", text=error_text)]
response_data = {}
else:
call_success = True
logger.info(f"Tool call successful - User ID: {user_id}, Tool: {name}")
# Calculate output token amount after tool execution
if pre_deduct_result.charge_type == "per_token" and result:
if pre_deduct_result.charge_type == "per_token" and result and call_success:
output_text = ""
for content in result:
if isinstance(content, types.TextContent):
@@ -254,7 +261,58 @@ class McpServerFactory:
logger.info(f"Billing message sent - User ID: {user_id}, Tool: {name}, Success: {call_success}")
# Ensure return type is correct
return result
return result,response_data
def _validate_output_schema(self, tool_config, response_data: dict) -> tuple[bool, str]:
try:
schema_str = getattr(tool_config, "response_schema", None)
if not schema_str:
return True, ""
try:
schema = json.loads(schema_str)
except Exception:
return False, "Invalid response_schema JSON"
def check(schema_obj, data_obj) -> tuple[bool, str]:
t = schema_obj.get("type")
if t == "object":
if not isinstance(data_obj, dict):
return False, "Expected object"
req = schema_obj.get("required", [])
for k in req:
if k not in data_obj:
return False, f"Missing required field: {k}"
props = schema_obj.get("properties", {})
for k, sub in props.items():
if k in data_obj:
ok, msg = check(sub, data_obj[k])
if not ok:
return False, f"Field {k}: {msg}"
return True, ""
if t == "array":
if not isinstance(data_obj, list):
return False, "Expected array"
items = schema_obj.get("items")
if items:
for i, it in enumerate(data_obj):
ok, msg = check(items, it)
if not ok:
return False, f"Item {i}: {msg}"
return True, ""
if t == "string":
return (isinstance(data_obj, str), "Expected string")
if t == "integer":
return (isinstance(data_obj, int), "Expected integer")
if t == "number":
return ((isinstance(data_obj, (int, float))), "Expected number")
if t == "boolean":
return (isinstance(data_obj, bool), "Expected boolean")
return True, ""
ok, msg = check(schema, response_data)
return ok, msg
except Exception as e:
return False, str(e)
def _create_mcp_service(self, db) -> McpService:
"""
+65 -3
View File
@@ -131,11 +131,15 @@ class McpService:
"required": []
}
return types.Tool(
t = types.Tool(
name=tool_api.name,
description=tool_api.description,
inputSchema=input_schema
inputSchema=input_schema,
)
output_schema = self._build_output_schema(tool_api)
if output_schema:
t.outputSchema = output_schema
return t
except Exception as e:
self.logger.error(f"Tool conversion failed for {tool_api.name}: {e}")
return None
@@ -271,4 +275,62 @@ class McpService:
return {
"base_url": service.base_url or "",
"headers": headers
}
}
def _build_output_schema(self,tool_api:McpToolApi) -> Optional[dict]:
"""
Build output schema based on API configuration
Priority:
1) Use explicit JSON Schema from `response_schema` if present
2) Infer a reasonable JSON Schema from `response_examples`
3) Fallback to a generic text content schema
"""
# 1) Try explicit response schema
try:
if tool_api.response_schema:
parsed = json.loads(tool_api.response_schema)
if isinstance(parsed, dict):
return parsed
except Exception as e:
self.logger.warning(f"Failed to parse response_schema for {tool_api.name}: {e}")
# 2) Try to infer schema from examples
try:
if getattr(tool_api, "response_examples", None) and tool_api.response_examples.strip():
examples = json.loads(tool_api.response_examples)
# If multiple examples provided, use the first for inference
example_value = examples[0] if isinstance(examples, list) and examples else examples
inferred = self._infer_json_schema_from_example(example_value)
if inferred:
return inferred
except Exception as e:
self.logger.warning(f"Failed to infer schema from response_examples for {tool_api.name}: {e}")
# 3) Fallback to a generic text MCP content schema
return None
# Helper: Infer a simple JSON Schema from a Python value
def _infer_json_schema_from_example(self, value) -> dict:
try:
if isinstance(value, str):
return {"type": "string"}
if isinstance(value, bool):
return {"type": "boolean"}
if isinstance(value, int):
return {"type": "integer"}
if isinstance(value, float):
return {"type": "number"}
if isinstance(value, list):
if not value:
return {"type": "array", "items": {}}
# Infer from first element; for heterogeneous arrays this is a best-effort
return {"type": "array", "items": self._infer_json_schema_from_example(value[0])}
if isinstance(value, dict):
props = {k: self._infer_json_schema_from_example(v) for k, v in value.items()}
required = list(value.keys())
return {"type": "object", "properties": props, "required": required}
# Fallback
return {"type": "string"}
except Exception:
return {"type": "string"}
@@ -17,7 +17,7 @@ class McpToolService:
def __init__(self):
self.http_builder = HttpRequestBuilder()
async def execute_tool(self, tool_config, arguments: dict, call_params: dict) -> List[types.Content]:
async def execute_tool(self, tool_config, arguments: dict, call_params: dict) -> tuple[List[types.Content],dict]:
"""
Execute tool call
@@ -37,14 +37,17 @@ class McpToolService:
# Send HTTP request
response_text = await self._send_http_request(request_info)
if response_text:
response_data = json.loads(response_text)
else:
response_data = {}
logger.info("Tool execution completed successfully")
return [types.TextContent(type="text", text=response_text)]
return [types.TextContent(type="text", text=response_text)],response_data
except Exception as e:
error_msg = f"Tool execution failed: {str(e)}"
logger.error(f"Tool execution failed: {error_msg}", exc_info=True)
return [types.TextContent(type="text", text=error_msg)]
return [types.TextContent(type="text", text=error_msg)],{}
async def _send_http_request(self, request_info: Dict[str, Any]) -> str:
"""
@@ -64,7 +67,7 @@ class McpToolService:
logger.info(f"Sending HTTP request: {method} {url}")
logger.debug(f"Query parameters: {query_params}")
logger.debug(f"Request body: {request_body}")
# logger.debug(f"Request body: {request_body}")
async with create_mcp_http_client(headers=headers) as client:
if method == "GET":
@@ -82,8 +85,6 @@ class McpToolService:
logger.info(f"HTTP response status code: {response.status_code}")
response.raise_for_status()
response_text = response.text
logger.debug(f"Response content length: {len(response_text)} characters")
logger.debug(f"Response length: {len(response_text)}")
return response_text
+2 -2
View File
@@ -307,7 +307,7 @@ class HttpRequestBuilder:
request_body[param_name] = arguments[param_name]
if request_body:
logger.debug(f"Built request body from parameters: {request_body}")
# logger.debug(f"Built request body from parameters: {request_body}")
return request_body
else:
# If not a parameters list, try to parse as JSON schema object
@@ -322,7 +322,7 @@ class HttpRequestBuilder:
request_body[prop_name] = arguments[prop_name]
if request_body:
logger.debug(f"Built request body from schema: {request_body}")
# logger.debug(f"Built request body from schema: {request_body}")
return request_body
except json.JSONDecodeError:
logger.warning(f"Failed to parse request body schema as JSON")
@@ -0,0 +1,91 @@
import json
import asyncio
from typing import List, cast
from mcp.server.streamable_http import (
EventStore,
EventId,
StreamId,
EventMessage,
EventCallback,
)
from mcp.types import JSONRPCMessage
from services.common.redis import redis_client
class RedisEventStore(EventStore):
def __init__(self, namespace: str, ttl_seconds: int = 900):
self.namespace = namespace
self.ttl_seconds = ttl_seconds
# Synchronous helpers; wrap at call sites to avoid blocking
def _rpush(self, key: str, value: str) -> int:
return cast(int, redis_client.client.rpush(key, value))
def _expire(self, key: str, seconds: int) -> None:
try:
redis_client.client.expire(key, int(seconds))
except Exception:
# Ignore expiration errors
pass
def _llen(self, key: str) -> int:
return cast(int, redis_client.client.llen(key))
def _lrange(self, key: str, start: int, end: int) -> List[str]:
raw = redis_client.client.lrange(key, int(start), int(end))
items: List[str] = cast(List[str], raw or [])
return [str(i) for i in items]
def _key(self, stream_id: StreamId) -> str:
return f"xpack:mcp:event:{self.namespace}:{stream_id}"
def _event_id(self, stream_id: StreamId, seq: int) -> EventId:
return f"{stream_id}:{seq}"
async def store_event(self, stream_id: StreamId, message: JSONRPCMessage) -> EventId:
key = self._key(stream_id)
payload = json.dumps(message.model_dump(by_alias=True, exclude_none=True))
# Append to Redis list via thread wrapper to avoid blocking
seq: int = await asyncio.to_thread(self._rpush, key, payload)
# rpush returns new length; sequence index is length-1
await asyncio.to_thread(self._expire, key, self.ttl_seconds)
return self._event_id(stream_id, seq - 1)
async def replay_events_after(
self,
last_event_id: EventId,
send_callback: EventCallback,
) -> StreamId | None:
# Parse last_event_id of format "<stream_id>:<seq>"
try:
stream_id_str, seq_str = last_event_id.rsplit(":", 1)
stream_id: StreamId = stream_id_str
start_idx = int(seq_str) + 1
except Exception:
return None
key = self._key(stream_id)
try:
length: int = await asyncio.to_thread(self._llen, key)
except Exception:
# Redis unavailable or key type mismatch; cannot replay
return stream_id
if length <= 0 or start_idx >= length:
return stream_id
# Fetch range [start_idx, length-1]
try:
items: list[str] = await asyncio.to_thread(self._lrange, key, start_idx, length - 1)
except Exception:
return stream_id
for item in items:
try:
data = json.loads(item)
msg = JSONRPCMessage.model_validate(data)
# send_callback is async and expects EventMessage
await send_callback(EventMessage(message=msg, event_id=None))
except Exception:
# Skip malformed entries
continue
return stream_id
+1
View File
@@ -75,3 +75,4 @@ class Config:
]
MCP_SESSION_IDLE_TTL_SECONDS = int(os.getenv("MCP_SESSION_IDLE_TTL_SECONDS", 900))
MCP_SESSION_CLEANUP_INTERVAL_SECONDS = int(os.getenv("MCP_SESSION_CLEANUP_INTERVAL_SECONDS", 60))
ALLOWED_ORIGINS = [s.strip() for s in os.getenv("ALLOWED_ORIGINS", "*").split(",") if s.strip()]
+3
View File
@@ -4,6 +4,9 @@
# 4xx Client Errors
INVALID_REQUEST = {"code": 400, "message": "Invalid request parameters"}
MISSING_PARAMETER = {"code": 400, "message": "Required parameter is missing"}
INVALID_PRICE = {"code": 400, "message": "Price must be a non-negative number"}
INVALID_INPUT_TOKEN = {"code": 400, "message": "Input token must be a non-negative number"}
INVALID_OUTPUT_TOKEN = {"code": 400, "message": "Output token must be a non-negative number"}
INVALID_URL = {"code": 400, "message": "Invalid URL provided"}
INVALID_FORMAT = {"code": 400, "message": "Invalid data format"}
+14 -1
View File
@@ -1,4 +1,17 @@
from sqlalchemy.orm import DeclarativeBase
from enum import Enum as PyEnum
class Base(DeclarativeBase):
pass
pass
class AuthMethod(PyEnum):
FREE = "free"
APIKEY = "apikey"
TOKEN = "token"
class ChargeType(PyEnum):
FREE = "free"
PER_CALL = "per_call"
PER_TOKEN = "per_token"
+2 -21
View File
@@ -1,21 +1,8 @@
from sqlalchemy import String, Enum, Numeric, Integer, DateTime
from sqlalchemy.sql import func
from sqlalchemy.orm import Mapped, mapped_column
from enum import Enum as PyEnum
from datetime import datetime
from services.common.models.base import Base
class AuthMethod(PyEnum):
FREE = "free"
APIKEY = "apikey"
TOKEN = "token"
class ChargeType(PyEnum):
FREE = "free"
PER_CALL = "per_call"
PER_TOKEN = "per_token"
from services.common.models.base import Base,ChargeType
class McpService(Base):
@@ -31,14 +18,7 @@ class McpService(Base):
slug_name: Mapped[str] = mapped_column(String(255), unique=True, nullable=False, comment="Unique slug name for the service")
short_description: Mapped[str] = mapped_column(String, nullable=False, comment="Short description of the service")
long_description: Mapped[str] = mapped_column(String, nullable=True, comment="Detailed description of the service (Markdown format)")
# auth_method: Mapped[AuthMethod] = mapped_column(
# Enum(AuthMethod, values_callable=lambda obj: [e.value for e in obj]),
# nullable=False,
# comment="Authentication method: free, apikey, token",
# )
base_url: Mapped[str] = mapped_column(String(512), nullable=True, comment="api url")
# auth_header: Mapped[str] = mapped_column(String(255), nullable=True, comment="Authentication header name")
# auth_token: Mapped[str] = mapped_column(String(255), nullable=True, comment="Authentication token value")
headers: Mapped[str] = mapped_column(String, nullable=True, comment="Additional headers for requests (JSON Array format)")
charge_type: Mapped[ChargeType] = mapped_column(
Enum(ChargeType, values_callable=lambda obj: [e.value for e in obj]),
@@ -54,6 +34,7 @@ class McpService(Base):
)
enabled: Mapped[int] = mapped_column(Integer, nullable=True, comment="Service status: 0=disabled, 1=enabled")
tags: Mapped[str] = mapped_column(String, nullable=True, comment="Tags")
service_type: Mapped[str] = mapped_column(String(255), nullable=True, comment="Service type",default="openapi")
created_at: Mapped[datetime] = mapped_column(
DateTime,
nullable=True,
+2 -1
View File
@@ -14,5 +14,6 @@ class PaymentChannel(Base):
id: Mapped[str] = mapped_column(String(36), primary_key=True, autoincrement=False, comment="Primary key")
name: Mapped[str] = mapped_column(String(255), nullable=False, comment="Channel name")
status: Mapped[int] = mapped_column(Integer, nullable=False, comment="Channel status, 0: disabled, 1: enabled")
config: Mapped[str] = mapped_column(Text, nullable=True, comment="Channel config")
# Store encrypted JSON envelope for channel configuration (AES-GCM). See secure_config.py
config: Mapped[str] = mapped_column(Text, nullable=True, comment="Channel config (encrypted envelope JSON)")
updated_at: Mapped[datetime] = mapped_column(DateTime, nullable=True, comment="Update time")
+1 -21
View File
@@ -1,23 +1,10 @@
from sqlalchemy import String, Enum, Numeric, Integer, DateTime
from sqlalchemy.sql import func
from sqlalchemy.orm import Mapped, mapped_column
from enum import Enum as PyEnum
from services.common.models.base import Base
from services.common.models.base import Base,ChargeType
from datetime import datetime
class AuthMethod(PyEnum):
FREE = "free"
APIKEY = "apikey"
TOKEN = "token"
class ChargeType(PyEnum):
FREE = "free"
PER_CALL = "per_call"
PER_TOKEN = "per_token"
class TempMcpService(Base):
__tablename__ = "temp_mcp_service"
@@ -31,15 +18,8 @@ class TempMcpService(Base):
slug_name: Mapped[str] = mapped_column(String(255), unique=True, nullable=False, comment="Unique slug name for the service")
short_description: Mapped[str] = mapped_column(String, nullable=False, comment="Short description of the service")
long_description: Mapped[str] = mapped_column(String, nullable=True, comment="Detailed description of the service (Markdown format)")
# auth_method: Mapped[AuthMethod] = mapped_column(
# Enum(AuthMethod, values_callable=lambda obj: [e.value for e in obj]),
# nullable=False,
# comment="Authentication method: free, apikey, token",
# )
base_url: Mapped[str] = mapped_column(String(512), nullable=True, comment="api url")
headers: Mapped[str] = mapped_column(String, nullable=True, comment="Additional headers for requests (JSON Array format)")
# auth_header: Mapped[str] = mapped_column(String(255), nullable=True, comment="Authentication header name")
# auth_token: Mapped[str] = mapped_column(String(255), nullable=True, comment="Authentication token value")
charge_type: Mapped[ChargeType] = mapped_column(
Enum(ChargeType, values_callable=lambda obj: [e.value for e in obj]),
nullable=False,
+2 -1
View File
@@ -1,4 +1,5 @@
import redis
from redis import Redis
from typing import Optional, Any
from .config import Config
@@ -9,7 +10,7 @@ class RedisClient:
def __init__(self):
"""Initialize Redis connection"""
try:
self.client = redis.Redis(
self.client: Redis = redis.Redis(
host=Config.REDIS_HOST,
port=Config.REDIS_PORT,
password=Config.REDIS_PASSWORD,
@@ -1,9 +1,14 @@
import datetime
from pydantic import BaseModel
from pydantic import BaseModel, field_serializer
from typing import Optional
from decimal import Decimal
class UserManagerResponse(BaseModel):
user_id: Optional[str] = None
email: Optional[str] = None
balance: Optional[float] = None
balance: Optional[Decimal] = None
created_at: Optional[datetime.datetime] = None
@field_serializer('balance', when_used='json')
def serialize_balance(self, v: Optional[Decimal]) -> Optional[float]:
return float(v) if v is not None else None
@@ -1,6 +1,11 @@
from pydantic import BaseModel
from pydantic import BaseModel, field_serializer
from typing import Optional
from decimal import Decimal
class UserWalletResponse(BaseModel):
balance: Optional[float] = None
balance: Optional[Decimal] = None
@field_serializer('balance', when_used='json')
def serialize_balance(self, v: Optional[Decimal]) -> Optional[float]:
return float(v) if v is not None else None
+8 -3
View File
@@ -35,10 +35,15 @@ def verify_token(token: str, db: Session) -> Optional[User]:
logging.info(f"query token info")
# Check if token is expired
expire_datetime = datetime.strptime(str(user_access_token.expire_at), "%Y-%m-%d %H:%M:%S")
expire_at = user_access_token.expire_at
try:
expire_datetime = expire_at if isinstance(expire_at, datetime) else datetime.strptime(str(expire_at), "%Y-%m-%d %H:%M:%S")
except Exception:
logger.warning(f"Invalid token expiry format: {expire_at}")
delete_cache(token_cache_key)
return None
if expire_datetime <= datetime.now():
logger.warning(f"Token expired: {token}, expire_at: {user_access_token.expire_at}")
# Delete expired cache
delete_cache(token_cache_key)
return None
@@ -47,7 +52,7 @@ def verify_token(token: str, db: Session) -> Optional[User]:
user = get_model_cache(user_cache_key, User)
if not user:
user = (
db.query(User).filter(User.id == user_access_token.user_id and User.is_deleted == False and User.is_active == True).first()
db.query(User).filter(User.id == user_access_token.user_id, User.is_deleted == False, User.is_active == True).first()
)
if not user:
logger.warning(f"User not found for token: {token}, user_id: {user_access_token.user_id}")
+16 -16
View File
@@ -114,16 +114,17 @@ class CacheUtils:
try:
cache_value = redis_client.get(cache_key)
if cache_value:
# Check if cache_value is already deserialized (dict) or needs deserialization (str)
if isinstance(cache_value, dict):
if isinstance(cache_value, str):
try:
model_data = json.loads(cache_value)
except Exception:
logger.warning(f"Failed to parse JSON cache for key {cache_key}")
return None
elif isinstance(cache_value, dict):
model_data = cache_value
elif isinstance(cache_value, str):
# Deserialize from pickled string data
model_data = pickle.loads(cache_value.encode('latin1'))
else:
logger.warning(f"Unexpected cache value type for key {cache_key}: {type(cache_value)}")
return None
return SqlalchemyUtils.dict_to_model(model_class, model_data)
return None
except Exception as e:
@@ -145,8 +146,7 @@ class CacheUtils:
"""
try:
model_dict = SqlalchemyUtils.model_to_dict(model)
# Serialize using pickle for better type preservation
serialized_data = pickle.dumps(model_dict).decode('latin1')
serialized_data = json.dumps(model_dict, ensure_ascii=False)
redis_client.set(cache_key, serialized_data, ex=expire_time)
return True
except Exception as e:
@@ -168,16 +168,17 @@ class CacheUtils:
try:
cache_value = redis_client.get(cache_key)
if cache_value:
# Check if cache_value is already deserialized (list) or needs deserialization (str)
if isinstance(cache_value, list):
if isinstance(cache_value, str):
try:
model_list_data = json.loads(cache_value)
except Exception:
logger.warning(f"Failed to parse JSON cache for key {cache_key}")
return None
elif isinstance(cache_value, list):
model_list_data = cache_value
elif isinstance(cache_value, str):
# Deserialize from pickled string data
model_list_data = pickle.loads(cache_value.encode('latin1'))
else:
logger.warning(f"Unexpected cache value type for key {cache_key}: {type(cache_value)}")
return None
if isinstance(model_list_data, list):
return [SqlalchemyUtils.dict_to_model(model_class, item) for item in model_list_data]
return None
@@ -204,8 +205,7 @@ class CacheUtils:
return False
model_dict_list = [SqlalchemyUtils.model_to_dict(model) for model in model_list]
# Serialize using pickle for better type preservation
serialized_data = pickle.dumps(model_dict_list).decode('latin1')
serialized_data = json.dumps(model_dict_list, ensure_ascii=False)
redis_client.set(cache_key, serialized_data, ex=expire_time)
return True
except Exception as e:
+19
View File
@@ -1,5 +1,6 @@
import aiohttp
import asyncio
from urllib.parse import urlparse
from typing import Optional, Dict, Any
from services.common.exceptions import (
ValidationException,
@@ -60,6 +61,15 @@ class HttpUtils:
if headers:
request_headers.update(headers)
# Basic SSRF protections: only allow http/https and block localhost/private IPs
parsed = urlparse(url)
if parsed.scheme not in ("http", "https"):
raise ValidationException("URL scheme must be http or https")
host = (parsed.hostname or "").lower()
private_prefixes = ("127.", "10.", "192.168.")
if host in ("localhost", "127.0.0.1") or host.startswith(private_prefixes) or host.startswith("172."):
raise ValidationException("Access to local/private addresses is not allowed")
async with aiohttp.ClientSession(
timeout=aiohttp.ClientTimeout(total=timeout),
headers=request_headers
@@ -178,6 +188,15 @@ class HttpUtils:
if headers:
request_headers.update(headers)
# Basic SSRF protections: only allow http/https and block localhost/private IPs
parsed = urlparse(url)
if parsed.scheme not in ("http", "https"):
raise ValidationException("URL scheme must be http or https")
host = (parsed.hostname or "").lower()
private_prefixes = ("127.", "10.", "192.168.")
if host in ("localhost", "127.0.0.1") or host.startswith(private_prefixes) or host.startswith("172."):
raise ValidationException("Access to local/private addresses is not allowed")
async with aiohttp.ClientSession(
timeout=aiohttp.ClientTimeout(total=timeout),
headers=request_headers
+102
View File
@@ -0,0 +1,102 @@
import os
import json
import base64
import secrets
from typing import Optional, Any, Dict
try:
from cryptography.hazmat.primitives.ciphers.aead import AESGCM
except Exception:
AESGCM = None
ENC_MARKER = "__enc__"
def _get_key() -> bytes:
"""Load symmetric encryption key from environment.
Expects `PAYMENT_CONFIG_SECRET_KEY` to be a base64-encoded 32-byte key.
Optionally supports `PAYMENT_CONFIG_KEY_ID` for key rotation tracking.
"""
key_b64 = os.getenv("PAYMENT_CONFIG_SECRET_KEY", "")
if not key_b64:
raise RuntimeError("Missing PAYMENT_CONFIG_SECRET_KEY environment variable")
try:
key = base64.b64decode(key_b64)
except Exception as e:
raise RuntimeError("Invalid base64 in PAYMENT_CONFIG_SECRET_KEY") from e
if len(key) != 32:
raise RuntimeError("PAYMENT_CONFIG_SECRET_KEY must decode to 32 bytes (AES-256)")
return key
def is_encrypted(value: Optional[str]) -> bool:
"""Heuristically determine if the stored config string is an encrypted envelope."""
if not value:
return False
try:
obj = json.loads(value)
return isinstance(obj, dict) and obj.get(ENC_MARKER) is True and "ct" in obj and "nonce" in obj
except Exception:
return False
def encrypt_config(config_obj: Dict[str, Any]) -> str:
"""Encrypt config object using AES-GCM and return envelope JSON string.
Envelope format:
{
"__enc__": true,
"v": 1,
"alg": "AESGCM",
"kid": "default",
"nonce": base64,
"ct": base64
}
"""
if AESGCM is None:
raise RuntimeError("cryptography library is required for encryption")
key = _get_key()
aesgcm = AESGCM(key)
nonce = secrets.token_bytes(12) # AES-GCM standard 96-bit nonce
plaintext = json.dumps(config_obj, ensure_ascii=False).encode("utf-8")
ciphertext = aesgcm.encrypt(nonce, plaintext, None)
envelope = {
ENC_MARKER: True,
"v": 1,
"alg": "AESGCM",
"kid": os.getenv("PAYMENT_CONFIG_KEY_ID", "default"),
"nonce": base64.b64encode(nonce).decode("ascii"),
"ct": base64.b64encode(ciphertext).decode("ascii"),
}
return json.dumps(envelope, ensure_ascii=False)
def decrypt_config(value: Optional[str]) -> Optional[Dict[str, Any]]:
"""Decrypt envelope if present; otherwise parse plaintext JSON.
Returns dict on success, or None on failure.
"""
if not value:
return None
# If looks like encrypted envelope, decrypt.
if is_encrypted(value):
if AESGCM is None:
# Cannot decrypt without cryptography
return None
try:
obj = json.loads(value)
key = _get_key()
aesgcm = AESGCM(key)
nonce = base64.b64decode(obj["nonce"])
ct = base64.b64decode(obj["ct"])
plaintext = aesgcm.decrypt(nonce, ct, None)
return json.loads(plaintext.decode("utf-8"))
except Exception:
return None
# Fallback: treat as plaintext JSON
try:
return json.loads(value)
except Exception:
return None
+40 -23
View File
@@ -1,5 +1,8 @@
from typing import get_origin, get_args
from enum import Enum as PyEnum
from decimal import Decimal
from datetime import datetime
from sqlalchemy import DateTime, Numeric
class SqlalchemyUtils:
@@ -7,10 +10,13 @@ class SqlalchemyUtils:
@staticmethod
def model_to_dict(model):
result = {column.name: getattr(model, column.name) for column in model.__table__.columns}
# Normalize Enum values to primitive for safe serialization
for key, value in list(result.items()):
if isinstance(value, PyEnum):
result[key] = value.value
elif isinstance(value, Decimal):
result[key] = str(value)
elif isinstance(value, datetime):
result[key] = value.isoformat()
return result
@staticmethod
@@ -27,31 +33,42 @@ class SqlalchemyUtils:
"""
instance = model_class()
# Get all column names for the model
column_names = {column.name for column in model_class.__table__.columns}
# Map column definitions by name for type-aware restoration
columns_by_name = {column.name: column for column in model_class.__table__.columns}
# Set attributes that exist in both the dictionary and the model
for key, value in data_dict.items():
if key in column_names and hasattr(instance, key):
# Attempt to restore Enum types from strings using type annotations
annotations = getattr(model_class, "__annotations__", {})
ann = annotations.get(key)
target_type = None
if ann is not None:
origin = get_origin(ann)
if origin is None:
target_type = ann
else:
args = get_args(ann)
if args:
target_type = args[0]
column = columns_by_name.get(key)
if column is None:
continue
if isinstance(target_type, type) and issubclass(target_type, PyEnum) and isinstance(value, str):
try:
value = target_type(value)
except Exception:
pass
# Restore Enum from string using annotations if available
annotations = getattr(model_class, "__annotations__", {})
ann = annotations.get(key)
target_type = None
if ann is not None:
origin = get_origin(ann)
if origin is None:
target_type = ann
else:
args = get_args(ann)
if args:
target_type = args[0]
if isinstance(target_type, type) and issubclass(target_type, PyEnum) and isinstance(value, str):
try:
value = target_type(value)
except Exception:
pass
setattr(instance, key, value)
# Restore Numeric and DateTime types from JSON-friendly forms
try:
if isinstance(column.type, Numeric) and value is not None:
if not isinstance(value, Decimal):
value = Decimal(str(value))
elif isinstance(column.type, DateTime) and isinstance(value, str):
value = datetime.fromisoformat(value)
except Exception:
pass
setattr(instance, key, value)
return instance