趋势（2s 采样 · 最近 ' + trendCpu.length + ' 点）
' +
+ '
' +
+ 'CPU ' + (cpu.usage == null ? '—' : (+cpu.usage).toFixed(1) + '%') + '' +
+ '内存 ' + (mem.total ? memP.toFixed(1) + '%' : '—') + '' +
+ '负载1m/核 ' + (cpu.load && cpu.load[0] != null ? (+cpu.load[0]).toFixed(2) : '—') + '' +
+ '温度 ' + (tmpCpu == null ? '—' : tmpCpu + '℃') + '' +
+ '
' + trendSvgHtml(perfTrend) +
+ '
温度曲线按 20–90℃ 归一；负载按 load1/核（100%=单核满载）。进页起累积，切页清零。
' +
@@ -645,6 +684,27 @@ const { $, $$, LOG_GROUP_NAME, SPARK_MAX, api, apiDownload, applyTheme, authMode
'
每实体连接表
' +
'
' +
@@ -1425,6 +1515,10 @@ const { $, $$, LOG_GROUP_NAME, SPARK_MAX, api, apiDownload, applyTheme, authMode
'' +
'' +
'
';
+ /* F1-④ 搜索（只读，当前目录起递归限深 4 层） */
+ h += '
' +
+ '' +
+ '
';
h += '
| 名称 | 大小 | 修改时间 | 操作 |
|---|
';
if (!d.items.length) h += '| 空目录 |
';
d.items.forEach(function (it) {
@@ -1450,6 +1544,49 @@ const { $, $$, LOG_GROUP_NAME, SPARK_MAX, api, apiDownload, applyTheme, authMode
function renderFiles() { $('#content').innerHTML = ''; navFiles(state.filesRel || '/'); }
+ /* F1-④ 搜索结果视图（GET /api/files/search，只读；下载/进入仍走既有端点） */
+ function searchParentRel(it) {
+ const rel = it.rel || '/';
+ if (it.type === 'dir') return rel;
+ const i = rel.lastIndexOf('/');
+ return i > 0 ? rel.slice(0, i) : '/';
+ }
+
+ async function searchFiles() {
+ const q = ($('#file-search') ? $('#file-search').value : '').trim();
+ if (!q) return toast('请输入搜索关键字');
+ const page = $('#files-page'); if (!page) return;
+ const abs = state.filesAbs || '/';
+ page.innerHTML = '在 ' + esc(state.filesRel || '/') + ' 内搜索「' + esc(q) + '」…
';
+ let d;
+ try { d = await api('GET', '/api/files/search?path=' + encodeURIComponent(abs) + '&name=' + encodeURIComponent(q)); }
+ catch (e) { page.innerHTML = emptyState('搜索失败：' + errText(e), e.code); return; }
+ let h = crumbHtml(segments(d.rel), d.rel);
+ h += '' +
+ '「' + esc(q) + '」在 ' + esc(d.rel) + ' 内命中 ' + (d.count || 0) + ' 条' +
+ (d.truncated ? '（已达上限，结果截断）' : '') + '' +
+ '
';
+ h += '| 名称 | 位置 | 大小 | 修改时间 | 操作 |
|---|
';
+ if (!d.items.length) h += '| 无匹配 |
';
+ d.items.forEach(function (it) {
+ const isDir = it.type === 'dir';
+ const icon = isDir ? '📁' : '📄';
+ const parent = searchParentRel(it);
+ h += '| ' + icon + ' ' + esc(it.name) + ' | ' +
+ '' + esc(parent) + ' | ' +
+ '' + (isDir ? '—' : fmtBytes(it.size)) + ' | ' +
+ '' + fmtTime(it.mtime) + ' | ' +
+ '' +
+ (isDir
+ ? ' '
+ : ' ' +
+ ' 下载') +
+ ' |
';
+ });
+ h += '
无 stdout 日志
';
+ const d = await api('GET', '/api/logs/read?file=' + encodeURIComponent(pkg + '/' + file) + '&lines=200');
+ const lines = d.lines || [];
+ return '' + esc(lines.join('\n') || '(空)') +
+ (d.truncated ? '\n…（超出尾部上限，部分被截断）' : '') + '' +
+ '' + esc(pkg + '/' + file) + ' · 末尾 ' + lines.length + ' 行
';
+ } catch (e) { return 'stdout 读取失败：' + esc(errText(e)) + '
'; }
+ }
+
+ async function appDetailBody(pkg) {
+ const r = await Promise.allSettled([
+ api('GET', '/api/apps/' + pkg),
+ api('GET', '/api/ams/' + pkg),
+ api('GET', '/api/net/conns?entity=' + encodeURIComponent('app:' + pkg)),
+ appStdoutBlock(pkg)
+ ]);
+
+ let h = '';
+ /* ① 安装域（app.json） */
+ const ap = r[0].status === 'fulfilled' ? r[0].value : null;
+ if (ap) {
+ h += '' +
+ row('名称', esc(ap.name || '—')) +
+ row('版本', esc(ap.version || '—')) +
+ row('执行', '' + esc(ap.exec || '—') + '') +
+ row('体积', fmtBytes(ap.size)) +
+ row('路径', '' + esc(ap.path || '—') + '') +
+ '
';
+ } else {
+ h += '安装详情不可用' + (r[0].status === 'rejected' ? '：' + esc(errText(r[0].reason)) : '') + '
';
+ }
+
+ /* ② 运行域崩溃/事件史（am history） */
+ h += '崩溃 / 事件历史（amsd）
';
+ const am = r[1].status === 'fulfilled' ? r[1].value : null;
+ const evs = (am && am.available && am.events) || [];
+ if (evs.length) {
+ h += '| 时间 | 类型 | 详情 |
|---|
';
+ evs.slice().reverse().slice(0, 10).forEach(function (ev) {
+ h += '| ' + fmtTime(ev.ts) + ' | ' + esc(ev.kind || '—') + ' | ' +
+ '' + esc(ev.detail || '—') + ' |
';
+ });
+ h += '
';
+ } else {
+ h += '无事件记录' + (r[1].status === 'rejected' ? '（' + esc(errText(r[1].reason)) + '）' : '') + '
';
+ }
+
+ /* ③ 实时连接（app:） */
+ h += '实时连接（app:' + esc(pkg) + '）
';
+ const cn = r[2].status === 'fulfilled' ? r[2].value : null;
+ const conns = (cn && cn.conns) || [];
+ if (conns.length) {
+ h += '| 远端 | 本端 | 状态 | 寿命 |
|---|
';
+ conns.forEach(function (c) {
+ h += '| ' + esc(c.domain || c.remote || '—') + ' | ' +
+ '' + esc(c.local || '—') + ' | ' +
+ '' + esc(c.state || '—') + ' | ' + fmtDur(c.age) + ' |
';
+ });
+ h += '
';
+ } else {
+ h += '无连接' + (r[2].status === 'rejected' ? '（' + esc(errText(r[2].reason)) + '）' : '') + '
';
+ }
+
+ /* ④ stdout 尾部 */
+ h += 'stdout 尾部
';
+ h += (r[3].status === 'fulfilled' && r[3].value) ? r[3].value : 'stdout 读取失败
';
+
+ return h;
+ }
+
+ async function appInfo(pkg) {
+ if (appDetailPkg === pkg) { appDetailRemove(); return; } // 已展开 → 收起
+ appDetailRemove(); // 收起上一个
+ const card = document.querySelector('.app-card[data-pkg="' + escSafeAttr(pkg) + '"]');
+ if (!card) return;
+ const box = document.createElement('div');
+ box.className = 'card app-detail-card';
+ box.innerHTML = '' + esc(pkg) + '' +
+ '
' +
+ '并发聚合四源详情…
';
+ card.after(box);
+ appDetailPkg = pkg;
+ try {
+ box.innerHTML = '' + esc(pkg) + '' +
+ '
' + (await appDetailBody(pkg));
+ } catch (e) {
+ box.innerHTML = '' + esc(pkg) + '' +
+ '
' +
+ '详情加载失败：' + esc(errText(e)) + '
';
+ appDetailPkg = null;
+ }
}
function renderFontsPage() {
diff --git a/patch_v2/meowpanel/web/mp_shared.js b/patch_v2/meowpanel/web/mp_shared.js
index f67b23b..af1e00e 100644
--- a/patch_v2/meowpanel/web/mp_shared.js
+++ b/patch_v2/meowpanel/web/mp_shared.js
@@ -99,6 +99,53 @@
if (arr.length > SPARK_MAX) arr.shift();
}
+ /* ---- F1-① 性能趋势（FUTURE_MEOWPANEL §2.1）：pushSpark 模式泛化到任意 0..100 归一值 ---- */
+ const trendCpu = [], trendMem = [], trendLoad = [], trendTemp = [];
+
+ function pushTrend(arr, v) { // 0..100 归一值入队（<=SPARK_MAX 点）；null/NaN 不入队（诚实空缺）
+ if (v == null || isNaN(v)) return;
+ arr.push(Math.max(0, Math.min(100, Number(v))));
+ if (arr.length > SPARK_MAX) arr.shift();
+ }
+
+ function resetTrend() { trendCpu.length = 0; trendMem.length = 0; trendLoad.length = 0; trendTemp.length = 0; }
+
+ /* series: [{cls,arr}]，cls 决定颜色（CSS .trend-cpu/.trend-mem/.trend-load/.trend-temp），
+ * 位置稳定（首页 3 序列、perf 页 4 序列共用同一语义色，不靠序号猜色）。 */
+ function trendSvgHtml(series) {
+ let polys = '';
+ series.forEach(function (s) {
+ polys += '';
+ });
+ return '';
+ }
+
+ function drawTrendSpark(rootEl, series) {
+ const svg = rootEl && rootEl.querySelector('.trend-spark');
+ if (!svg) return;
+ series.forEach(function (s) {
+ const p = svg.querySelector('.' + s.cls);
+ if (p) p.setAttribute('points', sparklinePoints(s.arr));
+ });
+ }
+
+ /* 通用折线点串（任意长度数组，值 0..100 归一；null 跳过）：x 铺满 w，y 反向映射 h 内（F1-② 功耗 4h 曲线用） */
+ function polylinePoints(vals, w, h) {
+ const n = vals.length;
+ if (!n) return '';
+ const out = [];
+ for (let i = 0; i < n; i++) {
+ const v = vals[i];
+ if (v == null || isNaN(v)) continue;
+ const x = n > 1 ? (i / (n - 1)) * w : w / 2;
+ const y = h - 2 - Math.max(0, Math.min(100, v)) / 100 * (h - 4);
+ out.push(x.toFixed(1) + ',' + y.toFixed(1));
+ }
+ return out.join(' ');
+ }
+
function drawSpark(rootEl) {
const svg = rootEl && rootEl.querySelector('.lvl-spark');
if (!svg) return;
@@ -463,5 +510,5 @@
});
}
- Object.assign(MP, { $, $$, LOG_GROUP_NAME, SPARK_MAX, api, apiDownload, applyTheme, authMode, authRequired, barHtml, bindLogin, bindPwDlg, bindSlider, bindThemeUi, browserMode, confirmDlg, dbPct, dbg, dbgErr, debounce, deciToDb, devStyleLabel, devThemeLabel, doLogin, drawSpark, emptyState, errText, esc, fmtBytes, fmtDb, fmtTime, fmtUptime, hideLogin, homeCard, homeKv, homeUnavailable, initTheme, isAvail, levelMeterHtml, loginErr, modePill, passwordDlg, pct, pushSpark, refreshAuthGate, resetSpark, resolveMode, resolveStyle, saveSetting, setConn, showLogin, slur, sparkPeak, sparkRms, sparklineHtml, sparklinePoints, stat, state, storageDel, storageGet, storageSet, storedMode, storedStyle, toast, toastTimer, updateLevelMeter, volTimer });
+ Object.assign(MP, { $, $$, LOG_GROUP_NAME, SPARK_MAX, api, apiDownload, applyTheme, authMode, authRequired, barHtml, bindLogin, bindPwDlg, bindSlider, bindThemeUi, browserMode, confirmDlg, dbPct, dbg, dbgErr, debounce, deciToDb, devStyleLabel, devThemeLabel, doLogin, drawSpark, drawTrendSpark, emptyState, errText, esc, fmtBytes, fmtDb, fmtTime, fmtUptime, hideLogin, homeCard, homeKv, homeUnavailable, initTheme, isAvail, levelMeterHtml, loginErr, modePill, passwordDlg, pct, polylinePoints, pushSpark, pushTrend, refreshAuthGate, resetSpark, resetTrend, resolveMode, resolveStyle, saveSetting, setConn, showLogin, slur, sparkPeak, sparkRms, sparklineHtml, sparklinePoints, stat, state, storageDel, storageGet, storageSet, storedMode, storedStyle, toast, toastTimer, trendCpu, trendLoad, trendMem, trendSvgHtml, trendTemp, updateLevelMeter, volTimer });
})();
\ No newline at end of file
diff --git a/patch_v2/reader_app/.gitignore b/patch_v2/reader_app/.gitignore
index 483ad59..f79b20a 100644
--- a/patch_v2/reader_app/.gitignore
+++ b/patch_v2/reader_app/.gitignore
@@ -4,6 +4,8 @@
/os.meow.reader.mpk
/test/test_reader_core_host
/test/loaders_smoke_host
+/test/seg_smoke_host
+/test/chapter_smoke_host
/test/rdft_smoke_mipsel
/test/book_smoke_mipsel
/test/formats_smoke_mipsel
diff --git a/patch_v2/reader_app/NOTICE b/patch_v2/reader_app/NOTICE
index a7c6b8d..2446773 100644
--- a/patch_v2/reader_app/NOTICE
+++ b/patch_v2/reader_app/NOTICE
@@ -232,3 +232,26 @@ Library.
project: https://github.com/nothings/stb
Used for image decode + downsample (CBZ pages, covers).
+--------------------------------------------------------------------
+4. FreeType — Copyright (c) 1996-2002, 2006, David Turner, Robert
+ Wilhelm, and Werner Lemberg
+ license: The FreeType Project License (FTL)
+ version: 2.14.3 (fetched by build_reader.sh)
+ project: https://freetype.org
+ Used for glyph loading, glyph measurement, and rasterization
+ of the reader's text layout.
+
+ Portions of this software are copyright © 2006 The FreeType
+ Project (https://freetype.org). All rights reserved.
+
+ Full license text (shipped with the package in
+ resources/licenses/):
+ - The FreeType Project License: resources/licenses/FTL.txt
+
+--------------------------------------------------------------------
+5. zlib — Copyright (c) 1995-2024 Jean-loup Gailly and Mark Adler
+ license: zlib license (permissive)
+ project: https://zlib.net
+ Statically linked for compression support (zlib on the
+ target sysroot; also used by the build toolchain).
+
diff --git a/patch_v2/reader_app/resources/licenses/FTL.txt b/patch_v2/reader_app/resources/licenses/FTL.txt
new file mode 100644
index 0000000..b9e8cbd
--- /dev/null
+++ b/patch_v2/reader_app/resources/licenses/FTL.txt
@@ -0,0 +1,169 @@
+ The FreeType Project LICENSE
+ ----------------------------
+
+ 2006-Jan-27
+
+ Copyright 1996-2002, 2006 by
+ David Turner, Robert Wilhelm, and Werner Lemberg
+
+
+
+Introduction
+============
+
+ The FreeType Project is distributed in several archive packages;
+ some of them may contain, in addition to the FreeType font engine,
+ various tools and contributions which rely on, or relate to, the
+ FreeType Project.
+
+ This license applies to all files found in such packages, and
+ which do not fall under their own explicit license. The license
+ affects thus the FreeType font engine, the test programs,
+ documentation and makefiles, at the very least.
+
+ This license was inspired by the BSD, Artistic, and IJG
+ (Independent JPEG Group) licenses, which all encourage inclusion
+ and use of free software in commercial and freeware products
+ alike. As a consequence, its main points are that:
+
+ o We don't promise that this software works. However, we will be
+ interested in any kind of bug reports. (`as is' distribution)
+
+ o You can use this software for whatever you want, in parts or
+ full form, without having to pay us. (`royalty-free' usage)
+
+ o You may not pretend that you wrote this software. If you use
+ it, or only parts of it, in a program, you must acknowledge
+ somewhere in your documentation that you have used the
+ FreeType code. (`credits')
+
+ We specifically permit and encourage the inclusion of this
+ software, with or without modifications, in commercial products.
+ We disclaim all warranties covering The FreeType Project and
+ assume no liability related to The FreeType Project.
+
+
+ Finally, many people asked us for a preferred form for a
+ credit/disclaimer to use in compliance with this license. We thus
+ encourage you to use the following text:
+
+ """
+ Portions of this software are copyright © The FreeType
+ Project (https://freetype.org). All rights reserved.
+ """
+
+ Please replace with the value from the FreeType version you
+ actually use.
+
+
+Legal Terms
+===========
+
+0. Definitions
+--------------
+
+ Throughout this license, the terms `package', `FreeType Project',
+ and `FreeType archive' refer to the set of files originally
+ distributed by the authors (David Turner, Robert Wilhelm, and
+ Werner Lemberg) as the `FreeType Project', be they named as alpha,
+ beta or final release.
+
+ `You' refers to the licensee, or person using the project, where
+ `using' is a generic term including compiling the project's source
+ code as well as linking it to form a `program' or `executable'.
+ This program is referred to as `a program using the FreeType
+ engine'.
+
+ This license applies to all files distributed in the original
+ FreeType Project, including all source code, binaries and
+ documentation, unless otherwise stated in the file in its
+ original, unmodified form as distributed in the original archive.
+ If you are unsure whether or not a particular file is covered by
+ this license, you must contact us to verify this.
+
+ The FreeType Project is copyright (C) 1996-2000 by David Turner,
+ Robert Wilhelm, and Werner Lemberg. All rights reserved except as
+ specified below.
+
+1. No Warranty
+--------------
+
+ THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
+ KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO
+ USE, OF THE FREETYPE PROJECT.
+
+2. Redistribution
+-----------------
+
+ This license grants a worldwide, royalty-free, perpetual and
+ irrevocable right and license to use, execute, perform, compile,
+ display, copy, create derivative works of, distribute and
+ sublicense the FreeType Project (in both source and object code
+ forms) and derivative works thereof for any purpose; and to
+ authorize others to exercise some or all of the rights granted
+ herein, subject to the following conditions:
+
+ o Redistribution of source code must retain this license file
+ (`FTL.TXT') unaltered; any additions, deletions or changes to
+ the original files must be clearly indicated in accompanying
+ documentation. The copyright notices of the unaltered,
+ original files must be preserved in all copies of source
+ files.
+
+ o Redistribution in binary form must provide a disclaimer that
+ states that the software is based in part of the work of the
+ FreeType Team, in the distribution documentation. We also
+ encourage you to put an URL to the FreeType web page in your
+ documentation, though this isn't mandatory.
+
+ These conditions apply to any software derived from or based on
+ the FreeType Project, not just the unmodified files. If you use
+ our work, you must acknowledge us. However, no fee need be paid
+ to us.
+
+3. Advertising
+--------------
+
+ Neither the FreeType authors and contributors nor you shall use
+ the name of the other for commercial, advertising, or promotional
+ purposes without specific prior written permission.
+
+ We suggest, but do not require, that you use one or more of the
+ following phrases to refer to this software in your documentation
+ or advertising materials: `FreeType Project', `FreeType Engine',
+ `FreeType library', or `FreeType Distribution'.
+
+ As you have not signed this license, you are not required to
+ accept it. However, as the FreeType Project is copyrighted
+ material, only this license, or another one contracted with the
+ authors, grants you the right to use, distribute, and modify it.
+ Therefore, by using, distributing, or modifying the FreeType
+ Project, you indicate that you understand and accept all the terms
+ of this license.
+
+4. Contacts
+-----------
+
+ There are two mailing lists related to FreeType:
+
+ o freetype@nongnu.org
+
+ Discusses general use and applications of FreeType, as well as
+ future and wanted additions to the library and distribution.
+ If you are looking for support, start in this list if you
+ haven't found anything to help you in the documentation.
+
+ o freetype-devel@nongnu.org
+
+ Discusses bugs, as well as engine internals, design issues,
+ specific licenses, porting, etc.
+
+ Our home page can be found at
+
+ https://freetype.org
+
+
+--- end of FTL.TXT ---
diff --git a/patch_v2/reader_app/resources/licenses/NOTICE b/patch_v2/reader_app/resources/licenses/NOTICE
index a7c6b8d..2446773 100644
--- a/patch_v2/reader_app/resources/licenses/NOTICE
+++ b/patch_v2/reader_app/resources/licenses/NOTICE
@@ -232,3 +232,26 @@ Library.
project: https://github.com/nothings/stb
Used for image decode + downsample (CBZ pages, covers).
+--------------------------------------------------------------------
+4. FreeType — Copyright (c) 1996-2002, 2006, David Turner, Robert
+ Wilhelm, and Werner Lemberg
+ license: The FreeType Project License (FTL)
+ version: 2.14.3 (fetched by build_reader.sh)
+ project: https://freetype.org
+ Used for glyph loading, glyph measurement, and rasterization
+ of the reader's text layout.
+
+ Portions of this software are copyright © 2006 The FreeType
+ Project (https://freetype.org). All rights reserved.
+
+ Full license text (shipped with the package in
+ resources/licenses/):
+ - The FreeType Project License: resources/licenses/FTL.txt
+
+--------------------------------------------------------------------
+5. zlib — Copyright (c) 1995-2024 Jean-loup Gailly and Mark Adler
+ license: zlib license (permissive)
+ project: https://zlib.net
+ Statically linked for compression support (zlib on the
+ target sysroot; also used by the build toolchain).
+