@librechat/data-schemas 0.0.47 → 0.0.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/admin/capabilities.cjs +14 -0
- package/dist/admin/capabilities.cjs.map +1 -1
- package/dist/admin/capabilities.es.js +14 -1
- package/dist/admin/capabilities.es.js.map +1 -1
- package/dist/app/resolution.cjs +56 -1
- package/dist/app/resolution.cjs.map +1 -1
- package/dist/app/resolution.es.js +56 -1
- package/dist/app/resolution.es.js.map +1 -1
- package/dist/config/tenantContext.cjs +13 -0
- package/dist/config/tenantContext.cjs.map +1 -1
- package/dist/config/tenantContext.es.js +13 -1
- package/dist/config/tenantContext.es.js.map +1 -1
- package/dist/index.cjs +4 -0
- package/dist/index.cjs.map +1 -1
- package/dist/index.es.js +3 -2
- package/dist/index.es.js.map +1 -1
- package/dist/methods/aclEntry.cjs +2 -1
- package/dist/methods/aclEntry.cjs.map +1 -1
- package/dist/methods/aclEntry.es.js +2 -1
- package/dist/methods/aclEntry.es.js.map +1 -1
- package/dist/methods/agentCategory.cjs +4 -2
- package/dist/methods/agentCategory.cjs.map +1 -1
- package/dist/methods/agentCategory.es.js +4 -2
- package/dist/methods/agentCategory.es.js.map +1 -1
- package/dist/methods/conversation.cjs +3 -2
- package/dist/methods/conversation.cjs.map +1 -1
- package/dist/methods/conversation.es.js +3 -2
- package/dist/methods/conversation.es.js.map +1 -1
- package/dist/methods/conversationTag.cjs +3 -2
- package/dist/methods/conversationTag.cjs.map +1 -1
- package/dist/methods/conversationTag.es.js +3 -2
- package/dist/methods/conversationTag.es.js.map +1 -1
- package/dist/methods/file.cjs +2 -1
- package/dist/methods/file.cjs.map +1 -1
- package/dist/methods/file.es.js +2 -1
- package/dist/methods/file.es.js.map +1 -1
- package/dist/methods/message.cjs +2 -1
- package/dist/methods/message.cjs.map +1 -1
- package/dist/methods/message.es.js +2 -1
- package/dist/methods/message.es.js.map +1 -1
- package/dist/methods/prompt.cjs +25 -5
- package/dist/methods/prompt.cjs.map +1 -1
- package/dist/methods/prompt.es.js +25 -5
- package/dist/methods/prompt.es.js.map +1 -1
- package/dist/methods/role.cjs.map +1 -1
- package/dist/methods/role.es.js.map +1 -1
- package/dist/methods/systemGrant.cjs +148 -29
- package/dist/methods/systemGrant.cjs.map +1 -1
- package/dist/methods/systemGrant.es.js +148 -29
- package/dist/methods/systemGrant.es.js.map +1 -1
- package/dist/methods/tx.cjs.map +1 -1
- package/dist/methods/tx.es.js.map +1 -1
- package/dist/methods/user.cjs +11 -4
- package/dist/methods/user.cjs.map +1 -1
- package/dist/methods/user.es.js +11 -4
- package/dist/methods/user.es.js.map +1 -1
- package/dist/methods/userGroup.cjs +1 -3
- package/dist/methods/userGroup.cjs.map +1 -1
- package/dist/methods/userGroup.es.js +1 -3
- package/dist/methods/userGroup.es.js.map +1 -1
- package/dist/migrations/promptGroupIndexes.cjs.map +1 -1
- package/dist/migrations/promptGroupIndexes.es.js.map +1 -1
- package/dist/migrations/tenantIndexes.cjs +4 -2
- package/dist/migrations/tenantIndexes.cjs.map +1 -1
- package/dist/migrations/tenantIndexes.es.js +4 -2
- package/dist/migrations/tenantIndexes.es.js.map +1 -1
- package/dist/schema/agent.cjs +1 -2
- package/dist/schema/agent.cjs.map +1 -1
- package/dist/schema/agent.es.js +1 -2
- package/dist/schema/agent.es.js.map +1 -1
- package/dist/schema/convo.cjs +0 -1
- package/dist/schema/convo.cjs.map +1 -1
- package/dist/schema/convo.es.js +0 -1
- package/dist/schema/convo.es.js.map +1 -1
- package/dist/schema/message.cjs +0 -1
- package/dist/schema/message.cjs.map +1 -1
- package/dist/schema/message.es.js +0 -1
- package/dist/schema/message.es.js.map +1 -1
- package/dist/schema/preset.cjs +1 -1
- package/dist/schema/preset.cjs.map +1 -1
- package/dist/schema/preset.es.js +1 -1
- package/dist/schema/preset.es.js.map +1 -1
- package/dist/schema/systemGrant.cjs +2 -4
- package/dist/schema/systemGrant.cjs.map +1 -1
- package/dist/schema/systemGrant.es.js +3 -5
- package/dist/schema/systemGrant.es.js.map +1 -1
- package/dist/types/admin/capabilities.d.ts +5 -0
- package/dist/types/config/tenantContext.d.ts +6 -0
- package/dist/types/index.d.ts +1 -1
- package/dist/types/methods/aclEntry.d.ts +2 -2
- package/dist/types/methods/systemGrant.d.ts +29 -1
- package/dist/types/methods/tx.d.ts +1 -1
- package/dist/types/methods/user.d.ts +5 -1
- package/dist/types/methods/userGroup.d.ts +1 -1
- package/dist/types/schema/user.d.ts +2 -2
- package/dist/types/types/admin.d.ts +16 -3
- package/dist/types/types/user.d.ts +9 -0
- package/dist/types/utils/index.d.ts +1 -0
- package/dist/types/utils/tenantBulkWrite.d.ts +45 -0
- package/dist/utils/tenantBulkWrite.cjs +85 -0
- package/dist/utils/tenantBulkWrite.cjs.map +1 -0
- package/dist/utils/tenantBulkWrite.es.js +83 -0
- package/dist/utils/tenantBulkWrite.es.js.map +1 -0
- package/package.json +1 -1
|
@@ -48,6 +48,19 @@ const CapabilityImplications = {
|
|
|
48
48
|
[SystemCapabilities.MANAGE_ASSISTANTS]: [SystemCapabilities.READ_ASSISTANTS],
|
|
49
49
|
};
|
|
50
50
|
// ---------------------------------------------------------------------------
|
|
51
|
+
// Capability validation
|
|
52
|
+
// ---------------------------------------------------------------------------
|
|
53
|
+
const baseCapabilitySet = new Set(Object.values(SystemCapabilities));
|
|
54
|
+
const sectionCapPattern = /^(?:manage|read):configs:\w+$/;
|
|
55
|
+
const assignCapPattern = /^assign:configs:(?:user|group|role)$/;
|
|
56
|
+
/**
|
|
57
|
+
* Runtime validator for the full `SystemCapability` union:
|
|
58
|
+
* base capabilities, section-level config capabilities, and config assignment capabilities.
|
|
59
|
+
*/
|
|
60
|
+
function isValidCapability(value) {
|
|
61
|
+
return (baseCapabilitySet.has(value) || sectionCapPattern.test(value) || assignCapPattern.test(value));
|
|
62
|
+
}
|
|
63
|
+
// ---------------------------------------------------------------------------
|
|
51
64
|
// Capability utility functions
|
|
52
65
|
// ---------------------------------------------------------------------------
|
|
53
66
|
/** Reverse map: for a given read capability, which manage capabilities imply it? */
|
|
@@ -188,5 +201,6 @@ exports.SystemCapabilities = SystemCapabilities;
|
|
|
188
201
|
exports.configCapability = configCapability;
|
|
189
202
|
exports.expandImplications = expandImplications;
|
|
190
203
|
exports.hasImpliedCapability = hasImpliedCapability;
|
|
204
|
+
exports.isValidCapability = isValidCapability;
|
|
191
205
|
exports.readConfigCapability = readConfigCapability;
|
|
192
206
|
//# sourceMappingURL=capabilities.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.cjs","sources":["../../src/admin/capabilities.ts"],"sourcesContent":[null],"names":["ResourceType"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"capabilities.cjs","sources":["../../src/admin/capabilities.ts"],"sourcesContent":[null],"names":["ResourceType"],"mappings":"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"}
|
|
@@ -46,6 +46,19 @@ const CapabilityImplications = {
|
|
|
46
46
|
[SystemCapabilities.MANAGE_ASSISTANTS]: [SystemCapabilities.READ_ASSISTANTS],
|
|
47
47
|
};
|
|
48
48
|
// ---------------------------------------------------------------------------
|
|
49
|
+
// Capability validation
|
|
50
|
+
// ---------------------------------------------------------------------------
|
|
51
|
+
const baseCapabilitySet = new Set(Object.values(SystemCapabilities));
|
|
52
|
+
const sectionCapPattern = /^(?:manage|read):configs:\w+$/;
|
|
53
|
+
const assignCapPattern = /^assign:configs:(?:user|group|role)$/;
|
|
54
|
+
/**
|
|
55
|
+
* Runtime validator for the full `SystemCapability` union:
|
|
56
|
+
* base capabilities, section-level config capabilities, and config assignment capabilities.
|
|
57
|
+
*/
|
|
58
|
+
function isValidCapability(value) {
|
|
59
|
+
return (baseCapabilitySet.has(value) || sectionCapPattern.test(value) || assignCapPattern.test(value));
|
|
60
|
+
}
|
|
61
|
+
// ---------------------------------------------------------------------------
|
|
49
62
|
// Capability utility functions
|
|
50
63
|
// ---------------------------------------------------------------------------
|
|
51
64
|
/** Reverse map: for a given read capability, which manage capabilities imply it? */
|
|
@@ -178,5 +191,5 @@ const CAPABILITY_CATEGORIES = [
|
|
|
178
191
|
},
|
|
179
192
|
];
|
|
180
193
|
|
|
181
|
-
export { BASE_CONFIG_PRINCIPAL_ID, CAPABILITY_CATEGORIES, CapabilityImplications, ResourceCapabilityMap, SystemCapabilities, configCapability, expandImplications, hasImpliedCapability, readConfigCapability };
|
|
194
|
+
export { BASE_CONFIG_PRINCIPAL_ID, CAPABILITY_CATEGORIES, CapabilityImplications, ResourceCapabilityMap, SystemCapabilities, configCapability, expandImplications, hasImpliedCapability, isValidCapability, readConfigCapability };
|
|
182
195
|
//# sourceMappingURL=capabilities.es.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capabilities.es.js","sources":["../../src/admin/capabilities.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"capabilities.es.js","sources":["../../src/admin/capabilities.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/dist/app/resolution.cjs
CHANGED
|
@@ -1,7 +1,24 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
var librechatDataProvider = require('librechat-data-provider');
|
|
4
|
+
|
|
3
5
|
const MAX_MERGE_DEPTH = 10;
|
|
4
6
|
const UNSAFE_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
|
|
7
|
+
/**
|
|
8
|
+
* Maps YAML-level override keys (TCustomConfig) to their AppConfig equivalents.
|
|
9
|
+
* Overrides are stored with YAML keys but merged into the already-processed AppConfig
|
|
10
|
+
* where some fields have been renamed by AppService.
|
|
11
|
+
*
|
|
12
|
+
* When AppService renames a field, add the mapping here. Map entries are
|
|
13
|
+
* type-checked: keys must be valid TCustomConfig fields, values must be
|
|
14
|
+
* valid AppConfig fields. The runtime lookup casts string keys to satisfy
|
|
15
|
+
* strict indexing — unknown keys safely fall through via the ?? fallback.
|
|
16
|
+
*/
|
|
17
|
+
const OVERRIDE_KEY_MAP = {
|
|
18
|
+
mcpServers: 'mcpConfig',
|
|
19
|
+
interface: 'interfaceConfig',
|
|
20
|
+
turnstile: 'turnstileConfig',
|
|
21
|
+
};
|
|
5
22
|
function deepMerge(target, source, depth = 0) {
|
|
6
23
|
const result = { ...target };
|
|
7
24
|
for (const key of Object.keys(source)) {
|
|
@@ -32,6 +49,7 @@ function deepMerge(target, source, depth = 0) {
|
|
|
32
49
|
* Each config's `overrides` is deep-merged into the base config in order.
|
|
33
50
|
*/
|
|
34
51
|
function mergeConfigOverrides(baseConfig, configs) {
|
|
52
|
+
var _a;
|
|
35
53
|
if (!configs || configs.length === 0) {
|
|
36
54
|
return baseConfig;
|
|
37
55
|
}
|
|
@@ -39,7 +57,44 @@ function mergeConfigOverrides(baseConfig, configs) {
|
|
|
39
57
|
let merged = { ...baseConfig };
|
|
40
58
|
for (const config of sorted) {
|
|
41
59
|
if (config.overrides && typeof config.overrides === 'object') {
|
|
42
|
-
|
|
60
|
+
const remapped = {};
|
|
61
|
+
for (const [key, value] of Object.entries(config.overrides)) {
|
|
62
|
+
const mappedKey = (_a = OVERRIDE_KEY_MAP[key]) !== null && _a !== void 0 ? _a : key;
|
|
63
|
+
if (key === 'interface' &&
|
|
64
|
+
value != null &&
|
|
65
|
+
typeof value === 'object' &&
|
|
66
|
+
!Array.isArray(value)) {
|
|
67
|
+
const filtered = {};
|
|
68
|
+
for (const [field, fieldVal] of Object.entries(value)) {
|
|
69
|
+
if (!librechatDataProvider.INTERFACE_PERMISSION_FIELDS.has(field)) {
|
|
70
|
+
filtered[field] = fieldVal;
|
|
71
|
+
}
|
|
72
|
+
else if (fieldVal != null &&
|
|
73
|
+
typeof fieldVal === 'object' &&
|
|
74
|
+
!Array.isArray(fieldVal)) {
|
|
75
|
+
// Composite permission field (e.g. mcpServers): strip permission
|
|
76
|
+
// sub-keys but preserve UI-only sub-keys like placeholder/trustCheckbox.
|
|
77
|
+
const uiOnly = {};
|
|
78
|
+
for (const [sub, subVal] of Object.entries(fieldVal)) {
|
|
79
|
+
if (!librechatDataProvider.PERMISSION_SUB_KEYS.has(sub)) {
|
|
80
|
+
uiOnly[sub] = subVal;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
if (Object.keys(uiOnly).length > 0) {
|
|
84
|
+
filtered[field] = uiOnly;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
// boolean permission fields (e.g. runCode: false) are fully stripped
|
|
88
|
+
}
|
|
89
|
+
if (Object.keys(filtered).length > 0) {
|
|
90
|
+
remapped[mappedKey] = filtered;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
remapped[mappedKey] = value;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
merged = deepMerge(merged, remapped);
|
|
43
98
|
}
|
|
44
99
|
}
|
|
45
100
|
return merged;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolution.cjs","sources":["../../src/app/resolution.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolution.cjs","sources":["../../src/app/resolution.ts"],"sourcesContent":[null],"names":["INTERFACE_PERMISSION_FIELDS","PERMISSION_SUB_KEYS"],"mappings":"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"}
|
|
@@ -1,5 +1,22 @@
|
|
|
1
|
+
import { INTERFACE_PERMISSION_FIELDS, PERMISSION_SUB_KEYS } from 'librechat-data-provider';
|
|
2
|
+
|
|
1
3
|
const MAX_MERGE_DEPTH = 10;
|
|
2
4
|
const UNSAFE_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
|
|
5
|
+
/**
|
|
6
|
+
* Maps YAML-level override keys (TCustomConfig) to their AppConfig equivalents.
|
|
7
|
+
* Overrides are stored with YAML keys but merged into the already-processed AppConfig
|
|
8
|
+
* where some fields have been renamed by AppService.
|
|
9
|
+
*
|
|
10
|
+
* When AppService renames a field, add the mapping here. Map entries are
|
|
11
|
+
* type-checked: keys must be valid TCustomConfig fields, values must be
|
|
12
|
+
* valid AppConfig fields. The runtime lookup casts string keys to satisfy
|
|
13
|
+
* strict indexing — unknown keys safely fall through via the ?? fallback.
|
|
14
|
+
*/
|
|
15
|
+
const OVERRIDE_KEY_MAP = {
|
|
16
|
+
mcpServers: 'mcpConfig',
|
|
17
|
+
interface: 'interfaceConfig',
|
|
18
|
+
turnstile: 'turnstileConfig',
|
|
19
|
+
};
|
|
3
20
|
function deepMerge(target, source, depth = 0) {
|
|
4
21
|
const result = { ...target };
|
|
5
22
|
for (const key of Object.keys(source)) {
|
|
@@ -30,6 +47,7 @@ function deepMerge(target, source, depth = 0) {
|
|
|
30
47
|
* Each config's `overrides` is deep-merged into the base config in order.
|
|
31
48
|
*/
|
|
32
49
|
function mergeConfigOverrides(baseConfig, configs) {
|
|
50
|
+
var _a;
|
|
33
51
|
if (!configs || configs.length === 0) {
|
|
34
52
|
return baseConfig;
|
|
35
53
|
}
|
|
@@ -37,7 +55,44 @@ function mergeConfigOverrides(baseConfig, configs) {
|
|
|
37
55
|
let merged = { ...baseConfig };
|
|
38
56
|
for (const config of sorted) {
|
|
39
57
|
if (config.overrides && typeof config.overrides === 'object') {
|
|
40
|
-
|
|
58
|
+
const remapped = {};
|
|
59
|
+
for (const [key, value] of Object.entries(config.overrides)) {
|
|
60
|
+
const mappedKey = (_a = OVERRIDE_KEY_MAP[key]) !== null && _a !== void 0 ? _a : key;
|
|
61
|
+
if (key === 'interface' &&
|
|
62
|
+
value != null &&
|
|
63
|
+
typeof value === 'object' &&
|
|
64
|
+
!Array.isArray(value)) {
|
|
65
|
+
const filtered = {};
|
|
66
|
+
for (const [field, fieldVal] of Object.entries(value)) {
|
|
67
|
+
if (!INTERFACE_PERMISSION_FIELDS.has(field)) {
|
|
68
|
+
filtered[field] = fieldVal;
|
|
69
|
+
}
|
|
70
|
+
else if (fieldVal != null &&
|
|
71
|
+
typeof fieldVal === 'object' &&
|
|
72
|
+
!Array.isArray(fieldVal)) {
|
|
73
|
+
// Composite permission field (e.g. mcpServers): strip permission
|
|
74
|
+
// sub-keys but preserve UI-only sub-keys like placeholder/trustCheckbox.
|
|
75
|
+
const uiOnly = {};
|
|
76
|
+
for (const [sub, subVal] of Object.entries(fieldVal)) {
|
|
77
|
+
if (!PERMISSION_SUB_KEYS.has(sub)) {
|
|
78
|
+
uiOnly[sub] = subVal;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
if (Object.keys(uiOnly).length > 0) {
|
|
82
|
+
filtered[field] = uiOnly;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
// boolean permission fields (e.g. runCode: false) are fully stripped
|
|
86
|
+
}
|
|
87
|
+
if (Object.keys(filtered).length > 0) {
|
|
88
|
+
remapped[mappedKey] = filtered;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
remapped[mappedKey] = value;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
merged = deepMerge(merged, remapped);
|
|
41
96
|
}
|
|
42
97
|
}
|
|
43
98
|
return merged;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolution.es.js","sources":["../../src/app/resolution.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolution.es.js","sources":["../../src/app/resolution.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -22,9 +22,22 @@ function getTenantId() {
|
|
|
22
22
|
function runAsSystem(fn) {
|
|
23
23
|
return tenantStorage.run({ tenantId: SYSTEM_TENANT_ID }, fn);
|
|
24
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* Appends `:${tenantId}` to a cache key when a non-system tenant context is active.
|
|
27
|
+
* Returns the base key unchanged when no ALS context is set or when running
|
|
28
|
+
* inside `runAsSystem()` (SYSTEM_TENANT_ID context).
|
|
29
|
+
*/
|
|
30
|
+
function scopedCacheKey(baseKey) {
|
|
31
|
+
const tenantId = getTenantId();
|
|
32
|
+
if (!tenantId || tenantId === SYSTEM_TENANT_ID) {
|
|
33
|
+
return baseKey;
|
|
34
|
+
}
|
|
35
|
+
return `${baseKey}:${tenantId}`;
|
|
36
|
+
}
|
|
25
37
|
|
|
26
38
|
exports.SYSTEM_TENANT_ID = SYSTEM_TENANT_ID;
|
|
27
39
|
exports.getTenantId = getTenantId;
|
|
28
40
|
exports.runAsSystem = runAsSystem;
|
|
41
|
+
exports.scopedCacheKey = scopedCacheKey;
|
|
29
42
|
exports.tenantStorage = tenantStorage;
|
|
30
43
|
//# sourceMappingURL=tenantContext.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenantContext.cjs","sources":["../../src/config/tenantContext.ts"],"sourcesContent":[null],"names":["AsyncLocalStorage"],"mappings":";;;;AAMA;AACO,MAAM,gBAAgB,GAAG;AAEhC;;;;AAIG;AACI,MAAM,aAAa,GAAG,IAAIA,6BAAiB;AAElD;SACgB,WAAW,GAAA;;AACzB,IAAA,OAAO,MAAA,aAAa,CAAC,QAAQ,EAAE,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,QAAQ;AAC3C;AAEA;;;AAGG;AACG,SAAU,WAAW,CAAI,EAAoB,EAAA;AACjD,IAAA,OAAO,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;AAC9D
|
|
1
|
+
{"version":3,"file":"tenantContext.cjs","sources":["../../src/config/tenantContext.ts"],"sourcesContent":[null],"names":["AsyncLocalStorage"],"mappings":";;;;AAMA;AACO,MAAM,gBAAgB,GAAG;AAEhC;;;;AAIG;AACI,MAAM,aAAa,GAAG,IAAIA,6BAAiB;AAElD;SACgB,WAAW,GAAA;;AACzB,IAAA,OAAO,MAAA,aAAa,CAAC,QAAQ,EAAE,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,QAAQ;AAC3C;AAEA;;;AAGG;AACG,SAAU,WAAW,CAAI,EAAoB,EAAA;AACjD,IAAA,OAAO,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;AAC9D;AAEA;;;;AAIG;AACG,SAAU,cAAc,CAAC,OAAe,EAAA;AAC5C,IAAA,MAAM,QAAQ,GAAG,WAAW,EAAE;AAC9B,IAAA,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,gBAAgB,EAAE;AAC9C,QAAA,OAAO,OAAO;IAChB;AACA,IAAA,OAAO,CAAA,EAAG,OAAO,CAAA,CAAA,EAAI,QAAQ,EAAE;AACjC;;;;;;;;"}
|
|
@@ -20,6 +20,18 @@ function getTenantId() {
|
|
|
20
20
|
function runAsSystem(fn) {
|
|
21
21
|
return tenantStorage.run({ tenantId: SYSTEM_TENANT_ID }, fn);
|
|
22
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* Appends `:${tenantId}` to a cache key when a non-system tenant context is active.
|
|
25
|
+
* Returns the base key unchanged when no ALS context is set or when running
|
|
26
|
+
* inside `runAsSystem()` (SYSTEM_TENANT_ID context).
|
|
27
|
+
*/
|
|
28
|
+
function scopedCacheKey(baseKey) {
|
|
29
|
+
const tenantId = getTenantId();
|
|
30
|
+
if (!tenantId || tenantId === SYSTEM_TENANT_ID) {
|
|
31
|
+
return baseKey;
|
|
32
|
+
}
|
|
33
|
+
return `${baseKey}:${tenantId}`;
|
|
34
|
+
}
|
|
23
35
|
|
|
24
|
-
export { SYSTEM_TENANT_ID, getTenantId, runAsSystem, tenantStorage };
|
|
36
|
+
export { SYSTEM_TENANT_ID, getTenantId, runAsSystem, scopedCacheKey, tenantStorage };
|
|
25
37
|
//# sourceMappingURL=tenantContext.es.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenantContext.es.js","sources":["../../src/config/tenantContext.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAMA;AACO,MAAM,gBAAgB,GAAG;AAEhC;;;;AAIG;AACI,MAAM,aAAa,GAAG,IAAI,iBAAiB;AAElD;SACgB,WAAW,GAAA;;AACzB,IAAA,OAAO,MAAA,aAAa,CAAC,QAAQ,EAAE,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,QAAQ;AAC3C;AAEA;;;AAGG;AACG,SAAU,WAAW,CAAI,EAAoB,EAAA;AACjD,IAAA,OAAO,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;AAC9D;;;;"}
|
|
1
|
+
{"version":3,"file":"tenantContext.es.js","sources":["../../src/config/tenantContext.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAMA;AACO,MAAM,gBAAgB,GAAG;AAEhC;;;;AAIG;AACI,MAAM,aAAa,GAAG,IAAI,iBAAiB;AAElD;SACgB,WAAW,GAAA;;AACzB,IAAA,OAAO,MAAA,aAAa,CAAC,QAAQ,EAAE,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,QAAQ;AAC3C;AAEA;;;AAGG;AACG,SAAU,WAAW,CAAI,EAAoB,EAAA;AACjD,IAAA,OAAO,aAAa,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;AAC9D;AAEA;;;;AAIG;AACG,SAAU,cAAc,CAAC,OAAe,EAAA;AAC5C,IAAA,MAAM,QAAQ,GAAG,WAAW,EAAE;AAC9B,IAAA,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,gBAAgB,EAAE;AAC9C,QAAA,OAAO,OAAO;IAChB;AACA,IAAA,OAAO,CAAA,EAAG,OAAO,CAAA,CAAA,EAAI,QAAQ,EAAE;AACjC;;;;"}
|
package/dist/index.cjs
CHANGED
|
@@ -42,6 +42,7 @@ var config = require('./schema/config.cjs');
|
|
|
42
42
|
var principal = require('./utils/principal.cjs');
|
|
43
43
|
var string = require('./utils/string.cjs');
|
|
44
44
|
var tempChatRetention = require('./utils/tempChatRetention.cjs');
|
|
45
|
+
var tenantBulkWrite = require('./utils/tenantBulkWrite.cjs');
|
|
45
46
|
var transactions = require('./utils/transactions.cjs');
|
|
46
47
|
var objectId = require('./utils/objectId.cjs');
|
|
47
48
|
var index$1 = require('./models/index.cjs');
|
|
@@ -79,6 +80,7 @@ exports.SystemCapabilities = capabilities.SystemCapabilities;
|
|
|
79
80
|
exports.configCapability = capabilities.configCapability;
|
|
80
81
|
exports.expandImplications = capabilities.expandImplications;
|
|
81
82
|
exports.hasImpliedCapability = capabilities.hasImpliedCapability;
|
|
83
|
+
exports.isValidCapability = capabilities.isValidCapability;
|
|
82
84
|
exports.readConfigCapability = capabilities.readConfigCapability;
|
|
83
85
|
Object.defineProperty(exports, "RoleBits", {
|
|
84
86
|
enumerable: true,
|
|
@@ -129,6 +131,7 @@ exports.MAX_RETENTION_HOURS = tempChatRetention.MAX_RETENTION_HOURS;
|
|
|
129
131
|
exports.MIN_RETENTION_HOURS = tempChatRetention.MIN_RETENTION_HOURS;
|
|
130
132
|
exports.createTempChatExpirationDate = tempChatRetention.createTempChatExpirationDate;
|
|
131
133
|
exports.getTempChatRetentionHours = tempChatRetention.getTempChatRetentionHours;
|
|
134
|
+
exports.tenantSafeBulkWrite = tenantBulkWrite.tenantSafeBulkWrite;
|
|
132
135
|
exports.CANCEL_RATE = transactions.CANCEL_RATE;
|
|
133
136
|
exports.getTransactionSupport = transactions.getTransactionSupport;
|
|
134
137
|
exports.supportsTransactions = transactions.supportsTransactions;
|
|
@@ -140,6 +143,7 @@ exports.meiliLogger = meiliLogger;
|
|
|
140
143
|
exports.SYSTEM_TENANT_ID = tenantContext.SYSTEM_TENANT_ID;
|
|
141
144
|
exports.getTenantId = tenantContext.getTenantId;
|
|
142
145
|
exports.runAsSystem = tenantContext.runAsSystem;
|
|
146
|
+
exports.scopedCacheKey = tenantContext.scopedCacheKey;
|
|
143
147
|
exports.tenantStorage = tenantContext.tenantStorage;
|
|
144
148
|
exports.dropSupersededTenantIndexes = tenantIndexes.dropSupersededTenantIndexes;
|
|
145
149
|
exports.dropSupersededPromptGroupIndexes = promptGroupIndexes.dropSupersededPromptGroupIndexes;
|
package/dist/index.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
package/dist/index.es.js
CHANGED
|
@@ -6,7 +6,7 @@ export { loadTurnstileConfig } from './app/turnstile.es.js';
|
|
|
6
6
|
export { defaultVertexModels, validateVertexConfig, vertexConfigSetup } from './app/vertex.es.js';
|
|
7
7
|
export { getWebSearchKeys, loadWebSearchConfig, webSearchAuth, webSearchKeys } from './app/web.es.js';
|
|
8
8
|
export { mergeConfigOverrides } from './app/resolution.es.js';
|
|
9
|
-
export { BASE_CONFIG_PRINCIPAL_ID, CAPABILITY_CATEGORIES, CapabilityImplications, ResourceCapabilityMap, SystemCapabilities, configCapability, expandImplications, hasImpliedCapability, readConfigCapability } from './admin/capabilities.es.js';
|
|
9
|
+
export { BASE_CONFIG_PRINCIPAL_ID, CAPABILITY_CATEGORIES, CapabilityImplications, ResourceCapabilityMap, SystemCapabilities, configCapability, expandImplications, hasImpliedCapability, isValidCapability, readConfigCapability } from './admin/capabilities.es.js';
|
|
10
10
|
export { RoleBits } from './common/enum.es.js';
|
|
11
11
|
export { decrypt, decryptV2, decryptV3, encrypt, encryptV2, encryptV3, getRandomValues, hashBackupCode, hashToken, signPayload } from './crypto/index.es.js';
|
|
12
12
|
export { default as actionSchema } from './schema/action.es.js';
|
|
@@ -40,13 +40,14 @@ export { default as configSchema } from './schema/config.es.js';
|
|
|
40
40
|
export { normalizePrincipalId } from './utils/principal.es.js';
|
|
41
41
|
export { escapeRegExp } from './utils/string.es.js';
|
|
42
42
|
export { DEFAULT_RETENTION_HOURS, MAX_RETENTION_HOURS, MIN_RETENTION_HOURS, createTempChatExpirationDate, getTempChatRetentionHours } from './utils/tempChatRetention.es.js';
|
|
43
|
+
export { tenantSafeBulkWrite } from './utils/tenantBulkWrite.es.js';
|
|
43
44
|
export { CANCEL_RATE, getTransactionSupport, supportsTransactions } from './utils/transactions.es.js';
|
|
44
45
|
export { isValidObjectIdString } from './utils/objectId.es.js';
|
|
45
46
|
export { createModels } from './models/index.es.js';
|
|
46
47
|
export { createMethods } from './methods/index.es.js';
|
|
47
48
|
export { default as logger } from './config/winston.es.js';
|
|
48
49
|
export { default as meiliLogger } from './config/meiliLogger.es.js';
|
|
49
|
-
export { SYSTEM_TENANT_ID, getTenantId, runAsSystem, tenantStorage } from './config/tenantContext.es.js';
|
|
50
|
+
export { SYSTEM_TENANT_ID, getTenantId, runAsSystem, scopedCacheKey, tenantStorage } from './config/tenantContext.es.js';
|
|
50
51
|
export { dropSupersededTenantIndexes } from './migrations/tenantIndexes.es.js';
|
|
51
52
|
export { dropSupersededPromptGroupIndexes } from './migrations/promptGroupIndexes.es.js';
|
|
52
53
|
export { DEFAULT_REFRESH_TOKEN_EXPIRY } from './methods/session.es.js';
|
package/dist/index.es.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.es.js","sources":[],"sourcesContent":[],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.es.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
var mongoose = require('mongoose');
|
|
4
4
|
var librechatDataProvider = require('librechat-data-provider');
|
|
5
|
+
var tenantBulkWrite = require('../utils/tenantBulkWrite.cjs');
|
|
5
6
|
|
|
6
7
|
function createAclEntryMethods(mongoose$1) {
|
|
7
8
|
/**
|
|
@@ -279,7 +280,7 @@ function createAclEntryMethods(mongoose$1) {
|
|
|
279
280
|
*/
|
|
280
281
|
async function bulkWriteAclEntries(ops, options) {
|
|
281
282
|
const AclEntry = mongoose$1.models.AclEntry;
|
|
282
|
-
return
|
|
283
|
+
return tenantBulkWrite.tenantSafeBulkWrite(AclEntry, ops, options || {});
|
|
283
284
|
}
|
|
284
285
|
/**
|
|
285
286
|
* Finds all publicly accessible resource IDs for a given resource type.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aclEntry.cjs","sources":["../../src/methods/aclEntry.ts"],"sourcesContent":[null],"names":["mongoose","PrincipalType","Types","PrincipalModel","PermissionBits"],"mappings":"
|
|
1
|
+
{"version":3,"file":"aclEntry.cjs","sources":["../../src/methods/aclEntry.ts"],"sourcesContent":[null],"names":["mongoose","PrincipalType","Types","PrincipalModel","tenantSafeBulkWrite","PermissionBits"],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Types } from 'mongoose';
|
|
2
2
|
import { PermissionBits, PrincipalType, PrincipalModel } from 'librechat-data-provider';
|
|
3
|
+
import { tenantSafeBulkWrite } from '../utils/tenantBulkWrite.es.js';
|
|
3
4
|
|
|
4
5
|
function createAclEntryMethods(mongoose) {
|
|
5
6
|
/**
|
|
@@ -277,7 +278,7 @@ function createAclEntryMethods(mongoose) {
|
|
|
277
278
|
*/
|
|
278
279
|
async function bulkWriteAclEntries(ops, options) {
|
|
279
280
|
const AclEntry = mongoose.models.AclEntry;
|
|
280
|
-
return AclEntry
|
|
281
|
+
return tenantSafeBulkWrite(AclEntry, ops, options || {});
|
|
281
282
|
}
|
|
282
283
|
/**
|
|
283
284
|
* Finds all publicly accessible resource IDs for a given resource type.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aclEntry.es.js","sources":["../../src/methods/aclEntry.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"aclEntry.es.js","sources":["../../src/methods/aclEntry.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
var tenantBulkWrite = require('../utils/tenantBulkWrite.cjs');
|
|
4
|
+
|
|
3
5
|
function createAgentCategoryMethods(mongoose) {
|
|
4
6
|
/**
|
|
5
7
|
* Get all active categories sorted by order
|
|
@@ -57,7 +59,7 @@ function createAgentCategoryMethods(mongoose) {
|
|
|
57
59
|
upsert: true,
|
|
58
60
|
},
|
|
59
61
|
}));
|
|
60
|
-
return await
|
|
62
|
+
return await tenantBulkWrite.tenantSafeBulkWrite(AgentCategory, operations);
|
|
61
63
|
}
|
|
62
64
|
/**
|
|
63
65
|
* Find a category by value
|
|
@@ -203,7 +205,7 @@ function createAgentCategoryMethods(mongoose) {
|
|
|
203
205
|
},
|
|
204
206
|
},
|
|
205
207
|
}));
|
|
206
|
-
await
|
|
208
|
+
await tenantBulkWrite.tenantSafeBulkWrite(AgentCategory, bulkOps, { ordered: false });
|
|
207
209
|
}
|
|
208
210
|
return updates.length > 0 || created > 0;
|
|
209
211
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentCategory.cjs","sources":["../../src/methods/agentCategory.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agentCategory.cjs","sources":["../../src/methods/agentCategory.ts"],"sourcesContent":[null],"names":["tenantSafeBulkWrite"],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { tenantSafeBulkWrite } from '../utils/tenantBulkWrite.es.js';
|
|
2
|
+
|
|
1
3
|
function createAgentCategoryMethods(mongoose) {
|
|
2
4
|
/**
|
|
3
5
|
* Get all active categories sorted by order
|
|
@@ -55,7 +57,7 @@ function createAgentCategoryMethods(mongoose) {
|
|
|
55
57
|
upsert: true,
|
|
56
58
|
},
|
|
57
59
|
}));
|
|
58
|
-
return await AgentCategory
|
|
60
|
+
return await tenantSafeBulkWrite(AgentCategory, operations);
|
|
59
61
|
}
|
|
60
62
|
/**
|
|
61
63
|
* Find a category by value
|
|
@@ -201,7 +203,7 @@ function createAgentCategoryMethods(mongoose) {
|
|
|
201
203
|
},
|
|
202
204
|
},
|
|
203
205
|
}));
|
|
204
|
-
await AgentCategory
|
|
206
|
+
await tenantSafeBulkWrite(AgentCategory, bulkOps, { ordered: false });
|
|
205
207
|
}
|
|
206
208
|
return updates.length > 0 || created > 0;
|
|
207
209
|
}
|