Ver Fonte

perf(learning): index unit progress reads and trim wordbook pages

彭峰 há 1 dia atrás
pai
commit
ee9af726eb

+ 9 - 0
docs/qa/teacher-library-loading-2026-11-18.md

@@ -0,0 +1,9 @@
+# 老师选择词库与生词本性能优化
+
+本地实现并测试,未上线。详见 [完整测量和验证](../../perf/teacher-library-loading-2026-11-18/RESULTS.md)。
+
+根因是教材单元进度统计的文本转换阻止数值索引完整生效,导致逐单元反复过滤约84万条记录;生词本还携带大量不参与学习展示的管理元数据。
+
+10组真实数据库交替配对:单元完整读取p75从3764ms降为23ms,结果逐字节一致。生词本响应45046→8839字节;本地Fast4G实际界面点击至可选p75从168.5ms降为100.8ms。SQL、回放和真实用户体验已分开标明。
+
+19项后端与107项移动端流程测试通过,移动构建及云函数定义/动作检查通过;手机/桌面4组前后截图无像素差。仅改读取与传输,没有业务写入、课时/费用变更或生产发布。应用线上函数哈希保持原样,临时只读诊断入口已删除。真实设备与线上新版体验待获准发布后验收。

+ 9 - 0
perf/teacher-library-loading-2026-11-18/BRIEF.md

@@ -0,0 +1,9 @@
+# 老师选词库、生词本加载优化
+
+授权范围:本地定位、优化、测试;不发布线上,不修改课时、费用、学习进度、教材授权。
+
+终点:教材单元和进度已显示、能勾选;生词本当前页单词与未学/已学计数已显示、能勾选。骨架和空壳不计完成。
+
+先测真实老师会话的只读接口,区分认证/运行时、数据库、响应体传输与页面显示。相同数据和排序建立黄金输出;优化前后交替各测至少 10 次,报告 p50/p75/p95。数据库微基准、受限网络实验和用户实际设备体验分开报告。
+
+目标:确认慢点后,目标路径 p75 减半;其他路径不回退。任何收益必须同时保留单词、释义、音标、音频、进度、计数、分页、租户/学员隔离及权限校验。拒绝通过隐藏真实内容、全局长缓存或减少财务校验提速。

+ 50 - 0
perf/teacher-library-loading-2026-11-18/RESULTS.md

@@ -0,0 +1,50 @@
+# 老师词库/生词本读取优化 — 2026-11-18
+
+本地完成,未部署。基线 d0d986a。原始身份、响应、SQL 计划和浏览器截图仅存私有 QA 目录,仓库只保留脱敏结果。
+
+## 原因与范围
+
+真实老师已有会话只读抽样:课程列表 380ms;三个教材的单元接口分别 4263/1507/1979ms;生词本第一页 545ms(30条,209未学+7已学);另一学员1条生词210ms。教材选词接口375ms。这些是单次请求,不能当成总体分位数。
+
+最慢教材7个单元的 SQL EXPLAIN ANALYZE 为3710.571ms。逐单元统计的模型/单元/词条键被转换为文本,索引条件只剩company;每轮过滤839365条无关内容,7个单元的两个统计分支反复执行。生产信息架构核对:Node.nodeId/parentId、CommonModel.modelId/nodeId/generalId、PracticeRecord.yhid/scid均numeric。
+
+生词本本次正常返回分页计数,未触发旧版全量下载兼容分支。其词条detail夹带发布模板、审核、权限和历史管理元数据,30条约45KB,增加下载和解析负担。
+
+## 改动
+
+- nodeUnitPage在原文本比较之外补充等价数值比较,让现有company/model/node和word索引生效。保留原文本守卫、排序、页数、授权及历史syjd单元回退,不加缓存、不建生产索引。
+- newWordPage新增严格布尔compact:true,保留词汇ID、单词、释义、音标、音频、例句及学习次数,旧客户端仍返回完整字段。
+- 移动端分页生词本请求使用compact:true;老师/学生共用组件同步生效。未更改整本选词、学习轮次、保存进度逻辑。
+- 没有改动任何充值、库存、预留、扣课、费用、结算或学习写入函数。
+
+## 交替配对结果(各10次)
+
+| 测量对象与口径 | 之前p50/p75/p95 | 之后p50/p75/p95 |
+| --- | --- | --- |
+| 真实数据库7单元完整读取,毫秒 | 3622 / 3764 / 3915 | 22 / 23 / 34 |
+| 真实数据库生词本分页,毫秒 | 14 / 15 / 18 | 15 / 15 / 16 |
+| 本地实际Angular界面,切换学员至30词可选,Fast4G,毫秒 | 161.2 / 168.5 / 247.2 | 88.7 / 100.8 / 108.3 |
+
+单元读取p75下降99.4%,每组完整JSON逐字节相同。生词本SQL本来就快,本次收益来自响应体45046→8839 UTF-8字节,减少80.4%;没有将其描述为数据库优化。后者页面p75改善40.2%,尚未达到单独生词本操作减半的目标,剩余包括请求往返、自动化操作和渲染。
+
+数据库配对在同一只读、可重复读事务中执行旧/新函数,排除数据变化。诊断入口固定帐套、目标和SQL,令牌摘要鉴权、5分钟过期、禁止业务写入;结束后删除。页面测试用捕获响应本地回放、固定14ms后端等待,CDP在计时的点击操作期间对所有请求应用20ms/4Mbps下行/3Mbps上行。每次新浏览器上下文,预先加载已有界面,再计时切换至尚未请求的学员。
+
+这些结果不是线上新版验收或真实教师设备体验;没有CrUX/用户设备分位数。不得把23ms SQL时间当成用户打开页面的总时间。
+
+## 验证与护栏
+
+- 后端针对性19/19:before/after完整输出、分页、空单元、重复练习、异常学习次数、其他学员/帐套、回收授权、syjd回退、numeric不同小数格式;原有单词进度、课程选择及费用快照保护测试保留。
+- 扫描棘轮:读2单元时无关行过滤<1000;必须使用模型+单元索引键。旧代码失败,候选通过。优化前基线fixture与d0d986a原函数相同。
+- compact棘轮:教学字段逐项等价,元数据体积至少减半,非boolean true不改变旧响应。
+- 移动端107/107、build:mobile、cloud:validate(11个函数)、app:actions:audit:local均通过。
+- 390/1024宽度,完整/compact各一次:30词、7单元可选;切换学员清空选择,无横向溢出/JS错误,4组前后截图像素差均0。音频保障接口被本地不可用桩拦截,未做真实发音听测,不据此认定线上音频可用。
+- 独立审查未发现阻断问题;生产numeric schema前提有当前只读证据。
+- 上线应用gateway哈希与检查前相同,临时诊断入口剩余0;未执行业务写入、部署或CDN刷新。
+
+## 复测
+
+后端:`node --test scripts/tests/library-loading-performance.test.mjs scripts/tests/wordbook-gateway.test.mjs scripts/tests/course-word-progress.test.mjs scripts/tests/lesson-course-selection.test.mjs`
+
+页面配对脚本:wordbook-browser-bench.mjs,参数为私有paired-sql JSON、本地移动端URL和输出路径。不含生产令牌,不访问生产。
+
+待用户授权上线时,仅选择本次app gateway读函数及移动端请求变更;不要默认携带其余待发布的16px报表、老师专项训练或阅读随机设置。保留旧函数/静态入口以便回退;上线后用真实老师选教材→单元→单词、生词本切换和分页重新验收。

+ 147 - 0
perf/teacher-library-loading-2026-11-18/results.json

@@ -0,0 +1,147 @@
+{
+  "samples": {
+    "before": {
+      "p50": 3622,
+      "p75": 3764,
+      "p95": 3915
+    },
+    "after": {
+      "p50": 22,
+      "p75": 23,
+      "p95": 34
+    }
+  },
+  "wordSamples": {
+    "before": {
+      "p50": 14,
+      "p75": 15,
+      "p95": 18
+    },
+    "after": {
+      "p50": 15,
+      "p75": 15,
+      "p95": 16
+    }
+  },
+  "bytes": {
+    "before": 45046,
+    "after": 8839
+  },
+  "browser": {
+    "profile": "Fast4G click to 30 selectable words, local real-response replay, SQL fixed14ms; not live-user acceptance",
+    "samples": [
+      {
+        "pair": 0,
+        "variant": "before",
+        "ms": 170.30000001192093
+      },
+      {
+        "pair": 0,
+        "variant": "after",
+        "ms": 88.80000001192093
+      },
+      {
+        "pair": 1,
+        "variant": "before",
+        "ms": 154.2000000178814
+      },
+      {
+        "pair": 1,
+        "variant": "after",
+        "ms": 88
+      },
+      {
+        "pair": 2,
+        "variant": "before",
+        "ms": 162.69999998807907
+      },
+      {
+        "pair": 2,
+        "variant": "after",
+        "ms": 82.09999999403954
+      },
+      {
+        "pair": 3,
+        "variant": "before",
+        "ms": 155.2000000178814
+      },
+      {
+        "pair": 3,
+        "variant": "after",
+        "ms": 88.69999998807907
+      },
+      {
+        "pair": 4,
+        "variant": "before",
+        "ms": 155.2999999821186
+      },
+      {
+        "pair": 4,
+        "variant": "after",
+        "ms": 86.60000002384186
+      },
+      {
+        "pair": 5,
+        "variant": "before",
+        "ms": 159.80000001192093
+      },
+      {
+        "pair": 5,
+        "variant": "after",
+        "ms": 108.2999999821186
+      },
+      {
+        "pair": 6,
+        "variant": "before",
+        "ms": 161.19999998807907
+      },
+      {
+        "pair": 6,
+        "variant": "after",
+        "ms": 87.80000001192093
+      },
+      {
+        "pair": 7,
+        "variant": "before",
+        "ms": 164.5
+      },
+      {
+        "pair": 7,
+        "variant": "after",
+        "ms": 100.80000001192093
+      },
+      {
+        "pair": 8,
+        "variant": "before",
+        "ms": 247.19999998807907
+      },
+      {
+        "pair": 8,
+        "variant": "after",
+        "ms": 102.69999998807907
+      },
+      {
+        "pair": 9,
+        "variant": "before",
+        "ms": 168.5
+      },
+      {
+        "pair": 9,
+        "variant": "after",
+        "ms": 89.59999999403954
+      }
+    ],
+    "summary": {
+      "before": {
+        "p50": 161.19999998807907,
+        "p75": 168.5,
+        "p95": 247.19999998807907
+      },
+      "after": {
+        "p50": 88.69999998807907,
+        "p75": 100.80000001192093,
+        "p95": 108.2999999821186
+      }
+    }
+  }
+}

+ 56 - 0
perf/teacher-library-loading-2026-11-18/wordbook-browser-bench.mjs

@@ -0,0 +1,56 @@
+// Usage: node this-file.mjs <private paired-sql JSON> <local mobile URL> <output JSON>
+// Local replay only. No production requests, credentials or writes. Actual Angular selector,
+// real captured response shapes; identical 14ms SQL delay, Fast 4G on every request during click.
+import fs from 'node:fs';
+import http from 'node:http';
+import assert from 'node:assert/strict';
+import {createRequire} from 'node:module';
+const require=createRequire(new URL('../../package.json',import.meta.url));
+const {chromium}=require('playwright');
+const [fixtureFile,base,output]=process.argv.slice(2);
+assert.ok(fixtureFile&&base&&output,'private fixture, local URL and output required');
+assert.match(base,/^http:\/\/(127\.0\.0\.1|localhost):\d+$/);
+const fixture=JSON.parse(fs.readFileSync(fixtureFile,'utf8')).result;
+let variant='before';
+const server=http.createServer(async(req,res)=>{
+ const headers={'Content-Type':'application/json','Access-Control-Allow-Origin':'*','Access-Control-Allow-Headers':'*'};
+ if(req.method==='OPTIONS'){res.writeHead(204,headers);res.end();return;}
+ let raw='';for await(const chunk of req)raw+=chunk;
+ const p=JSON.parse(raw||'{}').params||{};
+ let body;
+ if(p.action==='e_user_list')body={result:[{userId:101,honeyName:'学员甲'},{userId:102,honeyName:'学员乙'}],page:{itemCount:2,pageCount:1,pageIndex:1}};
+ else if(p.action==='e_words_list'){
+  assert.equal(p.compact,true);
+  const source=variant==='before'?fixture.wordBefore:fixture.wordAfter;
+  body=Number(p.uid)===101?{result:source.rows.slice(0,1),page:{itemCount:1,pendingCount:1,completedCount:0}}:{result:source.rows,page:source.page};
+ }else{res.writeHead(400,headers);res.end(JSON.stringify({retcode:-1}));return;}
+ await new Promise(r=>setTimeout(r,14));
+ res.writeHead(200,headers);res.end(JSON.stringify({retcode:0,...body}));
+});
+await new Promise(r=>server.listen(0,'127.0.0.1',r));
+const api='http://127.0.0.1:'+server.address().port;
+const browser=await chromium.launch({headless:true,executablePath:'/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',args:['--no-proxy-server']});
+const samples=[];
+try{
+ for(let pair=0;pair<10;pair++)for(variant of['before','after']){
+  const ctx=await browser.newContext({viewport:{width:390,height:1100}});
+  await ctx.addInitScript(()=>localStorage.setItem('xiaoshu.angular.session',JSON.stringify({token:'r:local-benchmark',user:{userId:300,groupId:3},student:null})));
+  const page=await ctx.newPage();
+  await page.route(/\/(?:api\/functions|cloud-functions)\//,r=>r.continue({url:api+'/gateway'}));
+  await page.goto(base+'/pages/member/starshop',{waitUntil:'domcontentloaded'});
+  await page.waitForFunction(()=>document.querySelectorAll('.word-select-list button').length===1);
+  const cdp=await ctx.newCDPSession(page);
+  await cdp.send('Network.enable');
+  await cdp.send('Network.setCacheDisabled',{cacheDisabled:true});
+  await cdp.send('Network.emulateNetworkConditions',{offline:false,latency:20,downloadThroughput:4_000_000/8,uploadThroughput:3_000_000/8});
+  await page.evaluate(()=>{window.__selectionStart=performance.now();window.__selectionEnd=null;const check=()=>{const buttons=[...document.querySelectorAll('.word-select-list button')];if(buttons.length===30&&buttons.every(b=>!b.disabled&&b.offsetHeight)){window.__selectionEnd=performance.now();return;}requestAnimationFrame(check);};requestAnimationFrame(check);});
+  await page.locator('#wordbook-student').selectOption('102');
+  await page.waitForFunction(()=>window.__selectionEnd!==null);
+  const ms=await page.evaluate(()=>window.__selectionEnd-window.__selectionStart);
+  samples.push({pair,variant,ms});
+  assert.equal(await page.locator('.word-select-list button').count(),30);
+  await ctx.close();
+ }
+ const summary={};for(const key of['before','after']){const a=samples.filter(s=>s.variant===key).map(s=>s.ms).sort((a,b)=>a-b);summary[key]={p50:a[Math.ceil(.5*a.length)-1],p75:a[Math.ceil(.75*a.length)-1],p95:a[Math.ceil(.95*a.length)-1]};}
+ fs.writeFileSync(output,JSON.stringify({profile:'Fast4G click to 30 selectable words, local real-response replay, SQL fixed14ms; not live-user acceptance',samples,summary},null,2));console.log(JSON.stringify(summary));
+}finally{await browser.close();await new Promise(r=>server.close(r));}

+ 1 - 0
projects/xiaoshu-mobile/src/app/core/home-learning-modules.integration.spec.ts

@@ -995,6 +995,7 @@ describe('home learning modules', () => {
     await settled();
     expect(router.url).toBe('/pages/member/starshop');
     expect(read).toHaveBeenCalledWith('e_user_list', jasmine.objectContaining({scope:'wordbook'}));
+    expect(read).toHaveBeenCalledWith('e_words_list', jasmine.objectContaining({uid:100, compact:true, psize:30}));
     expect(page().querySelector('.word-select-list')?.textContent).toContain('apple');
     expect(page().querySelector('.danger-button')).toBeNull();
     (page().querySelector('.word-select-list button') as HTMLButtonElement).click();

+ 1 - 1
projects/xiaoshu-mobile/src/app/features/learning/learning-page.component.ts

@@ -1649,7 +1649,7 @@ export class LearningPageComponent implements OnInit, OnDestroy {
 
     const uid = this.isCoachWordbookSelection ? this.wordbookStudentId() : this.session.user()?.userId;
     this.selectionLoading.set(true);
-    this.selectionRequest=this.api.get<unknown>('e_words_list',{uid,cpage:this.selectionPage(),psize:this.newWordPageSize,learningStatus:this.activeSelectionBucket()}).subscribe({
+    this.selectionRequest=this.api.get<unknown>('e_words_list',{uid,cpage:this.selectionPage(),psize:this.newWordPageSize,learningStatus:this.activeSelectionBucket(),compact:true}).subscribe({
       next: ({result,page}) => {
         const incoming = this.findList(result).map((item) => this.toNewWord(item)).filter((word) => word.word);
         const pendingCount = Number(page?.['pendingCount']);

+ 8 - 3
scripts/deploy-admin-functions.mjs

@@ -2530,6 +2530,7 @@ async function sqlPage(className, input, filters = []) {
 async function nodePage(input) {
   const paging = pageInput(input); const values = [DEFAULT_COMPANY_ID]; const clauses = ['"company"=$1']; if (input.pid !== undefined && input.pid !== '') { values.push(String(number(input.pid))); clauses.push('CAST("parentId" AS text)=$' + values.length); } const where = clauses.join(' AND '); const countRow = await Psql.one('SELECT COUNT(*)::int AS total FROM "Node" WHERE ' + where,values); const rows = await Psql.query('SELECT * FROM "Node" WHERE ' + where + ' ORDER BY CASE WHEN CAST("orderId" AS text) ~ \'^-?[0-9]+$\' THEN CAST("orderId" AS numeric) ELSE 0 END ASC, CASE WHEN CAST("nodeId" AS text) ~ \'^-?[0-9]+$\' THEN CAST("nodeId" AS numeric) ELSE 0 END ASC LIMIT $' + (values.length + 1) + ' OFFSET $' + (values.length + 2),values.concat([paging.size,(paging.index - 1) * paging.size])); const total = number(countRow.total); return { rows:rows.filter(isVisible).map((row) => legacyAliases(row,'Node')),page:{itemCount:total,pageCount:Math.ceil(total / paging.size),pageIndex:paging.index,pageSize:paging.size} };
 }
+// Keep original text equality guards while exposing numeric model/node/word keys to existing indexes.
 async function nodeUnitPage(input,current) {
   const uid = await authorizeRequestedUser(current,input.userId || input.uid); const paging = pageInput(input); const bindingId = String(input.bindingId || '').trim(); let parentId = number(input.pid); let binding = null;
   const bindingRows=await Psql.query('SELECT b.* FROM "CourseBinding" b JOIN "CommonModel" c ON c."company"=b."company" AND c."modelId"=58 AND c."itemId"=b."id" WHERE b."company"=$1 AND b."yhid"::text=$2 AND b."enrollmentStatus"=\'active\' AND c."status"=99 AND (($3<>\'\' AND (b."id"::text=$3 OR b."objectId"=$3)) OR ($3=\'\' AND b."kcid"::text=$4))',[DEFAULT_COMPANY_ID,String(uid),bindingId,String(parentId)]);
@@ -2537,10 +2538,10 @@ async function nodeUnitPage(input,current) {
   if (!binding) fail(403,'该课程尚未分配给当前学员'); parentId = number(binding.kcid,parentId);
   if (parentId) {
     const countRow = await Psql.one('SELECT COUNT(*)::int AS total FROM "Node" WHERE "company"=$1 AND CAST("parentId" AS text)=$2',[DEFAULT_COMPANY_ID,String(parentId)]); const total = number(countRow.total);
-    if (total) { const rows = await Psql.query('SELECT n.*,COALESCE(w.total,0)::int AS "total",COALESCE(l.learned,0)::int AS "yx_word" FROM "Node" n LEFT JOIN LATERAL (SELECT COUNT(*)::int AS total FROM "CommonModel" c WHERE c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."nodeId" AS text)=CAST(n."nodeId" AS text)) w ON TRUE LEFT JOIN LATERAL (SELECT COUNT(DISTINCT CAST(p."scid" AS text))::int AS learned FROM "PracticeRecord" p JOIN "CommonModel" c ON c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."generalId" AS text)=CAST(p."scid" AS text) AND CAST(c."nodeId" AS text)=CAST(n."nodeId" AS text) WHERE p."company"=$1 AND CAST(p."yhid" AS text)=$3 AND CASE WHEN CAST(p."xxcs" AS text) ~ \'^[0-9]+(?:\\.[0-9]+)?$\' THEN CAST(p."xxcs" AS numeric) ELSE 0 END>0) l ON TRUE WHERE n."company"=$1 AND CAST(n."parentId" AS text)=$2 ORDER BY CASE WHEN CAST(n."orderId" AS text) ~ \'^-?[0-9]+$\' THEN CAST(n."orderId" AS numeric) ELSE 0 END ASC,CASE WHEN CAST(n."nodeId" AS text) ~ \'^-?[0-9]+$\' THEN CAST(n."nodeId" AS numeric) ELSE 0 END ASC LIMIT $4 OFFSET $5',[DEFAULT_COMPANY_ID,String(parentId),String(uid),paging.size,(paging.index - 1) * paging.size]); return { rows:rows.map((source) => { const row = legacyAliases(source,'Node'); row.total = number(source.total); row.yx_word = number(source.yx_word); row.process = row.total ? Math.round(row.yx_word / row.total * 100) : 0; return row; }),page:{itemCount:total,pageCount:Math.ceil(total / paging.size),pageIndex:paging.index,pageSize:paging.size} }; }
+    if (total) { const rows = await Psql.query('SELECT n.*,COALESCE(w.total,0)::int AS "total",COALESCE(l.learned,0)::int AS "yx_word" FROM "Node" n LEFT JOIN LATERAL (SELECT COUNT(*)::int AS total FROM "CommonModel" c WHERE c."company"=$1 AND c."modelId"=52 AND CAST(c."modelId" AS text)=\'52\' AND c."nodeId"=n."nodeId" AND CAST(c."nodeId" AS text)=CAST(n."nodeId" AS text)) w ON TRUE LEFT JOIN LATERAL (SELECT COUNT(DISTINCT CAST(p."scid" AS text))::int AS learned FROM "PracticeRecord" p JOIN "CommonModel" c ON c."company"=$1 AND c."modelId"=52 AND CAST(c."modelId" AS text)=\'52\' AND c."generalId"=p."scid" AND CAST(c."generalId" AS text)=CAST(p."scid" AS text) AND c."nodeId"=n."nodeId" AND CAST(c."nodeId" AS text)=CAST(n."nodeId" AS text) WHERE p."company"=$1 AND CAST(p."yhid" AS text)=$3 AND CASE WHEN CAST(p."xxcs" AS text) ~ \'^[0-9]+(?:\\.[0-9]+)?$\' THEN CAST(p."xxcs" AS numeric) ELSE 0 END>0) l ON TRUE WHERE n."company"=$1 AND CAST(n."parentId" AS text)=$2 ORDER BY CASE WHEN CAST(n."orderId" AS text) ~ \'^-?[0-9]+$\' THEN CAST(n."orderId" AS numeric) ELSE 0 END ASC,CASE WHEN CAST(n."nodeId" AS text) ~ \'^-?[0-9]+$\' THEN CAST(n."nodeId" AS numeric) ELSE 0 END ASC LIMIT $4 OFFSET $5',[DEFAULT_COMPANY_ID,String(parentId),String(uid),paging.size,(paging.index - 1) * paging.size]); return { rows:rows.map((source) => { const row = legacyAliases(source,'Node'); row.total = number(source.total); row.yx_word = number(source.yx_word); row.process = row.total ? Math.round(row.yx_word / row.total * 100) : 0; return row; }),page:{itemCount:total,pageCount:Math.ceil(total / paging.size),pageIndex:paging.index,pageSize:paging.size} }; }
   }
   const assigned = courseAssignedUnits(binding.syjd); const total = assigned.length; if (!total) return {rows:[],page:{itemCount:0,pageCount:0,pageIndex:paging.index,pageSize:paging.size}}; const pageUnits = assigned.slice((paging.index - 1) * paging.size,paging.index * paging.size),unitIds=pageUnits.map((unit)=>unit.id);
-  const wordRows = await Psql.query('SELECT CAST(c."nodeId" AS text) AS id,COUNT(*)::int AS total FROM "CommonModel" c WHERE c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."nodeId" AS text)=ANY($2::text[]) GROUP BY CAST(c."nodeId" AS text)',[DEFAULT_COMPANY_ID,unitIds]); const learnedRows = await Psql.query('SELECT CAST(c."nodeId" AS text) AS id,COUNT(DISTINCT CAST(p."scid" AS text))::int AS learned FROM "PracticeRecord" p JOIN "CommonModel" c ON c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."generalId" AS text)=CAST(p."scid" AS text) WHERE p."company"=$1 AND CAST(p."yhid" AS text)=$2 AND CAST(c."nodeId" AS text)=ANY($3::text[]) AND CASE WHEN CAST(p."xxcs" AS text) ~ \'^[0-9]+(?:\\.[0-9]+)?$\' THEN CAST(p."xxcs" AS numeric) ELSE 0 END>0 GROUP BY CAST(c."nodeId" AS text)',[DEFAULT_COMPANY_ID,String(uid),unitIds]); const totals=new Map(wordRows.map((row)=>[String(row.id),number(row.total)])),learned=new Map(learnedRows.map((row)=>[String(row.id),number(row.learned)])); const rows=pageUnits.map((unit)=>{const count=totals.get(unit.id)||0,done=learned.get(unit.id)||0;return legacyAliases({nodeId:number(unit.id),nodeName:unit.name,parentId,total:count,yx_word:done,process:count?Math.round(done/count*100):0},'Node');}); return {rows,page:{itemCount:total,pageCount:Math.ceil(total/paging.size),pageIndex:paging.index,pageSize:paging.size}};
+  const wordRows = await Psql.query('SELECT CAST(c."nodeId" AS text) AS id,COUNT(*)::int AS total FROM "CommonModel" c WHERE c."company"=$1 AND c."modelId"=52 AND CAST(c."modelId" AS text)=\'52\' AND c."nodeId"=ANY($2::numeric[]) AND CAST(c."nodeId" AS text)=ANY($2::text[]) GROUP BY CAST(c."nodeId" AS text)',[DEFAULT_COMPANY_ID,unitIds]); const learnedRows = await Psql.query('SELECT CAST(c."nodeId" AS text) AS id,COUNT(DISTINCT CAST(p."scid" AS text))::int AS learned FROM "PracticeRecord" p JOIN "CommonModel" c ON c."company"=$1 AND c."modelId"=52 AND CAST(c."modelId" AS text)=\'52\' AND c."generalId"=p."scid" AND CAST(c."generalId" AS text)=CAST(p."scid" AS text) WHERE p."company"=$1 AND CAST(p."yhid" AS text)=$2 AND c."nodeId"=ANY($3::numeric[]) AND CAST(c."nodeId" AS text)=ANY($3::text[]) AND CASE WHEN CAST(p."xxcs" AS text) ~ \'^[0-9]+(?:\\.[0-9]+)?$\' THEN CAST(p."xxcs" AS numeric) ELSE 0 END>0 GROUP BY CAST(c."nodeId" AS text)',[DEFAULT_COMPANY_ID,String(uid),unitIds]); const totals=new Map(wordRows.map((row)=>[String(row.id),number(row.total)])),learned=new Map(learnedRows.map((row)=>[String(row.id),number(row.learned)])); const rows=pageUnits.map((unit)=>{const count=totals.get(unit.id)||0,done=learned.get(unit.id)||0;return legacyAliases({nodeId:number(unit.id),nodeName:unit.name,parentId,total:count,yx_word:done,process:count?Math.round(done/count*100):0},'Node');}); return {rows,page:{itemCount:total,pageCount:Math.ceil(total/paging.size),pageIndex:paging.index,pageSize:paging.size}};
 }
 function legacyAppRow(source) { if (!source) return null; const row = legacyAliases(source,'App'); row.ver = number(firstValue(row.index,String(row.version || '').replace(/\D/g,''))); row.nver = String(row.version || ''); row.intro = String(firstValue(row.changelog,row.desc,'') || ''); row.path = String(firstValue(row.downUrl,row.apkUrl,'') || ''); row.size = null; row.sizeUnavailable = true; return row; }
 function parseArray(value) { if (Array.isArray(value)) return value; if (typeof value !== 'string' || !value.trim()) return []; try { const parsed = JSON.parse(value); return Array.isArray(parsed) ? parsed : []; } catch (_) { return []; } }
@@ -2690,7 +2691,11 @@ async function newWordPage(input, current) {
   const countRow = await Psql.one('SELECT COUNT(*) FILTER (WHERE NOT (' + learned + '))::int AS "pendingCount", COUNT(*) FILTER (WHERE ' + learned + ')::int AS "completedCount"' + from + where, values);
   const filter = status ? ' AND ' + (status === 'completed' ? learned : 'NOT (' + learned + ')') : '';
   const rows = await Psql.query('SELECT p.*, pc."generalId" AS "__practiceGeneralId", c.*, row_to_json(v) AS "__addon"' + from + ' LEFT JOIN "VocabularyWord" v ON v."company" = $1 AND v."id" = c."itemId" AND CAST(v."id" AS text) = CAST(c."itemId" AS text) LEFT JOIN "CommonModel" pc ON pc."company" = $1 AND pc."modelId" = 53 AND pc."itemId" = CAST(CAST(p."id" AS text) AS numeric) AND CAST(pc."modelId" AS text) = \'53\' AND CAST(pc."itemId" AS text) = CAST(p."id" AS text)' + where + filter + ' ORDER BY p."updatedAt" DESC, p."id" DESC LIMIT $3 OFFSET $4', values.concat([paging.size, (paging.index - 1) * paging.size]));
-  const result = rows.map((source) => { const practice = { id: source.id, kcid: source.kcid, scid: source.scid, xxcs: source.xxcs, yhid: source.yhid, jrscb: source.jrscb }; const detail = normalizeWordRow(source); return { ...practice, GeneralID: number(source.__practiceGeneralId || source.id), Title: detail.Title || detail.title || '', detail: [detail] }; });
+  const result = rows.map((source) => { const practice = { id: source.id, kcid: source.kcid, scid: source.scid, xxcs: source.xxcs, yhid: source.yhid, jrscb: source.jrscb }; const word = normalizeWordRow(source);
+    // Opt-in payload: keep teaching data, omit legacy publishing/admin metadata.
+    const keys = ['GeneralID','NodeID','Title','Title2','word','Word','sy','jssy','Translate','Meaning','yb','Phonetic','phonetic','yp','dy','lj','nodeId'];
+    const detail = input.compact === true ? Object.fromEntries(keys.filter(key => word[key] !== undefined).map(key => [key,word[key]])) : word;
+    return { ...practice, GeneralID: number(source.__practiceGeneralId || source.id), Title: detail.Title || detail.title || '', detail: [detail] }; });
   const pendingCount = number(countRow.pendingCount), completedCount = number(countRow.completedCount);
   const total = status === 'pending' ? pendingCount : status === 'completed' ? completedCount : pendingCount + completedCount;
   return { rows: result, page: { itemCount: total, pageCount: Math.ceil(total / paging.size), pageIndex: paging.index, pageSize: paging.size, pendingCount, completedCount } };

+ 12 - 0
scripts/tests/fixtures/library-loading-before.js

@@ -0,0 +1,12 @@
+async function nodeUnitPage(input,current) {
+  const uid = await authorizeRequestedUser(current,input.userId || input.uid); const paging = pageInput(input); const bindingId = String(input.bindingId || '').trim(); let parentId = number(input.pid); let binding = null;
+  const bindingRows=await Psql.query('SELECT b.* FROM "CourseBinding" b JOIN "CommonModel" c ON c."company"=b."company" AND c."modelId"=58 AND c."itemId"=b."id" WHERE b."company"=$1 AND b."yhid"::text=$2 AND b."enrollmentStatus"=\'active\' AND c."status"=99 AND (($3<>\'\' AND (b."id"::text=$3 OR b."objectId"=$3)) OR ($3=\'\' AND b."kcid"::text=$4))',[DEFAULT_COMPANY_ID,String(uid),bindingId,String(parentId)]);
+  if(bindingRows.length>1)fail(409,'该内容有多个开课分类,请选择具体开课记录');binding=bindingRows[0]||null;
+  if (!binding) fail(403,'该课程尚未分配给当前学员'); parentId = number(binding.kcid,parentId);
+  if (parentId) {
+    const countRow = await Psql.one('SELECT COUNT(*)::int AS total FROM "Node" WHERE "company"=$1 AND CAST("parentId" AS text)=$2',[DEFAULT_COMPANY_ID,String(parentId)]); const total = number(countRow.total);
+    if (total) { const rows = await Psql.query('SELECT n.*,COALESCE(w.total,0)::int AS "total",COALESCE(l.learned,0)::int AS "yx_word" FROM "Node" n LEFT JOIN LATERAL (SELECT COUNT(*)::int AS total FROM "CommonModel" c WHERE c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."nodeId" AS text)=CAST(n."nodeId" AS text)) w ON TRUE LEFT JOIN LATERAL (SELECT COUNT(DISTINCT CAST(p."scid" AS text))::int AS learned FROM "PracticeRecord" p JOIN "CommonModel" c ON c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."generalId" AS text)=CAST(p."scid" AS text) AND CAST(c."nodeId" AS text)=CAST(n."nodeId" AS text) WHERE p."company"=$1 AND CAST(p."yhid" AS text)=$3 AND CASE WHEN CAST(p."xxcs" AS text) ~ \'^[0-9]+(?:\\.[0-9]+)?$\' THEN CAST(p."xxcs" AS numeric) ELSE 0 END>0) l ON TRUE WHERE n."company"=$1 AND CAST(n."parentId" AS text)=$2 ORDER BY CASE WHEN CAST(n."orderId" AS text) ~ \'^-?[0-9]+$\' THEN CAST(n."orderId" AS numeric) ELSE 0 END ASC,CASE WHEN CAST(n."nodeId" AS text) ~ \'^-?[0-9]+$\' THEN CAST(n."nodeId" AS numeric) ELSE 0 END ASC LIMIT $4 OFFSET $5',[DEFAULT_COMPANY_ID,String(parentId),String(uid),paging.size,(paging.index - 1) * paging.size]); return { rows:rows.map((source) => { const row = legacyAliases(source,'Node'); row.total = number(source.total); row.yx_word = number(source.yx_word); row.process = row.total ? Math.round(row.yx_word / row.total * 100) : 0; return row; }),page:{itemCount:total,pageCount:Math.ceil(total / paging.size),pageIndex:paging.index,pageSize:paging.size} }; }
+  }
+  const assigned = courseAssignedUnits(binding.syjd); const total = assigned.length; if (!total) return {rows:[],page:{itemCount:0,pageCount:0,pageIndex:paging.index,pageSize:paging.size}}; const pageUnits = assigned.slice((paging.index - 1) * paging.size,paging.index * paging.size),unitIds=pageUnits.map((unit)=>unit.id);
+  const wordRows = await Psql.query('SELECT CAST(c."nodeId" AS text) AS id,COUNT(*)::int AS total FROM "CommonModel" c WHERE c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."nodeId" AS text)=ANY($2::text[]) GROUP BY CAST(c."nodeId" AS text)',[DEFAULT_COMPANY_ID,unitIds]); const learnedRows = await Psql.query('SELECT CAST(c."nodeId" AS text) AS id,COUNT(DISTINCT CAST(p."scid" AS text))::int AS learned FROM "PracticeRecord" p JOIN "CommonModel" c ON c."company"=$1 AND CAST(c."modelId" AS text)=\'52\' AND CAST(c."generalId" AS text)=CAST(p."scid" AS text) WHERE p."company"=$1 AND CAST(p."yhid" AS text)=$2 AND CAST(c."nodeId" AS text)=ANY($3::text[]) AND CASE WHEN CAST(p."xxcs" AS text) ~ \'^[0-9]+(?:\\.[0-9]+)?$\' THEN CAST(p."xxcs" AS numeric) ELSE 0 END>0 GROUP BY CAST(c."nodeId" AS text)',[DEFAULT_COMPANY_ID,String(uid),unitIds]); const totals=new Map(wordRows.map((row)=>[String(row.id),number(row.total)])),learned=new Map(learnedRows.map((row)=>[String(row.id),number(row.learned)])); const rows=pageUnits.map((unit)=>{const count=totals.get(unit.id)||0,done=learned.get(unit.id)||0;return legacyAliases({nodeId:number(unit.id),nodeName:unit.name,parentId,total:count,yx_word:done,process:count?Math.round(done/count*100):0},'Node');}); return {rows,page:{itemCount:total,pageCount:Math.ceil(total/paging.size),pageIndex:paging.index,pageSize:paging.size}};
+}

+ 48 - 0
scripts/tests/library-loading-performance.test.mjs

@@ -0,0 +1,48 @@
+import {test} from 'node:test';
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import vm from 'node:vm';
+import {PGlite} from '@electric-sql/pglite';
+const source=fs.readFileSync(new URL('../deploy-admin-functions.mjs',import.meta.url),'utf8');
+const gateway=source.match(/const appGatewayCode = String.raw`([\s\S]*?)\n`;/)[1];
+const before=fs.readFileSync(new URL('./fixtures/library-loading-before.js',import.meta.url),'utf8');
+const plain=v=>JSON.parse(JSON.stringify(v));
+async function fixture(t){
+ const db=new PGlite();t.after(()=>db.close());
+ await db.exec(`CREATE TABLE "Node"(company text,"nodeId" numeric,"parentId" numeric,"nodeName" text,"orderId" numeric);
+ CREATE TABLE "CourseBinding"(company text,id numeric,"objectId" text,yhid text,kcid text,"enrollmentStatus" text,syjd text);
+ CREATE TABLE "CommonModel"(company text,"modelId" numeric,"itemId" numeric,"nodeId" numeric,"generalId" numeric,status numeric);
+ CREATE TABLE "PracticeRecord"(company text,yhid numeric,scid numeric,xxcs text);
+ INSERT INTO "CourseBinding" VALUES('7pIbDBJmKx',1,'binding','42','100','active','{}'),('7pIbDBJmKx',2,'assigned','42','200','active','{"110":"110@Unit 1","120":"120@Unit 2"}');
+ INSERT INTO "CommonModel" VALUES('7pIbDBJmKx',58,1,0,999,99),('7pIbDBJmKx',58,2,0,998,99);
+ INSERT INTO "Node" VALUES('7pIbDBJmKx',110,100,'Unit 1',1),('7pIbDBJmKx',120,100,'Unit 2',2),('7pIbDBJmKx',130,100,'Empty',3),('other',140,100,'Foreign',0);
+ INSERT INTO "CommonModel" SELECT '7pIbDBJmKx',52,i,CASE WHEN i<11 THEN 110 ELSE 120 END,i,99 FROM generate_series(1,20)i;
+ INSERT INTO "CommonModel" SELECT '7pIbDBJmKx',CASE WHEN i%2=0 THEN 52 ELSE 56 END,i,999,i,99 FROM generate_series(1000,15000)i;
+ INSERT INTO "CommonModel" VALUES('other',52,1,110,1,99);
+ INSERT INTO "PracticeRecord" VALUES('7pIbDBJmKx',42,1,'1'),('7pIbDBJmKx',42,1,'2'),('7pIbDBJmKx',42,2,'0'),('7pIbDBJmKx',42,3,'bad'),('7pIbDBJmKx',42,11,'1.5'),('7pIbDBJmKx',99,2,'1'),('other',42,2,'1');
+ CREATE INDEX cm_node ON "CommonModel"(company,"modelId","nodeId");CREATE INDEX cm_general ON "CommonModel"(company,"modelId","generalId");CREATE INDEX pr_user ON "PracticeRecord"(company,(yhid::text),(scid::text));ANALYZE;`);
+ function harness(code){const calls=[];const c=vm.createContext({Psql:{one:async(sql,args)=>{calls.push({sql,args});return(await db.query(sql,args)).rows[0];},query:async(sql,args)=>{calls.push({sql,args});return(await db.query(sql,args)).rows;}}});vm.runInContext(gateway,c);if(code)vm.runInContext(code,c);c.authorizeRequestedUser=async(_,uid)=>{if(uid!==42)throw Error('denied');return uid;};return{calls,read:input=>c.nodeUnitPage({pid:100,userId:42,psize:2,...input},{})};}
+ return{db,before:harness(before),after:harness()};
+}
+test('unit optimization preserves every row, progress, count, page and assigned-unit fallback',async t=>{
+ const h=await fixture(t);
+ for(const input of [{},{cpage:2},{cpage:3},{bindingId:'assigned',pid:200},{bindingId:'assigned',pid:200,psize:1,cpage:2}])assert.deepEqual(plain(await h.after.read(input)),plain(await h.before.read(input)));
+ const r=await h.after.read({});assert.deepEqual(plain(r.rows.map(x=>[x.total,x.yx_word,x.process])),[[10,1,10],[10,1,10]]);
+ await assert.rejects(h.after.read({userId:99}),/denied/);
+ await assert.rejects(h.after.read({bindingId:'missing'}),/尚未分配/);
+ await h.db.exec(`UPDATE "CourseBinding" SET "enrollmentStatus"='recycled' WHERE "objectId"='binding'`);
+ await assert.rejects(h.after.read({}),/尚未分配/);
+});
+test('unit progress scans only selected vocabulary using all existing model/node index keys',async t=>{
+ const h=await fixture(t);await h.after.read({});let discarded=0;const nodes=[];
+ for(const q of h.after.calls){const result=await h.db.query('EXPLAIN (ANALYZE,FORMAT JSON) '+q.sql,q.args);const walk=p=>{discarded+=Number(p['Rows Removed by Filter']||0)*Number(p['Actual Loops']||1);nodes.push(p);for(const c of p.Plans||[])walk(c);};walk(result.rows[0]['QUERY PLAN'][0].Plan);}
+ assert.ok(discarded<1000,`discarded ${discarded} irrelevant rows while reading only two units`);
+ assert.ok(nodes.some(p=>(p['Index Cond']||'').includes('modelId')&&(p['Index Cond']||'').includes('nodeId')),'must retain numeric model + node lookup');
+});
+
+test('numeric scale guards keep historical model/node/word text matching exactly unchanged',async t=>{
+ const h=await fixture(t);
+ await h.db.exec(`INSERT INTO "CommonModel" VALUES('7pIbDBJmKx',52.0,501,110,501,99),('7pIbDBJmKx',52,502,110.0,502,99),('7pIbDBJmKx',52,503,110,503.0,99);INSERT INTO "PracticeRecord" VALUES('7pIbDBJmKx',42,503,'1');`);
+ for(const input of [{},{bindingId:'assigned',pid:200}])assert.deepEqual(plain(await h.after.read(input)),plain(await h.before.read(input)));
+ const rows=(await h.after.read({})).rows;assert.equal(rows[0].total,11);assert.equal(rows[0].yx_word,1);
+});

+ 15 - 0
scripts/tests/wordbook-gateway.test.mjs

@@ -96,3 +96,18 @@ test('索引优化保留原文本编号匹配,不把带前导零或小数的
  await db.exec(`INSERT INTO "PracticeRecord" VALUES (21,'7pIbDBJmKx','42','00101','100','0','1',now()),(22,'7pIbDBJmKx','42','101.0','100','0','1',now()),(23,'7pIbDBJmKx','42','invalid','100','0','1',now());`);
  const result=await read({learningStatus:'pending'});assert.equal(result.page.itemCount,2);assert.deepEqual(result.rows.map(row=>row.Title),['apple','banana']);
 });
+
+test('生词本精简响应保留教学字段、词汇身份及分页,兼容旧完整响应',async t=>{
+ const {read,db}=await setup(t);
+ await db.exec(`ALTER TABLE "CommonModel" ADD COLUMN body text;UPDATE "CommonModel" SET body=repeat('metadata',400);ALTER TABLE "VocabularyWord" ADD COLUMN yb text,ADD COLUMN yp text,ADD COLUMN lj text;UPDATE "VocabularyWord" SET yb='/ˈæpəl/',yp='apple.mp3',lj='an apple' WHERE id=1;`);
+ const full=await read({learningStatus:'pending'}),compact=await read({learningStatus:'pending',compact:true});
+ assert.equal(full.rows[0].detail[0].body.length,3200);
+ assert.equal(compact.rows[0].detail[0].body,undefined);
+ assert.deepEqual(JSON.parse(JSON.stringify(compact.page)),JSON.parse(JSON.stringify(full.page)));
+ for(let i=0;i<full.rows.length;i++){
+  for(const key of ['id','kcid','scid','xxcs','yhid','jrscb','GeneralID','Title'])assert.deepEqual(compact.rows[i][key],full.rows[i][key],key);
+  for(const key of ['GeneralID','NodeID','Title','sy','yb','yp','lj'])assert.deepEqual(compact.rows[i].detail[0][key],full.rows[i].detail[0][key],key);
+ }
+ assert.ok(JSON.stringify(compact).length<JSON.stringify(full).length/2);
+ assert.equal((await read({compact:'true'})).rows[0].detail[0].body.length,3200);
+});