mm_datas 5.3.1 → 5.3.2
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/example/custom_demo.js +17 -17
- package/example/preset_demo.js +8 -8
- package/example/rpg_cache.js +39 -39
- package/example/rpg_crud.js +19 -19
- package/example/rpg_demo.js +5 -5
- package/example/rpg_persistence.js +39 -39
- package/example/rpg_relations.js +28 -28
- package/example/rpg_world.js +7 -7
- package/example/storage_demo.js +33 -35
- package/index.js +7 -55
- package/lib/backend.js +35 -569
- package/lib/backend_codec.js +42 -0
- package/lib/cache_adapter.js +112 -0
- package/lib/data_error.js +19 -0
- package/lib/errors.js +11 -10
- package/lib/hybrid_store.js +225 -0
- package/lib/json_db_layout.js +266 -0
- package/lib/json_file_store.js +66 -0
- package/lib/manager.js +234 -507
- package/lib/manager_define.js +131 -0
- package/lib/manager_ext.js +412 -0
- package/lib/manager_helper.js +97 -0
- package/lib/manager_store.js +196 -0
- package/lib/memory_store.js +203 -0
- package/lib/model.js +114 -288
- package/lib/model_check.js +184 -0
- package/lib/model_validator.js +104 -0
- package/lib/mongo_adapter.js +106 -0
- package/lib/pool.js +58 -42
- package/lib/relation.js +81 -55
- package/lib/sql_adapter.js +116 -0
- package/lib/store.js +16 -409
- package/lib/store_query.js +119 -0
- package/lib/tool_scan.js +106 -0
- package/package.json +2 -3
- package/test.js +21 -42
- package/tool/data/index.js +19 -8
- package/tool/data_admin/index.js +38 -0
- package/tool/data_admin/tool.json +42 -0
package/test.js
CHANGED
|
@@ -115,7 +115,7 @@ async function run() {
|
|
|
115
115
|
eq('additionalProperties:false 即严格', hero.strict, true);
|
|
116
116
|
ok('properties 是标准字段表', !!hero.schema().properties.level);
|
|
117
117
|
ok('主键自动补入 properties(不误判未知字段)', !!hero.schema().properties.hero_id);
|
|
118
|
-
eq('保留原始 jsonSchema', hero.model().
|
|
118
|
+
eq('保留原始 jsonSchema', hero.model().json_schema.$schema, DRAFT);
|
|
119
119
|
|
|
120
120
|
eq('合法 object 通过 validate()', hero.validate({
|
|
121
121
|
name: '亚瑟', attrs: { hp: 100, mp: 20 }, tags: ['tank'], code: 'AB12'
|
|
@@ -246,12 +246,10 @@ async function run() {
|
|
|
246
246
|
eq('drop 删除集合', (function () { mm.dataAdmin('tmp').drop(); return mm.dataAdmin.registry().has('tmp'); })(), false);
|
|
247
247
|
eq('clear 只清数据保留定义', (function () { hero.clear(); return hero.model().key; })(), 'hero_id');
|
|
248
248
|
|
|
249
|
-
//
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
eq('旧 required:true 升级成顶层 required 数组', legacy.schema().required, ['a']);
|
|
254
|
-
throws('升级后约束仍生效', function () { legacy.add({ a: 0 }); }, 'SCHEMA_VALIDATION');
|
|
249
|
+
// 非标准 schema 不再猜测旧扁平格式,直接报错
|
|
250
|
+
throws('非标准 schema 直接报错', function () {
|
|
251
|
+
mm.dataAdmin('legacy', { schema: { a: { type: 'number', required: true } } });
|
|
252
|
+
});
|
|
255
253
|
|
|
256
254
|
// ============ 6. 静态 / 动态集合关联 ============
|
|
257
255
|
group('6. 静态 / 动态集合关联(运行时声明)');
|
|
@@ -360,7 +358,7 @@ async function run() {
|
|
|
360
358
|
eq('load 恢复数据', d2.data('role').get(1).name, '存档A');
|
|
361
359
|
fs.rmSync(dir, { recursive: true, force: true });
|
|
362
360
|
|
|
363
|
-
group('8.1 持久化策略:persist /
|
|
361
|
+
group('8.1 持久化策略:persist / auto_save / flush_interval');
|
|
364
362
|
const policyDir = path.join(os.tmpdir(), 'mm_data_policy_' + Date.now());
|
|
365
363
|
const manualPool = mm.createPool('policy_manual', { store: 'json', dir: policyDir });
|
|
366
364
|
manualPool.data('role').add({ name: '手动' });
|
|
@@ -371,9 +369,9 @@ async function run() {
|
|
|
371
369
|
eq('落盘后脏标记清除', manualPool.persistStatus().dirty, false);
|
|
372
370
|
|
|
373
371
|
const autoDir = path.join(os.tmpdir(), 'mm_data_policy_auto_' + Date.now());
|
|
374
|
-
const autoPool = mm.createPool('policy_auto', { store: 'json', dir: autoDir,
|
|
372
|
+
const autoPool = mm.createPool('policy_auto', { store: 'json', dir: autoDir, auto_save: true });
|
|
375
373
|
autoPool.data('role').add({ name: '立即' });
|
|
376
|
-
eq('
|
|
374
|
+
eq('auto_save 写入即落盘', fs.existsSync(path.join(autoDir, 'role.json')), true);
|
|
377
375
|
|
|
378
376
|
const intervalDir = path.join(os.tmpdir(), 'mm_data_policy_interval_' + Date.now());
|
|
379
377
|
const intervalPool = mm.createPool('policy_interval', { store: 'json', dir: intervalDir, flush_interval: 20 });
|
|
@@ -386,7 +384,7 @@ async function run() {
|
|
|
386
384
|
eq('close 收尾落盘', JSON.parse(fs.readFileSync(path.join(intervalDir, 'role.json'), 'utf8')).length, 2);
|
|
387
385
|
|
|
388
386
|
const offDir = path.join(os.tmpdir(), 'mm_data_policy_off_' + Date.now());
|
|
389
|
-
const offPool = mm.createPool('policy_off', { store: 'json', dir: offDir, persist: false,
|
|
387
|
+
const offPool = mm.createPool('policy_off', { store: 'json', dir: offDir, persist: false, auto_save: true });
|
|
390
388
|
offPool.data('role').add({ name: '不落盘' });
|
|
391
389
|
eq('persist=false 不落盘', fs.existsSync(offDir) && fs.readdirSync(offDir).length > 0, false);
|
|
392
390
|
eq('persist=false 状态', offPool.persistStatus().persist, false);
|
|
@@ -440,7 +438,7 @@ async function run() {
|
|
|
440
438
|
eq('工具 with 空关联为 null', out.obj.map === null || out.obj.map === undefined, true);
|
|
441
439
|
out = await tool.main({ action: 'add', model: 'role', body: { name: 'y', level: 2, map_id: 999 }, admin: tp }, {});
|
|
442
440
|
eq('工具异常格式', out.error.code, 'REF_MISSING');
|
|
443
|
-
eq('listTools 契约扫描', mm.listTools(), ['data']);
|
|
441
|
+
eq('listTools 契约扫描', mm.listTools(), ['data', 'data_admin']);
|
|
444
442
|
ok('getToolConfig 可读', !!mm.getToolConfig('data'));
|
|
445
443
|
ok('tool.json 描述含 JSON Schema', JSON.stringify(mm.getToolConfig('data')).indexOf('JSON Schema') > -1);
|
|
446
444
|
|
|
@@ -541,7 +539,7 @@ async function run() {
|
|
|
541
539
|
eq('function 视图只含标准三字段', Object.keys(fnTool.function).sort(), ['description', 'name', 'parameters']);
|
|
542
540
|
eq('listFunctionTools 含 data', mm.listFunctionTools().map(function (t) {
|
|
543
541
|
return t.function.name;
|
|
544
|
-
}), ['data']);
|
|
542
|
+
}), ['data', 'data_admin']);
|
|
545
543
|
const cfgView = mm.getToolConfig('data');
|
|
546
544
|
ok('getToolConfig 同时带 parameters/params', !!cfgView.parameters && !!cfgView.params);
|
|
547
545
|
out = await tool.main({ action: 'add', model: 'llm_probe', body: { name: 'LLM' } }, {});
|
|
@@ -565,16 +563,15 @@ async function run() {
|
|
|
565
563
|
fs.mkdirSync(legacyDir, { recursive: true });
|
|
566
564
|
fs.writeFileSync(path.join(legacyDir, 'a.json'), JSON.stringify({ key: 'id' }));
|
|
567
565
|
fs.writeFileSync(path.join(legacyDir, 'b.json'), JSON.stringify({ key: 'id' }));
|
|
568
|
-
eq('
|
|
566
|
+
eq('非规范命名文件被忽略', mm.modelFiles(legacyDir), []);
|
|
569
567
|
|
|
570
568
|
const deps = require('./package.json').dependencies;
|
|
571
|
-
ok('package.json
|
|
569
|
+
ok('package.json 声明硬依赖',
|
|
572
570
|
!!(deps.mm_cache && deps.mm_sql && deps.mm_mongodb && deps.mm_jsondb) &&
|
|
573
571
|
!!deps.mm_admin && !!deps.mm_validator);
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
ok('mm_jsondb 可解析', mm.probe().mm_jsondb === true);
|
|
572
|
+
ok('四依赖均可解析',
|
|
573
|
+
!!require('mm_cache').cacheAdmin && !!require('mm_sql').sqlAdmin &&
|
|
574
|
+
!!require('mm_mongodb').mongodbAdmin && !!require('mm_jsondb').jsondbAdmin);
|
|
578
575
|
|
|
579
576
|
group('v5 静态逐文件 / 动态缓存+持久');
|
|
580
577
|
const MODEL_DIR = path.join(__dirname, 'example', 'model');
|
|
@@ -651,30 +648,22 @@ async function run() {
|
|
|
651
648
|
await v5c.connect();
|
|
652
649
|
eq('未启用 mm_mongodb', v5c.backends().adapters.mongodb.enabled, false);
|
|
653
650
|
const f3 = await v5c.flush();
|
|
654
|
-
eq('
|
|
651
|
+
eq('未启用数据源不写 mongodb', f3.mongodb, 0);
|
|
652
|
+
eq('动态集合仍写本地快照', f3.snapshots, 1);
|
|
655
653
|
const rr3 = await v5c.restore();
|
|
656
|
-
eq('
|
|
657
|
-
ok('
|
|
654
|
+
eq('恢复来源为文件快照', rr3.sources.player, 'file-snapshot');
|
|
655
|
+
ok('未启用外部数据源时集合仍完整', rr3.table_names.length === 5);
|
|
658
656
|
|
|
659
|
-
group('v5.1 mm_jsondb 文件层
|
|
657
|
+
group('v5.1 mm_jsondb 文件层');
|
|
660
658
|
const B = require('./lib/backend.js');
|
|
661
659
|
const jl = new B.JsonDbLayout(v5dir);
|
|
662
660
|
eq('文件层绑定 mm_jsondb', jl.backend, 'mm_jsondb');
|
|
663
661
|
eq('文件层集合目录', jl.collectionDir('role'), path.join(v5dir, 'role'));
|
|
664
662
|
eq('文件层补零命名', jl.fileFor('role', 12), path.join(v5dir, 'role', '000012.json'));
|
|
665
|
-
eq('补零由 mm_jsondb 负责', jl.nativePad, true);
|
|
666
663
|
eq('文件层报告 pad 宽度', jl.status().pad, 6);
|
|
667
664
|
eq('非数字 id 不补零', jl.fileFor('role', '_rows'), path.join(v5dir, 'role', '_rows.json'));
|
|
668
665
|
eq('backends 文件层 pad', v5.backends().file_layer.pad, 6);
|
|
669
666
|
|
|
670
|
-
// 模拟 mm_jsondb 1.1.x(无 pad 配置):适配层兜底补零,输出格式不变
|
|
671
|
-
const jdirOld = path.join(os.tmpdir(), 'mm_data_jsondb_oldpad_' + Date.now());
|
|
672
|
-
const jlOld = new B.JsonDbLayout(jdirOld);
|
|
673
|
-
jlOld.nativePad = false;
|
|
674
|
-
eq('老版本适配层兜底命名', jlOld.fileFor('role', 5), path.join(jdirOld, 'role', '000005.json'));
|
|
675
|
-
await jlOld.flushStatic('role', 'role_id', [{ role_id: 9, name: '老版本' }]);
|
|
676
|
-
ok('老版本 flush 仍补零', fs.existsSync(path.join(jdirOld, 'role', '000009.json')));
|
|
677
|
-
|
|
678
667
|
const jdir = path.join(os.tmpdir(), 'mm_data_jsondb_direct_' + Date.now());
|
|
679
668
|
const jl2 = new B.JsonDbLayout(jdir);
|
|
680
669
|
await jl2.flushStatic('role', 'role_id', [{ role_id: 7, name: '游侠' }]);
|
|
@@ -684,16 +673,6 @@ async function run() {
|
|
|
684
673
|
const restoredRows = await jl2.restore(function () {}, jdir);
|
|
685
674
|
eq('异步 restore 列出两种集合', restoredRows.table_names.sort(), ['player', 'role']);
|
|
686
675
|
|
|
687
|
-
// 依赖缺失时同步 / 异步都回退到 fs 实现,且输出格式不变
|
|
688
|
-
const jdir2 = path.join(os.tmpdir(), 'mm_data_jsondb_fallback_' + Date.now());
|
|
689
|
-
const jl3 = new B.JsonDbLayout(jdir2);
|
|
690
|
-
jl3.mod = null;
|
|
691
|
-
jl3._bind(jdir2);
|
|
692
|
-
eq('依赖缺失回退 fs', jl3.backend, 'fs-fallback');
|
|
693
|
-
eq('降级 flushStatic', await jl3.flushStatic('role', 'role_id', [{ role_id: 3, name: '骑士' }]), 1);
|
|
694
|
-
eq('降级仍输出 000003.json',
|
|
695
|
-
JSON.parse(fs.readFileSync(path.join(jdir2, 'role', '000003.json'), 'utf8')).name, '骑士');
|
|
696
|
-
|
|
697
676
|
group('v5.3 四个依赖统一走 xxxAdmin / mm_sql way:jsondb');
|
|
698
677
|
const cacheAdmin = require('mm_cache').cacheAdmin;
|
|
699
678
|
const sqlAdmin = require('mm_sql').sqlAdmin;
|
package/tool/data/index.js
CHANGED
|
@@ -13,6 +13,12 @@
|
|
|
13
13
|
*/
|
|
14
14
|
const mm = require('../../index.js');
|
|
15
15
|
|
|
16
|
+
/**
|
|
17
|
+
* 提取调用方注入的集合宿主(params/options 上的 admin 或 world)
|
|
18
|
+
* @param {object} params - 工具入参
|
|
19
|
+
* @param {object} options - 工具选项
|
|
20
|
+
* @returns {object|null} 注入的宿主实例,未注入时返回 null
|
|
21
|
+
*/
|
|
16
22
|
function injected(params, options) {
|
|
17
23
|
return (params && (params.admin || params.world)) ||
|
|
18
24
|
(options && (options.admin || options.world)) || null;
|
|
@@ -20,7 +26,7 @@ function injected(params, options) {
|
|
|
20
26
|
|
|
21
27
|
/** 取集合实例:支持注入 DataManager 实例 / mm_admin 池 / 默认池 */
|
|
22
28
|
function col(params, options, name) {
|
|
23
|
-
|
|
29
|
+
let a = injected(params, options);
|
|
24
30
|
if (a && typeof a.collection === 'function') return a.collection(name);
|
|
25
31
|
if (a && typeof a.data === 'function') return a.data(name);
|
|
26
32
|
return mm.dataAdmin(name);
|
|
@@ -28,14 +34,19 @@ function col(params, options, name) {
|
|
|
28
34
|
|
|
29
35
|
/** 取注册表级入口(verify/stats/save/load/dump 等) */
|
|
30
36
|
function registry(params, options) {
|
|
31
|
-
|
|
37
|
+
let a = injected(params, options);
|
|
32
38
|
if (a && typeof a.verify === 'function') return a;
|
|
33
39
|
if (a && typeof a.getServer === 'function') return mm.dataAdmin.registry(a);
|
|
34
40
|
return mm.dataAdmin.registry();
|
|
35
41
|
}
|
|
36
42
|
|
|
43
|
+
/**
|
|
44
|
+
* 归一化查询选项:合并 params.options,并把顶层 with 展开参数并入
|
|
45
|
+
* @param {object} params - 工具入参
|
|
46
|
+
* @returns {object} 归一化后的选项对象
|
|
47
|
+
*/
|
|
37
48
|
function opts(params) {
|
|
38
|
-
|
|
49
|
+
let o = Object.assign({}, params.options || {});
|
|
39
50
|
if (params.with) o.with = params.with;
|
|
40
51
|
return o;
|
|
41
52
|
}
|
|
@@ -44,11 +55,11 @@ async function main(params, ctx, options) {
|
|
|
44
55
|
params = params || {};
|
|
45
56
|
ctx = ctx || {};
|
|
46
57
|
options = options || {};
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
58
|
+
let action = params.action || 'list';
|
|
59
|
+
let model = params.model || params.collection;
|
|
60
|
+
let query = params.query === undefined ? {} : params.query;
|
|
61
|
+
let body = params.body || {};
|
|
62
|
+
let o = opts(params);
|
|
52
63
|
|
|
53
64
|
try {
|
|
54
65
|
let out;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
const { admin } = require('../../index.js');
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* 管理数据集合实例池
|
|
6
|
+
* @param {object} params 参数:action/model
|
|
7
|
+
* @param {object} ctx 执行上下文
|
|
8
|
+
* @returns {Promise<object>} 执行结果
|
|
9
|
+
*/
|
|
10
|
+
async function main(params, ctx) {
|
|
11
|
+
let p = params || {};
|
|
12
|
+
let action = p.action || 'list';
|
|
13
|
+
let model = p.model;
|
|
14
|
+
const done = (data) => {
|
|
15
|
+
if (ctx) ctx.output = data;
|
|
16
|
+
return data;
|
|
17
|
+
};
|
|
18
|
+
try {
|
|
19
|
+
if (action === 'list') {
|
|
20
|
+
let names = [...admin.keys()];
|
|
21
|
+
return done({ code: 0, msg: '获取成功', action, count: names.length, names });
|
|
22
|
+
}
|
|
23
|
+
if (action === 'inspect') {
|
|
24
|
+
let exists = admin.has(model);
|
|
25
|
+
let instance = exists ? admin.get(model) : null;
|
|
26
|
+
return done({ code: 0, msg: exists ? '获取成功' : '集合不存在', action, model, exists,
|
|
27
|
+
config: instance && instance.config ? instance.config : null });
|
|
28
|
+
}
|
|
29
|
+
if (action === 'del') return done({ code: 0, msg: '删除成功', action, model, ok: admin.del(model) });
|
|
30
|
+
if (action === 'clear') { admin.clear(); return done({ code: 0, msg: '实例池已清空', action }); }
|
|
31
|
+
return done({ code: 10001, msg: '不支持的操作: ' + action });
|
|
32
|
+
} catch (error) {
|
|
33
|
+
return done({ code: 10000, msg: '执行失败:' + error.message,
|
|
34
|
+
error: { name: error.name, message: error.message } });
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
module.exports = { main };
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "data_admin",
|
|
3
|
+
"title": "通用数据集合实例管理",
|
|
4
|
+
"description": "管理 mm_datas 的实例池:list 列出集合、inspect 查看集合配置、del 删除集合、clear 清空实例池。与 data 工具共享同一份 mm_admin 实例池。",
|
|
5
|
+
"category": "数据管理",
|
|
6
|
+
"group": "system",
|
|
7
|
+
"type": "function",
|
|
8
|
+
"main": "./index.js",
|
|
9
|
+
"params": {
|
|
10
|
+
"type": "object",
|
|
11
|
+
"properties": {
|
|
12
|
+
"action": {
|
|
13
|
+
"type": "string",
|
|
14
|
+
"enum": ["list", "inspect", "del", "clear"],
|
|
15
|
+
"description": "操作类型: list/inspect/del/clear",
|
|
16
|
+
"default": "list"
|
|
17
|
+
},
|
|
18
|
+
"model": {
|
|
19
|
+
"type": "string",
|
|
20
|
+
"description": "集合名(实例池键),inspect/del 必填"
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
"required": ["action"]
|
|
24
|
+
},
|
|
25
|
+
"parameters": {
|
|
26
|
+
"type": "object",
|
|
27
|
+
"properties": {
|
|
28
|
+
"action": {
|
|
29
|
+
"type": "string",
|
|
30
|
+
"enum": ["list", "inspect", "del", "clear"],
|
|
31
|
+
"description": "操作类型: list/inspect/del/clear",
|
|
32
|
+
"default": "list"
|
|
33
|
+
},
|
|
34
|
+
"model": {
|
|
35
|
+
"type": "string",
|
|
36
|
+
"description": "集合名(实例池键),inspect/del 必填"
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
"required": ["action"]
|
|
40
|
+
},
|
|
41
|
+
"handler": "manager"
|
|
42
|
+
}
|