Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

⚡ perf: Migrate `data-schemas` Build to tsdown with isolatedDeclarations (#13578)

Danny Avila192703e0411c
diff --git a/.github/playwright.yml b/.github/playwright.yml
index 28eca14d58..27f026a525 100644
--- a/.github/playwright.yml
+++ b/.github/playwright.yml
@@ -39,7 +39,7 @@
# - uses: actions/checkout@v4
# - uses: actions/setup-node@v4
# with:
-# node-version: 18
+# node-version: 24.16.0
# cache: 'npm'
# - name: Install global dependencies
diff --git a/.github/workflows/backend-review.yml b/.github/workflows/backend-review.yml
index 87a22b4017..50816832cd 100644
--- a/.github/workflows/backend-review.yml
+++ b/.github/workflows/backend-review.yml
@@ -57,7 +57,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/data-schemas/dist
- key: build-data-schemas-${{ runner.os }}-${{ hashFiles('packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
+ key: build-data-schemas-${{ runner.os }}-${{ hashFiles('packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
- name: Build data-schemas
if: steps.cache-data-schemas.outputs.cache-hit != 'true'
@@ -68,7 +68,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/api/dist
- key: build-api-${{ runner.os }}-${{ hashFiles('packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/server-rollup.config.js', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json') }}
+ key: build-api-${{ runner.os }}-${{ hashFiles('packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/server-rollup.config.js', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json') }}
- name: Build api
if: steps.cache-api.outputs.cache-hit != 'true'
diff --git a/.github/workflows/config-review.yml b/.github/workflows/config-review.yml
index e08662aa1c..f0cdb2b09f 100644
--- a/.github/workflows/config-review.yml
+++ b/.github/workflows/config-review.yml
@@ -22,10 +22,10 @@ jobs:
steps:
- uses: actions/checkout@v4
- - name: Use Node.js 20.19
+ - name: Use Node.js 24.16.0
uses: actions/setup-node@v4
with:
- node-version: '20.19'
+ node-version: '24.16.0'
- name: Restore node_modules cache
id: cache-node-modules
@@ -59,7 +59,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/data-schemas/dist
- key: build-data-schemas-${{ runner.os }}-${{ hashFiles('packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
+ key: build-data-schemas-${{ runner.os }}-${{ hashFiles('packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
- name: Build data-schemas
if: steps.cache-data-schemas.outputs.cache-hit != 'true'
@@ -70,7 +70,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/api/dist
- key: build-api-${{ runner.os }}-${{ hashFiles('packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/server-rollup.config.js', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json') }}
+ key: build-api-${{ runner.os }}-${{ hashFiles('packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/server-rollup.config.js', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json') }}
- name: Build api
if: steps.cache-api.outputs.cache-hit != 'true'
diff --git a/.github/workflows/playwright-mock.yml b/.github/workflows/playwright-mock.yml
index f0d0d1323d..9d5d2ae50e 100644
--- a/.github/workflows/playwright-mock.yml
+++ b/.github/workflows/playwright-mock.yml
@@ -68,7 +68,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/data-schemas/dist
- key: build-data-schemas-${{ runner.os }}-${{ hashFiles('package-lock.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
+ key: build-data-schemas-${{ runner.os }}-${{ hashFiles('package-lock.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json') }}
- name: Build data-schemas
if: steps.cache-data-schemas.outputs.cache-hit != 'true'
@@ -79,7 +79,7 @@ jobs:
uses: actions/cache@v4
with:
path: packages/api/dist
- key: build-api-${{ runner.os }}-${{ hashFiles('package-lock.json', 'packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/server-rollup.config.js', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/rollup.config.js', 'packages/data-schemas/package.json') }}
+ key: build-api-${{ runner.os }}-${{ hashFiles('package-lock.json', 'packages/api/src/**', 'packages/api/tsconfig*.json', 'packages/api/server-rollup.config.js', 'packages/api/package.json', 'packages/data-provider/src/**', 'packages/data-provider/tsconfig*.json', 'packages/data-provider/rollup.config.js', 'packages/data-provider/package.json', 'packages/data-schemas/src/**', 'packages/data-schemas/tsconfig*.json', 'packages/data-schemas/tsdown.config.mjs', 'packages/data-schemas/package.json') }}
- name: Build api
if: steps.cache-api.outputs.cache-hit != 'true'
diff --git a/package-lock.json b/package-lock.json
index e141d7d0e5..6ff14ad1a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13446,6 +13446,19 @@
"integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
"license": "BSD-3-Clause"
},
+ "node_modules/@quansync/fs": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@quansync/fs/-/fs-1.0.0.tgz",
+ "integrity": "sha512-4TJ3DFtlf1L5LDMaM6CanJ/0lckGNtJcMjQ1NAV6zDmA0tEHKZtxNKin8EgPaVX1YzljbxckyT2tJrpQKAtngQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "quansync": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ }
+ },
"node_modules/@quilted/events": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/@quilted/events/-/events-2.1.3.tgz",
@@ -20262,6 +20275,13 @@
"parse5": "^7.0.0"
}
},
+ "node_modules/@types/jsesc": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/@types/jsesc/-/jsesc-2.5.1.tgz",
+ "integrity": "sha512-9VN+6yxLOPLOav+7PwjZbxiID2bVaeq0ED4qSQmdQTdjnXJSaCVKTR58t15oqH1H5t8Ng2ZX1SabJVoN9Q34bw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/@types/json-schema": {
"version": "7.0.15",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
@@ -21338,6 +21358,16 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
+ "node_modules/ansis": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/ansis/-/ansis-4.3.1.tgz",
+ "integrity": "sha512-BJ8/l4R5LRE7hW9WdSuGYrLSHi2ynxeFpDFbH0K/CgNeY/tyhk+vO6TYxXC5r5CpUhNVX310xzPsN/H9lCdfOA==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/any-promise": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
@@ -21603,6 +21633,84 @@
"node": ">=0.8"
}
},
+ "node_modules/ast-kit": {
+ "version": "3.0.0-beta.1",
+ "resolved": "https://registry.npmjs.org/ast-kit/-/ast-kit-3.0.0-beta.1.tgz",
+ "integrity": "sha512-trmleAnZ2PxN/loHWVhhx1qeOHSRXq4TDsBBxq3GqeJitfk3+jTQ+v/C1km/KYq9M7wKqCewMh+/NAvVH7m+bw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/parser": "^8.0.0-beta.4",
+ "estree-walker": "^3.0.3",
+ "pathe": "^2.0.3"
+ },
+ "engines": {
+ "node": ">=20.19.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ }
+ },
+ "node_modules/ast-kit/node_modules/@babel/helper-string-parser": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0-rc.6.tgz",
+ "integrity": "sha512-BCkFy+zN6kXQed3YOT7aJl93NfDSzQc3pBfsvTVPs9gU9X3V0aefEF5kwBT0E+mDWH9QgKaZstYUQN9VdQZT4g==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "node_modules/ast-kit/node_modules/@babel/helper-validator-identifier": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0-rc.6.tgz",
+ "integrity": "sha512-nVJ+1JcCgntv8d78rRo++o2wuODT0Irknx2BF8Np4Ft2CRgjLqIs4qzSZ8b66yGbBdMWGmZBO9WEZv1hhNiSpg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "node_modules/ast-kit/node_modules/@babel/parser": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0-rc.6.tgz",
+ "integrity": "sha512-rOS8IpdO7mQELkTPlCsTgPejO0bFuZdEDCGQJouYbYf9e1FLTym7Fei2pEjq8q7MWbX0ravcd7QQYKs1TxOuog==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/types": "^8.0.0-rc.6"
+ },
+ "bin": {
+ "parser": "bin/babel-parser.js"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "node_modules/ast-kit/node_modules/@babel/types": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0-rc.6.tgz",
+ "integrity": "sha512-p7/ABylAYlexb31wtRdIfH9L9A0Z2T/9H6zAqzqndkY2PLkvNNc580wGhp/gGKN4Sp9sQvSkhc6Oga8/O+wTyw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-string-parser": "^8.0.0-rc.6",
+ "@babel/helper-validator-identifier": "^8.0.0-rc.6"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "node_modules/ast-kit/node_modules/estree-walker": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+ "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/estree": "^1.0.0"
+ }
+ },
"node_modules/ast-types-flow": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
@@ -22248,6 +22356,16 @@
"integrity": "sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==",
"license": "MIT"
},
+ "node_modules/birpc": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/birpc/-/birpc-4.0.0.tgz",
+ "integrity": "sha512-LShSxJP0KTmd101b6DRyGBj57LZxSDYWKitQNW/mi8GRMvZb078Uf9+pveax1DrVL89vm7mWe+TovdI/UDOuPw==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
"node_modules/bluebird": {
"version": "3.4.7",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
@@ -22663,6 +22781,16 @@
"node": ">= 0.8"
}
},
+ "node_modules/cac": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/cac/-/cac-7.0.0.tgz",
+ "integrity": "sha512-tixWYgm5ZoOD+3g6UTea91eow5z6AAHaho3g0V9CNSNb45gM8SmflpAc+GRd1InC4AqN/07Unrgp56Y94N9hJQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=20.19.0"
+ }
+ },
"node_modules/call-bind": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
@@ -24827,6 +24955,13 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/defu": {
+ "version": "6.1.7",
+ "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz",
+ "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/delaunator": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz",
@@ -25106,6 +25241,27 @@
"resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz",
"integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q=="
},
+ "node_modules/dts-resolver": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/dts-resolver/-/dts-resolver-3.0.0.tgz",
+ "integrity": "sha512-1T1f+z+4tl9XD+m+0HBgWoL/nm0bOIffyWaUuUSBlFg/86IWvfx+wjNaO/ybU0AJzG9/Mi5hBUgGV6zCmWEN7Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^22.18.0 || >=24.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ },
+ "peerDependencies": {
+ "oxc-resolver": ">=11.0.0"
+ },
+ "peerDependenciesMeta": {
+ "oxc-resolver": {
+ "optional": true
+ }
+ }
+ },
"node_modules/duck": {
"version": "0.1.12",
"resolved": "https://registry.npmjs.org/duck/-/duck-0.1.12.tgz",
@@ -25210,6 +25366,16 @@
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
},
+ "node_modules/empathic": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/empathic/-/empathic-2.0.1.tgz",
+ "integrity": "sha512-YGRs8knHhKHVShLkFET/rWAU8kmHbOV5LwN938RHI0pljAJ1Gf6SzXsSmRaEzcXTtOOmVqJ5+WtQPL5uigY50Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/enabled": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
@@ -28051,6 +28217,13 @@
"node": ">=16.9.0"
}
},
+ "node_modules/hookable": {
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/hookable/-/hookable-6.1.1.tgz",
+ "integrity": "sha512-U9LYDy1CwhMCnprUfeAZWZGByVbhd54hwepegYTK7Pi5NvqEj63ifz5z+xukznehT7i6NIZRu89Ay1AZmRsLEQ==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/hookified": {
"version": "1.12.1",
"resolved": "https://registry.npmjs.org/hookified/-/hookified-1.12.1.tgz",
@@ -28435,6 +28608,19 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/import-without-cache": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/import-without-cache/-/import-without-cache-0.4.0.tgz",
+ "integrity": "sha512-NkJQA7oZ4YHQhd2+H3BoRFKF3d/XNsiKpHZCQEMH9pDX27hQQLsTyOocyRgaIVtf8gHX3Nt3LPkR4e5EdtPAGQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": "^22.18.0 || >=24.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ }
+ },
"node_modules/imurmurhash": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -34667,6 +34853,20 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/obug": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.2.tgz",
+ "integrity": "sha512-AWGB9WFcRXOQs48Z/udjI5ZcZMHXwX8XPByNpOydgcGsDLIzjGizhoMWJyKAWze7AVW/2W1i+/gPX4YtKe5cyg==",
+ "dev": true,
+ "funding": [
+ "https://github.com/sponsors/sxzz",
+ "https://opencollective.com/debug"
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">=12.20.0"
+ }
+ },
"node_modules/okapibm25": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/okapibm25/-/okapibm25-1.4.1.tgz",
@@ -37490,6 +37690,23 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/quansync": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/quansync/-/quansync-1.0.0.tgz",
+ "integrity": "sha512-5xZacEEufv3HSTPQuchrvV6soaiACMFnq1H8wkVioctoH3TRha9Sz66lOxRwPK/qZj7HPiSveih9yAyh98gvqA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://github.com/sponsors/antfu"
+ },
+ {
+ "type": "individual",
+ "url": "https://github.com/sponsors/sxzz"
+ }
+ ],
+ "license": "MIT"
+ },
"node_modules/querystring-es3": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
@@ -39734,9 +39951,9 @@
"license": "MIT"
},
"node_modules/semver": {
- "version": "7.7.3",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
- "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+ "version": "7.8.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.2.tgz",
+ "integrity": "sha512-c8jsqUZm3omBOI66G90z1Dyw5z622G8oLG+omfsHBJf3CWQTlOcwOjvOG6wtiNfW6anKm/eA39LMwMtMez2TiQ==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@@ -41328,9 +41545,9 @@
"license": "MIT"
},
"node_modules/tinyexec": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz",
- "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==",
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
+ "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==",
"license": "MIT",
"engines": {
"node": ">=18"
@@ -41497,6 +41714,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/tree-kill": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+ "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "tree-kill": "cli.js"
+ }
+ },
"node_modules/trim-lines": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@@ -41946,6 +42173,20 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/unconfig-core": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/unconfig-core/-/unconfig-core-7.5.0.tgz",
+ "integrity": "sha512-Su3FauozOGP44ZmKdHy2oE6LPjk51M/TRRjHv2HNCWiDvfvCoxC2lno6jevMA91MYAdCdwP05QnWdWpSbncX/w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@quansync/fs": "^1.0.0",
+ "quansync": "^1.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
"node_modules/undefsafe": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
@@ -44618,6 +44859,7 @@
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-typescript2": "^0.37.0",
"ts-node": "^10.9.2",
+ "tsdown": "^0.22.2",
"typescript": "^5.0.4"
},
"peerDependencies": {
@@ -44632,50 +44874,602 @@
"winston-daily-rotate-file": "^5.0.0"
}
},
- "packages/data-schemas/node_modules/logform": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
- "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==",
- "peer": true,
+ "packages/data-schemas/node_modules/@babel/generator": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-8.0.0-rc.6.tgz",
+ "integrity": "sha512-6mIzgVK8DgEzvIapoQwhXTMnnkuE4STQmVv9H03i/tZ2ml8oev3TRvZJgTenK2Bsq0YWNtzOrFdTyNzCMFtjJQ==",
+ "dev": true,
+ "license": "MIT",
"dependencies": {
- "@colors/colors": "1.6.0",
- "@types/triple-beam": "^1.3.2",
- "fecha": "^4.2.0",
- "ms": "^2.1.1",
- "safe-stable-stringify": "^2.3.1",
- "triple-beam": "^1.3.0"
+ "@babel/parser": "^8.0.0-rc.6",
+ "@babel/types": "^8.0.0-rc.6",
+ "@jridgewell/gen-mapping": "^0.3.12",
+ "@jridgewell/trace-mapping": "^0.3.28",
+ "@types/jsesc": "^2.5.0",
+ "jsesc": "^3.0.2"
},
"engines": {
- "node": ">= 12.0.0"
+ "node": "^22.18.0 || >=24.11.0"
}
},
- "packages/data-schemas/node_modules/object-hash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
- "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
- "peer": true,
+ "packages/data-schemas/node_modules/@babel/helper-string-parser": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.0-rc.6.tgz",
+ "integrity": "sha512-BCkFy+zN6kXQed3YOT7aJl93NfDSzQc3pBfsvTVPs9gU9X3V0aefEF5kwBT0E+mDWH9QgKaZstYUQN9VdQZT4g==",
+ "dev": true,
+ "license": "MIT",
"engines": {
- "node": ">= 6"
+ "node": "^22.18.0 || >=24.11.0"
}
},
- "packages/data-schemas/node_modules/rimraf": {
- "version": "6.1.3",
- "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz",
- "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==",
+ "packages/data-schemas/node_modules/@babel/helper-validator-identifier": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.0-rc.6.tgz",
+ "integrity": "sha512-nVJ+1JcCgntv8d78rRo++o2wuODT0Irknx2BF8Np4Ft2CRgjLqIs4qzSZ8b66yGbBdMWGmZBO9WEZv1hhNiSpg==",
"dev": true,
- "license": "BlueOak-1.0.0",
+ "license": "MIT",
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@babel/parser": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.0-rc.6.tgz",
+ "integrity": "sha512-rOS8IpdO7mQELkTPlCsTgPejO0bFuZdEDCGQJouYbYf9e1FLTym7Fei2pEjq8q7MWbX0ravcd7QQYKs1TxOuog==",
+ "dev": true,
+ "license": "MIT",
"dependencies": {
- "glob": "^13.0.3",
- "package-json-from-dist": "^1.0.1"
+ "@babel/types": "^8.0.0-rc.6"
},
"bin": {
- "rimraf": "dist/esm/bin.mjs"
+ "parser": "bin/babel-parser.js"
},
"engines": {
- "node": "20 || >=22"
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@babel/types": {
+ "version": "8.0.0-rc.6",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.0-rc.6.tgz",
+ "integrity": "sha512-p7/ABylAYlexb31wtRdIfH9L9A0Z2T/9H6zAqzqndkY2PLkvNNc580wGhp/gGKN4Sp9sQvSkhc6Oga8/O+wTyw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-string-parser": "^8.0.0-rc.6",
+ "@babel/helper-validator-identifier": "^8.0.0-rc.6"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.11.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@napi-rs/wasm-runtime": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
+ "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@tybys/wasm-util": "^0.10.1"
},
"funding": {
- "url": "https://github.com/sponsors/isaacs"
+ "type": "github",
+ "url": "https://github.com/sponsors/Brooooooklyn"
+ },
+ "peerDependencies": {
+ "@emnapi/core": "^1.7.1",
+ "@emnapi/runtime": "^1.7.1"
+ }
+ },
+ "packages/data-schemas/node_modules/@oxc-project/types": {
+ "version": "0.134.0",
+ "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.134.0.tgz",
+ "integrity": "sha512-T0xuRRKrQFmocH8y+jGfpmSkGcheaJExY9lEihmR1Gm2aH+75B8CzgU2rABRQSzzDxLjZ15Sc0bRVLj5lVeNXQ==",
+ "dev": true,
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/Boshen"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-android-arm64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.0.tgz",
+ "integrity": "sha512-gCYzGOSkYY6Z034suzd20euvds7lPzMEEla62DJGE/ZAlR4OMBnNbvnBSsIGUCAr52gaWMsloGxP4tVGtN5aCA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-darwin-arm64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.0.tgz",
+ "integrity": "sha512-JQBD77MNgu+4Z6RAyg69acugdrhhVoWesr3l47zohYZ2YV2fwkWMArkN/2p4l6Ei+Sno7W5q+UsKdVWq5Ens0w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-darwin-x64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.0.tgz",
+ "integrity": "sha512-p/8cXUTK4Sob604e+xxPhVSbDFf29E6J0l/xESM9rdCfn3aDai3nEs6TnMHUsdD5aNlFz0+gDbiGlozLKGa2YA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-freebsd-x64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.0.tgz",
+ "integrity": "sha512-KbtOSlVv6fElujiZWMcC3aQYhEwLVVf073RcwlSmpGQvIsKZFUqc0ef4sjUuurRwfbiI6JJXji9DQn+86hawmQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-linux-arm-gnueabihf": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.0.tgz",
+ "integrity": "sha512-9fZ9i0o0/MQaw7om6Z6TsT7tfCk0jtbEFtC+aPqZL5RNsGWNcHvn6EHgL3dAprjq+AZzPTAQjg2JtpJaMt+6pg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-linux-arm64-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.0.tgz",
+ "integrity": "sha512-+tog7T66i+yFyIuuAnjL6xmW182W/qTBOUt6BtQ6lBIM1Eikh/fSMz4HGgvuCp5uU0zuIVWng7kDYthjCMOHcg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-linux-arm64-musl": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.0.tgz",
+ "integrity": "sha512-4b7yruLIIj/oZ3GpcLOvxcLCLDMraohn3IhQfN2hBP4w9UekG0DTIajWguJosRGfySf/+h/NwRUiMKoCpxCrqQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-linux-ppc64-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.0.tgz",
+ "integrity": "sha512-QRDOVZd0bhQ5jLsUsCC3dUxDWdTSVY9WMznowZgCGOrZfLLgctWpelhUASEiBwsXfat/JwYnVd1EaxMhqyT+UQ==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-linux-s390x-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.0.tgz",
+ "integrity": "sha512-ypxT+Hq76NFG7woFbNbySnGEajFuYuIXeKz/jfCU+lXUoxfi3zLE6OG/ZQNeK3RpZSYJlAe2bokpsQ046CaieQ==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-linux-x64-gnu": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.0.tgz",
+ "integrity": "sha512-IdovCmfROFmpTLahdecTDFL74aLERVYN68F/mLZjfVh6LfoplPfI6deyHNMTcVujbokDV5k05XrFO22zfv+qjg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "libc": [
+ "glibc"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-linux-x64-musl": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.0.tgz",
+ "integrity": "sha512-pcA8xlFp2tyk9T2R6Fi/rPe3bQ1MA+sSMDNUU5Ogu80GHOatkE4P8YCreGAvZErm5Ho2YRXnyvNrWiRncfVysQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "libc": [
+ "musl"
+ ],
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-openharmony-arm64": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.0.tgz",
+ "integrity": "sha512-4+fexHayrLCWpriPh4c6dNvL4an34DEZCG7zOM/FD5QNF6h8DT+bDXzyB/kfC8lDJbaFb7jKShtnjDQFXVQEjg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openharmony"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-wasm32-wasi": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.0.tgz",
+ "integrity": "sha512-SbL++MNmOw6QamrwIGDMSSfM4ceTzFr+RjbOExJSLLBinScU4WI5OdA413h1qwPw2yH7lVF1+H4svQ+6mSXKTQ==",
+ "cpu": [
+ "wasm32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "dependencies": {
+ "@emnapi/core": "1.10.0",
+ "@emnapi/runtime": "1.10.0",
+ "@napi-rs/wasm-runtime": "^1.1.4"
+ },
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-win32-arm64-msvc": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.0.tgz",
+ "integrity": "sha512-+xTE6XC7wBgk0VKRXGG+QAnyW5S9b8vfsFpiMjf0waQTmSQSU8onsH/beyZ8X4aXVveJnotiy7VDjLOaW8bTrg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/@rolldown/binding-win32-x64-msvc": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.0.tgz",
+ "integrity": "sha512-Ogji1TQNqH3ACLnYr+1Ns1nyrJ0CO2P585u9Hsh02pXvtFiFpgtgT2b3P4PnCOU86VVCvqtAeCN4OftMT8KU4w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ }
+ },
+ "packages/data-schemas/node_modules/get-tsconfig": {
+ "version": "5.0.0-beta.5",
+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-5.0.0-beta.5.tgz",
+ "integrity": "sha512-/6gFNr0N04nob252sTQxyFLi3eKFRqIg1I87YcqAMT1i6SQrSF6KujUEQrtrjMV0H/eejTCltLdDSTEMzHbnsQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "resolve-pkg-maps": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=20.20.0"
+ },
+ "funding": {
+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+ }
+ },
+ "packages/data-schemas/node_modules/logform": {
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
+ "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==",
+ "peer": true,
+ "dependencies": {
+ "@colors/colors": "1.6.0",
+ "@types/triple-beam": "^1.3.2",
+ "fecha": "^4.2.0",
+ "ms": "^2.1.1",
+ "safe-stable-stringify": "^2.3.1",
+ "triple-beam": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 12.0.0"
+ }
+ },
+ "packages/data-schemas/node_modules/object-hash": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+ "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+ "peer": true,
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "packages/data-schemas/node_modules/picomatch": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "packages/data-schemas/node_modules/rimraf": {
+ "version": "6.1.3",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz",
+ "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==",
+ "dev": true,
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "glob": "^13.0.3",
+ "package-json-from-dist": "^1.0.1"
+ },
+ "bin": {
+ "rimraf": "dist/esm/bin.mjs"
+ },
+ "engines": {
+ "node": "20 || >=22"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "packages/data-schemas/node_modules/rolldown": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.0.tgz",
+ "integrity": "sha512-zpMvlJhs5PkXRTtKc0CaLBVI9AR/VDiJFpM+kx//hgToEca7FgMlGjaRIisXBcb19T76LswgmKECSQ96hjWr5A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@oxc-project/types": "=0.134.0",
+ "@rolldown/pluginutils": "^1.0.0"
+ },
+ "bin": {
+ "rolldown": "bin/cli.mjs"
+ },
+ "engines": {
+ "node": "^20.19.0 || >=22.12.0"
+ },
+ "optionalDependencies": {
+ "@rolldown/binding-android-arm64": "1.1.0",
+ "@rolldown/binding-darwin-arm64": "1.1.0",
+ "@rolldown/binding-darwin-x64": "1.1.0",
+ "@rolldown/binding-freebsd-x64": "1.1.0",
+ "@rolldown/binding-linux-arm-gnueabihf": "1.1.0",
+ "@rolldown/binding-linux-arm64-gnu": "1.1.0",
+ "@rolldown/binding-linux-arm64-musl": "1.1.0",
+ "@rolldown/binding-linux-ppc64-gnu": "1.1.0",
+ "@rolldown/binding-linux-s390x-gnu": "1.1.0",
+ "@rolldown/binding-linux-x64-gnu": "1.1.0",
+ "@rolldown/binding-linux-x64-musl": "1.1.0",
+ "@rolldown/binding-openharmony-arm64": "1.1.0",
+ "@rolldown/binding-wasm32-wasi": "1.1.0",
+ "@rolldown/binding-win32-arm64-msvc": "1.1.0",
+ "@rolldown/binding-win32-x64-msvc": "1.1.0"
+ }
+ },
+ "packages/data-schemas/node_modules/tsdown": {
+ "version": "0.22.2",
+ "resolved": "https://registry.npmjs.org/tsdown/-/tsdown-0.22.2.tgz",
+ "integrity": "sha512-VX9gsyKXsTnBZjnIM4jsHl9aRv+GfgkE/k1hQslilaBfZMlaw3JuGR+6yhiU0QxWBtOCDnTjwOSoXzgB7Rr50g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansis": "^4.3.1",
+ "cac": "^7.0.0",
+ "defu": "^6.1.7",
+ "empathic": "^2.0.1",
+ "hookable": "^6.1.1",
+ "import-without-cache": "^0.4.0",
+ "obug": "^2.1.1",
+ "picomatch": "^4.0.4",
+ "rolldown": "~1.1.0",
+ "rolldown-plugin-dts": "^0.25.2",
+ "semver": "^7.8.1",
+ "tinyexec": "^1.2.4",
+ "tinyglobby": "^0.2.17",
+ "tree-kill": "^1.2.2",
+ "unconfig-core": "^7.5.0"
+ },
+ "bin": {
+ "tsdown": "dist/run.mjs"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ },
+ "peerDependencies": {
+ "@arethetypeswrong/core": "^0.18.1",
+ "@tsdown/css": "0.22.2",
+ "@tsdown/exe": "0.22.2",
+ "@vitejs/devtools": "*",
+ "publint": "^0.3.8",
+ "tsx": "*",
+ "typescript": "^5.0.0 || ^6.0.0",
+ "unplugin-unused": "^0.5.0",
+ "unrun": "*"
+ },
+ "peerDependenciesMeta": {
+ "@arethetypeswrong/core": {
+ "optional": true
+ },
+ "@tsdown/css": {
+ "optional": true
+ },
+ "@tsdown/exe": {
+ "optional": true
+ },
+ "@vitejs/devtools": {
+ "optional": true
+ },
+ "publint": {
+ "optional": true
+ },
+ "tsx": {
+ "optional": true
+ },
+ "typescript": {
+ "optional": true
+ },
+ "unplugin-unused": {
+ "optional": true
+ },
+ "unrun": {
+ "optional": true
+ }
+ }
+ },
+ "packages/data-schemas/node_modules/tsdown/node_modules/rolldown-plugin-dts": {
+ "version": "0.25.2",
+ "resolved": "https://registry.npmjs.org/rolldown-plugin-dts/-/rolldown-plugin-dts-0.25.2.tgz",
+ "integrity": "sha512-nMhN/R+vmR8GM45ZW1FWMSjRTSDDn/6w4GTf8RNrEFCBdl8B1kySWrU1ixPtbwzXoRlcO+R/S88VgXuJQwfdDg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@babel/generator": "8.0.0-rc.6",
+ "@babel/helper-validator-identifier": "8.0.0-rc.6",
+ "@babel/parser": "8.0.0-rc.6",
+ "ast-kit": "^3.0.0-beta.1",
+ "birpc": "^4.0.0",
+ "dts-resolver": "^3.0.0",
+ "get-tsconfig": "5.0.0-beta.5",
+ "obug": "^2.1.1"
+ },
+ "engines": {
+ "node": "^22.18.0 || >=24.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sxzz"
+ },
+ "peerDependencies": {
+ "@ts-macro/tsc": "^0.3.6",
+ "@typescript/native-preview": ">=7.0.0-dev.20260325.1",
+ "rolldown": "^1.0.0",
+ "typescript": "^5.0.0 || ^6.0.0",
+ "vue-tsc": "~3.2.0"
+ },
+ "peerDependenciesMeta": {
+ "@ts-macro/tsc": {
+ "optional": true
+ },
+ "@typescript/native-preview": {
+ "optional": true
+ },
+ "typescript": {
+ "optional": true
+ },
+ "vue-tsc": {
+ "optional": true
+ }
}
},
"packages/data-schemas/node_modules/winston": {
diff --git a/packages/api/src/agents/__tests__/load.spec.ts b/packages/api/src/agents/__tests__/load.spec.ts
index fb8c98039d..0bc93e8336 100644
--- a/packages/api/src/agents/__tests__/load.spec.ts
+++ b/packages/api/src/agents/__tests__/load.spec.ts
@@ -1,7 +1,7 @@
import mongoose from 'mongoose';
import { v4 as uuidv4 } from 'uuid';
-import { Constants, FileSources } from 'librechat-data-provider';
import { MongoMemoryServer } from 'mongodb-memory-server';
+import { Constants, FileSources } from 'librechat-data-provider';
import { agentSchema, createMethods } from '@librechat/data-schemas';
import type {
Agent as LibreChatAgent,
@@ -9,8 +9,8 @@ import type {
TConversation,
} from 'librechat-data-provider';
import type { LoadAgentParams, LoadAgentDeps } from '../load';
-import { loadAgent } from '../load';
import { loadAddedAgent } from '../added';
+import { loadAgent } from '../load';
let Agent: mongoose.Model<unknown>;
let createAgent: ReturnType<typeof createMethods>['createAgent'];
@@ -19,7 +19,7 @@ let getAgent: ReturnType<typeof createMethods>['getAgent'];
const mockGetMCPServerTools = jest.fn();
const deps: LoadAgentDeps = {
- getAgent: (searchParameter) => getAgent(searchParameter),
+ getAgent: (searchParameter) => getAgent(searchParameter) as Promise<LibreChatAgent | null>,
getMCPServerTools: mockGetMCPServerTools,
};
diff --git a/packages/api/src/app/AppService.spec.ts b/packages/api/src/app/AppService.spec.ts
index 2c07460b84..7c06fcd40f 100644
--- a/packages/api/src/app/AppService.spec.ts
+++ b/packages/api/src/app/AppService.spec.ts
@@ -9,6 +9,7 @@ import {
defaultAgentCapabilities,
} from 'librechat-data-provider';
import type { TCustomConfig } from 'librechat-data-provider';
+import type { FunctionTool } from '@librechat/data-schemas';
jest.mock('@librechat/data-schemas', () => ({
...jest.requireActual('@librechat/data-schemas'),
@@ -60,7 +61,7 @@ const azureGroups = [
];
describe('AppService', () => {
- const mockSystemTools = {
+ const mockSystemTools: Record<string, FunctionTool> = {
ExampleTool: {
type: 'function',
function: {
@@ -598,9 +599,9 @@ describe('AppService', () => {
);
// Verify that optional fields are not set when not provided
- expect(result.endpoints[EModelEndpoint.openAI].titlePrompt).toBeUndefined();
- expect(result.endpoints[EModelEndpoint.openAI].titlePromptTemplate).toBeUndefined();
- expect(result.endpoints[EModelEndpoint.openAI].titleMethod).toBeUndefined();
+ expect(result.endpoints![EModelEndpoint.openAI]!.titlePrompt).toBeUndefined();
+ expect(result.endpoints![EModelEndpoint.openAI]!.titlePromptTemplate).toBeUndefined();
+ expect(result.endpoints![EModelEndpoint.openAI]!.titleMethod).toBeUndefined();
});
it('should correctly configure titleEndpoint when specified', async () => {
@@ -859,7 +860,7 @@ describe('AppService updating app config and issuing warnings', () => {
);
// Verify excludedIds is undefined when not provided
- expect(result.endpoints.assistants.excludedIds).toBeUndefined();
+ expect(result.endpoints!.assistants!.excludedIds).toBeUndefined();
});
it('should not parse environment variable references in OCR config', async () => {
diff --git a/packages/api/src/mcp/__tests__/helpers/oauthTestServer.ts b/packages/api/src/mcp/__tests__/helpers/oauthTestServer.ts
index 34f968d4e2..9f75347778 100644
--- a/packages/api/src/mcp/__tests__/helpers/oauthTestServer.ts
+++ b/packages/api/src/mcp/__tests__/helpers/oauthTestServer.ts
@@ -1,11 +1,12 @@
-import * as http from 'http';
+import { z } from 'zod';
import * as net from 'net';
+import * as http from 'http';
import { randomUUID, createHash } from 'crypto';
-import { z } from 'zod';
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import type { FlowState } from '~/flow/types';
+import type { TokenMethods } from '@librechat/data-schemas';
import type { Socket } from 'net';
+import type { FlowState } from '~/flow/types';
export class MockKeyv<T = unknown> {
private store: Map<string, FlowState<T>>;
@@ -400,7 +401,7 @@ export class InMemoryTokenStore {
return `${filter.userId}:${filter.type}:${filter.identifier}`;
}
- findToken = async (filter: {
+ findToken = (async (filter: {
userId?: string;
type?: string;
identifier?: string;
@@ -414,9 +415,9 @@ export class InMemoryTokenStore {
}
}
return null;
- };
+ }) as unknown as TokenMethods['findToken'];
- createToken = async (data: {
+ createToken = (async (data: {
userId: string;
type: string;
identifier: string;
@@ -436,9 +437,9 @@ export class InMemoryTokenStore {
};
this.tokens.set(this.key(data), token);
return token;
- };
+ }) as unknown as TokenMethods['createToken'];
- updateToken = async (
+ updateToken = (async (
filter: { userId?: string; type?: string; identifier?: string },
data: {
userId?: string;
@@ -449,7 +450,7 @@ export class InMemoryTokenStore {
metadata?: Record<string, unknown>;
},
): Promise<InMemoryToken> => {
- const existing = await this.findToken(filter);
+ const existing = (await this.findToken(filter)) as InMemoryToken | null;
if (!existing) {
throw new Error(`Token not found for filter: ${JSON.stringify(filter)}`);
}
@@ -464,7 +465,7 @@ export class InMemoryTokenStore {
};
this.tokens.set(existingKey, updated);
return updated;
- };
+ }) as unknown as TokenMethods['updateToken'];
deleteToken = async (filter: {
userId: string;
@@ -474,7 +475,7 @@ export class InMemoryTokenStore {
this.tokens.delete(this.key(filter));
};
- deleteTokens = async (query: {
+ deleteTokens = (async (query: {
userId?: string;
type?: string;
identifier?: string;
@@ -491,7 +492,7 @@ export class InMemoryTokenStore {
}
}
return { acknowledged: true, deletedCount };
- };
+ }) as unknown as TokenMethods['deleteTokens'];
getAll(): InMemoryToken[] {
return [...this.tokens.values()];
diff --git a/packages/api/src/mcp/oauth/OAuthReconnectionManager.test.ts b/packages/api/src/mcp/oauth/OAuthReconnectionManager.test.ts
index 23a3278797..c4c0544b96 100644
--- a/packages/api/src/mcp/oauth/OAuthReconnectionManager.test.ts
+++ b/packages/api/src/mcp/oauth/OAuthReconnectionManager.test.ts
@@ -1,8 +1,9 @@
import { logger, TokenMethods } from '@librechat/data-schemas';
-import { FlowStateManager, MCPConnection, MCPOAuthTokens, MCPOptions } from '../..';
-import { MCPManager } from '../MCPManager';
+import type { IToken } from '@librechat/data-schemas';
import { OAuthReconnectionManager } from './OAuthReconnectionManager';
import { OAuthReconnectionTracker } from './OAuthReconnectionTracker';
+import { FlowStateManager, MCPConnection, MCPOptions } from '../..';
+import { MCPManager } from '../MCPManager';
jest.mock('@librechat/data-schemas', () => ({
logger: {
@@ -183,7 +184,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier,
expiresAt: new Date(Date.now() + 3600000), // 1 hour from now
- } as unknown as MCPOAuthTokens;
+ } as unknown as IToken;
}
return null;
});
@@ -234,7 +235,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier: 'mcp:server1',
expiresAt: new Date(Date.now() + 3600000),
- } as unknown as MCPOAuthTokens);
+ } as unknown as IToken);
// Mock failed connection
mockMCPManager.getUserConnection.mockRejectedValue(new Error('Connection failed'));
@@ -264,7 +265,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier,
expiresAt: new Date(Date.now() - 3600000),
- } as unknown as MCPOAuthTokens;
+ } as unknown as IToken;
}
return null;
});
@@ -287,13 +288,13 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier,
expiresAt: new Date(Date.now() - 3600000),
- } as unknown as MCPOAuthTokens;
+ } as unknown as IToken;
}
if (identifier === 'mcp:server1:refresh') {
return {
userId,
identifier,
- } as unknown as MCPOAuthTokens;
+ } as unknown as IToken;
}
return null;
});
@@ -330,7 +331,7 @@ describe('OAuthReconnectionManager', () => {
return {
userId,
identifier,
- } as unknown as MCPOAuthTokens;
+ } as unknown as IToken;
}
return null;
});
@@ -366,7 +367,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier: 'mcp:server1',
expiresAt: new Date(Date.now() + 3600000),
- } as unknown as MCPOAuthTokens);
+ } as unknown as IToken);
// Mock connection that returns but is not connected
const mockConnection = {
@@ -512,7 +513,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier,
expiresAt: new Date(Date.now() + 3600000),
- } as unknown as MCPOAuthTokens;
+ } as unknown as IToken;
});
const mockNewConnection = {
@@ -576,7 +577,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier: 'mcp:server1',
expiresAt: new Date(Date.now() + 3600000),
- } as unknown as MCPOAuthTokens);
+ } as unknown as IToken);
const boom = new Error('boom');
(mockRegistryInstance.getServerConfig as jest.Mock).mockRejectedValue(boom);
@@ -650,7 +651,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier,
expiresAt: new Date(Date.now() + 3600000),
- } as unknown as MCPOAuthTokens;
+ } as unknown as IToken;
}
return null;
});
@@ -699,7 +700,7 @@ describe('OAuthReconnectionManager', () => {
userId,
identifier: `mcp:${serverName}`,
expiresAt: new Date(Date.now() + 3600000),
- } as unknown as MCPOAuthTokens);
+ } as unknown as IToken);
// First reconnect attempt - will fail
mockMCPManager.getUserConnection.mockRejectedValueOnce(new Error('Connection failed'));
diff --git a/packages/api/src/mcp/oauth/tokens.ts b/packages/api/src/mcp/oauth/tokens.ts
index ae15268c8f..aae325f252 100644
--- a/packages/api/src/mcp/oauth/tokens.ts
+++ b/packages/api/src/mcp/oauth/tokens.ts
@@ -253,7 +253,7 @@ export class MCPTokenStorage {
identifier: `${identifier}:client`,
token: encryptedClientInfo,
expiresIn: 365 * 24 * 60 * 60,
- metadata,
+ metadata: metadata ? { ...metadata } : undefined,
};
// Check if client info already exists and update if it does
diff --git a/packages/api/src/middleware/remoteAgentAuth.spec.ts b/packages/api/src/middleware/remoteAgentAuth.spec.ts
index f7c7c96db0..72decf4a3c 100644
--- a/packages/api/src/middleware/remoteAgentAuth.spec.ts
+++ b/packages/api/src/middleware/remoteAgentAuth.spec.ts
@@ -3,6 +3,7 @@ import type { TAgentsEndpoint } from 'librechat-data-provider';
import type { JwtPayload, VerifyOptions } from 'jsonwebtoken';
import type { Request, Response } from 'express';
import type { RequestInit } from 'undici';
+import type { RemoteAgentAuthDeps } from './remoteAgentAuth';
jest.mock('@librechat/data-schemas', () => {
const actual = jest.requireActual('@librechat/data-schemas');
@@ -226,6 +227,10 @@ function makeDeps(appConfig: AppConfig = makeConfig()) {
};
}
+function asDeps(deps: ReturnType<typeof makeDeps>): RemoteAgentAuthDeps {
+ return deps as unknown as RemoteAgentAuthDeps;
+}
+
function setupOidcMocks(payload: JwtPayload, kid: string | null = 'test-kid') {
(jwt.decode as jest.Mock).mockReturnValue({ header: kid == null ? {} : { kid }, payload });
mockGetSigningKey.mockResolvedValue({ getPublicKey: () => 'public-key' });
@@ -265,7 +270,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ enabled: false }, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(401);
expect(json).toHaveBeenCalledWith({ error: 'Authentication required' });
@@ -275,14 +280,14 @@ describe('createRemoteAgentAuth', () => {
it('falls back to apiKeyMiddleware when oidc.enabled is false', async () => {
const deps = makeDeps(makeConfig({ enabled: false }));
- await createRemoteAgentAuth(deps)(makeReq() as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, makeRes().res, mockNext);
expect(deps.apiKeyMiddleware).toHaveBeenCalled();
});
it('loads base config before authentication when tenant context is absent', async () => {
const deps = makeDeps(makeConfig({ enabled: false }));
- await createRemoteAgentAuth(deps)(makeReq() as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, makeRes().res, mockNext);
expect(deps.getAppConfig).toHaveBeenCalledWith({ baseOnly: true });
expect(deps.apiKeyMiddleware).toHaveBeenCalled();
@@ -301,7 +306,7 @@ describe('createRemoteAgentAuth', () => {
});
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(deps.getAppConfig).toHaveBeenNthCalledWith(1, { baseOnly: true });
expect(deps.getAppConfig).toHaveBeenNthCalledWith(2, { tenantId: 'tenant-oidc-only' });
@@ -314,7 +319,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ enabled: false }));
await tenantStorage.run({ tenantId: 'tenant-preauth' }, async () => {
- await createRemoteAgentAuth(deps)(makeReq() as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, makeRes().res, mockNext);
});
expect(deps.getAppConfig).toHaveBeenCalledWith({ tenantId: 'tenant-preauth' });
@@ -331,7 +336,7 @@ describe('createRemoteAgentAuth', () => {
const { res, status } = makeRes();
await tenantStorage.run({ tenantId: 'tenant-oidc-only' }, async () => {
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
});
expect(deps.getAppConfig).toHaveBeenCalledWith({ tenantId: 'tenant-oidc-only' });
@@ -344,7 +349,7 @@ describe('createRemoteAgentAuth', () => {
const req = makeReq();
req.user = makeUser({ tenantId: 'tenant-a' });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.getAppConfig).toHaveBeenCalledWith({ tenantId: 'tenant-a' });
expect(deps.apiKeyMiddleware).toHaveBeenCalled();
@@ -352,7 +357,7 @@ describe('createRemoteAgentAuth', () => {
it('falls back to apiKeyMiddleware when remoteApi auth is absent', async () => {
const deps = makeDeps({ endpoints: { agents: {} } } as unknown as AppConfig);
- await createRemoteAgentAuth(deps)(makeReq() as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, makeRes().res, mockNext);
expect(deps.apiKeyMiddleware).toHaveBeenCalled();
});
@@ -363,7 +368,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(config);
const { res, status } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(401);
expect(mockNext).not.toHaveBeenCalled();
@@ -376,7 +381,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: true }));
const { res } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(deps.apiKeyMiddleware).toHaveBeenCalled();
expect(mockNext).toHaveBeenCalled();
@@ -386,7 +391,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(401);
expect(json).toHaveBeenCalledWith({ error: 'Bearer token required' });
@@ -397,7 +402,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ issuer: undefined }, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(500);
expect(json).toHaveBeenCalledWith({ error: 'Internal server error' });
@@ -408,7 +413,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ audience: undefined }, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(500);
expect(json).toHaveBeenCalledWith({ error: 'Internal server error' });
@@ -423,7 +428,7 @@ describe('createRemoteAgentAuth', () => {
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
const { res } = makeRes();
- await createRemoteAgentAuth(deps)(req as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, res, mockNext);
expect(req.user).toMatchObject({ id: 'uid123', email: '[email protected]' });
expect((jwt.verify as jest.Mock).mock.calls[0][2]).toEqual(
@@ -444,7 +449,7 @@ describe('createRemoteAgentAuth', () => {
);
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.getAppConfig).toHaveBeenNthCalledWith(1, { baseOnly: true });
expect(deps.getAppConfig).toHaveBeenNthCalledWith(2, {
@@ -480,7 +485,7 @@ describe('createRemoteAgentAuth', () => {
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(req as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, res, mockNext);
expect(deps.getAppConfig).toHaveBeenNthCalledWith(1, { baseOnly: true });
expect(deps.getAppConfig).toHaveBeenNthCalledWith(2, {
@@ -516,7 +521,7 @@ describe('createRemoteAgentAuth', () => {
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(req as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, res, mockNext);
expect(deps.getAppConfig).toHaveBeenNthCalledWith(1, { baseOnly: true });
expect(deps.getAppConfig).toHaveBeenNthCalledWith(2, {
@@ -538,7 +543,7 @@ describe('createRemoteAgentAuth', () => {
const issuer = `${BASE_ISSUER}/`;
const deps = makeDeps(makeConfig({ issuer }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -555,7 +560,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(jwt.verify).toHaveBeenCalledWith(
FAKE_TOKEN,
@@ -572,7 +577,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN} ` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(jwt.verify).toHaveBeenCalledWith(
FAKE_TOKEN,
@@ -588,7 +593,7 @@ describe('createRemoteAgentAuth', () => {
setupOidcMocks({ sub: 'sub123', email: '[email protected]' });
const deps = makeDeps();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -615,7 +620,7 @@ describe('createRemoteAgentAuth', () => {
setupOidcMocks({ sub: 'sub123', email: '[email protected]' });
const deps = makeDeps();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -648,7 +653,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(mockGetSigningKey).not.toHaveBeenCalled();
expect(jwt.verify).toHaveBeenCalledTimes(2);
@@ -664,7 +669,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect((req.user as IUser).federatedTokens).toEqual({
access_token: FAKE_TOKEN,
@@ -677,7 +682,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect((req.user as IUser).federatedTokens).toEqual({
access_token: FAKE_TOKEN,
@@ -691,7 +696,7 @@ describe('createRemoteAgentAuth', () => {
deps.findUser.mockResolvedValue(null);
const { res } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -710,7 +715,7 @@ describe('createRemoteAgentAuth', () => {
deps.findUser.mockResolvedValue(null);
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -736,7 +741,7 @@ describe('createRemoteAgentAuth', () => {
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(req as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(401);
expect(json).toHaveBeenCalledWith({ error: 'Unauthorized' });
@@ -751,7 +756,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: true }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -773,7 +778,7 @@ describe('createRemoteAgentAuth', () => {
.mockResolvedValueOnce(makeUser({ provider: 'google', openidId: undefined }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -796,7 +801,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: true }));
const { res } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -814,7 +819,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -833,7 +838,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: false }));
const { res, status } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: 'Bearer not.a.jwt' }) as Request,
res,
mockNext,
@@ -858,7 +863,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -883,7 +888,7 @@ describe('createRemoteAgentAuth', () => {
};
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(makeReq() as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(makeReq() as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(500);
expect(json).toHaveBeenCalledWith({ error: 'Internal server error' });
@@ -900,7 +905,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({}, { enabled: true }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -925,7 +930,7 @@ describe('createRemoteAgentAuth', () => {
}),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -941,7 +946,7 @@ describe('createRemoteAgentAuth', () => {
makeConfig({ jwksUri: undefined, issuer: 'https://issuer-env-1.example.com' }),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -961,7 +966,7 @@ describe('createRemoteAgentAuth', () => {
);
const { res, status } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -983,7 +988,7 @@ describe('createRemoteAgentAuth', () => {
);
const { res, status } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1001,7 +1006,7 @@ describe('createRemoteAgentAuth', () => {
makeConfig({ jwksUri: undefined, issuer: 'http://localhost:8080/realms/test' }),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1024,7 +1029,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ jwksUri: undefined, issuer }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1048,7 +1053,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ jwksUri: undefined, issuer }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1075,7 +1080,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ jwksUri: undefined, issuer }, { enabled: false }));
const { res, status } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1097,7 +1102,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ jwksUri: undefined, issuer }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1116,7 +1121,7 @@ describe('createRemoteAgentAuth', () => {
makeConfig({ jwksUri: undefined, issuer: 'https://issuer-env-cache.example.com' }),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1124,7 +1129,7 @@ describe('createRemoteAgentAuth', () => {
process.env.OPENID_JWKS_URL = 'https://env-two.example.com/jwks';
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1147,13 +1152,13 @@ describe('createRemoteAgentAuth', () => {
}),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1171,7 +1176,7 @@ describe('createRemoteAgentAuth', () => {
}),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1199,7 +1204,7 @@ describe('createRemoteAgentAuth', () => {
}),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1247,7 +1252,7 @@ describe('createRemoteAgentAuth', () => {
),
);
const { res, status } = makeRes();
- const request = createRemoteAgentAuth(deps)(
+ const request = createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1275,7 +1280,7 @@ describe('createRemoteAgentAuth', () => {
);
const { res, status } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1295,7 +1300,7 @@ describe('createRemoteAgentAuth', () => {
);
const { res, status } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1313,7 +1318,7 @@ describe('createRemoteAgentAuth', () => {
deps.findUser
.mockResolvedValueOnce(null)
.mockResolvedValueOnce(makeUser({ email: getOpenIdEmail(claims), openidId: claims.sub }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1375,7 +1380,7 @@ describe('createRemoteAgentAuth', () => {
role: 'user',
}),
);
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1407,7 +1412,7 @@ describe('createRemoteAgentAuth', () => {
);
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1424,7 +1429,7 @@ describe('createRemoteAgentAuth', () => {
setupOidcMocks({ sub: 'sub123', email: '[email protected]' });
const deps = { ...makeDeps(), updateUser: mockUpdateUser };
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1456,7 +1461,7 @@ describe('createRemoteAgentAuth', () => {
setupOidcMocks({ sub: 'sub123', email: '[email protected]', roles: ['STANDARD-USER'] });
const deps = makeDeps();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1477,7 +1482,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.updateUser).toHaveBeenCalledWith('uid123', { role: 'STANDARD-USER' });
expect(req.user).toMatchObject({ role: 'STANDARD-USER' });
@@ -1494,7 +1499,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.updateUser).toHaveBeenCalledWith('uid123', { role: 'USER' });
expect(req.user).toMatchObject({ role: 'USER' });
@@ -1510,7 +1515,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.updateUser).toHaveBeenCalledWith('uid123', { role: 'USER' });
expect(req.user).toMatchObject({ role: 'USER' });
@@ -1527,7 +1532,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
deps.findUser = makeFindUser(makeUser({ role: SystemRoles.ADMIN }));
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.getRolesByNames).not.toHaveBeenCalled();
expect(deps.updateUser).not.toHaveBeenCalled();
@@ -1540,7 +1545,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.getRolesByNames).not.toHaveBeenCalled();
expect(deps.updateUser).not.toHaveBeenCalled();
@@ -1557,7 +1562,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps();
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.updateUser).not.toHaveBeenCalled();
expect(req.user).toMatchObject({ role: 'user' });
@@ -1576,7 +1581,7 @@ describe('createRemoteAgentAuth', () => {
);
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
- await createRemoteAgentAuth(deps)(req as Request, makeRes().res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, makeRes().res, mockNext);
expect(deps.getRolesByNames).toHaveBeenCalledWith(
['STANDARD-USER', 'BASIC-USER', 'USER'],
@@ -1604,7 +1609,7 @@ describe('createRemoteAgentAuth', () => {
const req = makeReq({ authorization: `Bearer ${FAKE_TOKEN}` });
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(req as Request, res, mockNext);
+ await createRemoteAgentAuth(asDeps(deps))(req as Request, res, mockNext);
expect(status).toHaveBeenCalledWith(401);
expect(json).toHaveBeenCalledWith({ error: 'Unauthorized' });
@@ -1621,7 +1626,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ scope: 'remote_agent' }, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1637,7 +1642,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ scope: 'remote_agent' }, { enabled: true }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1657,7 +1662,7 @@ describe('createRemoteAgentAuth', () => {
});
const deps = makeDeps(makeConfig({ scope: 'remote_agent' }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1674,7 +1679,7 @@ describe('createRemoteAgentAuth', () => {
});
const deps = makeDeps(makeConfig({ scope: 'remote_agent' }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1691,7 +1696,7 @@ describe('createRemoteAgentAuth', () => {
});
const deps = makeDeps(makeConfig({ scope: 'remote_agent admin' }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
@@ -1710,7 +1715,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ scope: 'remote_agent admin' }, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1731,7 +1736,7 @@ describe('createRemoteAgentAuth', () => {
const deps = makeDeps(makeConfig({ scope: 'remote_agent,admin' }, { enabled: false }));
const { res, status, json } = makeRes();
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
res,
mockNext,
@@ -1746,7 +1751,7 @@ describe('createRemoteAgentAuth', () => {
setupOidcMocks({ sub: 'sub123', email: '[email protected]' });
const deps = makeDeps(makeConfig({ scope: undefined }));
- await createRemoteAgentAuth(deps)(
+ await createRemoteAgentAuth(asDeps(deps))(
makeReq({ authorization: `Bearer ${FAKE_TOKEN}` }) as Request,
makeRes().res,
mockNext,
diff --git a/packages/data-provider/rollup.config.js b/packages/data-provider/rollup.config.js
index 8eb655cc41..056d48c562 100644
--- a/packages/data-provider/rollup.config.js
+++ b/packages/data-provider/rollup.config.js
@@ -5,7 +5,6 @@ import rootPkg from '../../package.json';
import peerDepsExternal from 'rollup-plugin-peer-deps-external';
import commonjs from '@rollup/plugin-commonjs';
import replace from '@rollup/plugin-replace';
-import terser from '@rollup/plugin-terser';
const plugins = [
peerDepsExternal(),
@@ -27,7 +26,6 @@ const plugins = [
tsconfig: './tsconfig.json',
useTsconfigDeclarationDir: true,
}),
- terser(),
];
export default [
diff --git a/packages/data-schemas/package.json b/packages/data-schemas/package.json
index b9afab139f..2c0520da52 100644
--- a/packages/data-schemas/package.json
+++ b/packages/data-schemas/package.json
@@ -4,19 +4,29 @@
"description": "Mongoose schemas and models for LibreChat",
"type": "module",
"main": "dist/index.cjs",
- "module": "dist/index.es.js",
- "types": "./dist/types/index.d.ts",
+ "module": "dist/index.mjs",
+ "types": "./dist/index.d.cts",
"sideEffects": false,
"exports": {
".": {
- "import": "./dist/index.es.js",
- "require": "./dist/index.cjs",
- "types": "./dist/types/index.d.ts"
+ "import": {
+ "types": "./dist/index.d.mts",
+ "default": "./dist/index.mjs"
+ },
+ "require": {
+ "types": "./dist/index.d.cts",
+ "default": "./dist/index.cjs"
+ }
},
"./capabilities": {
- "import": "./dist/admin/capabilities.es.js",
- "require": "./dist/admin/capabilities.cjs",
- "types": "./dist/types/admin/capabilities.d.ts"
+ "import": {
+ "types": "./dist/capabilities.d.mts",
+ "default": "./dist/admin/capabilities.mjs"
+ },
+ "require": {
+ "types": "./dist/capabilities.d.cts",
+ "default": "./dist/admin/capabilities.cjs"
+ }
}
},
"files": [
@@ -24,13 +34,13 @@
],
"scripts": {
"clean": "rimraf dist",
- "build": "npm run clean && rollup -c --silent --bundleConfigAsCjs",
- "build:watch": "rollup -c -w",
+ "build": "npm run clean && tsdown",
+ "build:watch": "tsdown --watch",
"test": "jest --coverage --watch",
"test:ci": "jest --coverage --ci",
"verify": "npm run test:ci",
"b:clean": "bun run rimraf dist",
- "b:build": "bun run b:clean && bun run rollup -c --silent --bundleConfigAsCjs"
+ "b:build": "bun run b:clean && bun run tsdown"
},
"repository": {
"type": "git",
@@ -61,6 +71,7 @@
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-typescript2": "^0.37.0",
"ts-node": "^10.9.2",
+ "tsdown": "^0.22.2",
"typescript": "^5.0.4"
},
"peerDependencies": {
diff --git a/packages/data-schemas/rollup.config.js b/packages/data-schemas/rollup.config.js
deleted file mode 100644
index 703630e121..0000000000
--- a/packages/data-schemas/rollup.config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import json from '@rollup/plugin-json';
-import typescript from '@rollup/plugin-typescript';
-import commonjs from '@rollup/plugin-commonjs';
-import nodeResolve from '@rollup/plugin-node-resolve';
-import peerDepsExternal from 'rollup-plugin-peer-deps-external';
-
-export default {
- input: 'src/index.ts',
- output: [
- {
- dir: 'dist',
- format: 'es',
- sourcemap: true,
- preserveModules: true,
- preserveModulesRoot: 'src',
- entryFileNames: '[name].es.js',
- },
- {
- dir: 'dist',
- format: 'cjs',
- sourcemap: true,
- preserveModules: true,
- preserveModulesRoot: 'src',
- entryFileNames: '[name].cjs',
- },
- ],
- plugins: [
- // Allow importing JSON files
- json(),
- // Automatically externalize peer dependencies
- peerDepsExternal(),
- // Resolve modules from node_modules
- nodeResolve(),
- // Convert CommonJS modules to ES6
- commonjs(),
- // Compile TypeScript files and generate type declarations
- typescript({
- tsconfig: './tsconfig.build.json',
- declaration: true,
- declarationDir: 'dist/types',
- rootDir: 'src',
- }),
- ],
- // Do not bundle these external dependencies
- external: ['mongoose'],
-};
diff --git a/packages/data-schemas/src/app/endpoints.ts b/packages/data-schemas/src/app/endpoints.ts
index 1c8ed5b5d0..8db3a3e9f6 100644
--- a/packages/data-schemas/src/app/endpoints.ts
+++ b/packages/data-schemas/src/app/endpoints.ts
@@ -3,8 +3,8 @@ import type { TCustomConfig, TAgentsEndpoint, TAnthropicEndpoint } from 'librech
import type { AppConfig } from '~/types';
import { azureAssistantsDefaults, assistantsConfigSetup } from './assistants';
import { agentsConfigSetup } from './agents';
-import { azureConfigSetup } from './azure';
import { vertexConfigSetup } from './vertex';
+import { azureConfigSetup } from './azure';
/**
* Loads custom config endpoints
@@ -14,7 +14,21 @@ import { vertexConfigSetup } from './vertex';
export const loadEndpoints = (
config: Partial<TCustomConfig>,
agentsDefaults?: Partial<TAgentsEndpoint>,
-) => {
+): {
+ allowedAddresses?: string[];
+ openAI?: Partial<import('librechat-data-provider').TEndpoint>;
+ google?: Partial<import('librechat-data-provider').TEndpoint>;
+ bedrock?: Partial<import('librechat-data-provider').TEndpoint>;
+ anthropic?: Partial<TAnthropicEndpoint> & {
+ vertexConfig?: import('librechat-data-provider').TVertexAIConfig;
+ };
+ azureOpenAI?: import('librechat-data-provider').TAzureConfig;
+ assistants?: Partial<import('librechat-data-provider').TAssistantEndpoint>;
+ azureAssistants?: Partial<import('librechat-data-provider').TAssistantEndpoint>;
+ all?: Partial<import('librechat-data-provider').TEndpoint>;
+ agents?: Partial<TAgentsEndpoint>;
+ custom?: import('librechat-data-provider').TCustomEndpoints;
+} => {
const loadedEndpoints: AppConfig['endpoints'] = {};
const endpoints = config?.endpoints;
diff --git a/packages/data-schemas/src/app/vertex.ts b/packages/data-schemas/src/app/vertex.ts
index 92c71c370b..c773729bed 100644
--- a/packages/data-schemas/src/app/vertex.ts
+++ b/packages/data-schemas/src/app/vertex.ts
@@ -1,4 +1,3 @@
-import logger from '~/config/winston';
import {
EModelEndpoint,
extractEnvVariable,
@@ -12,12 +11,13 @@ import type {
TAnthropicEndpoint,
TVertexModelConfig,
} from 'librechat-data-provider';
+import logger from '~/config/winston';
/**
* Default Vertex AI models available through Google Cloud
* These are the standard Anthropic model names as served by Vertex AI
*/
-export const defaultVertexModels = [
+export const defaultVertexModels: string[] = [
'claude-sonnet-4-6',
'claude-3-7-sonnet-20250219',
'claude-3-5-sonnet-v2@20241022',
diff --git a/packages/data-schemas/src/common/enum.ts b/packages/data-schemas/src/common/enum.ts
index 6fdce9c2bc..191191ecdf 100644
--- a/packages/data-schemas/src/common/enum.ts
+++ b/packages/data-schemas/src/common/enum.ts
@@ -1,15 +1,28 @@
import { PermissionBits } from 'librechat-data-provider';
/**
- * Common role combinations
+ * Common role combinations. Values mirror unions of `PermissionBits` flags;
+ * literals are required by `--isolatedDeclarations` (cross-file enum refs
+ * aren't computable). The guard below fails fast on any drift.
*/
export enum RoleBits {
- /** 0001 = 1 */
- VIEWER = PermissionBits.VIEW,
- /** 0011 = 3 */
- EDITOR = PermissionBits.VIEW | PermissionBits.EDIT,
- /** 0111 = 7 */
- MANAGER = PermissionBits.VIEW | PermissionBits.EDIT | PermissionBits.DELETE,
- /** 1111 = 15 */
- OWNER = PermissionBits.VIEW | PermissionBits.EDIT | PermissionBits.DELETE | PermissionBits.SHARE,
+ /** VIEW */
+ VIEWER = 1,
+ /** VIEW | EDIT */
+ EDITOR = 3,
+ /** VIEW | EDIT | DELETE */
+ MANAGER = 7,
+ /** VIEW | EDIT | DELETE | SHARE */
+ OWNER = 15,
+}
+
+if (
+ (RoleBits.VIEWER as number) !== PermissionBits.VIEW ||
+ (RoleBits.EDITOR as number) !== (PermissionBits.VIEW | PermissionBits.EDIT) ||
+ (RoleBits.MANAGER as number) !==
+ (PermissionBits.VIEW | PermissionBits.EDIT | PermissionBits.DELETE) ||
+ (RoleBits.OWNER as number) !==
+ (PermissionBits.VIEW | PermissionBits.EDIT | PermissionBits.DELETE | PermissionBits.SHARE)
+) {
+ throw new Error('RoleBits is out of sync with PermissionBits');
}
diff --git a/packages/data-schemas/src/config/meiliLogger.ts b/packages/data-schemas/src/config/meiliLogger.ts
index 243b3bed69..46cff165fa 100644
--- a/packages/data-schemas/src/config/meiliLogger.ts
+++ b/packages/data-schemas/src/config/meiliLogger.ts
@@ -72,7 +72,7 @@ transports.push(
}),
);
-const logger = winston.createLogger({
+const logger: winston.Logger = winston.createLogger({
level: level(),
levels,
transports,
diff --git a/packages/data-schemas/src/config/parsers.ts b/packages/data-schemas/src/config/parsers.ts
index 0558759474..ad12f2cfe5 100644
--- a/packages/data-schemas/src/config/parsers.ts
+++ b/packages/data-schemas/src/config/parsers.ts
@@ -330,23 +330,25 @@ function redactLogValue(value: unknown, seen = new WeakMap<object, unknown>(), d
* @param info - The log information object.
* @returns The modified log information object.
*/
-const redactFormat = winston.format((info: winston.Logform.TransformableInfo) => {
- const infoRecord = info as Record<string | symbol, unknown>;
+const redactFormat: winston.Logform.FormatWrap = winston.format(
+ (info: winston.Logform.TransformableInfo) => {
+ const infoRecord = info as Record<string | symbol, unknown>;
- if (info.message !== undefined) {
- info.message = redactLogValue(info.message);
- }
+ if (info.message !== undefined) {
+ info.message = redactLogValue(info.message);
+ }
- const symbolValue = infoRecord[MESSAGE_SYMBOL];
- if (symbolValue !== undefined) {
- infoRecord[MESSAGE_SYMBOL] = redactLogValue(symbolValue);
- }
+ const symbolValue = infoRecord[MESSAGE_SYMBOL];
+ if (symbolValue !== undefined) {
+ infoRecord[MESSAGE_SYMBOL] = redactLogValue(symbolValue);
+ }
- if (infoRecord[SPLAT_SYMBOL] !== undefined) {
- infoRecord[SPLAT_SYMBOL] = redactLogValue(infoRecord[SPLAT_SYMBOL]);
- }
- return info;
-});
+ if (infoRecord[SPLAT_SYMBOL] !== undefined) {
+ infoRecord[SPLAT_SYMBOL] = redactLogValue(infoRecord[SPLAT_SYMBOL]);
+ }
+ return info;
+ },
+);
/**
* Truncates long strings, especially base64 image data, within log messages.
@@ -406,7 +408,7 @@ function appendRequestContext(line: string, metadata: Record<string, unknown>):
* @param options - The options for formatting log messages.
* @returns The formatted log message.
*/
-const debugTraverse = winston.format.printf(
+const debugTraverse: winston.Logform.Format = winston.format.printf(
({ level, message, timestamp, ...metadata }: Record<string, unknown>) => {
if (!message) {
return `${timestamp} ${level}`;
@@ -507,41 +509,43 @@ const debugTraverse = winston.format.printf(
* Truncates long string values in JSON log objects.
* Prevents outputting extremely long values (e.g., base64, blobs).
*/
-const jsonTruncateFormat = winston.format((info: winston.Logform.TransformableInfo) => {
- const truncateLongStrings = (str: string, maxLength: number): string =>
- str.length > maxLength ? str.substring(0, maxLength) + '...' : str;
+const jsonTruncateFormat: winston.Logform.FormatWrap = winston.format(
+ (info: winston.Logform.TransformableInfo) => {
+ const truncateLongStrings = (str: string, maxLength: number): string =>
+ str.length > maxLength ? str.substring(0, maxLength) + '...' : str;
- const seen = new WeakSet<object>();
+ const seen = new WeakSet<object>();
- const truncateObject = (obj: unknown): unknown => {
- if (typeof obj !== 'object' || obj === null) {
- return obj;
- }
-
- // Handle circular references - now with proper object type
- if (seen.has(obj)) {
- return '[Circular]';
- }
- seen.add(obj);
+ const truncateObject = (obj: unknown): unknown => {
+ if (typeof obj !== 'object' || obj === null) {
+ return obj;
+ }
- if (Array.isArray(obj)) {
- return obj.map((item) => truncateObject(item));
- }
+ // Handle circular references - now with proper object type
+ if (seen.has(obj)) {
+ return '[Circular]';
+ }
+ seen.add(obj);
- // We know this is an object at this point
- const objectRecord = obj as Record<string, unknown>;
- const newObj: Record<string, unknown> = {};
- Object.entries(objectRecord).forEach(([key, value]) => {
- if (typeof value === 'string') {
- newObj[key] = truncateLongStrings(value, CONSOLE_JSON_STRING_LENGTH);
- } else {
- newObj[key] = truncateObject(value);
+ if (Array.isArray(obj)) {
+ return obj.map((item) => truncateObject(item));
}
- });
- return newObj;
- };
- return truncateObject(info) as winston.Logform.TransformableInfo;
-});
+ // We know this is an object at this point
+ const objectRecord = obj as Record<string, unknown>;
+ const newObj: Record<string, unknown> = {};
+ Object.entries(objectRecord).forEach(([key, value]) => {
+ if (typeof value === 'string') {
+ newObj[key] = truncateLongStrings(value, CONSOLE_JSON_STRING_LENGTH);
+ } else {
+ newObj[key] = truncateObject(value);
+ }
+ });
+ return newObj;
+ };
+
+ return truncateObject(info) as winston.Logform.TransformableInfo;
+ },
+);
export { redactFormat, redactMessage, debugTraverse, jsonTruncateFormat };
diff --git a/packages/data-schemas/src/config/tenantContext.ts b/packages/data-schemas/src/config/tenantContext.ts
index 9dc73f972b..00e18603d6 100644
--- a/packages/data-schemas/src/config/tenantContext.ts
+++ b/packages/data-schemas/src/config/tenantContext.ts
@@ -14,7 +14,8 @@ export const SYSTEM_TENANT_ID = '__SYSTEM__';
* Callbacks passed to `tenantStorage.run()` must be `async` for the context to propagate
* through Mongoose query execution. Sync callbacks returning a Mongoose thenable will lose context.
*/
-export const tenantStorage = new AsyncLocalStorage<TenantContext>();
+export const tenantStorage: AsyncLocalStorage<TenantContext> =
+ new AsyncLocalStorage<TenantContext>();
/** Returns the current tenant ID from async context, or undefined if none is set */
export function getTenantId(): string | undefined {
diff --git a/packages/data-schemas/src/config/winston.ts b/packages/data-schemas/src/config/winston.ts
index 9c4a7b7800..7b856b41fd 100644
--- a/packages/data-schemas/src/config/winston.ts
+++ b/packages/data-schemas/src/config/winston.ts
@@ -164,7 +164,7 @@ if (useDebugConsole) {
}
// Create logger
-const logger = winston.createLogger({
+const logger: winston.Logger = winston.createLogger({
level: level(),
levels,
transports,
diff --git a/packages/data-schemas/src/methods/accessRole.ts b/packages/data-schemas/src/methods/accessRole.ts
index 2853ea4564..63a49f3dba 100644
--- a/packages/data-schemas/src/methods/accessRole.ts
+++ b/packages/data-schemas/src/methods/accessRole.ts
@@ -3,7 +3,27 @@ import type { Model, Types, DeleteResult } from 'mongoose';
import type { IAccessRole } from '~/types';
import { RoleBits } from '~/common';
-export function createAccessRoleMethods(mongoose: typeof import('mongoose')) {
+export function createAccessRoleMethods(mongoose: typeof import('mongoose')): {
+ createRole: (roleData: Partial<IAccessRole>) => Promise<IAccessRole>;
+ updateRole: (
+ accessRoleId: string | Types.ObjectId,
+ updateData: Partial<IAccessRole>,
+ ) => Promise<IAccessRole | null>;
+ deleteRole: (accessRoleId: string | Types.ObjectId) => Promise<DeleteResult>;
+ getAllRoles: () => Promise<IAccessRole[]>;
+ findRoleById: (roleId: string | Types.ObjectId) => Promise<IAccessRole | null>;
+ seedDefaultRoles: () => Promise<Record<string, IAccessRole>>;
+ findRoleByIdentifier: (accessRoleId: string | Types.ObjectId) => Promise<IAccessRole | null>;
+ getRoleForPermissions: (
+ resourceType: string,
+ permBits: PermissionBits | RoleBits,
+ ) => Promise<IAccessRole | null>;
+ findRoleByPermissions: (
+ resourceType: string,
+ permBits: PermissionBits | RoleBits,
+ ) => Promise<IAccessRole | null>;
+ findRolesByResourceType: (resourceType: string) => Promise<IAccessRole[]>;
+} {
/**
* Find an access role by its ID
* @param roleId - The role ID
@@ -101,7 +121,7 @@ export function createAccessRoleMethods(mongoose: typeof import('mongoose')) {
* Seed default roles if they don't exist
* @returns Object containing created roles
*/
- async function seedDefaultRoles() {
+ async function seedDefaultRoles(): Promise<Record<string, IAccessRole>> {
const AccessRole = mongoose.models.AccessRole as Model<IAccessRole>;
const defaultRoles = [
{
diff --git a/packages/data-schemas/src/methods/aclEntry.spec.ts b/packages/data-schemas/src/methods/aclEntry.spec.ts
index 62bf13ad9c..68e2307830 100644
--- a/packages/data-schemas/src/methods/aclEntry.spec.ts
+++ b/packages/data-schemas/src/methods/aclEntry.spec.ts
@@ -1,11 +1,11 @@
import mongoose from 'mongoose';
+import { MongoMemoryServer } from 'mongodb-memory-server';
import {
ResourceType,
PrincipalType,
PrincipalModel,
PermissionBits,
} from 'librechat-data-provider';
-import { MongoMemoryServer } from 'mongodb-memory-server';
import type * as t from '~/types';
import { createAclEntryMethods, permissionBitSupersets } from './aclEntry';
import aclEntrySchema from '~/schema/aclEntry';
@@ -1259,14 +1259,14 @@ describe('AclEntry Model Tests', () => {
grantedById,
);
- const results = await methods.aggregateAclEntries([
+ const results = (await methods.aggregateAclEntries([
{ $group: { _id: '$resourceType', count: { $sum: 1 } } },
{ $sort: { _id: 1 } },
- ]);
+ ])) as Array<{ _id: string; count: number }>;
expect(results).toHaveLength(2);
- const agentResult = results.find((r: { _id: string }) => r._id === ResourceType.AGENT);
- expect(agentResult.count).toBe(2);
+ const agentResult = results.find((r) => r._id === ResourceType.AGENT);
+ expect(agentResult?.count).toBe(2);
});
test('should return empty array for non-matching pipeline', async () => {
diff --git a/packages/data-schemas/src/methods/aclEntry.ts b/packages/data-schemas/src/methods/aclEntry.ts
index cb2f32c0b6..105d55a1d1 100644
--- a/packages/data-schemas/src/methods/aclEntry.ts
+++ b/packages/data-schemas/src/methods/aclEntry.ts
@@ -8,8 +8,8 @@ import type {
Model,
} from 'mongoose';
import type { AclEntry, IAclEntry } from '~/types';
-import { MAX_PERM_BITS } from '~/common/permissions';
import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';
+import { MAX_PERM_BITS } from '~/common/permissions';
/**
* Empty frozen array shared by every rejection path. Returning a single
@@ -76,7 +76,87 @@ export function permissionBitSupersets(requiredBits: number): readonly number[]
return frozen;
}
-export function createAclEntryMethods(mongoose: typeof import('mongoose')) {
+export function createAclEntryMethods(mongoose: typeof import('mongoose')): {
+ findEntriesByPrincipal: (
+ principalType: string,
+ principalId: string | Types.ObjectId,
+ resourceType?: string,
+ ) => Promise<IAclEntry[]>;
+ findEntriesByResource: (
+ resourceType: string,
+ resourceId: string | Types.ObjectId,
+ ) => Promise<IAclEntry[]>;
+ findEntriesByPrincipalsAndResource: (
+ principalsList: Array<{ principalType: string; principalId?: string | Types.ObjectId }>,
+ resourceType: string,
+ resourceId: string | Types.ObjectId,
+ ) => Promise<IAclEntry[]>;
+ hasPermission: (
+ principalsList: Array<{ principalType: string; principalId?: string | Types.ObjectId }>,
+ resourceType: string,
+ resourceId: string | Types.ObjectId,
+ permissionBit: number,
+ ) => Promise<boolean>;
+ getEffectivePermissions: (
+ principalsList: Array<{ principalType: string; principalId?: string | Types.ObjectId }>,
+ resourceType: string,
+ resourceId: string | Types.ObjectId,
+ ) => Promise<number>;
+ getEffectivePermissionsForResources: (
+ principalsList: Array<{ principalType: string; principalId?: string | Types.ObjectId }>,
+ resourceType: string,
+ resourceIds: Array<string | Types.ObjectId>,
+ ) => Promise<Map<string, number>>;
+ grantPermission: (
+ principalType: string,
+ principalId: string | Types.ObjectId | null,
+ resourceType: string,
+ resourceId: string | Types.ObjectId,
+ permBits: number,
+ grantedBy?: string | Types.ObjectId,
+ session?: ClientSession,
+ roleId?: string | Types.ObjectId,
+ expiredAt?: Date,
+ ) => Promise<IAclEntry | null>;
+ revokePermission: (
+ principalType: string,
+ principalId: string | Types.ObjectId | null,
+ resourceType: string,
+ resourceId: string | Types.ObjectId,
+ session?: ClientSession,
+ ) => Promise<DeleteResult>;
+ modifyPermissionBits: (
+ principalType: string,
+ principalId: string | Types.ObjectId | null,
+ resourceType: string,
+ resourceId: string | Types.ObjectId,
+ addBits?: number | null,
+ removeBits?: number | null,
+ session?: ClientSession,
+ ) => Promise<IAclEntry | null>;
+ findAccessibleResources: (
+ principalsList: Array<{ principalType: string; principalId?: string | Types.ObjectId }>,
+ resourceType: string,
+ requiredPermBit: number,
+ ) => Promise<Types.ObjectId[]>;
+ deleteAclEntries: (
+ filter: Record<string, unknown>,
+ options?: { session?: ClientSession },
+ ) => Promise<DeleteResult>;
+ bulkWriteAclEntries: (
+ ops: AnyBulkWriteOperation<AclEntry>[],
+ options?: { session?: ClientSession },
+ ) => Promise<import('mongodb').BulkWriteResult>;
+ findPublicResourceIds: (
+ resourceType: string,
+ requiredPermissions: number,
+ ) => Promise<Types.ObjectId[]>;
+ aggregateAclEntries: (pipeline: PipelineStage[]) => Promise<unknown[]>;
+ getSoleOwnedResourceIds: (
+ userObjectId: Types.ObjectId,
+ resourceTypes: string | string[],
+ ) => Promise<Types.ObjectId[]>;
+} {
/**
* Find ACL entries for a specific principal (user or group)
* @param principalType - The type of principal ('user', 'group')
@@ -447,7 +527,7 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')) {
async function bulkWriteAclEntries(
ops: AnyBulkWriteOperation<AclEntry>[],
options?: { session?: ClientSession },
- ) {
+ ): Promise<import('mongodb').BulkWriteResult> {
const AclEntry = mongoose.models.AclEntry as Model<IAclEntry>;
return tenantSafeBulkWrite(AclEntry, ops as AnyBulkWriteOperation[], options || {});
}
@@ -474,7 +554,7 @@ export function createAclEntryMethods(mongoose: typeof import('mongoose')) {
* Runs an aggregation pipeline on the AclEntry collection.
* @param pipeline - MongoDB aggregation pipeline stages
*/
- async function aggregateAclEntries(pipeline: PipelineStage[]) {
+ async function aggregateAclEntries(pipeline: PipelineStage[]): Promise<unknown[]> {
const AclEntry = mongoose.models.AclEntry as Model<IAclEntry>;
return AclEntry.aggregate(pipeline);
}
diff --git a/packages/data-schemas/src/methods/action.ts b/packages/data-schemas/src/methods/action.ts
index 3dc5a2c87a..b86509800f 100644
--- a/packages/data-schemas/src/methods/action.ts
+++ b/packages/data-schemas/src/methods/action.ts
@@ -3,7 +3,18 @@ import type { IAction } from '~/types';
const sensitiveFields = ['api_key', 'oauth_client_id', 'oauth_client_secret'] as const;
-export function createActionMethods(mongoose: typeof import('mongoose')) {
+export function createActionMethods(mongoose: typeof import('mongoose')): {
+ getActions: (
+ searchParams: FilterQuery<IAction>,
+ includeSensitive?: boolean,
+ ) => Promise<IAction[]>;
+ updateAction: (
+ searchParams: FilterQuery<IAction>,
+ updateData: Partial<IAction>,
+ ) => Promise<IAction | null>;
+ deleteAction: (searchParams: FilterQuery<IAction>) => Promise<IAction | null>;
+ deleteActions: (searchParams: FilterQuery<IAction>) => Promise<number>;
+} {
/**
* Update an action with new data without overwriting existing properties,
* or create a new action if it doesn't exist.
diff --git a/packages/data-schemas/src/methods/agent.ts b/packages/data-schemas/src/methods/agent.ts
index 8a593b4498..344431d806 100644
--- a/packages/data-schemas/src/methods/agent.ts
+++ b/packages/data-schemas/src/methods/agent.ts
@@ -246,7 +246,83 @@ async function generateActionMetadataHash(
return hashHex;
}
-export function createAgentMethods(mongoose: typeof import('mongoose'), deps: AgentDeps) {
+export function createAgentMethods(
+ mongoose: typeof import('mongoose'),
+ deps: AgentDeps,
+): {
+ getAgent: (searchParameter: FilterQuery<IAgent>) => Promise<IAgent | null>;
+ getAgents: (searchParameter: FilterQuery<IAgent>) => Promise<IAgent[]>;
+ createAgent: (agentData: Record<string, unknown>) => Promise<IAgent>;
+ hasAgentWithMCPServerName: ({
+ agentIds,
+ serverName,
+ }: {
+ agentIds: Types.ObjectId[];
+ serverName: string;
+ }) => Promise<boolean>;
+ getMCPServerNamesByAgentIds: (agentIds: Types.ObjectId[]) => Promise<string[]>;
+ updateAgent: (
+ searchParameter: FilterQuery<IAgent>,
+ updateData: Record<string, unknown>,
+ options?: {
+ updatingUserId?: string | null;
+ forceVersion?: boolean;
+ skipVersioning?: boolean;
+ },
+ ) => Promise<IAgent | null>;
+ deleteAgent: (searchParameter: FilterQuery<IAgent>) => Promise<IAgent | null>;
+ deleteUserAgents: (userId: string) => Promise<void>;
+ revertAgentVersion: (
+ searchParameter: FilterQuery<IAgent>,
+ versionIndex: number,
+ ) => Promise<IAgent>;
+ countPromotedAgents: () => Promise<number>;
+ addAgentResourceFile: ({
+ agent_id,
+ tool_resource,
+ file_id,
+ updatingUserId,
+ }: {
+ agent_id: string;
+ tool_resource: string;
+ file_id: string;
+ updatingUserId?: string;
+ }) => Promise<IAgent>;
+ getListAgentsByAccess: ({
+ accessibleIds,
+ otherParams,
+ limit,
+ after,
+ includeSkillConfig,
+ }: {
+ accessibleIds?: Types.ObjectId[];
+ otherParams?: Record<string, unknown>;
+ limit?: number | null;
+ after?: string | null;
+ includeSkillConfig?: boolean;
+ }) => Promise<{
+ object: string;
+ data: Array<Record<string, unknown>>;
+ first_id: string | null;
+ last_id: string | null;
+ has_more: boolean;
+ after: string | null;
+ }>;
+ removeAgentResourceFiles: ({
+ agent_id,
+ files,
+ }: {
+ agent_id: string;
+ files: Array<{ tool_resource: string; file_id: string }>;
+ }) => Promise<IAgent>;
+ generateActionMetadataHash: typeof generateActionMetadataHash;
+ removeAgentFromUserFavorites: (resourceId: string, userIds: string[]) => Promise<void>;
+ removeAgentResourceFilesFromAllAgents: ({
+ file_ids,
+ }: {
+ file_ids: string[];
+ }) => Promise<{ matchedCount: number; modifiedCount: number }>;
+} {
const { removeAllPermissions, getActions, getSoleOwnedResourceIds } = deps;
/**
diff --git a/packages/data-schemas/src/methods/agentApiKey.ts b/packages/data-schemas/src/methods/agentApiKey.ts
index 3462f9ff84..c3de31f6bc 100644
--- a/packages/data-schemas/src/methods/agentApiKey.ts
+++ b/packages/data-schemas/src/methods/agentApiKey.ts
@@ -11,7 +11,22 @@ import logger from '~/config/winston';
const API_KEY_PREFIX = 'sk-';
const API_KEY_LENGTH = 32;
-export function createAgentApiKeyMethods(mongoose: typeof import('mongoose')) {
+export function createAgentApiKeyMethods(mongoose: typeof import('mongoose')): {
+ createAgentApiKey: (data: AgentApiKeyCreateData) => Promise<AgentApiKeyCreateResult>;
+ validateAgentApiKey: (
+ apiKey: string,
+ ) => Promise<{ userId: Types.ObjectId; keyId: Types.ObjectId } | null>;
+ listAgentApiKeys: (userId: string | Types.ObjectId) => Promise<AgentApiKeyListItem[]>;
+ deleteAgentApiKey: (
+ keyId: string | Types.ObjectId,
+ userId: string | Types.ObjectId,
+ ) => Promise<boolean>;
+ deleteAllAgentApiKeys: (userId: string | Types.ObjectId) => Promise<number>;
+ getAgentApiKeyById: (
+ keyId: string | Types.ObjectId,
+ userId: string | Types.ObjectId,
+ ) => Promise<AgentApiKeyListItem | null>;
+} {
async function generateApiKey(): Promise<{ key: string; keyHash: string; keyPrefix: string }> {
const randomPart = await getRandomValues(API_KEY_LENGTH);
const key = `${API_KEY_PREFIX}${randomPart}`;
diff --git a/packages/data-schemas/src/methods/agentCategory.ts b/packages/data-schemas/src/methods/agentCategory.ts
index 0a71d777db..cb26923e23 100644
--- a/packages/data-schemas/src/methods/agentCategory.ts
+++ b/packages/data-schemas/src/methods/agentCategory.ts
@@ -2,7 +2,30 @@ import type { Model, Types } from 'mongoose';
import type { IAgentCategory } from '~/types';
import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';
-export function createAgentCategoryMethods(mongoose: typeof import('mongoose')) {
+export function createAgentCategoryMethods(mongoose: typeof import('mongoose')): {
+ getActiveCategories: () => Promise<IAgentCategory[]>;
+ getCategoriesWithCounts: () => Promise<(IAgentCategory & { agentCount: number })[]>;
+ getValidCategoryValues: () => Promise<string[]>;
+ seedCategories: (
+ categories: Array<{
+ value: string;
+ label?: string;
+ description?: string;
+ order?: number;
+ custom?: boolean;
+ }>,
+ ) => Promise<import('mongoose').mongo.BulkWriteResult>;
+ findCategoryByValue: (value: string) => Promise<IAgentCategory | null>;
+ createCategory: (categoryData: Partial<IAgentCategory>) => Promise<IAgentCategory>;
+ updateCategory: (
+ value: string,
+ updateData: Partial<IAgentCategory>,
+ ) => Promise<IAgentCategory | null>;
+ deleteCategory: (value: string) => Promise<boolean>;
+ findCategoryById: (id: string | Types.ObjectId) => Promise<IAgentCategory | null>;
+ getAllCategories: () => Promise<IAgentCategory[]>;
+ ensureDefaultCategories: () => Promise<boolean>;
+} {
/**
* Get all active categories sorted by order
* @returns Array of active categories
diff --git a/packages/data-schemas/src/methods/assistant.ts b/packages/data-schemas/src/methods/assistant.ts
index 798acb688c..cc558ebc33 100644
--- a/packages/data-schemas/src/methods/assistant.ts
+++ b/packages/data-schemas/src/methods/assistant.ts
@@ -1,7 +1,19 @@
import type { FilterQuery, Model } from 'mongoose';
import type { IAssistant } from '~/types';
-export function createAssistantMethods(mongoose: typeof import('mongoose')) {
+export function createAssistantMethods(mongoose: typeof import('mongoose')): {
+ updateAssistantDoc: (
+ searchParams: FilterQuery<IAssistant>,
+ updateData: Partial<IAssistant>,
+ ) => Promise<IAssistant | null>;
+ deleteAssistant: (searchParams: FilterQuery<IAssistant>) => Promise<IAssistant | null>;
+ deleteAssistants: (searchParams: FilterQuery<IAssistant>) => Promise<number>;
+ getAssistants: (
+ searchParams: FilterQuery<IAssistant>,
+ select?: string | Record<string, number> | null,
+ ) => Promise<IAssistant[]>;
+ getAssistant: (searchParams: FilterQuery<IAssistant>) => Promise<IAssistant | null>;
+} {
/**
* Update an assistant with new data without overwriting existing properties,
* or create a new assistant if it doesn't exist.
@@ -39,7 +51,9 @@ export function createAssistantMethods(mongoose: typeof import('mongoose')) {
/**
* Deletes an assistant based on the provided search params.
*/
- async function deleteAssistant(searchParams: FilterQuery<IAssistant>) {
+ async function deleteAssistant(
+ searchParams: FilterQuery<IAssistant>,
+ ): Promise<IAssistant | null> {
const Assistant = mongoose.models.Assistant as Model<IAssistant>;
return await Assistant.findOneAndDelete(searchParams);
}
diff --git a/packages/data-schemas/src/methods/banner.ts b/packages/data-schemas/src/methods/banner.ts
index 6ae4877207..17bab9ddcd 100644
--- a/packages/data-schemas/src/methods/banner.ts
+++ b/packages/data-schemas/src/methods/banner.ts
@@ -1,8 +1,10 @@
import type { Model } from 'mongoose';
-import logger from '~/config/winston';
import type { IBanner, IUser } from '~/types';
+import logger from '~/config/winston';
-export function createBannerMethods(mongoose: typeof import('mongoose')) {
+export function createBannerMethods(mongoose: typeof import('mongoose')): {
+ getBanner: (user?: IUser | null) => Promise<IBanner | null>;
+} {
/**
* Retrieves the current active banner.
*/
diff --git a/packages/data-schemas/src/methods/categories.ts b/packages/data-schemas/src/methods/categories.ts
index 4761a32c16..3fb8692943 100644
--- a/packages/data-schemas/src/methods/categories.ts
+++ b/packages/data-schemas/src/methods/categories.ts
@@ -14,7 +14,9 @@ const options = [
export type CategoryOption = { label: string; value: string };
-export function createCategoriesMethods(_mongoose: typeof import('mongoose')) {
+export function createCategoriesMethods(_mongoose: typeof import('mongoose')): {
+ getCategories: () => Promise<CategoryOption[]>;
+} {
/**
* Retrieves the categories.
*/
diff --git a/packages/data-schemas/src/methods/config.ts b/packages/data-schemas/src/methods/config.ts
index ae58eb5b30..ca7bf015fd 100644
--- a/packages/data-schemas/src/methods/config.ts
+++ b/packages/data-schemas/src/methods/config.ts
@@ -1,10 +1,10 @@
import { Types } from 'mongoose';
import { PrincipalType, PrincipalModel } from 'librechat-data-provider';
-import { BASE_CONFIG_PRINCIPAL_ID } from '~/admin/capabilities';
-import { escapeRegExp } from '~/utils/string';
import type { TCustomConfig } from 'librechat-data-provider';
import type { Model, ClientSession } from 'mongoose';
import type { IConfig } from '~/types';
+import { BASE_CONFIG_PRINCIPAL_ID } from '~/admin/capabilities';
+import { escapeRegExp } from '~/utils/string';
function getTombstonePathsToClear(fieldPath: string): string[] {
const parts = fieldPath.split('.');
@@ -18,7 +18,60 @@ function getPathAndDescendantsRegex(fieldPath: string): RegExp {
return new RegExp(`^${escapeRegExp(fieldPath)}(?:\\.|$)`);
}
-export function createConfigMethods(mongoose: typeof import('mongoose')) {
+export function createConfigMethods(mongoose: typeof import('mongoose')): {
+ listAllConfigs: (filter?: { isActive?: boolean }, session?: ClientSession) => Promise<IConfig[]>;
+ findConfigByPrincipal: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ options?: { includeInactive?: boolean },
+ session?: ClientSession,
+ ) => Promise<IConfig | null>;
+ getApplicableConfigs: (
+ principals?: Array<{ principalType: string; principalId?: string | Types.ObjectId }>,
+ session?: ClientSession,
+ ) => Promise<IConfig[]>;
+ upsertConfig: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ principalModel: PrincipalModel,
+ overrides: Partial<TCustomConfig>,
+ priority: number,
+ session?: ClientSession,
+ ) => Promise<IConfig | null>;
+ patchConfigFields: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ principalModel: PrincipalModel,
+ fields: Record<string, unknown>,
+ priority: number,
+ session?: ClientSession,
+ ) => Promise<IConfig | null>;
+ tombstoneConfigField: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ principalModel: PrincipalModel,
+ fieldPath: string,
+ priority: number,
+ session?: ClientSession,
+ ) => Promise<IConfig | null>;
+ unsetConfigField: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ fieldPath: string,
+ session?: ClientSession,
+ ) => Promise<IConfig | null>;
+ deleteConfig: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ session?: ClientSession,
+ ) => Promise<IConfig | null>;
+ toggleConfigActive: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ isActive: boolean,
+ session?: ClientSession,
+ ) => Promise<IConfig | null>;
+} {
async function findConfigByPrincipal(
principalType: PrincipalType,
principalId: string | Types.ObjectId,
diff --git a/packages/data-schemas/src/methods/conversationTag.ts b/packages/data-schemas/src/methods/conversationTag.ts
index 085948bab5..c4f239c07d 100644
--- a/packages/data-schemas/src/methods/conversationTag.ts
+++ b/packages/data-schemas/src/methods/conversationTag.ts
@@ -12,11 +12,111 @@ interface IConversationTag {
[key: string]: unknown;
}
-export function createConversationTagMethods(mongoose: typeof import('mongoose')) {
+export function createConversationTagMethods(mongoose: typeof import('mongoose')): {
+ getConversationTags: (user: string) => Promise<
+ (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ >;
+ createConversationTag: (
+ user: string,
+ data: {
+ tag: string;
+ description?: string;
+ addToConversation?: boolean;
+ conversationId?: string;
+ },
+ ) => Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ >;
+ updateConversationTag: (
+ user: string,
+ oldTag: string,
+ data: { tag?: string; description?: string; position?: number },
+ ) => Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ >;
+ deleteConversationTag: (
+ user: string,
+ tag: string,
+ ) => Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ >;
+ deleteConversationTags: (filter: Record<string, unknown>) => Promise<number>;
+ bulkIncrementTagCounts: (user: string, tags: string[]) => Promise<void>;
+ updateTagsForConversation: (
+ user: string,
+ conversationId: string,
+ tags: string[],
+ ) => Promise<string[]>;
+} {
/**
* Retrieves all conversation tags for a user.
*/
- async function getConversationTags(user: string) {
+ async function getConversationTags(user: string): Promise<
+ (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ > {
try {
const ConversationTag = mongoose.models.ConversationTag as Model<IConversationTag>;
return await ConversationTag.find({ user }).sort({ position: 1 }).lean();
@@ -37,7 +137,22 @@ export function createConversationTagMethods(mongoose: typeof import('mongoose')
addToConversation?: boolean;
conversationId?: string;
},
- ) {
+ ): Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ > {
try {
const ConversationTag = mongoose.models.ConversationTag as Model<IConversationTag>;
const Conversation = mongoose.models.Conversation;
@@ -116,7 +231,22 @@ export function createConversationTagMethods(mongoose: typeof import('mongoose')
user: string,
oldTag: string,
data: { tag?: string; description?: string; position?: number },
- ) {
+ ): Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ > {
try {
const ConversationTag = mongoose.models.ConversationTag as Model<IConversationTag>;
const Conversation = mongoose.models.Conversation;
@@ -161,7 +291,25 @@ export function createConversationTagMethods(mongoose: typeof import('mongoose')
/**
* Deletes a conversation tag.
*/
- async function deleteConversationTag(user: string, tag: string) {
+ async function deleteConversationTag(
+ user: string,
+ tag: string,
+ ): Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user: string;
+ tag: string;
+ description?: string | undefined;
+ position: number;
+ count: number;
+ createdAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ > {
try {
const ConversationTag = mongoose.models.ConversationTag as Model<IConversationTag>;
const Conversation = mongoose.models.Conversation;
@@ -188,7 +336,11 @@ export function createConversationTagMethods(mongoose: typeof import('mongoose')
/**
* Updates tags for a specific conversation.
*/
- async function updateTagsForConversation(user: string, conversationId: string, tags: string[]) {
+ async function updateTagsForConversation(
+ user: string,
+ conversationId: string,
+ tags: string[],
+ ): Promise<string[]> {
try {
const ConversationTag = mongoose.models.ConversationTag as Model<IConversationTag>;
const Conversation = mongoose.models.Conversation;
@@ -255,7 +407,7 @@ export function createConversationTagMethods(mongoose: typeof import('mongoose')
/**
* Increments tag counts for existing tags only.
*/
- async function bulkIncrementTagCounts(user: string, tags: string[]) {
+ async function bulkIncrementTagCounts(user: string, tags: string[]): Promise<void> {
if (!tags || tags.length === 0) {
return;
}
diff --git a/packages/data-schemas/src/methods/file.ts b/packages/data-schemas/src/methods/file.ts
index 29efc1bc49..c8d7620580 100644
--- a/packages/data-schemas/src/methods/file.ts
+++ b/packages/data-schemas/src/methods/file.ts
@@ -5,7 +5,58 @@ import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';
import logger from '../config/winston';
/** Factory function that takes mongoose instance and returns the file methods */
-export function createFileMethods(mongoose: typeof import('mongoose')) {
+export function createFileMethods(mongoose: typeof import('mongoose')): {
+ findFileById: (file_id: string, options?: Record<string, unknown>) => Promise<IMongoFile | null>;
+ getFiles: (
+ filter: FilterQuery<IMongoFile>,
+ _sortOptions?: Record<string, SortOrder> | null,
+ selectFields?: Record<string, 0 | 1> | string | null,
+ ) => Promise<IMongoFile[] | null>;
+ getExpiredFiles: (limit?: number, now?: Date) => Promise<IMongoFile[]>;
+ getToolFilesByIds: (
+ fileIds: string[],
+ toolResourceSet?: Set<EToolResources>,
+ ) => Promise<IMongoFile[]>;
+ getCodeGeneratedFiles: (
+ conversationId: string,
+ threadFileIds?: string[],
+ ) => Promise<IMongoFile[]>;
+ getUserCodeFiles: (fileIds?: string[]) => Promise<IMongoFile[]>;
+ claimCodeFile: (data: {
+ filename: string;
+ conversationId: string;
+ file_id: string;
+ user: string;
+ tenantId?: string | null;
+ }) => Promise<IMongoFile>;
+ createFile: (data: Partial<IMongoFile>, disableTTL?: boolean) => Promise<IMongoFile | null>;
+ updateFile: (
+ data: Partial<IMongoFile> & { file_id: string },
+ extraFilter?: FilterQuery<IMongoFile>,
+ ) => Promise<IMongoFile | null>;
+ updateFileUsage: (data: {
+ file_id: string;
+ inc?: number;
+ user?: string;
+ }) => Promise<IMongoFile | null>;
+ deleteFile: (file_id: string) => Promise<IMongoFile | null>;
+ deleteFiles: (file_ids: string[], user?: string) => Promise<{ deletedCount?: number }>;
+ deleteFileByFilter: (filter: FilterQuery<IMongoFile>) => Promise<IMongoFile | null>;
+ batchUpdateFiles: (
+ updates: Array<{
+ file_id: string;
+ filepath: string;
+ storageKey?: string;
+ storageRegion?: string;
+ }>,
+ ) => Promise<void>;
+ updateFilesUsage: (
+ files: Array<{ file_id: string }>,
+ fileIds?: string[],
+ options?: { user?: string },
+ ) => Promise<IMongoFile[]>;
+ sweepOrphanedPreviews: (maxAgeMs?: number) => Promise<number>;
+} {
/**
* Finds a file by its file_id with additional query options.
* @param file_id - The unique identifier of the file
@@ -34,7 +85,7 @@ export function createFileMethods(mongoose: typeof import('mongoose')) {
async function getFiles(
filter: FilterQuery<IMongoFile>,
_sortOptions?: Record<string, SortOrder> | null,
- selectFields?: SelectProjection | string | null,
+ selectFields?: string | Record<string, 0 | 1> | null | undefined,
): Promise<IMongoFile[] | null> {
const File = mongoose.models.File as Model<IMongoFile>;
const sortOptions = { updatedAt: -1 as SortOrder, ..._sortOptions };
@@ -47,7 +98,7 @@ export function createFileMethods(mongoose: typeof import('mongoose')) {
return await query.sort(sortOptions).lean<IMongoFile[]>();
}
- async function getExpiredFiles(limit = 100, now = new Date()): Promise<IMongoFile[]> {
+ async function getExpiredFiles(limit = 100, now: Date = new Date()): Promise<IMongoFile[]> {
const File = mongoose.models.File as Model<IMongoFile>;
return await File.find({ expiredAt: { $ne: null, $lte: now } })
.sort({ expiredAt: 1 })
diff --git a/packages/data-schemas/src/methods/key.ts b/packages/data-schemas/src/methods/key.ts
index 094b1f9dfc..8a7c8a337a 100644
--- a/packages/data-schemas/src/methods/key.ts
+++ b/packages/data-schemas/src/methods/key.ts
@@ -4,7 +4,21 @@ import { encrypt, decrypt } from '~/crypto';
import logger from '~/config/winston';
/** Factory function that takes mongoose instance and returns the key methods */
-export function createKeyMethods(mongoose: typeof import('mongoose')) {
+export function createKeyMethods(mongoose: typeof import('mongoose')): {
+ getUserKey: (params: { userId: string; name: string }) => Promise<string>;
+ updateUserKey: (params: {
+ userId: string;
+ name: string;
+ value: string;
+ expiresAt?: Date | null;
+ }) => Promise<unknown>;
+ deleteUserKey: (params: { userId: string; name?: string; all?: boolean }) => Promise<unknown>;
+ getUserKeyValues: (params: { userId: string; name: string }) => Promise<Record<string, string>>;
+ getUserKeyExpiry: (params: {
+ userId: string;
+ name: string;
+ }) => Promise<{ expiresAt: Date | 'never' | null }>;
+} {
/**
* Retrieves and decrypts the key value for a given user identified by userId and identifier name.
* @param params - The parameters object
diff --git a/packages/data-schemas/src/methods/mcpServer.ts b/packages/data-schemas/src/methods/mcpServer.ts
index d48fd2a4e4..f6d8868f62 100644
--- a/packages/data-schemas/src/methods/mcpServer.ts
+++ b/packages/data-schemas/src/methods/mcpServer.ts
@@ -1,8 +1,8 @@
+import { nanoid } from 'nanoid';
import type { Model, RootFilterQuery, Types } from 'mongoose';
-import type { MCPServerDocument } from '../types';
import type { MCPOptions } from 'librechat-data-provider';
+import type { MCPServerDocument } from '../types';
import logger from '~/config/winston';
-import { nanoid } from 'nanoid';
const NORMALIZED_LIMIT_DEFAULT = 20;
const MAX_CREATE_RETRIES = 5;
@@ -44,7 +44,39 @@ function generateServerNameFromTitle(title: string): string {
return slug || 'mcp-server'; // Fallback if empty
}
-export function createMCPServerMethods(mongoose: typeof import('mongoose')) {
+export function createMCPServerMethods(mongoose: typeof import('mongoose')): {
+ createMCPServer: (data: {
+ config: MCPOptions;
+ author: string | Types.ObjectId;
+ reservedServerNames?: Iterable<string>;
+ }) => Promise<MCPServerDocument>;
+ findMCPServerByServerName: (serverName: string) => Promise<MCPServerDocument | null>;
+ findMCPServerByObjectId: (_id: string | Types.ObjectId) => Promise<MCPServerDocument | null>;
+ findMCPServersByAuthor: (authorId: string | Types.ObjectId) => Promise<MCPServerDocument[]>;
+ getListMCPServersByIds: ({
+ ids,
+ otherParams,
+ limit,
+ after,
+ }: {
+ ids?: Types.ObjectId[];
+ otherParams?: RootFilterQuery<MCPServerDocument>;
+ limit?: number | null;
+ after?: string | null;
+ }) => Promise<{
+ data: MCPServerDocument[];
+ has_more: boolean;
+ after: string | null;
+ }>;
+ getListMCPServersByNames: ({ names }: { names: string[] }) => Promise<{
+ data: MCPServerDocument[];
+ }>;
+ updateMCPServer: (
+ serverName: string,
+ updateData: { config?: MCPOptions },
+ ) => Promise<MCPServerDocument | null>;
+ deleteMCPServer: (serverName: string) => Promise<MCPServerDocument | null>;
+} {
/**
* Finds the next available server name by checking DB and reserved-name collisions.
* If baseName is taken or reserved, returns baseName-2, baseName-3, etc.
diff --git a/packages/data-schemas/src/methods/memory.ts b/packages/data-schemas/src/methods/memory.ts
index 749fbc9cf1..7c89535198 100644
--- a/packages/data-schemas/src/methods/memory.ts
+++ b/packages/data-schemas/src/methods/memory.ts
@@ -1,6 +1,6 @@
import { Types } from 'mongoose';
-import logger from '~/config/winston';
import type * as t from '~/types';
+import logger from '~/config/winston';
/**
* Formats a date in YYYY-MM-DD format
@@ -10,7 +10,16 @@ const formatDate = (date: Date): string => {
};
// Factory function that takes mongoose instance and returns the methods
-export function createMemoryMethods(mongoose: typeof import('mongoose')) {
+export function createMemoryMethods(mongoose: typeof import('mongoose')): {
+ setMemory: ({ userId, key, value, tokenCount }: t.SetMemoryParams) => Promise<t.MemoryResult>;
+ createMemory: ({ userId, key, value, tokenCount }: t.SetMemoryParams) => Promise<t.MemoryResult>;
+ deleteMemory: ({ userId, key }: t.DeleteMemoryParams) => Promise<t.MemoryResult>;
+ getAllUserMemories: (userId: string | Types.ObjectId) => Promise<t.IMemoryEntryLean[]>;
+ getFormattedMemories: ({
+ userId,
+ }: t.GetFormattedMemoriesParams) => Promise<t.FormattedMemoriesResult>;
+ deleteAllUserMemories: (userId: string | Types.ObjectId) => Promise<number>;
+} {
/**
* Creates a new memory entry for a user
* Throws an error if a memory with the same key already exists
diff --git a/packages/data-schemas/src/methods/pluginAuth.ts b/packages/data-schemas/src/methods/pluginAuth.ts
index e95e3123be..3aed689ccb 100644
--- a/packages/data-schemas/src/methods/pluginAuth.ts
+++ b/packages/data-schemas/src/methods/pluginAuth.ts
@@ -8,7 +8,30 @@ import type {
} from '~/types';
// Factory function that takes mongoose instance and returns the methods
-export function createPluginAuthMethods(mongoose: typeof import('mongoose')) {
+export function createPluginAuthMethods(mongoose: typeof import('mongoose')): {
+ findOnePluginAuth: ({
+ userId,
+ authField,
+ pluginKey,
+ }: FindPluginAuthParams) => Promise<IPluginAuth | null>;
+ findPluginAuthsByKeys: ({
+ userId,
+ pluginKeys,
+ }: FindPluginAuthsByKeysParams) => Promise<IPluginAuth[]>;
+ updatePluginAuth: ({
+ userId,
+ authField,
+ pluginKey,
+ value,
+ }: UpdatePluginAuthParams) => Promise<IPluginAuth>;
+ deletePluginAuth: ({
+ userId,
+ authField,
+ pluginKey,
+ all,
+ }: DeletePluginAuthParams) => Promise<DeleteResult>;
+ deleteAllUserPluginAuths: (userId: string) => Promise<DeleteResult>;
+} {
/**
* Finds a single plugin auth entry by userId and authField (and optionally pluginKey)
*/
diff --git a/packages/data-schemas/src/methods/preset.ts b/packages/data-schemas/src/methods/preset.ts
index 11af817cbd..300c96c5e8 100644
--- a/packages/data-schemas/src/methods/preset.ts
+++ b/packages/data-schemas/src/methods/preset.ts
@@ -11,11 +11,120 @@ interface IPreset {
[key: string]: unknown;
}
-export function createPresetMethods(mongoose: typeof import('mongoose')) {
+export function createPresetMethods(mongoose: typeof import('mongoose')): {
+ getPreset: (
+ user: string,
+ presetId: string,
+ ) => Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user?: string | undefined;
+ presetId?: string | undefined;
+ order?: number | undefined;
+ defaultPreset?: boolean | undefined;
+ tools?:
+ | (
+ | string
+ | {
+ pluginKey?: string | undefined;
+ }
+ )[]
+ | undefined;
+ updatedAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | {
+ message: string;
+ }
+ | null
+ >;
+ getPresets: (
+ user: string,
+ filter?: Record<string, unknown>,
+ ) => Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user?: string | undefined;
+ presetId?: string | undefined;
+ order?: number | undefined;
+ defaultPreset?: boolean | undefined;
+ tools?:
+ | (
+ | string
+ | {
+ pluginKey?: string | undefined;
+ }
+ )[]
+ | undefined;
+ updatedAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ | {
+ message: string;
+ }
+ >;
+ savePreset: (
+ user: string,
+ {
+ presetId,
+ newPresetId,
+ defaultPreset,
+ ...preset
+ }: {
+ presetId?: string;
+ newPresetId?: string;
+ defaultPreset?: boolean;
+ [key: string]: unknown;
+ },
+ ) => Promise<
+ | IPreset
+ | {
+ message: string;
+ }
+ >;
+ deletePresets: (
+ user: string,
+ filter?: Record<string, unknown>,
+ ) => Promise<import('mongodb').DeleteResult>;
+} {
/**
* Retrieves a single preset by user and presetId.
*/
- async function getPreset(user: string, presetId: string) {
+ async function getPreset(
+ user: string,
+ presetId: string,
+ ): Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user?: string | undefined;
+ presetId?: string | undefined;
+ order?: number | undefined;
+ defaultPreset?: boolean | undefined;
+ tools?:
+ | (
+ | string
+ | {
+ pluginKey?: string | undefined;
+ }
+ )[]
+ | undefined;
+ updatedAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | {
+ message: string;
+ }
+ | null
+ > {
try {
const Preset = mongoose.models.Preset as Model<IPreset>;
return await Preset.findOne({ user, presetId }).lean();
@@ -28,7 +137,34 @@ export function createPresetMethods(mongoose: typeof import('mongoose')) {
/**
* Retrieves all presets for a user, sorted by order then updatedAt.
*/
- async function getPresets(user: string, filter: Record<string, unknown> = {}) {
+ async function getPresets(
+ user: string,
+ filter: Record<string, unknown> = {},
+ ): Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ user?: string | undefined;
+ presetId?: string | undefined;
+ order?: number | undefined;
+ defaultPreset?: boolean | undefined;
+ tools?:
+ | (
+ | string
+ | {
+ pluginKey?: string | undefined;
+ }
+ )[]
+ | undefined;
+ updatedAt?: Date | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ | {
+ message: string;
+ }
+ > {
try {
const Preset = mongoose.models.Preset as Model<IPreset>;
const presets = await Preset.find({ ...filter, user }).lean();
@@ -68,7 +204,12 @@ export function createPresetMethods(mongoose: typeof import('mongoose')) {
defaultPreset?: boolean;
[key: string]: unknown;
},
- ) {
+ ): Promise<
+ | IPreset
+ | {
+ message: string;
+ }
+ > {
try {
const Preset = mongoose.models.Preset as Model<IPreset>;
const setter: Record<string, unknown> = { $set: {} };
@@ -115,7 +256,10 @@ export function createPresetMethods(mongoose: typeof import('mongoose')) {
/**
* Deletes presets matching the given filter for a user.
*/
- async function deletePresets(user: string, filter: Record<string, unknown> = {}) {
+ async function deletePresets(
+ user: string,
+ filter: Record<string, unknown> = {},
+ ): Promise<import('mongodb').DeleteResult> {
const Preset = mongoose.models.Preset as Model<IPreset>;
const deleteCount = await Preset.deleteMany({ ...filter, user });
return deleteCount;
diff --git a/packages/data-schemas/src/methods/prompt.ts b/packages/data-schemas/src/methods/prompt.ts
index 3a0bd35262..10dbd026fb 100644
--- a/packages/data-schemas/src/methods/prompt.ts
+++ b/packages/data-schemas/src/methods/prompt.ts
@@ -16,7 +16,76 @@ export interface PromptDeps {
) => Promise<Types.ObjectId[]>;
}
-export function createPromptMethods(mongoose: typeof import('mongoose'), deps: PromptDeps) {
+export interface PromptMethods {
+ getPromptGroups(filter: Record<string, unknown>): Promise<
+ | {
+ promptGroups: Record<string, unknown>[];
+ pageNumber: string;
+ pageSize: string;
+ pages: string;
+ }
+ | { message: string }
+ >;
+ deletePromptGroup(params: { _id: string }): Promise<{ message: string }>;
+ getAllPromptGroups(
+ filter: Record<string, unknown>,
+ ): Promise<Record<string, unknown>[] | { message: string }>;
+ getListPromptGroupsByAccess(params: {
+ accessibleIds?: Types.ObjectId[];
+ otherParams?: Record<string, unknown>;
+ limit?: number | null;
+ after?: string | null;
+ }): Promise<{
+ object: 'list';
+ data: Record<string, unknown>[];
+ first_id: string | null;
+ last_id: string | null;
+ has_more: boolean;
+ after: string | null;
+ }>;
+ incrementPromptGroupUsage(groupId: string): Promise<{ numberOfGenerations: number }>;
+ createPromptGroup(saveData: {
+ prompt: Record<string, unknown>;
+ group: Record<string, unknown>;
+ author: string;
+ authorName: string;
+ }): Promise<{ prompt: Record<string, unknown> | null; group: Record<string, unknown> }>;
+ savePrompt(saveData: {
+ prompt: Record<string, unknown>;
+ author: string | Types.ObjectId;
+ }): Promise<{ prompt: IPrompt } | { message: string }>;
+ getPrompts(
+ filter: Record<string, unknown>,
+ ): Promise<Record<string, unknown>[] | { message: string }>;
+ getPrompt(
+ filter: Record<string, unknown>,
+ ): Promise<Record<string, unknown> | null | { message: string }>;
+ getRandomPromptGroups(filter: {
+ skip: number | string;
+ limit: number | string;
+ }): Promise<{ prompts: unknown[] } | { message: string }>;
+ getPromptGroupsWithPrompts(
+ filter: Record<string, unknown>,
+ ): Promise<Record<string, unknown> | null | { message: string }>;
+ getPromptGroup(filter: Record<string, unknown>): Promise<Record<string, unknown> | null>;
+ getOwnedPromptGroupIds(author: string): Promise<Types.ObjectId[]>;
+ deletePrompt(params: {
+ promptId: string | Types.ObjectId;
+ groupId: string | Types.ObjectId;
+ }): Promise<{ prompt: string; promptGroup?: { message: string; id: string | Types.ObjectId } }>;
+ deleteUserPrompts(userId: string): Promise<void>;
+ updatePromptGroup(
+ filter: Record<string, unknown>,
+ data: Record<string, unknown>,
+ ): Promise<IPromptGroupDocument | { message: string }>;
+ makePromptProduction(promptId: string): Promise<{ message: string }>;
+ updatePromptLabels(_id: string, labels: unknown): Promise<{ message: string }>;
+}
+
+export function createPromptMethods(
+ mongoose: typeof import('mongoose'),
+ deps: PromptDeps,
+): PromptMethods {
const { getSoleOwnedResourceIds } = deps;
const { ObjectId } = mongoose.Types;
@@ -51,7 +120,12 @@ export function createPromptMethods(mongoose: typeof import('mongoose'), deps: P
/**
* Get all prompt groups with filters (no pagination).
*/
- async function getAllPromptGroups(filter: Record<string, unknown>) {
+ async function getAllPromptGroups(filter: Record<string, unknown>): Promise<
+ | Record<string, unknown>[]
+ | {
+ message: string;
+ }
+ > {
try {
const PromptGroup = mongoose.models.PromptGroup as Model<IPromptGroupDocument>;
const { name, ...query } = filter as {
@@ -89,7 +163,22 @@ export function createPromptMethods(mongoose: typeof import('mongoose'), deps: P
/**
* Get prompt groups with pagination and filters.
*/
- async function getPromptGroups(filter: Record<string, unknown>) {
+ async function getPromptGroups(filter: Record<string, unknown>): Promise<
+ | {
+ promptGroups: Record<string, unknown>[];
+ pageNumber: string;
+ pageSize: string;
+ pages: string;
+ message?: undefined;
+ }
+ | {
+ message: string;
+ promptGroups?: undefined;
+ pageNumber?: undefined;
+ pageSize?: undefined;
+ pages?: undefined;
+ }
+ > {
try {
const PromptGroup = mongoose.models.PromptGroup as Model<IPromptGroupDocument>;
const {
@@ -159,7 +248,9 @@ export function createPromptMethods(mongoose: typeof import('mongoose'), deps: P
* check — it deletes any group by ID. Callers must gate access via
* `canAccessPromptGroupResource` middleware before invoking this.
*/
- async function deletePromptGroup({ _id }: { _id: string }) {
+ async function deletePromptGroup({ _id }: { _id: string }): Promise<{
+ message: string;
+ }> {
const PromptGroup = mongoose.models.PromptGroup as Model<IPromptGroupDocument>;
const Prompt = mongoose.models.Prompt as Model<IPrompt>;
@@ -199,7 +290,14 @@ export function createPromptMethods(mongoose: typeof import('mongoose'), deps: P
otherParams?: Record<string, unknown>;
limit?: number | null;
after?: string | null;
- }) {
+ }): Promise<{
+ object: 'list';
+ data: Record<string, unknown>[];
+ first_id: string | null;
+ last_id: string | null;
+ has_more: boolean;
+ after: string | null;
+ }> {
const PromptGroup = mongoose.models.PromptGroup as Model<IPromptGroupDocument>;
const isPaginated = limit !== null && limit !== undefined;
const normalizedLimit = isPaginated
@@ -305,7 +403,9 @@ export function createPromptMethods(mongoose: typeof import('mongoose'), deps: P
/**
* Increment the numberOfGenerations counter for a prompt group.
*/
- async function incrementPromptGroupUsage(groupId: string) {
+ async function incrementPromptGroupUsage(groupId: string): Promise<{
+ numberOfGenerations: number;
+ }> {
if (!isValidObjectIdString(groupId)) {
throw new Error('Invalid groupId');
}
@@ -733,7 +833,12 @@ export function createPromptMethods(mongoose: typeof import('mongoose'), deps: P
/**
* Update prompt labels.
*/
- async function updatePromptLabels(_id: string, labels: unknown) {
+ async function updatePromptLabels(
+ _id: string,
+ labels: unknown,
+ ): Promise<{
+ message: string;
+ }> {
try {
const Prompt = mongoose.models.Prompt as Model<IPrompt>;
const response = await Prompt.updateOne({ _id }, { $set: { labels } });
@@ -768,5 +873,3 @@ export function createPromptMethods(mongoose: typeof import('mongoose'), deps: P
updatePromptLabels,
};
}
-
-export type PromptMethods = ReturnType<typeof createPromptMethods>;
diff --git a/packages/data-schemas/src/methods/role.ts b/packages/data-schemas/src/methods/role.ts
index 8b22e4a5a0..dea9da6fa9 100644
--- a/packages/data-schemas/src/methods/role.ts
+++ b/packages/data-schemas/src/methods/role.ts
@@ -33,13 +33,45 @@ export interface RoleDeps {
};
}
-export function createRoleMethods(mongoose: typeof import('mongoose'), deps: RoleDeps = {}) {
+export function createRoleMethods(
+ mongoose: typeof import('mongoose'),
+ deps: RoleDeps = {},
+): {
+ listRoles: (options?: {
+ limit?: number;
+ offset?: number;
+ }) => Promise<Pick<IRole, '_id' | 'name' | 'description'>[]>;
+ countRoles: () => Promise<number>;
+ initializeRoles: () => Promise<void>;
+ getRoleByName: (roleName: string, fieldsToSelect?: string | string[] | null) => Promise<IRole>;
+ findRolesByNames: (
+ roleNames: string[],
+ fieldsToSelect?: string | string[] | null,
+ ) => Promise<IRole[]>;
+ updateRoleByName: (roleName: string, updates: Partial<IRole>) => Promise<IRole>;
+ updateAccessPermissions: (
+ roleName: string,
+ permissionsUpdate: Record<string, Record<string, boolean>>,
+ roleData?: IRole,
+ ) => Promise<void>;
+ migrateRoleSchema: (roleName?: string) => Promise<number>;
+ createRoleByName: (roleData: Partial<IRole>) => Promise<IRole>;
+ deleteRoleByName: (roleName: string) => Promise<IRole | null>;
+ updateUsersByRole: (oldRole: string, newRole: string) => Promise<void>;
+ findUserIdsByRole: (roleName: string) => Promise<string[]>;
+ updateUsersRoleByIds: (userIds: string[], newRole: string) => Promise<void>;
+ listUsersByRole: (
+ roleName: string,
+ options?: { limit?: number; offset?: number },
+ ) => Promise<IUser[]>;
+ countUsersByRole: (roleName: string) => Promise<number>;
+} {
/**
* Initialize default roles in the system.
* Creates the default roles (ADMIN, USER) if they don't exist in the database.
* Updates existing roles with new permission types if they're missing.
*/
- async function initializeRoles() {
+ async function initializeRoles(): Promise<void> {
const Role = mongoose.models.Role;
for (const roleName of [SystemRoles.ADMIN, SystemRoles.USER]) {
@@ -92,7 +124,10 @@ export function createRoleMethods(mongoose: typeof import('mongoose'), deps: Rol
* If the role with the given name doesn't exist and the name is a system defined role,
* create it and return the lean version.
*/
- async function getRoleByName(roleName: string, fieldsToSelect: string | string[] | null = null) {
+ async function getRoleByName(
+ roleName: string,
+ fieldsToSelect: string | string[] | null = null,
+ ): Promise<IRole> {
const cache = deps.getCache?.(CacheKeys.ROLES);
try {
if (cache) {
@@ -137,7 +172,7 @@ export function createRoleMethods(mongoose: typeof import('mongoose'), deps: Rol
async function findRolesByNames(
roleNames: string[],
fieldsToSelect: string | string[] | null = null,
- ) {
+ ): Promise<IRole[]> {
try {
const uniqueRoleNames = [
...new Set(roleNames.map((roleName) => roleName.trim()).filter(Boolean)),
@@ -177,7 +212,7 @@ export function createRoleMethods(mongoose: typeof import('mongoose'), deps: Rol
/**
* Update role values by name.
*/
- async function updateRoleByName(roleName: string, updates: Partial<IRole>) {
+ async function updateRoleByName(roleName: string, updates: Partial<IRole>): Promise<IRole> {
const cache = deps.getCache?.(CacheKeys.ROLES);
try {
const Role = mongoose.models.Role;
@@ -218,7 +253,7 @@ export function createRoleMethods(mongoose: typeof import('mongoose'), deps: Rol
roleName: string,
permissionsUpdate: Record<string, Record<string, boolean>>,
roleData?: IRole,
- ) {
+ ): Promise<void> {
const updates: Record<string, Record<string, boolean>> = {};
for (const [permissionType, permissions] of Object.entries(permissionsUpdate)) {
if (
diff --git a/packages/data-schemas/src/methods/session.ts b/packages/data-schemas/src/methods/session.ts
index 68c851414a..391ef9e39f 100644
--- a/packages/data-schemas/src/methods/session.ts
+++ b/packages/data-schemas/src/methods/session.ts
@@ -13,10 +13,29 @@ export class SessionError extends Error {
}
/** Default refresh token expiry: 7 days in milliseconds */
-export const DEFAULT_REFRESH_TOKEN_EXPIRY = 1000 * 60 * 60 * 24 * 7;
+export const DEFAULT_REFRESH_TOKEN_EXPIRY: number = 1000 * 60 * 60 * 24 * 7;
// Factory function that takes mongoose instance and returns the methods
-export function createSessionMethods(mongoose: typeof import('mongoose')) {
+export function createSessionMethods(mongoose: typeof import('mongoose')): {
+ findSession: (
+ params: t.SessionSearchParams,
+ options?: t.SessionQueryOptions,
+ ) => Promise<t.ISession | null>;
+ SessionError: typeof SessionError;
+ deleteSession: (params: t.DeleteSessionParams) => Promise<{ deletedCount?: number }>;
+ createSession: (userId: string, options?: t.CreateSessionOptions) => Promise<t.SessionResult>;
+ updateExpiration: (
+ session: t.ISession | string,
+ newExpiration?: Date,
+ options?: t.UpdateExpirationOptions,
+ ) => Promise<t.ISession>;
+ countActiveSessions: (userId: string) => Promise<number>;
+ generateRefreshToken: (session: t.ISession) => Promise<string>;
+ deleteAllUserSessions: (
+ userId: string | { userId: string },
+ options?: t.DeleteAllSessionsOptions,
+ ) => Promise<{ deletedCount?: number }>;
+} {
/**
* Creates a new session for a user
*/
diff --git a/packages/data-schemas/src/methods/share.ts b/packages/data-schemas/src/methods/share.ts
index 2fb78bc9a6..88a328644b 100644
--- a/packages/data-schemas/src/methods/share.ts
+++ b/packages/data-schemas/src/methods/share.ts
@@ -3,8 +3,8 @@ import { Constants } from 'librechat-data-provider';
import type { FilterQuery, Model } from 'mongoose';
import type { SchemaWithMeiliMethods } from '~/models/plugins/mongoMeili';
import type * as t from '~/types';
-import logger from '~/config/winston';
import { activeExpirationFilter } from '~/utils/retention';
+import logger from '~/config/winston';
class ShareServiceError extends Error {
code: string;
@@ -239,7 +239,41 @@ function getMessagesUpToTarget(messages: t.IMessage[], targetMessageId: string):
}
/** Factory function that takes mongoose instance and returns the methods */
-export function createShareMethods(mongoose: typeof import('mongoose')) {
+export function createShareMethods(mongoose: typeof import('mongoose')): {
+ getSharedLink: (user: string, conversationId: string) => Promise<t.GetShareLinkResult>;
+ getSharedLinks: (
+ user: string,
+ pageParam?: Date,
+ pageSize?: number,
+ sortBy?: string,
+ sortDirection?: string,
+ search?: string,
+ ) => Promise<t.SharedLinksResult>;
+ createSharedLink: (
+ user: string,
+ conversationId: string,
+ targetMessageId?: string,
+ expiredAt?: Date,
+ ) => Promise<t.CreateShareResult>;
+ updateSharedLink: (
+ user: string,
+ shareId: string,
+ targetMessageId?: string,
+ expiredAt?: Date | null,
+ ) => Promise<t.UpdateShareResult>;
+ deleteSharedLink: (user: string, shareId: string) => Promise<t.DeleteShareResult | null>;
+ getSharedMessages: (
+ shareId: string,
+ shareObjectId?: string,
+ ) => Promise<t.SharedMessagesResult | null>;
+ deleteAllSharedLinks: (
+ user: string,
+ ) => Promise<t.DeleteAllSharesResult & { deletedIds: string[] }>;
+ deleteConvoSharedLink: (
+ user: string,
+ conversationId: string,
+ ) => Promise<t.DeleteAllSharesResult & { deletedIds: string[] }>;
+} {
/**
* Get shared messages for a share link
*/
diff --git a/packages/data-schemas/src/methods/skill.ts b/packages/data-schemas/src/methods/skill.ts
index 22eb60fa3f..74273335c7 100644
--- a/packages/data-schemas/src/methods/skill.ts
+++ b/packages/data-schemas/src/methods/skill.ts
@@ -16,8 +16,8 @@ import type {
ISkillFileDocument,
ISkillSummary,
} from '~/types/skill';
-import { isValidObjectIdString } from '~/utils/objectId';
import { tenantSafeBulkWrite } from '~/utils/tenantBulkWrite';
+import { isValidObjectIdString } from '~/utils/objectId';
import { stripYamlTrailingComment } from '~/utils/yaml';
import { escapeRegExp } from '~/utils/string';
import logger from '~/config/winston';
@@ -855,7 +855,78 @@ export function validateAlwaysApplyInBody(body: string | undefined): ValidationI
return [];
}
-export function createSkillMethods(mongoose: typeof import('mongoose'), deps: SkillDeps) {
+export function createSkillMethods(
+ mongoose: typeof import('mongoose'),
+ deps: SkillDeps,
+): {
+ createSkill: (data: CreateSkillInput) => Promise<CreateSkillResult>;
+ getSkillById: (id: string | Types.ObjectId) => Promise<(ISkill & { _id: Types.ObjectId }) | null>;
+ getSkillByName: (
+ name: string,
+ accessibleIds: Types.ObjectId[],
+ options?: {
+ /**
+ * Manual paths (`$` popover, always-apply once Phase 5 lands) set
+ * this so a same-name newer `userInvocable: false` duplicate can't
+ * shadow the older user-invocable doc the popover surfaced.
+ * Disable-model-invocation status is irrelevant here — manually-
+ * primed disabled skills are explicitly supported (iter 4).
+ */
+ preferUserInvocable?: boolean;
+ /**
+ * Model paths (`skill` / `read_file` tool handlers) set this so a
+ * same-name newer `disable-model-invocation: true` duplicate can't
+ * shadow the cataloged model-invocable doc. User-invocability is
+ * irrelevant here — `userInvocable: false` skills are model-only
+ * and remain valid model-invocation targets.
+ *
+ * Both flags fall back to the newest match when no preferred doc
+ * exists, so handlers can still fire their explicit-rejection
+ * error paths (e.g. "cannot be invoked by the model" in the
+ * disabled-only case).
+ */
+ preferModelInvocable?: boolean;
+ },
+ ) => Promise<(ISkill & { _id: Types.ObjectId }) | null>;
+ getAuthorSkillByName: (
+ params: GetAuthorSkillByNameParams,
+ ) => Promise<(ISkill & { _id: Types.ObjectId }) | null>;
+ listSkillsByAccess: (params: ListSkillsByAccessParams) => Promise<ListSkillsByAccessResult>;
+ listAlwaysApplySkills: (
+ params: ListAlwaysApplySkillsParams,
+ ) => Promise<ListAlwaysApplySkillsResult>;
+ updateSkill: (params: {
+ id: string;
+ expectedVersion: number;
+ update: UpdateSkillInput;
+ }) => Promise<UpdateSkillResult>;
+ deleteSkill: (id: string) => Promise<{ deleted: boolean }>;
+ deleteUserSkills: (userId: Types.ObjectId | string) => Promise<number>;
+ listSkillFiles: (
+ skillId: Types.ObjectId | string,
+ ) => Promise<Array<ISkillFile & { _id: Types.ObjectId }>>;
+ upsertSkillFile: (row: UpsertSkillFileInput) => Promise<ISkillFile & { _id: Types.ObjectId }>;
+ deleteSkillFile: (
+ skillId: Types.ObjectId | string,
+ relativePath: string,
+ ) => Promise<{ deleted: boolean }>;
+ getSkillFileByPath: (
+ skillId: Types.ObjectId | string,
+ relativePath: string,
+ ) => Promise<(ISkillFile & { _id: Types.ObjectId }) | null>;
+ updateSkillFileContent: (
+ skillId: Types.ObjectId | string,
+ relativePath: string,
+ update: { content?: string; isBinary?: boolean },
+ ) => Promise<void>;
+ updateSkillFileCodeEnvIds: (
+ updates: Array<{
+ skillId: Types.ObjectId | string;
+ relativePath: string;
+ codeEnvRef: CodeEnvRef;
+ }>,
+ ) => Promise<{ matchedCount: number; modifiedCount: number }>;
+} {
const { ObjectId } = mongoose.Types;
function buildSkillFilter(
diff --git a/packages/data-schemas/src/methods/spendTokens.ts b/packages/data-schemas/src/methods/spendTokens.ts
index 4cb6167b55..07c6d3818a 100644
--- a/packages/data-schemas/src/methods/spendTokens.ts
+++ b/packages/data-schemas/src/methods/spendTokens.ts
@@ -1,5 +1,5 @@
-import logger from '~/config/winston';
import type { TxData, TransactionResult } from './transaction';
+import logger from '~/config/winston';
/** Base transaction context passed by callers — does not include fields added internally */
export interface SpendTxData {
@@ -19,14 +19,29 @@ export function createSpendTokensMethods(
createTransaction: (txData: TxData) => Promise<TransactionResult | undefined>;
createStructuredTransaction: (txData: TxData) => Promise<TransactionResult | undefined>;
},
-) {
+): {
+ spendTokens: (
+ txData: SpendTxData,
+ tokenUsage: { promptTokens?: number; completionTokens?: number },
+ ) => Promise<void>;
+ spendStructuredTokens: (
+ txData: SpendTxData,
+ tokenUsage: {
+ promptTokens?: { input?: number; write?: number; read?: number };
+ completionTokens?: number;
+ },
+ ) => Promise<{
+ prompt: TransactionResult | undefined;
+ completion: TransactionResult | undefined;
+ }>;
+} {
/**
* Creates up to two transactions to record the spending of tokens.
*/
async function spendTokens(
txData: SpendTxData,
tokenUsage: { promptTokens?: number; completionTokens?: number },
- ) {
+ ): Promise<void> {
const { promptTokens, completionTokens } = tokenUsage;
logger.debug(
`[spendTokens] conversationId: ${txData.conversationId}${
@@ -81,7 +96,10 @@ export function createSpendTokensMethods(
promptTokens?: { input?: number; write?: number; read?: number };
completionTokens?: number;
},
- ) {
+ ): Promise<{
+ prompt: TransactionResult | undefined;
+ completion: TransactionResult | undefined;
+ }> {
const { promptTokens, completionTokens } = tokenUsage;
logger.debug(
`[spendStructuredTokens] conversationId: ${txData.conversationId}${
diff --git a/packages/data-schemas/src/methods/systemGrant.ts b/packages/data-schemas/src/methods/systemGrant.ts
index 2e8eea80cf..c3ef6100af 100644
--- a/packages/data-schemas/src/methods/systemGrant.ts
+++ b/packages/data-schemas/src/methods/systemGrant.ts
@@ -46,7 +46,88 @@ function getParentCapabilities(capability: string): string[] {
return parents;
}
-export function createSystemGrantMethods(mongoose: typeof import('mongoose')) {
+export function createSystemGrantMethods(mongoose: typeof import('mongoose')): {
+ grantCapability: (
+ {
+ principalType,
+ principalId,
+ capability,
+ tenantId,
+ grantedBy,
+ }: {
+ principalType: PrincipalType;
+ principalId: string | Types.ObjectId;
+ capability: SystemCapability;
+ tenantId?: string;
+ grantedBy?: string | Types.ObjectId;
+ },
+ session?: ClientSession,
+ ) => Promise<ISystemGrant | null>;
+ seedSystemGrants: () => Promise<void>;
+ revokeCapability: (
+ {
+ principalType,
+ principalId,
+ capability,
+ tenantId,
+ }: {
+ principalType: PrincipalType;
+ principalId: string | Types.ObjectId;
+ capability: SystemCapability;
+ tenantId?: string;
+ },
+ session?: ClientSession,
+ ) => Promise<void>;
+ hasCapabilityForPrincipals: ({
+ principals,
+ capability,
+ tenantId,
+ }: {
+ principals: Array<{ principalType: PrincipalType; principalId?: string | Types.ObjectId }>;
+ capability: SystemCapability;
+ tenantId?: string;
+ }) => Promise<boolean>;
+ getHeldCapabilities: ({
+ principals,
+ capabilities,
+ tenantId,
+ }: {
+ principals: Array<{ principalType: PrincipalType; principalId?: string | Types.ObjectId }>;
+ capabilities: SystemCapability[];
+ tenantId?: string;
+ }) => Promise<Set<SystemCapability>>;
+ listGrants: (options?: {
+ tenantId?: string;
+ principalTypes?: PrincipalType[];
+ limit?: number;
+ offset?: number;
+ }) => Promise<ISystemGrant[]>;
+ countGrants: (options?: {
+ tenantId?: string;
+ principalTypes?: PrincipalType[];
+ }) => Promise<number>;
+ getCapabilitiesForPrincipal: ({
+ principalType,
+ principalId,
+ tenantId,
+ }: {
+ principalType: PrincipalType;
+ principalId: string | Types.ObjectId;
+ tenantId?: string;
+ }) => Promise<ISystemGrant[]>;
+ getCapabilitiesForPrincipals: ({
+ principals,
+ tenantId,
+ }: {
+ principals: Array<{ principalType: PrincipalType; principalId: string | Types.ObjectId }>;
+ tenantId?: string;
+ }) => Promise<ISystemGrant[]>;
+ deleteGrantsForPrincipal: (
+ principalType: PrincipalType,
+ principalId: string | Types.ObjectId,
+ options?: { tenantId?: string; session?: ClientSession },
+ ) => Promise<void>;
+} {
function tenantCondition(tenantId?: string): FilterQuery<ISystemGrant> {
return tenantId != null
? { $and: [{ $or: [{ tenantId }, { tenantId: { $exists: false } }] }] }
diff --git a/packages/data-schemas/src/methods/token.ts b/packages/data-schemas/src/methods/token.ts
index 76fcd292dd..412001cfa3 100644
--- a/packages/data-schemas/src/methods/token.ts
+++ b/packages/data-schemas/src/methods/token.ts
@@ -3,7 +3,12 @@ import { IToken, TokenCreateData, TokenQuery, TokenUpdateData, TokenDeleteResult
import logger from '~/config/winston';
// Factory function that takes mongoose instance and returns the methods
-export function createTokenMethods(mongoose: typeof import('mongoose')) {
+export function createTokenMethods(mongoose: typeof import('mongoose')): {
+ findToken: (query: TokenQuery, options?: QueryOptions) => Promise<IToken | null>;
+ createToken: (tokenData: TokenCreateData) => Promise<IToken>;
+ updateToken: (query: TokenQuery, updateData: TokenUpdateData) => Promise<IToken | null>;
+ deleteTokens: (query: TokenQuery) => Promise<TokenDeleteResult>;
+} {
/**
* Creates a new Token instance.
*/
diff --git a/packages/data-schemas/src/methods/toolCall.ts b/packages/data-schemas/src/methods/toolCall.ts
index 49dfb627e0..5faba98a3b 100644
--- a/packages/data-schemas/src/methods/toolCall.ts
+++ b/packages/data-schemas/src/methods/toolCall.ts
@@ -7,11 +7,76 @@ interface IToolCallData {
[key: string]: unknown;
}
-export function createToolCallMethods(mongoose: typeof import('mongoose')) {
+export function createToolCallMethods(mongoose: typeof import('mongoose')): {
+ createToolCall: (toolCallData: IToolCallData) => Promise<IToolCallData>;
+ updateToolCall: (
+ id: string,
+ updateData: Partial<IToolCallData>,
+ ) => Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ >;
+ deleteToolCalls: (
+ userId: string,
+ conversationId?: string,
+ ) => Promise<import('mongodb').DeleteResult>;
+ getToolCallById: (id: string) => Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ >;
+ getToolCallsByConvo: (
+ conversationId: string,
+ userId: string,
+ ) => Promise<
+ (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ >;
+ getToolCallsByMessage: (
+ messageId: string,
+ userId: string,
+ ) => Promise<
+ (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ >;
+} {
/**
* Create a new tool call
*/
- async function createToolCall(toolCallData: IToolCallData) {
+ async function createToolCall(toolCallData: IToolCallData): Promise<IToolCallData> {
try {
const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
return await ToolCall.create(toolCallData);
@@ -23,7 +88,19 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')) {
/**
* Get a tool call by ID
*/
- async function getToolCallById(id: string) {
+ async function getToolCallById(id: string): Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ > {
try {
const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
return await ToolCall.findById(id).lean();
@@ -35,7 +112,21 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')) {
/**
* Get tool calls by message ID and user
*/
- async function getToolCallsByMessage(messageId: string, userId: string) {
+ async function getToolCallsByMessage(
+ messageId: string,
+ userId: string,
+ ): Promise<
+ (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ > {
try {
const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
return await ToolCall.find({ messageId, user: userId }).lean();
@@ -47,7 +138,21 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')) {
/**
* Get tool calls by conversation ID and user
*/
- async function getToolCallsByConvo(conversationId: string, userId: string) {
+ async function getToolCallsByConvo(
+ conversationId: string,
+ userId: string,
+ ): Promise<
+ (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })[]
+ > {
try {
const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
return await ToolCall.find({ conversationId, user: userId }).lean();
@@ -59,7 +164,22 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')) {
/**
* Update a tool call
*/
- async function updateToolCall(id: string, updateData: Partial<IToolCallData>) {
+ async function updateToolCall(
+ id: string,
+ updateData: Partial<IToolCallData>,
+ ): Promise<
+ | (import('mongoose').FlattenMaps<{
+ [x: string]: unknown;
+ messageId?: string | undefined;
+ conversationId?: string | undefined;
+ user?: string | undefined;
+ }> & {
+ _id: import('mongoose').Types.ObjectId;
+ } & {
+ __v: number;
+ })
+ | null
+ > {
try {
const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
return await ToolCall.findByIdAndUpdate(id, updateData, { new: true }).lean();
@@ -71,7 +191,10 @@ export function createToolCallMethods(mongoose: typeof import('mongoose')) {
/**
* Delete tool calls by user and optionally conversation
*/
- async function deleteToolCalls(userId: string, conversationId?: string) {
+ async function deleteToolCalls(
+ userId: string,
+ conversationId?: string,
+ ): Promise<import('mongodb').DeleteResult> {
try {
const ToolCall = mongoose.models.ToolCall as Model<IToolCallData>;
const query: Record<string, string> = { user: userId };
diff --git a/packages/data-schemas/src/methods/transaction.ts b/packages/data-schemas/src/methods/transaction.ts
index b71e111a79..bfd5376f71 100644
--- a/packages/data-schemas/src/methods/transaction.ts
+++ b/packages/data-schemas/src/methods/transaction.ts
@@ -1,7 +1,7 @@
-import logger from '~/config/winston';
import type { FilterQuery, Model, Types } from 'mongoose';
import type { IBalance, IBalanceUpdate, TransactionData } from '~/types';
import type { ITransaction } from '~/schema/transaction';
+import logger from '~/config/winston';
const cancelRate = 1.15;
@@ -70,7 +70,36 @@ export function createTransactionMethods(
getMultiplier: (params: MultiplierParams) => number;
getCacheMultiplier: (params: CacheMultiplierParams) => number | null;
},
-) {
+): {
+ updateBalance: ({
+ user,
+ incrementValue,
+ setValues,
+ }: {
+ user: string;
+ incrementValue: number;
+ setValues?: IBalanceUpdate;
+ }) => Promise<IBalance>;
+ bulkInsertTransactions: (docs: TransactionData[]) => Promise<void>;
+ findBalanceByUser: (user: string) => Promise<IBalance | null>;
+ upsertBalanceFields: (user: string, fields: IBalanceUpdate) => Promise<IBalance | null>;
+ getTransactions: (filter: FilterQuery<ITransaction>) => Promise<ITransaction[]>;
+ deleteTransactions: (
+ filter: FilterQuery<ITransaction>,
+ ) => Promise<import('mongodb').DeleteResult>;
+ deleteBalances: (filter: FilterQuery<IBalance>) => Promise<import('mongodb').DeleteResult>;
+ createTransaction: (_txData: TxData) => Promise<TransactionResult | undefined>;
+ createAutoRefillTransaction: (txData: TxData) => Promise<
+ | {
+ rate: number;
+ user: string;
+ balance: number;
+ transaction: ITransaction;
+ }
+ | undefined
+ >;
+ createStructuredTransaction: (_txData: TxData) => Promise<TransactionResult | undefined>;
+} {
/** Calculate and set the tokenValue for a transaction */
function calculateTokenValue(txn: InternalTxDoc) {
const { valueKey, tokenType, model, endpointTokenConfig, inputTokenCount } = txn;
@@ -265,7 +294,15 @@ export function createTransactionMethods(
/**
* Creates an auto-refill transaction that also updates balance.
*/
- async function createAutoRefillTransaction(txData: TxData) {
+ async function createAutoRefillTransaction(txData: TxData): Promise<
+ | {
+ rate: number;
+ user: string;
+ balance: number;
+ transaction: ITransaction;
+ }
+ | undefined
+ > {
if (txData.rawAmount != null && isNaN(txData.rawAmount)) {
return;
}
@@ -371,10 +408,10 @@ export function createTransactionMethods(
/**
* Queries and retrieves transactions based on a given filter.
*/
- async function getTransactions(filter: FilterQuery<ITransaction>) {
+ async function getTransactions(filter: FilterQuery<ITransaction>): Promise<ITransaction[]> {
try {
const Transaction = mongoose.models.Transaction;
- return await Transaction.find(filter).lean();
+ return await Transaction.find(filter).lean<ITransaction[]>();
} catch (error) {
logger.error('Error querying transactions:', error);
throw error;
@@ -401,13 +438,17 @@ export function createTransactionMethods(
}
/** Deletes transactions matching a filter. */
- async function deleteTransactions(filter: FilterQuery<ITransaction>) {
+ async function deleteTransactions(
+ filter: FilterQuery<ITransaction>,
+ ): Promise<import('mongodb').DeleteResult> {
const Transaction = mongoose.models.Transaction;
return Transaction.deleteMany(filter);
}
/** Deletes balance records matching a filter. */
- async function deleteBalances(filter: FilterQuery<IBalance>) {
+ async function deleteBalances(
+ filter: FilterQuery<IBalance>,
+ ): Promise<import('mongodb').DeleteResult> {
const Balance = mongoose.models.Balance as Model<IBalance>;
return Balance.deleteMany(filter);
}
diff --git a/packages/data-schemas/src/methods/tx.ts b/packages/data-schemas/src/methods/tx.ts
index fdd2ace8c3..2a226d34f0 100644
--- a/packages/data-schemas/src/methods/tx.ts
+++ b/packages/data-schemas/src/methods/tx.ts
@@ -346,7 +346,68 @@ export const premiumTokenValues: Record<
'gemini-3.1': { threshold: 200000, prompt: 4, completion: 18 },
};
-export function createTxMethods(_mongoose: typeof import('mongoose'), txDeps: TxDeps) {
+export function createTxMethods(
+ _mongoose: typeof import('mongoose'),
+ txDeps: TxDeps,
+): {
+ tokenValues: Record<
+ string,
+ {
+ prompt: number;
+ completion: number;
+ }
+ >;
+ premiumTokenValues: Record<
+ string,
+ {
+ threshold: number;
+ prompt: number;
+ completion: number;
+ }
+ >;
+ getValueKey: (model: string, endpoint?: string) => string | undefined;
+ getMultiplier: ({
+ model,
+ valueKey,
+ endpoint,
+ tokenType,
+ inputTokenCount,
+ endpointTokenConfig,
+ }: {
+ model?: string;
+ valueKey?: string;
+ endpoint?: string;
+ tokenType?: 'prompt' | 'completion';
+ inputTokenCount?: number;
+ endpointTokenConfig?: Record<string, Record<string, number>>;
+ }) => number;
+ getPremiumRate: (
+ valueKey: string,
+ tokenType: string,
+ inputTokenCount?: number | null,
+ ) => number | null;
+ getCacheMultiplier: ({
+ valueKey,
+ cacheType,
+ model,
+ endpoint,
+ endpointTokenConfig,
+ }: {
+ valueKey?: string;
+ cacheType?: 'write' | 'read';
+ model?: string;
+ endpoint?: string;
+ endpointTokenConfig?: Record<string, Record<string, number>>;
+ }) => number | null;
+ defaultRate: number;
+ cacheTokenValues: Record<
+ string,
+ {
+ write: number;
+ read: number;
+ }
+ >;
+} {
const { matchModelName, findMatchingPattern } = txDeps;
/**
diff --git a/packages/data-schemas/src/methods/user.ts b/packages/data-schemas/src/methods/user.ts
index 7573a48f6d..56ba50fae4 100644
--- a/packages/data-schemas/src/methods/user.ts
+++ b/packages/data-schemas/src/methods/user.ts
@@ -5,10 +5,108 @@ import { escapeRegExp } from '~/utils/string';
import { signPayload } from '~/crypto';
/** Default JWT session expiry: 15 minutes in milliseconds */
-export const DEFAULT_SESSION_EXPIRY = 1000 * 60 * 15;
+export const DEFAULT_SESSION_EXPIRY: number = 1000 * 60 * 15;
/** Factory function that takes mongoose instance and returns the methods */
-export function createUserMethods(mongoose: typeof import('mongoose')) {
+export function createUserMethods(mongoose: typeof import('mongoose')): {
+ findUser: (
+ searchCriteria: FilterQuery<IUser>,
+ fieldsToSelect?: string | string[] | null,
+ ) => Promise<IUser | null>;
+ findUsers: (
+ searchCriteria: FilterQuery<IUser>,
+ fieldsToSelect?: string | string[] | null,
+ options?: { limit?: number; offset?: number; sort?: Record<string, 1 | -1> },
+ ) => Promise<IUser[]>;
+ countUsers: (filter?: FilterQuery<IUser>) => Promise<number>;
+ createUser: (
+ data: CreateUserRequest,
+ balanceConfig?: BalanceConfig,
+ disableTTL?: boolean,
+ returnUser?: boolean,
+ ) => Promise<mongoose.Types.ObjectId | Partial<IUser>>;
+ updateUser: (userId: string, updateData: Partial<IUser>) => Promise<IUser | null>;
+ searchUsers: ({
+ searchPattern,
+ limit,
+ fieldsToSelect,
+ }: {
+ searchPattern: string;
+ limit?: number;
+ fieldsToSelect?: string | string[] | null;
+ }) => Promise<
+ {
+ _id: mongoose.Types.ObjectId;
+ id: string;
+ name?: string;
+ username?: string;
+ email: string;
+ emailVerified: boolean;
+ password?: string;
+ avatar?: string;
+ provider: string;
+ role?: string;
+ googleId?: string;
+ facebookId?: string;
+ openidId?: string;
+ samlId?: string;
+ ldapId?: string;
+ githubId?: string;
+ discordId?: string;
+ appleId?: string;
+ plugins?: string[];
+ openidIssuer?: string;
+ twoFactorEnabled?: boolean;
+ totpSecret?: string;
+ backupCodes?: Array<{
+ codeHash: string;
+ used: boolean;
+ usedAt?: Date | null;
+ }>;
+ pendingTotpSecret?: string;
+ pendingBackupCodes?: Array<{
+ codeHash: string;
+ used: boolean;
+ usedAt?: Date | null;
+ }>;
+ refreshToken?: Array<{
+ refreshToken: string;
+ }>;
+ expiresAt?: Date;
+ termsAccepted?: boolean;
+ personalization?: {
+ memories?: boolean;
+ };
+ favorites?: import('librechat-data-provider').TUserFavorite[];
+ skillStates?: Record<string, boolean>;
+ createdAt?: Date;
+ updatedAt?: Date;
+ idOnTheSource?: string;
+ tenantId?: string;
+ federatedTokens?: import('~/types').OIDCTokens;
+ openidTokens?: import('~/types').OIDCTokens;
+ $locals: Record<string, unknown>;
+ $op: 'save' | 'validate' | 'remove' | null;
+ $where: Record<string, unknown>;
+ baseModelName?: string;
+ collection: mongoose.Collection;
+ db: mongoose.Connection;
+ errors?: mongoose.Error.ValidationError;
+ isNew: boolean;
+ schema: mongoose.Schema;
+ }[]
+ >;
+ getUserById: (userId: string, fieldsToSelect?: string | string[] | null) => Promise<IUser | null>;
+ generateToken: (user: IUser, expiresIn?: number) => Promise<string>;
+ deleteUserById: (userId: string) => Promise<UserDeleteResult>;
+ updateUserPlugins: (
+ userId: string,
+ plugins: string[] | undefined,
+ pluginKey: string,
+ action: 'install' | 'uninstall',
+ ) => Promise<IUser | null>;
+ toggleUserMemories: (userId: string, memoriesEnabled: boolean) => Promise<IUser | null>;
+} {
/**
* Normalizes email fields in search criteria to lowercase and trimmed.
* Handles both direct email fields and $or arrays containing email conditions.
@@ -255,7 +353,68 @@ export function createUserMethods(mongoose: typeof import('mongoose')) {
searchPattern: string;
limit?: number;
fieldsToSelect?: string | string[] | null;
- }) {
+ }): Promise<
+ {
+ _id: mongoose.Types.ObjectId;
+ id: string;
+ name?: string;
+ username?: string;
+ email: string;
+ emailVerified: boolean;
+ password?: string;
+ avatar?: string;
+ provider: string;
+ role?: string;
+ googleId?: string;
+ facebookId?: string;
+ openidId?: string;
+ samlId?: string;
+ ldapId?: string;
+ githubId?: string;
+ discordId?: string;
+ appleId?: string;
+ plugins?: string[];
+ openidIssuer?: string;
+ twoFactorEnabled?: boolean;
+ totpSecret?: string;
+ backupCodes?: Array<{
+ codeHash: string;
+ used: boolean;
+ usedAt?: Date | null;
+ }>;
+ pendingTotpSecret?: string;
+ pendingBackupCodes?: Array<{
+ codeHash: string;
+ used: boolean;
+ usedAt?: Date | null;
+ }>;
+ refreshToken?: Array<{
+ refreshToken: string;
+ }>;
+ expiresAt?: Date;
+ termsAccepted?: boolean;
+ personalization?: {
+ memories?: boolean;
+ };
+ favorites?: import('librechat-data-provider').TUserFavorite[];
+ skillStates?: Record<string, boolean>;
+ createdAt?: Date;
+ updatedAt?: Date;
+ idOnTheSource?: string;
+ tenantId?: string;
+ federatedTokens?: import('~/types').OIDCTokens;
+ openidTokens?: import('~/types').OIDCTokens;
+ $locals: Record<string, unknown>;
+ $op: 'save' | 'validate' | 'remove' | null;
+ $where: Record<string, unknown>;
+ baseModelName?: string;
+ collection: mongoose.Collection;
+ db: mongoose.Connection;
+ errors?: mongoose.Error.ValidationError;
+ isNew: boolean;
+ schema: mongoose.Schema;
+ }[]
+ > {
if (!searchPattern || searchPattern.trim().length === 0) {
return [];
}
diff --git a/packages/data-schemas/src/methods/userGroup.ts b/packages/data-schemas/src/methods/userGroup.ts
index 3122806627..022f42d2ee 100644
--- a/packages/data-schemas/src/methods/userGroup.ts
+++ b/packages/data-schemas/src/methods/userGroup.ts
@@ -5,7 +5,117 @@ import type { Model, ClientSession, FilterQuery } from 'mongoose';
import type { IGroup, IRole, IUser } from '~/types';
import { escapeRegExp } from '~/utils/string';
-export function createUserGroupMethods(mongoose: typeof import('mongoose')) {
+export function createUserGroupMethods(mongoose: typeof import('mongoose')): {
+ findGroupById: (
+ groupId: string | Types.ObjectId,
+ projection?: Record<string, 0 | 1>,
+ session?: ClientSession,
+ ) => Promise<IGroup | null>;
+ findGroupByExternalId: (
+ idOnTheSource: string,
+ source?: 'entra' | 'local',
+ projection?: Record<string, 0 | 1>,
+ session?: ClientSession,
+ ) => Promise<IGroup | null>;
+ findGroupsByExternalIds: (
+ idsOnTheSource: string[],
+ source?: 'entra' | 'local',
+ session?: ClientSession,
+ ) => Promise<IGroup[]>;
+ findGroupsByNamePattern: (
+ namePattern: string,
+ source?: 'entra' | 'local' | null,
+ limit?: number,
+ session?: ClientSession,
+ ) => Promise<IGroup[]>;
+ findGroupsByMemberId: (
+ userId: string | Types.ObjectId,
+ session?: ClientSession,
+ ) => Promise<IGroup[]>;
+ createGroup: (groupData: Partial<IGroup>, session?: ClientSession) => Promise<IGroup>;
+ upsertGroupByExternalId: (
+ idOnTheSource: string,
+ source: 'entra' | 'local',
+ updateData: Partial<IGroup>,
+ session?: ClientSession,
+ ) => Promise<IGroup | null>;
+ addUserToGroup: (
+ userId: string | Types.ObjectId,
+ groupId: string | Types.ObjectId,
+ session?: ClientSession,
+ ) => Promise<{ user: IUser; group: IGroup | null }>;
+ removeUserFromGroup: (
+ userId: string | Types.ObjectId,
+ groupId: string | Types.ObjectId,
+ session?: ClientSession,
+ ) => Promise<{ user: IUser; group: IGroup | null }>;
+ removeUserFromAllGroups: (userId: string | Types.ObjectId) => Promise<void>;
+ findGroupByQuery: (
+ filter: Record<string, unknown>,
+ session?: ClientSession,
+ ) => Promise<IGroup | null>;
+ updateGroupById: (
+ groupId: string | Types.ObjectId,
+ data: Record<string, unknown>,
+ session?: ClientSession,
+ ) => Promise<IGroup | null>;
+ bulkUpdateGroups: (
+ filter: Record<string, unknown>,
+ update: Record<string, unknown>,
+ options?: { session?: ClientSession },
+ ) => Promise<import('mongoose').UpdateWriteOpResult>;
+ getUserGroups: (userId: string | Types.ObjectId, session?: ClientSession) => Promise<IGroup[]>;
+ getUserPrincipals: (
+ params: {
+ userId: string | Types.ObjectId;
+ role?: string | null;
+ },
+ session?: ClientSession,
+ ) => Promise<Array<{ principalType: PrincipalType; principalId?: string | Types.ObjectId }>>;
+ syncUserEntraGroups: (
+ userId: string | Types.ObjectId,
+ entraGroups: Array<{ id: string; name: string; description?: string; email?: string }>,
+ session?: ClientSession,
+ ) => Promise<{
+ user: IUser;
+ addedGroups: IGroup[];
+ removedGroups: IGroup[];
+ }>;
+ searchPrincipals: (
+ searchPattern: string,
+ limitPerType?: number,
+ typeFilter?: Array<PrincipalType.USER | PrincipalType.GROUP | PrincipalType.ROLE> | null,
+ session?: ClientSession,
+ ) => Promise<TPrincipalSearchResult[]>;
+ calculateRelevanceScore: (item: TPrincipalSearchResult, searchPattern: string) => number;
+ sortPrincipalsByRelevance: <
+ T extends { _searchScore?: number; type: string; name?: string; email?: string },
+ >(
+ results: T[],
+ ) => T[];
+ listGroups: (
+ filter?: {
+ source?: 'local' | 'entra';
+ search?: string;
+ limit?: number;
+ offset?: number;
+ },
+ session?: ClientSession,
+ ) => Promise<IGroup[]>;
+ countGroups: (
+ filter?: { source?: 'local' | 'entra'; search?: string },
+ session?: ClientSession,
+ ) => Promise<number>;
+ deleteGroup: (
+ groupId: string | Types.ObjectId,
+ session?: ClientSession,
+ ) => Promise<IGroup | null>;
+ removeMemberById: (
+ groupId: string | Types.ObjectId,
+ memberId: string,
+ session?: ClientSession,
+ ) => Promise<IGroup | null>;
+} {
/**
* Find a group by its ID
* @param groupId - The group ID
@@ -680,7 +790,7 @@ export function createUserGroupMethods(mongoose: typeof import('mongoose')) {
filter: Record<string, unknown>,
update: Record<string, unknown>,
options?: { session?: ClientSession },
- ) {
+ ): Promise<import('mongoose').UpdateWriteOpResult> {
const Group = mongoose.models.Group as Model<IGroup>;
return Group.updateMany(filter, update, options || {});
}
diff --git a/packages/data-schemas/src/models/accessRole.ts b/packages/data-schemas/src/models/accessRole.ts
index cd2c8b691c..2c3264d746 100644
--- a/packages/data-schemas/src/models/accessRole.ts
+++ b/packages/data-schemas/src/models/accessRole.ts
@@ -1,8 +1,9 @@
-import accessRoleSchema from '~/schema/accessRole';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import accessRoleSchema from '~/schema/accessRole';
-export function createAccessRoleModel(mongoose: typeof import('mongoose')) {
+export function createAccessRoleModel(mongoose: typeof import('mongoose')): Model<t.IAccessRole> {
applyTenantIsolation(accessRoleSchema);
return (
mongoose.models.AccessRole || mongoose.model<t.IAccessRole>('AccessRole', accessRoleSchema)
diff --git a/packages/data-schemas/src/models/aclEntry.ts b/packages/data-schemas/src/models/aclEntry.ts
index 195b328438..225e3862e3 100644
--- a/packages/data-schemas/src/models/aclEntry.ts
+++ b/packages/data-schemas/src/models/aclEntry.ts
@@ -1,8 +1,9 @@
-import aclEntrySchema from '~/schema/aclEntry';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import aclEntrySchema from '~/schema/aclEntry';
-export function createAclEntryModel(mongoose: typeof import('mongoose')) {
+export function createAclEntryModel(mongoose: typeof import('mongoose')): Model<t.IAclEntry> {
applyTenantIsolation(aclEntrySchema);
return mongoose.models.AclEntry || mongoose.model<t.IAclEntry>('AclEntry', aclEntrySchema);
}
diff --git a/packages/data-schemas/src/models/action.ts b/packages/data-schemas/src/models/action.ts
index 421610ab73..8be9dd4b1d 100644
--- a/packages/data-schemas/src/models/action.ts
+++ b/packages/data-schemas/src/models/action.ts
@@ -1,8 +1,9 @@
-import actionSchema from '~/schema/action';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IAction } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import actionSchema from '~/schema/action';
-export function createActionModel(mongoose: typeof import('mongoose')) {
+export function createActionModel(mongoose: typeof import('mongoose')): Model<IAction> {
applyTenantIsolation(actionSchema);
return mongoose.models.Action || mongoose.model<IAction>('Action', actionSchema);
}
diff --git a/packages/data-schemas/src/models/agent.ts b/packages/data-schemas/src/models/agent.ts
index 595d890f06..7b3327daca 100644
--- a/packages/data-schemas/src/models/agent.ts
+++ b/packages/data-schemas/src/models/agent.ts
@@ -1,8 +1,9 @@
-import agentSchema from '~/schema/agent';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IAgent } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import agentSchema from '~/schema/agent';
-export function createAgentModel(mongoose: typeof import('mongoose')) {
+export function createAgentModel(mongoose: typeof import('mongoose')): Model<IAgent> {
applyTenantIsolation(agentSchema);
return mongoose.models.Agent || mongoose.model<IAgent>('Agent', agentSchema);
}
diff --git a/packages/data-schemas/src/models/agentApiKey.ts b/packages/data-schemas/src/models/agentApiKey.ts
index 8251b3d7cd..925394084e 100644
--- a/packages/data-schemas/src/models/agentApiKey.ts
+++ b/packages/data-schemas/src/models/agentApiKey.ts
@@ -1,7 +1,8 @@
-import agentApiKeySchema, { IAgentApiKey } from '~/schema/agentApiKey';
+import { Model } from 'mongoose';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import agentApiKeySchema, { IAgentApiKey } from '~/schema/agentApiKey';
-export function createAgentApiKeyModel(mongoose: typeof import('mongoose')) {
+export function createAgentApiKeyModel(mongoose: typeof import('mongoose')): Model<IAgentApiKey> {
applyTenantIsolation(agentApiKeySchema);
return (
mongoose.models.AgentApiKey || mongoose.model<IAgentApiKey>('AgentApiKey', agentApiKeySchema)
diff --git a/packages/data-schemas/src/models/agentCategory.ts b/packages/data-schemas/src/models/agentCategory.ts
index f0f1f79d2e..9621ce7830 100644
--- a/packages/data-schemas/src/models/agentCategory.ts
+++ b/packages/data-schemas/src/models/agentCategory.ts
@@ -1,8 +1,11 @@
-import agentCategorySchema from '~/schema/agentCategory';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import agentCategorySchema from '~/schema/agentCategory';
-export function createAgentCategoryModel(mongoose: typeof import('mongoose')) {
+export function createAgentCategoryModel(
+ mongoose: typeof import('mongoose'),
+): Model<t.IAgentCategory> {
applyTenantIsolation(agentCategorySchema);
return (
mongoose.models.AgentCategory ||
diff --git a/packages/data-schemas/src/models/assistant.ts b/packages/data-schemas/src/models/assistant.ts
index 16c6dc2bc6..03bd52b917 100644
--- a/packages/data-schemas/src/models/assistant.ts
+++ b/packages/data-schemas/src/models/assistant.ts
@@ -1,8 +1,9 @@
-import assistantSchema from '~/schema/assistant';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IAssistant } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import assistantSchema from '~/schema/assistant';
-export function createAssistantModel(mongoose: typeof import('mongoose')) {
+export function createAssistantModel(mongoose: typeof import('mongoose')): Model<IAssistant> {
applyTenantIsolation(assistantSchema);
return mongoose.models.Assistant || mongoose.model<IAssistant>('Assistant', assistantSchema);
}
diff --git a/packages/data-schemas/src/models/balance.ts b/packages/data-schemas/src/models/balance.ts
index 7c1fb34478..6a531ab95d 100644
--- a/packages/data-schemas/src/models/balance.ts
+++ b/packages/data-schemas/src/models/balance.ts
@@ -1,8 +1,9 @@
-import balanceSchema from '~/schema/balance';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import balanceSchema from '~/schema/balance';
-export function createBalanceModel(mongoose: typeof import('mongoose')) {
+export function createBalanceModel(mongoose: typeof import('mongoose')): Model<t.IBalance> {
applyTenantIsolation(balanceSchema);
return mongoose.models.Balance || mongoose.model<t.IBalance>('Balance', balanceSchema);
}
diff --git a/packages/data-schemas/src/models/banner.ts b/packages/data-schemas/src/models/banner.ts
index ac18fa72b4..0bf12bac39 100644
--- a/packages/data-schemas/src/models/banner.ts
+++ b/packages/data-schemas/src/models/banner.ts
@@ -1,8 +1,9 @@
-import bannerSchema from '~/schema/banner';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IBanner } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import bannerSchema from '~/schema/banner';
-export function createBannerModel(mongoose: typeof import('mongoose')) {
+export function createBannerModel(mongoose: typeof import('mongoose')): Model<IBanner> {
applyTenantIsolation(bannerSchema);
return mongoose.models.Banner || mongoose.model<IBanner>('Banner', bannerSchema);
}
diff --git a/packages/data-schemas/src/models/chatProject.ts b/packages/data-schemas/src/models/chatProject.ts
index 4a4dc41b5f..27134b0a06 100644
--- a/packages/data-schemas/src/models/chatProject.ts
+++ b/packages/data-schemas/src/models/chatProject.ts
@@ -1,8 +1,11 @@
-import chatProjectSchema from '~/schema/chatProject';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IChatProjectDocument } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import chatProjectSchema from '~/schema/chatProject';
-export function createChatProjectModel(mongoose: typeof import('mongoose')) {
+export function createChatProjectModel(
+ mongoose: typeof import('mongoose'),
+): Model<IChatProjectDocument> {
applyTenantIsolation(chatProjectSchema);
return (
mongoose.models.ChatProject ||
diff --git a/packages/data-schemas/src/models/config.ts b/packages/data-schemas/src/models/config.ts
index 97c08ce1da..24a796a50c 100644
--- a/packages/data-schemas/src/models/config.ts
+++ b/packages/data-schemas/src/models/config.ts
@@ -1,8 +1,9 @@
-import configSchema from '~/schema/config';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import configSchema from '~/schema/config';
-export function createConfigModel(mongoose: typeof import('mongoose')) {
+export function createConfigModel(mongoose: typeof import('mongoose')): Model<t.IConfig> {
applyTenantIsolation(configSchema);
return mongoose.models.Config || mongoose.model<t.IConfig>('Config', configSchema);
}
diff --git a/packages/data-schemas/src/models/conversationTag.ts b/packages/data-schemas/src/models/conversationTag.ts
index a2df6459cc..e4dcb8f50c 100644
--- a/packages/data-schemas/src/models/conversationTag.ts
+++ b/packages/data-schemas/src/models/conversationTag.ts
@@ -1,7 +1,10 @@
+import { Model } from 'mongoose';
import conversationTagSchema, { IConversationTag } from '~/schema/conversationTag';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
-export function createConversationTagModel(mongoose: typeof import('mongoose')) {
+export function createConversationTagModel(
+ mongoose: typeof import('mongoose'),
+): Model<IConversationTag> {
applyTenantIsolation(conversationTagSchema);
return (
mongoose.models.ConversationTag ||
diff --git a/packages/data-schemas/src/models/convo.ts b/packages/data-schemas/src/models/convo.ts
index 7cf504bf48..d636718373 100644
--- a/packages/data-schemas/src/models/convo.ts
+++ b/packages/data-schemas/src/models/convo.ts
@@ -1,9 +1,12 @@
+import { Model } from 'mongoose';
import type * as t from '~/types';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
import mongoMeili from '~/models/plugins/mongoMeili';
import convoSchema from '~/schema/convo';
-export function createConversationModel(mongoose: typeof import('mongoose')) {
+export function createConversationModel(
+ mongoose: typeof import('mongoose'),
+): Model<t.IConversation> {
applyTenantIsolation(convoSchema);
if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
convoSchema.plugin(mongoMeili, {
diff --git a/packages/data-schemas/src/models/file.ts b/packages/data-schemas/src/models/file.ts
index da291a13e3..796e896bc5 100644
--- a/packages/data-schemas/src/models/file.ts
+++ b/packages/data-schemas/src/models/file.ts
@@ -1,8 +1,9 @@
-import fileSchema from '~/schema/file';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IMongoFile } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import fileSchema from '~/schema/file';
-export function createFileModel(mongoose: typeof import('mongoose')) {
+export function createFileModel(mongoose: typeof import('mongoose')): Model<IMongoFile> {
applyTenantIsolation(fileSchema);
return mongoose.models.File || mongoose.model<IMongoFile>('File', fileSchema);
}
diff --git a/packages/data-schemas/src/models/group.ts b/packages/data-schemas/src/models/group.ts
index 0396de83f1..46494c9ad6 100644
--- a/packages/data-schemas/src/models/group.ts
+++ b/packages/data-schemas/src/models/group.ts
@@ -1,8 +1,9 @@
-import groupSchema from '~/schema/group';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import groupSchema from '~/schema/group';
-export function createGroupModel(mongoose: typeof import('mongoose')) {
+export function createGroupModel(mongoose: typeof import('mongoose')): Model<t.IGroup> {
applyTenantIsolation(groupSchema);
return mongoose.models.Group || mongoose.model<t.IGroup>('Group', groupSchema);
}
diff --git a/packages/data-schemas/src/models/index.ts b/packages/data-schemas/src/models/index.ts
index 797a658143..c8a9808bd9 100644
--- a/packages/data-schemas/src/models/index.ts
+++ b/packages/data-schemas/src/models/index.ts
@@ -1,41 +1,75 @@
-import { createUserModel } from './user';
-import { createTokenModel } from './token';
-import { createSessionModel } from './session';
-import { createBalanceModel } from './balance';
-import { createConversationModel } from './convo';
+import { createConversationTagModel } from './conversationTag';
+import { createAgentCategoryModel } from './agentCategory';
import { createChatProjectModel } from './chatProject';
-import { createMessageModel } from './message';
-import { createAgentModel } from './agent';
import { createAgentApiKeyModel } from './agentApiKey';
-import { createAgentCategoryModel } from './agentCategory';
+import { createTransactionModel } from './transaction';
+import { createPromptGroupModel } from './promptGroup';
+import { createSystemGrantModel } from './systemGrant';
+import { createPluginAuthModel } from './pluginAuth';
+import { createSharedLinkModel } from './sharedLink';
+import { createAccessRoleModel } from './accessRole';
import { createMCPServerModel } from './mcpServer';
-import { createRoleModel } from './role';
-import { createActionModel } from './action';
import { createAssistantModel } from './assistant';
-import { createFileModel } from './file';
+import { createSkillFileModel } from './skillFile';
+import { createConversationModel } from './convo';
+import { createToolCallModel } from './toolCall';
+import { createAclEntryModel } from './aclEntry';
+import { createSessionModel } from './session';
+import { createBalanceModel } from './balance';
+import { createMessageModel } from './message';
+import { createActionModel } from './action';
import { createBannerModel } from './banner';
-import { createKeyModel } from './key';
-import { createPluginAuthModel } from './pluginAuth';
-import { createTransactionModel } from './transaction';
import { createPresetModel } from './preset';
import { createPromptModel } from './prompt';
-import { createPromptGroupModel } from './promptGroup';
-import { createSkillModel } from './skill';
-import { createSkillFileModel } from './skillFile';
-import { createConversationTagModel } from './conversationTag';
-import { createSharedLinkModel } from './sharedLink';
-import { createToolCallModel } from './toolCall';
import { createMemoryModel } from './memory';
-import { createAccessRoleModel } from './accessRole';
-import { createAclEntryModel } from './aclEntry';
-import { createSystemGrantModel } from './systemGrant';
-import { createGroupModel } from './group';
import { createConfigModel } from './config';
+import { createTokenModel } from './token';
+import { createAgentModel } from './agent';
+import { createSkillModel } from './skill';
+import { createGroupModel } from './group';
+import { createUserModel } from './user';
+import { createRoleModel } from './role';
+import { createFileModel } from './file';
+import { createKeyModel } from './key';
/**
* Creates all database models for all collections
*/
-export function createModels(mongoose: typeof import('mongoose')) {
+export function createModels(mongoose: typeof import('mongoose')): {
+ User: ReturnType<typeof createUserModel>;
+ Token: ReturnType<typeof createTokenModel>;
+ Session: ReturnType<typeof createSessionModel>;
+ Balance: ReturnType<typeof createBalanceModel>;
+ Conversation: ReturnType<typeof createConversationModel>;
+ ChatProject: ReturnType<typeof createChatProjectModel>;
+ Message: ReturnType<typeof createMessageModel>;
+ Agent: ReturnType<typeof createAgentModel>;
+ AgentApiKey: ReturnType<typeof createAgentApiKeyModel>;
+ AgentCategory: ReturnType<typeof createAgentCategoryModel>;
+ MCPServer: ReturnType<typeof createMCPServerModel>;
+ Role: ReturnType<typeof createRoleModel>;
+ Action: ReturnType<typeof createActionModel>;
+ Assistant: ReturnType<typeof createAssistantModel>;
+ File: ReturnType<typeof createFileModel>;
+ Banner: ReturnType<typeof createBannerModel>;
+ Key: ReturnType<typeof createKeyModel>;
+ PluginAuth: ReturnType<typeof createPluginAuthModel>;
+ Transaction: ReturnType<typeof createTransactionModel>;
+ Preset: ReturnType<typeof createPresetModel>;
+ Prompt: ReturnType<typeof createPromptModel>;
+ PromptGroup: ReturnType<typeof createPromptGroupModel>;
+ Skill: ReturnType<typeof createSkillModel>;
+ SkillFile: ReturnType<typeof createSkillFileModel>;
+ ConversationTag: ReturnType<typeof createConversationTagModel>;
+ SharedLink: ReturnType<typeof createSharedLinkModel>;
+ ToolCall: ReturnType<typeof createToolCallModel>;
+ MemoryEntry: ReturnType<typeof createMemoryModel>;
+ AccessRole: ReturnType<typeof createAccessRoleModel>;
+ AclEntry: ReturnType<typeof createAclEntryModel>;
+ SystemGrant: ReturnType<typeof createSystemGrantModel>;
+ Group: ReturnType<typeof createGroupModel>;
+ Config: ReturnType<typeof createConfigModel>;
+} {
return {
User: createUserModel(mongoose),
Token: createTokenModel(mongoose),
diff --git a/packages/data-schemas/src/models/key.ts b/packages/data-schemas/src/models/key.ts
index d6534e870b..1772a11e6c 100644
--- a/packages/data-schemas/src/models/key.ts
+++ b/packages/data-schemas/src/models/key.ts
@@ -1,7 +1,8 @@
-import keySchema, { IKey } from '~/schema/key';
+import { Model } from 'mongoose';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import keySchema, { IKey } from '~/schema/key';
-export function createKeyModel(mongoose: typeof import('mongoose')) {
+export function createKeyModel(mongoose: typeof import('mongoose')): Model<IKey> {
applyTenantIsolation(keySchema);
return mongoose.models.Key || mongoose.model<IKey>('Key', keySchema);
}
diff --git a/packages/data-schemas/src/models/mcpServer.ts b/packages/data-schemas/src/models/mcpServer.ts
index 6b93754d1c..03187911ad 100644
--- a/packages/data-schemas/src/models/mcpServer.ts
+++ b/packages/data-schemas/src/models/mcpServer.ts
@@ -1,8 +1,11 @@
-import mcpServerSchema from '~/schema/mcpServer';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { MCPServerDocument } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import mcpServerSchema from '~/schema/mcpServer';
-export function createMCPServerModel(mongoose: typeof import('mongoose')) {
+export function createMCPServerModel(
+ mongoose: typeof import('mongoose'),
+): Model<MCPServerDocument> {
applyTenantIsolation(mcpServerSchema);
return (
mongoose.models.MCPServer || mongoose.model<MCPServerDocument>('MCPServer', mcpServerSchema)
diff --git a/packages/data-schemas/src/models/memory.ts b/packages/data-schemas/src/models/memory.ts
index ad2c8cf8dc..4ae4a7eceb 100644
--- a/packages/data-schemas/src/models/memory.ts
+++ b/packages/data-schemas/src/models/memory.ts
@@ -1,8 +1,9 @@
-import memorySchema from '~/schema/memory';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IMemoryEntry } from '~/types/memory';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import memorySchema from '~/schema/memory';
-export function createMemoryModel(mongoose: typeof import('mongoose')) {
+export function createMemoryModel(mongoose: typeof import('mongoose')): Model<IMemoryEntry> {
applyTenantIsolation(memorySchema);
return mongoose.models.MemoryEntry || mongoose.model<IMemoryEntry>('MemoryEntry', memorySchema);
}
diff --git a/packages/data-schemas/src/models/message.ts b/packages/data-schemas/src/models/message.ts
index b8b26b3e06..2dfcf66fe4 100644
--- a/packages/data-schemas/src/models/message.ts
+++ b/packages/data-schemas/src/models/message.ts
@@ -1,9 +1,10 @@
+import { Model } from 'mongoose';
import type * as t from '~/types';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
import mongoMeili from '~/models/plugins/mongoMeili';
import messageSchema from '~/schema/message';
-export function createMessageModel(mongoose: typeof import('mongoose')) {
+export function createMessageModel(mongoose: typeof import('mongoose')): Model<t.IMessage> {
applyTenantIsolation(messageSchema);
if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
messageSchema.plugin(mongoMeili, {
diff --git a/packages/data-schemas/src/models/pluginAuth.ts b/packages/data-schemas/src/models/pluginAuth.ts
index 22b46d05a8..3d879217b3 100644
--- a/packages/data-schemas/src/models/pluginAuth.ts
+++ b/packages/data-schemas/src/models/pluginAuth.ts
@@ -1,8 +1,9 @@
-import pluginAuthSchema from '~/schema/pluginAuth';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IPluginAuth } from '~/types/pluginAuth';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import pluginAuthSchema from '~/schema/pluginAuth';
-export function createPluginAuthModel(mongoose: typeof import('mongoose')) {
+export function createPluginAuthModel(mongoose: typeof import('mongoose')): Model<IPluginAuth> {
applyTenantIsolation(pluginAuthSchema);
return mongoose.models.PluginAuth || mongoose.model<IPluginAuth>('PluginAuth', pluginAuthSchema);
}
diff --git a/packages/data-schemas/src/models/plugins/mongoMeili.spec.ts b/packages/data-schemas/src/models/plugins/mongoMeili.spec.ts
index b4084fa936..421c15c14d 100644
--- a/packages/data-schemas/src/models/plugins/mongoMeili.spec.ts
+++ b/packages/data-schemas/src/models/plugins/mongoMeili.spec.ts
@@ -1,9 +1,9 @@
-import { MongoMemoryServer } from 'mongodb-memory-server';
import mongoose from 'mongoose';
import { EModelEndpoint } from 'librechat-data-provider';
+import { MongoMemoryServer } from 'mongodb-memory-server';
+import mongoMeili, { type SchemaWithMeiliMethods } from '~/models/plugins/mongoMeili';
import { createConversationModel } from '~/models/convo';
import { createMessageModel } from '~/models/message';
-import mongoMeili, { type SchemaWithMeiliMethods } from '~/models/plugins/mongoMeili';
interface DynamicMeiliDocument extends mongoose.Document {
docId: string;
@@ -235,7 +235,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('updating an indexed conversation calls updateDocuments with primaryKey', async () => {
- const conversationModel = createConversationModel(mongoose);
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
const convo = await conversationModel.create({
conversationId: new mongoose.Types.ObjectId().toString(),
user: new mongoose.Types.ObjectId(),
@@ -295,7 +297,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('updateDocuments receives preprocessed data with primaryKey', async () => {
- const conversationModel = createConversationModel(mongoose);
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
const conversationId = 'abc|def|ghi';
const convo = await conversationModel.create({
conversationId,
@@ -316,7 +320,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('sync w/ meili does not include TTL documents', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.create({
conversationId: new mongoose.Types.ObjectId(),
user: new mongoose.Types.ObjectId(),
@@ -332,7 +338,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('sync w/ meili excludes legacy temporary conversations without isTemporary', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
const conversationId = new mongoose.Types.ObjectId().toString();
@@ -356,7 +364,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('saving hydrated legacy temporary conversations without isTemporary does NOT index', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocuments.mockClear();
mockUpdateDocuments.mockClear();
@@ -386,7 +396,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('findOneAndUpdate on legacy temporary conversations without isTemporary does NOT index', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocuments.mockClear();
mockUpdateDocuments.mockClear();
@@ -416,7 +428,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('sync w/ meili excludes legacy temporary messages without isTemporary', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
const messageId = new mongoose.Types.ObjectId().toString();
@@ -501,7 +513,9 @@ describe('Meilisearch Mongoose plugin', () => {
describe('estimatedDocumentCount usage in syncWithMeili', () => {
test('syncWithMeili completes successfully with estimatedDocumentCount', async () => {
// Clear any previous documents
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
// Create test documents
@@ -527,7 +541,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili handles empty collection correctly', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
// Verify collection is empty
@@ -539,7 +553,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('estimatedDocumentCount returns count for non-empty collection', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
// Create documents
@@ -562,7 +578,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('estimatedDocumentCount is available on model', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
// Verify the method exists and is callable
expect(typeof messageModel.estimatedDocumentCount).toBe('function');
@@ -574,7 +590,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili handles mix of syncable and TTL documents correctly', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
mockAddDocuments.mockClear();
@@ -637,7 +653,9 @@ describe('Meilisearch Mongoose plugin', () => {
describe('New batch processing and retry functionality', () => {
test('processSyncBatch uses addDocumentsInBatches', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
mockAddDocuments.mockClear();
@@ -661,7 +679,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('addObjectToMeili retries on failure', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
// Mock addDocuments to fail twice then succeed
mockAddDocuments
@@ -685,7 +705,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('getSyncProgress returns accurate progress information', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
// Insert documents directly to control the _meiliIndex flag
@@ -715,7 +737,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('getSyncProgress excludes TTL documents from counts', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
// Insert syncable documents (expiredAt: null)
@@ -765,7 +789,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('getSyncProgress shows completion when all syncable documents are indexed', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
// All syncable documents are indexed
@@ -807,7 +831,9 @@ describe('Meilisearch Mongoose plugin', () => {
describe('Error handling in processSyncBatch', () => {
test('syncWithMeili fails when processSyncBatch encounters addDocumentsInBatches error', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -839,7 +865,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili fails when processSyncBatch encounters updateMany error', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -871,7 +899,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('processSyncBatch logs error and throws when addDocumentsInBatches fails', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
mockAddDocumentsInBatches.mockRejectedValueOnce(new Error('Network timeout'));
@@ -897,7 +925,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('processSyncBatch handles empty document array gracefully', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
const indexMock = mockIndex();
// Should not throw with empty array
@@ -908,7 +938,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili stops processing when batch fails and does not process remaining documents', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -939,7 +971,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('error in processSyncBatch is properly logged before being thrown', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
const testError = new Error('Test error for logging');
@@ -962,7 +994,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili properly propagates processSyncBatch errors', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -1003,7 +1037,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex deletes orphaned documents from MeiliSearch', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
const existingConvoId = new mongoose.Types.ObjectId().toString();
@@ -1037,7 +1073,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex handles offset correctly when documents are deleted', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
const existingIds = [
@@ -1093,7 +1129,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex preserves existing documents', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
const existingId1 = new mongoose.Types.ObjectId().toString();
@@ -1132,7 +1170,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex handles empty MeiliSearch index', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
// Mock empty MeiliSearch index
mockGetDocuments.mockResolvedValueOnce({
@@ -1148,7 +1186,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex stops when results.length < batchSize', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
const id1 = new mongoose.Types.ObjectId().toString();
@@ -1187,7 +1227,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex handles multiple batches correctly', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
const existingIds = Array.from({ length: 5 }, () => new mongoose.Types.ObjectId().toString());
@@ -1243,7 +1283,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex handles delay between batches', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
const id1 = new mongoose.Types.ObjectId().toString();
@@ -1290,7 +1332,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex handles errors gracefully', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
mockGetDocuments.mockRejectedValueOnce(new Error('MeiliSearch connection error'));
@@ -1303,7 +1345,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex with all documents being orphaned', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
const orphanedId1 = new mongoose.Types.ObjectId().toString();
@@ -1327,7 +1371,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('cleanupMeiliIndex adjusts offset to 0 when all batch documents are deleted', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
const orphanedIds = Array.from({ length: 3 }, () => new mongoose.Types.ObjectId().toString());
@@ -1375,7 +1419,9 @@ describe('Meilisearch Mongoose plugin', () => {
describe('processSyncBatch does not modify updatedAt timestamps', () => {
test('syncWithMeili preserves original updatedAt on conversations', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -1426,7 +1472,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili preserves original updatedAt on messages', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -1474,7 +1520,9 @@ describe('Meilisearch Mongoose plugin', () => {
describe('Missing _meiliIndex property handling in sync process', () => {
test('syncWithMeili includes documents with missing _meiliIndex', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -1529,7 +1577,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('getSyncProgress counts documents with missing _meiliIndex as not indexed', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
// Insert documents with different _meiliIndex states
@@ -1571,7 +1619,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('query with _meiliIndex: { $ne: true } includes missing values', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
// Insert documents with different _meiliIndex states
@@ -1615,7 +1665,7 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili processes all documents where _meiliIndex is not true', async () => {
- const messageModel = createMessageModel(mongoose) as SchemaWithMeiliMethods;
+ const messageModel = createMessageModel(mongoose) as unknown as SchemaWithMeiliMethods;
await messageModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
@@ -1665,7 +1715,9 @@ describe('Meilisearch Mongoose plugin', () => {
});
test('syncWithMeili treats missing _meiliIndex same as false', async () => {
- const conversationModel = createConversationModel(mongoose) as SchemaWithMeiliMethods;
+ const conversationModel = createConversationModel(
+ mongoose,
+ ) as unknown as SchemaWithMeiliMethods;
await conversationModel.deleteMany({});
mockAddDocumentsInBatches.mockClear();
diff --git a/packages/data-schemas/src/models/preset.ts b/packages/data-schemas/src/models/preset.ts
index dc61c6d251..07b979b438 100644
--- a/packages/data-schemas/src/models/preset.ts
+++ b/packages/data-schemas/src/models/preset.ts
@@ -1,7 +1,8 @@
-import presetSchema, { IPreset } from '~/schema/preset';
+import { Model } from 'mongoose';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import presetSchema, { IPreset } from '~/schema/preset';
-export function createPresetModel(mongoose: typeof import('mongoose')) {
+export function createPresetModel(mongoose: typeof import('mongoose')): Model<IPreset> {
applyTenantIsolation(presetSchema);
return mongoose.models.Preset || mongoose.model<IPreset>('Preset', presetSchema);
}
diff --git a/packages/data-schemas/src/models/prompt.ts b/packages/data-schemas/src/models/prompt.ts
index 25ff23e81a..939bd57510 100644
--- a/packages/data-schemas/src/models/prompt.ts
+++ b/packages/data-schemas/src/models/prompt.ts
@@ -1,8 +1,9 @@
-import promptSchema from '~/schema/prompt';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IPrompt } from '~/types/prompts';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import promptSchema from '~/schema/prompt';
-export function createPromptModel(mongoose: typeof import('mongoose')) {
+export function createPromptModel(mongoose: typeof import('mongoose')): Model<IPrompt> {
applyTenantIsolation(promptSchema);
return mongoose.models.Prompt || mongoose.model<IPrompt>('Prompt', promptSchema);
}
diff --git a/packages/data-schemas/src/models/promptGroup.ts b/packages/data-schemas/src/models/promptGroup.ts
index 2d1d226988..22d4b5ced0 100644
--- a/packages/data-schemas/src/models/promptGroup.ts
+++ b/packages/data-schemas/src/models/promptGroup.ts
@@ -1,8 +1,11 @@
-import promptGroupSchema from '~/schema/promptGroup';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IPromptGroupDocument } from '~/types/prompts';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import promptGroupSchema from '~/schema/promptGroup';
-export function createPromptGroupModel(mongoose: typeof import('mongoose')) {
+export function createPromptGroupModel(
+ mongoose: typeof import('mongoose'),
+): Model<IPromptGroupDocument> {
applyTenantIsolation(promptGroupSchema);
return (
mongoose.models.PromptGroup ||
diff --git a/packages/data-schemas/src/models/role.ts b/packages/data-schemas/src/models/role.ts
index 2860007044..fec17004a3 100644
--- a/packages/data-schemas/src/models/role.ts
+++ b/packages/data-schemas/src/models/role.ts
@@ -1,8 +1,9 @@
-import roleSchema from '~/schema/role';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { IRole } from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import roleSchema from '~/schema/role';
-export function createRoleModel(mongoose: typeof import('mongoose')) {
+export function createRoleModel(mongoose: typeof import('mongoose')): Model<IRole> {
applyTenantIsolation(roleSchema);
return mongoose.models.Role || mongoose.model<IRole>('Role', roleSchema);
}
diff --git a/packages/data-schemas/src/models/session.ts b/packages/data-schemas/src/models/session.ts
index 746f9a74dd..157a1ef770 100644
--- a/packages/data-schemas/src/models/session.ts
+++ b/packages/data-schemas/src/models/session.ts
@@ -1,8 +1,9 @@
-import sessionSchema from '~/schema/session';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import sessionSchema from '~/schema/session';
-export function createSessionModel(mongoose: typeof import('mongoose')) {
+export function createSessionModel(mongoose: typeof import('mongoose')): Model<t.ISession> {
applyTenantIsolation(sessionSchema);
return mongoose.models.Session || mongoose.model<t.ISession>('Session', sessionSchema);
}
diff --git a/packages/data-schemas/src/models/sharedLink.ts b/packages/data-schemas/src/models/sharedLink.ts
index f379c4605c..b84327431f 100644
--- a/packages/data-schemas/src/models/sharedLink.ts
+++ b/packages/data-schemas/src/models/sharedLink.ts
@@ -1,7 +1,8 @@
-import shareSchema, { ISharedLink } from '~/schema/share';
+import { Model } from 'mongoose';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import shareSchema, { ISharedLink } from '~/schema/share';
-export function createSharedLinkModel(mongoose: typeof import('mongoose')) {
+export function createSharedLinkModel(mongoose: typeof import('mongoose')): Model<ISharedLink> {
applyTenantIsolation(shareSchema);
return mongoose.models.SharedLink || mongoose.model<ISharedLink>('SharedLink', shareSchema);
}
diff --git a/packages/data-schemas/src/models/skill.ts b/packages/data-schemas/src/models/skill.ts
index 588523f3de..efe93f08bf 100644
--- a/packages/data-schemas/src/models/skill.ts
+++ b/packages/data-schemas/src/models/skill.ts
@@ -1,8 +1,9 @@
-import skillSchema from '~/schema/skill';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { ISkillDocument } from '~/types/skill';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import skillSchema from '~/schema/skill';
-export function createSkillModel(mongoose: typeof import('mongoose')) {
+export function createSkillModel(mongoose: typeof import('mongoose')): Model<ISkillDocument> {
applyTenantIsolation(skillSchema);
return mongoose.models.Skill || mongoose.model<ISkillDocument>('Skill', skillSchema);
}
diff --git a/packages/data-schemas/src/models/skillFile.ts b/packages/data-schemas/src/models/skillFile.ts
index 230a244910..94380d86d9 100644
--- a/packages/data-schemas/src/models/skillFile.ts
+++ b/packages/data-schemas/src/models/skillFile.ts
@@ -1,8 +1,11 @@
-import skillFileSchema from '~/schema/skillFile';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type { ISkillFileDocument } from '~/types/skill';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import skillFileSchema from '~/schema/skillFile';
-export function createSkillFileModel(mongoose: typeof import('mongoose')) {
+export function createSkillFileModel(
+ mongoose: typeof import('mongoose'),
+): Model<ISkillFileDocument> {
applyTenantIsolation(skillFileSchema);
return (
mongoose.models.SkillFile || mongoose.model<ISkillFileDocument>('SkillFile', skillFileSchema)
diff --git a/packages/data-schemas/src/models/systemGrant.ts b/packages/data-schemas/src/models/systemGrant.ts
index e30b444c65..057e1cff79 100644
--- a/packages/data-schemas/src/models/systemGrant.ts
+++ b/packages/data-schemas/src/models/systemGrant.ts
@@ -1,3 +1,4 @@
+import { Model } from 'mongoose';
import type * as t from '~/types';
import systemGrantSchema from '~/schema/systemGrant';
@@ -7,7 +8,7 @@ import systemGrantSchema from '~/schema/systemGrant';
* Do NOT apply tenant isolation plugin here; it would inject a hard tenantId equality
* filter that conflicts with the $and/$or logic in hasCapabilityForPrincipals.
*/
-export function createSystemGrantModel(mongoose: typeof import('mongoose')) {
+export function createSystemGrantModel(mongoose: typeof import('mongoose')): Model<t.ISystemGrant> {
return (
mongoose.models.SystemGrant || mongoose.model<t.ISystemGrant>('SystemGrant', systemGrantSchema)
);
diff --git a/packages/data-schemas/src/models/token.ts b/packages/data-schemas/src/models/token.ts
index 0cdefab0d9..5e187d2a62 100644
--- a/packages/data-schemas/src/models/token.ts
+++ b/packages/data-schemas/src/models/token.ts
@@ -1,8 +1,9 @@
-import tokenSchema from '~/schema/token';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import tokenSchema from '~/schema/token';
-export function createTokenModel(mongoose: typeof import('mongoose')) {
+export function createTokenModel(mongoose: typeof import('mongoose')): Model<t.IToken> {
applyTenantIsolation(tokenSchema);
return mongoose.models.Token || mongoose.model<t.IToken>('Token', tokenSchema);
}
diff --git a/packages/data-schemas/src/models/toolCall.ts b/packages/data-schemas/src/models/toolCall.ts
index 262aade342..1917f51981 100644
--- a/packages/data-schemas/src/models/toolCall.ts
+++ b/packages/data-schemas/src/models/toolCall.ts
@@ -1,7 +1,8 @@
-import toolCallSchema, { IToolCallData } from '~/schema/toolCall';
+import { Model } from 'mongoose';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import toolCallSchema, { IToolCallData } from '~/schema/toolCall';
-export function createToolCallModel(mongoose: typeof import('mongoose')) {
+export function createToolCallModel(mongoose: typeof import('mongoose')): Model<IToolCallData> {
applyTenantIsolation(toolCallSchema);
return mongoose.models.ToolCall || mongoose.model<IToolCallData>('ToolCall', toolCallSchema);
}
diff --git a/packages/data-schemas/src/models/transaction.ts b/packages/data-schemas/src/models/transaction.ts
index 358ead23a7..4e2392e1d8 100644
--- a/packages/data-schemas/src/models/transaction.ts
+++ b/packages/data-schemas/src/models/transaction.ts
@@ -1,7 +1,8 @@
-import transactionSchema, { ITransaction } from '~/schema/transaction';
+import { Model } from 'mongoose';
import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import transactionSchema, { ITransaction } from '~/schema/transaction';
-export function createTransactionModel(mongoose: typeof import('mongoose')) {
+export function createTransactionModel(mongoose: typeof import('mongoose')): Model<ITransaction> {
applyTenantIsolation(transactionSchema);
return (
mongoose.models.Transaction || mongoose.model<ITransaction>('Transaction', transactionSchema)
diff --git a/packages/data-schemas/src/models/user.ts b/packages/data-schemas/src/models/user.ts
index 18a1da2b0b..5908018299 100644
--- a/packages/data-schemas/src/models/user.ts
+++ b/packages/data-schemas/src/models/user.ts
@@ -1,8 +1,9 @@
-import userSchema from '~/schema/user';
-import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import { Model } from 'mongoose';
import type * as t from '~/types';
+import { applyTenantIsolation } from '~/models/plugins/tenantIsolation';
+import userSchema from '~/schema/user';
-export function createUserModel(mongoose: typeof import('mongoose')) {
+export function createUserModel(mongoose: typeof import('mongoose')): Model<t.IUser> {
applyTenantIsolation(userSchema);
return mongoose.models.User || mongoose.model<t.IUser>('User', userSchema);
}
diff --git a/packages/data-schemas/src/schema/accessRole.ts b/packages/data-schemas/src/schema/accessRole.ts
index c2b3527488..b0a07a7c3e 100644
--- a/packages/data-schemas/src/schema/accessRole.ts
+++ b/packages/data-schemas/src/schema/accessRole.ts
@@ -1,7 +1,7 @@
import { Schema } from 'mongoose';
import type { IAccessRole } from '~/types';
-const accessRoleSchema = new Schema<IAccessRole>(
+const accessRoleSchema: Schema<IAccessRole> = new Schema<IAccessRole>(
{
accessRoleId: {
type: String,
diff --git a/packages/data-schemas/src/schema/aclEntry.ts b/packages/data-schemas/src/schema/aclEntry.ts
index b97d612196..562d4e5b21 100644
--- a/packages/data-schemas/src/schema/aclEntry.ts
+++ b/packages/data-schemas/src/schema/aclEntry.ts
@@ -3,7 +3,7 @@ import { PrincipalType, PrincipalModel, ResourceType } from 'librechat-data-prov
import type { IAclEntry } from '~/types';
import { MAX_PERM_BITS } from '~/common/permissions';
-const aclEntrySchema = new Schema<IAclEntry>(
+const aclEntrySchema: Schema<IAclEntry> = new Schema<IAclEntry>(
{
principalType: {
type: String,
diff --git a/packages/data-schemas/src/schema/action.ts b/packages/data-schemas/src/schema/action.ts
index 5cde2ad6fc..771b0301f1 100644
--- a/packages/data-schemas/src/schema/action.ts
+++ b/packages/data-schemas/src/schema/action.ts
@@ -16,7 +16,7 @@ const AuthSchema = new Schema(
{ _id: false },
);
-const Action = new Schema<IAction>({
+const Action: mongoose.Schema<IAction> = new Schema<IAction>({
user: {
type: mongoose.Schema.Types.ObjectId,
ref: 'User',
diff --git a/packages/data-schemas/src/schema/agent.ts b/packages/data-schemas/src/schema/agent.ts
index 33e1a92d6f..5ef6a9cf0d 100644
--- a/packages/data-schemas/src/schema/agent.ts
+++ b/packages/data-schemas/src/schema/agent.ts
@@ -1,7 +1,7 @@
import { Schema } from 'mongoose';
import type { IAgent } from '~/types';
-const agentSchema = new Schema<IAgent>(
+const agentSchema: Schema<IAgent> = new Schema<IAgent>(
{
id: {
type: String,
diff --git a/packages/data-schemas/src/schema/agentCategory.ts b/packages/data-schemas/src/schema/agentCategory.ts
index 2922042129..e8d611fb05 100644
--- a/packages/data-schemas/src/schema/agentCategory.ts
+++ b/packages/data-schemas/src/schema/agentCategory.ts
@@ -1,7 +1,7 @@
import { Schema } from 'mongoose';
import type { IAgentCategory } from '~/types';
-const agentCategorySchema = new Schema<IAgentCategory>(
+const agentCategorySchema: Schema<IAgentCategory> = new Schema<IAgentCategory>(
{
value: {
type: String,
diff --git a/packages/data-schemas/src/schema/assistant.ts b/packages/data-schemas/src/schema/assistant.ts
index 3fc052d458..da2c86b762 100644
--- a/packages/data-schemas/src/schema/assistant.ts
+++ b/packages/data-schemas/src/schema/assistant.ts
@@ -1,7 +1,7 @@
import { Schema } from 'mongoose';
import type { IAssistant } from '~/types';
-const assistantSchema = new Schema<IAssistant>(
+const assistantSchema: Schema<IAssistant> = new Schema<IAssistant>(
{
user: {
type: Schema.Types.ObjectId,
diff --git a/packages/data-schemas/src/schema/balance.ts b/packages/data-schemas/src/schema/balance.ts
index 07c94b71f8..4314d1f2cf 100644
--- a/packages/data-schemas/src/schema/balance.ts
+++ b/packages/data-schemas/src/schema/balance.ts
@@ -2,7 +2,7 @@ import { Schema } from 'mongoose';
import { REFILL_INTERVAL_UNITS } from 'librechat-data-provider';
import type * as t from '~/types';
-const balanceSchema = new Schema<t.IBalance>({
+const balanceSchema: Schema<t.IBalance> = new Schema<t.IBalance>({
user: {
type: Schema.Types.ObjectId,
ref: 'User',
diff --git a/packages/data-schemas/src/schema/banner.ts b/packages/data-schemas/src/schema/banner.ts
index 73baa92b2f..6c369c199d 100644
--- a/packages/data-schemas/src/schema/banner.ts
+++ b/packages/data-schemas/src/schema/banner.ts
@@ -11,7 +11,7 @@ export interface IBanner extends Document {
tenantId?: string;
}
-const bannerSchema = new Schema<IBanner>(
+const bannerSchema: Schema<IBanner> = new Schema<IBanner>(
{
bannerId: {
type: String,
diff --git a/packages/data-schemas/src/schema/categories.ts b/packages/data-schemas/src/schema/categories.ts
index 94832b54de..6fa3ab1e6b 100644
--- a/packages/data-schemas/src/schema/categories.ts
+++ b/packages/data-schemas/src/schema/categories.ts
@@ -6,7 +6,7 @@ export interface ICategory extends Document {
tenantId?: string;
}
-const categoriesSchema = new Schema<ICategory>({
+const categoriesSchema: Schema<ICategory> = new Schema<ICategory>({
label: {
type: String,
required: true,
diff --git a/packages/data-schemas/src/schema/chatProject.ts b/packages/data-schemas/src/schema/chatProject.ts
index 4cd9edccee..837a68b3e7 100644
--- a/packages/data-schemas/src/schema/chatProject.ts
+++ b/packages/data-schemas/src/schema/chatProject.ts
@@ -1,7 +1,7 @@
import { Schema } from 'mongoose';
import type { IChatProjectDocument } from '~/types';
-const chatProjectSchema = new Schema<IChatProjectDocument>(
+const chatProjectSchema: Schema<IChatProjectDocument> = new Schema<IChatProjectDocument>(
{
name: {
type: String,
diff --git a/packages/data-schemas/src/schema/config.ts b/packages/data-schemas/src/schema/config.ts
index 57e9d5f326..bc8654e9df 100644
--- a/packages/data-schemas/src/schema/config.ts
+++ b/packages/data-schemas/src/schema/config.ts
@@ -2,7 +2,7 @@ import { Schema } from 'mongoose';
import { PrincipalType, PrincipalModel } from 'librechat-data-provider';
import type { IConfig } from '~/types';
-const configSchema = new Schema<IConfig>(
+const configSchema: Schema<IConfig> = new Schema<IConfig>(
{
principalType: {
type: String,
diff --git a/packages/data-schemas/src/schema/conversationTag.ts b/packages/data-schemas/src/schema/conversationTag.ts
index 6b37257121..f3d0c8c0ef 100644
--- a/packages/data-schemas/src/schema/conversationTag.ts
+++ b/packages/data-schemas/src/schema/conversationTag.ts
@@ -9,7 +9,7 @@ export interface IConversationTag extends Document {
tenantId?: string;
}
-const conversationTag = new Schema<IConversationTag>(
+const conversationTag: Schema<IConversationTag> = new Schema<IConversationTag>(
{
tag: {
type: String,
diff --git a/packages/data-schemas/src/schema/defaults.ts b/packages/data-schemas/src/schema/defaults.ts
index 9b50bceb1d..148a2b5f42 100644
--- a/packages/data-schemas/src/schema/defaults.ts
+++ b/packages/data-schemas/src/schema/defaults.ts
@@ -1,7 +1,186 @@
import { Schema } from 'mongoose';
// @ts-ignore
-export const conversationPreset = {
+export const conversationPreset: {
+ endpoint: {
+ type: StringConstructor;
+ default: null;
+ required: boolean;
+ };
+ endpointType: {
+ type: StringConstructor;
+ };
+ // for azureOpenAI, openAI only
+ model: {
+ type: StringConstructor;
+ required: boolean;
+ };
+ // for bedrock only
+ region: {
+ type: StringConstructor;
+ required: boolean;
+ };
+ // for azureOpenAI, openAI only
+ chatGptLabel: {
+ type: StringConstructor;
+ required: boolean;
+ };
+ // for google only
+ examples: {
+ type: {
+ type: typeof Schema.Types.Mixed;
+ }[];
+ default: undefined;
+ };
+ modelLabel: {
+ type: StringConstructor;
+ required: boolean;
+ };
+ promptPrefix: {
+ type: StringConstructor;
+ required: boolean;
+ };
+ temperature: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ top_p: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ // for google only
+ topP: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ topK: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ maxOutputTokens: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ maxTokens: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ presence_penalty: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ frequency_penalty: {
+ type: NumberConstructor;
+ required: boolean;
+ };
+ file_ids: {
+ type: {
+ type: StringConstructor;
+ }[];
+ default: undefined;
+ };
+ // deprecated
+ resendImages: {
+ type: BooleanConstructor;
+ };
+ /* Anthropic only */
+ promptCache: {
+ type: BooleanConstructor;
+ };
+ thinking: {
+ type: BooleanConstructor;
+ };
+ thinkingBudget: {
+ type: NumberConstructor;
+ };
+ thinkingLevel: {
+ type: StringConstructor;
+ };
+ effort: {
+ type: StringConstructor;
+ };
+ system: {
+ type: StringConstructor;
+ };
+ // files
+ resendFiles: {
+ type: BooleanConstructor;
+ };
+ imageDetail: {
+ type: StringConstructor;
+ };
+ /* agents */
+ agent_id: {
+ type: StringConstructor;
+ };
+ /* assistants */
+ assistant_id: {
+ type: StringConstructor;
+ };
+ instructions: {
+ type: StringConstructor;
+ };
+ stop: {
+ type: {
+ type: StringConstructor;
+ }[];
+ default: undefined;
+ };
+ isArchived: {
+ type: BooleanConstructor;
+ default: boolean;
+ };
+ /* UI Components */
+ iconURL: {
+ type: StringConstructor;
+ };
+ greeting: {
+ type: StringConstructor;
+ };
+ spec: {
+ type: StringConstructor;
+ };
+ tags: {
+ type: StringConstructor[];
+ default: never[];
+ };
+ tools: {
+ type: {
+ type: StringConstructor;
+ }[];
+ default: undefined;
+ };
+ maxContextTokens: {
+ type: NumberConstructor;
+ };
+ max_tokens: {
+ type: NumberConstructor;
+ };
+ useResponsesApi: {
+ type: BooleanConstructor;
+ };
+ /** OpenAI Responses API / Anthropic API / Google API */
+ web_search: {
+ type: BooleanConstructor;
+ };
+ disableStreaming: {
+ type: BooleanConstructor;
+ };
+ fileTokenLimit: {
+ type: NumberConstructor;
+ };
+ /** Reasoning models only */
+ reasoning_effort: {
+ type: StringConstructor;
+ };
+ reasoning_summary: {
+ type: StringConstructor;
+ };
+ /** Verbosity control */
+ verbosity: {
+ type: StringConstructor;
+ };
+} = {
endpoint: {
type: String,
default: null,
diff --git a/packages/data-schemas/src/schema/group.ts b/packages/data-schemas/src/schema/group.ts
index 3cdbd31330..73d8928233 100644
--- a/packages/data-schemas/src/schema/group.ts
+++ b/packages/data-schemas/src/schema/group.ts
@@ -1,7 +1,7 @@
import { Schema } from 'mongoose';
import type { IGroup } from '~/types';
-const groupSchema = new Schema<IGroup>(
+const groupSchema: Schema<IGroup> = new Schema<IGroup>(
{
name: {
type: String,
diff --git a/packages/data-schemas/src/schema/mcpServer.ts b/packages/data-schemas/src/schema/mcpServer.ts
index ac881932da..9a0d63bff8 100644
--- a/packages/data-schemas/src/schema/mcpServer.ts
+++ b/packages/data-schemas/src/schema/mcpServer.ts
@@ -1,7 +1,7 @@
import { Schema } from 'mongoose';
import type { MCPServerDocument } from '~/types';
-const mcpServerSchema = new Schema<MCPServerDocument>(
+const mcpServerSchema: Schema<MCPServerDocument> = new Schema<MCPServerDocument>(
{
serverName: {
type: String,
diff --git a/packages/data-schemas/src/schema/promptGroup.ts b/packages/data-schemas/src/schema/promptGroup.ts
index 629942f23b..99dc8bda69 100644
--- a/packages/data-schemas/src/schema/promptGroup.ts
+++ b/packages/data-schemas/src/schema/promptGroup.ts
@@ -2,7 +2,7 @@ import { Schema } from 'mongoose';
import { Constants } from 'librechat-data-provider';
import type { IPromptGroupDocument } from '~/types';
-const promptGroupSchema = new Schema<IPromptGroupDocument>(
+const promptGroupSchema: Schema<IPromptGroupDocument> = new Schema<IPromptGroupDocument>(
{
name: {
type: String,
diff --git a/packages/data-schemas/src/schema/systemGrant.ts b/packages/data-schemas/src/schema/systemGrant.ts
index 61ba319ba4..eac8dc6b19 100644
--- a/packages/data-schemas/src/schema/systemGrant.ts
+++ b/packages/data-schemas/src/schema/systemGrant.ts
@@ -1,9 +1,9 @@
import { Schema } from 'mongoose';
import { PrincipalType } from 'librechat-data-provider';
-import { isValidCapability } from '~/admin/capabilities';
import type { ISystemGrant } from '~/types';
+import { isValidCapability } from '~/admin/capabilities';
-const systemGrantSchema = new Schema<ISystemGrant>(
+const systemGrantSchema: Schema<ISystemGrant> = new Schema<ISystemGrant>(
{
principalType: {
type: String,
diff --git a/packages/data-schemas/src/schema/user.ts b/packages/data-schemas/src/schema/user.ts
index f43319642d..8c407e3d36 100644
--- a/packages/data-schemas/src/schema/user.ts
+++ b/packages/data-schemas/src/schema/user.ts
@@ -23,7 +23,7 @@ const BackupCodeSchema = new Schema(
{ _id: false },
);
-const userSchema = new Schema<IUser>(
+const userSchema: Schema<IUser> = new Schema<IUser>(
{
name: {
type: String,
diff --git a/packages/data-schemas/src/types/token.ts b/packages/data-schemas/src/types/token.ts
index 889f1768a3..560900c409 100644
--- a/packages/data-schemas/src/types/token.ts
+++ b/packages/data-schemas/src/types/token.ts
@@ -19,7 +19,7 @@ export interface TokenCreateData {
identifier?: string;
token: string;
expiresIn: number;
- metadata?: Map<string, unknown>;
+ metadata?: Record<string, unknown> | Map<string, unknown>;
}
export interface TokenQuery {
@@ -37,7 +37,7 @@ export interface TokenUpdateData {
token?: string;
expiresAt?: Date;
expiresIn?: number;
- metadata?: Map<string, unknown>;
+ metadata?: Record<string, unknown> | Map<string, unknown>;
}
export interface TokenDeleteResult {
diff --git a/packages/data-schemas/src/utils/retention.ts b/packages/data-schemas/src/utils/retention.ts
index 7d57351676..68188209da 100644
--- a/packages/data-schemas/src/utils/retention.ts
+++ b/packages/data-schemas/src/utils/retention.ts
@@ -28,5 +28,5 @@ export const buildRetentionVisibilityFilter = <
],
}) as FilterQuery<T>;
-export const createFallbackRetentionDate = (now = Date.now()): Date =>
+export const createFallbackRetentionDate = (now: number = Date.now()): Date =>
new Date(now + DEFAULT_RETENTION_HOURS * 60 * 60 * 1000);
diff --git a/packages/data-schemas/src/utils/tempChatRetention.ts b/packages/data-schemas/src/utils/tempChatRetention.ts
index 663228c13e..0012254625 100644
--- a/packages/data-schemas/src/utils/tempChatRetention.ts
+++ b/packages/data-schemas/src/utils/tempChatRetention.ts
@@ -1,10 +1,10 @@
-import logger from '~/config/winston';
import type { AppConfig } from '~/types';
+import logger from '~/config/winston';
/**
* Default retention period for temporary chats in hours
*/
-export const DEFAULT_RETENTION_HOURS = 24 * 30; // 30 days
+export const DEFAULT_RETENTION_HOURS: number = 24 * 30; // 30 days
/**
* Minimum allowed retention period in hours
diff --git a/packages/data-schemas/tsdown.config.mjs b/packages/data-schemas/tsdown.config.mjs
new file mode 100644
index 0000000000..0159c4ab94
--- /dev/null
+++ b/packages/data-schemas/tsdown.config.mjs
@@ -0,0 +1,23 @@
+import { defineConfig } from 'tsdown';
+
+export default defineConfig({
+ entry: ['src/index.ts', 'src/admin/capabilities.ts'],
+ format: ['esm', 'cjs'],
+ platform: 'node',
+ dts: { oxc: true },
+ outDir: 'dist',
+ sourcemap: true,
+ // Externalize all third-party deps (consumers provide the peers); bundle only `dotenv`
+ // so the package stays self-contained for its env-loading side effect, matching the
+ // prior Rollup build. `neverBundle` is the 0.22 replacement for the deprecated `external`.
+ deps: {
+ neverBundle: (id) =>
+ id !== 'dotenv' &&
+ !id.startsWith('dotenv/') &&
+ !id.startsWith('.') &&
+ !id.startsWith('~') &&
+ !id.startsWith('/'),
+ // dotenv is bundled on purpose, so silence the "detected dependencies in bundle" hint.
+ onlyBundle: false,
+ },
+});