diff --git a/src/commands/app/list.ts b/src/commands/app/list.ts index bebc898..37f6ed8 100644 --- a/src/commands/app/list.ts +++ b/src/commands/app/list.ts @@ -13,6 +13,7 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi as initSystemWebapi, getSystemList } from '../../webapi/system.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface AppItem { id?: string @@ -28,38 +29,60 @@ interface AppItem { interface ListOpts { keyword?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildAppListCommand(): Command { const cmd = new Command('list') .description('列出所有应用 (JNPF 多 app 生命周期, v3.0+ 走 webapi/system 镜像)') .option('--keyword ', '按名称/编码模糊搜索') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - // v3.0+ P0: webapi 镜像 (替代直接 c.get('/system/System')) - await initSystemWebapi(c) - const raw = (await getSystemList({ - keyword: opts.keyword, - currentPage: 1, - pageSize: 50, - })) as { list?: AppItem[] } | AppItem[] - // web 端 defHttp shim 已解构 {code, msg, data}, 但 getSystemList 可能返回数组或 {list} - const list: AppItem[] = Array.isArray(raw) ? raw : (raw?.list || []) - if (opts.json) { - printJson({ list }) - return - } - log.info(`共 ${list.length} 个应用`) - console.log('ID FULL_NAME ENCODE DEL') - console.log('-'.repeat(85)) - for (const d of list) { - const id = String(d.id || '').padEnd(30) - const name = String(d.fullName || '').padEnd(23) - const code = String(d.enCode || '').padEnd(21) - const del = d.hasDelete ? 'yes' : 'no' - console.log(`${id}${name}${code}${del}`) - } + + await wrapCommand({ + command: 'app list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + // v3.0+ P0: webapi 镜像 (替代直接 c.get('/system/System')) + await initSystemWebapi(c) + const raw = (await getSystemList({ + keyword: opts.keyword, + currentPage: 1, + pageSize: 50, + })) as { list?: AppItem[] } | AppItem[] + // web 端 defHttp shim 已解构 {code, msg, data}, 但 getSystemList 可能返回数组或 {list} + const list: AppItem[] = Array.isArray(raw) ? raw : (raw?.list || []) + const summary = { + keyword: opts.keyword, + total: list.length, + } + if (opts.json) { + printJson({ list }) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个应用`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'DEL'], + list.map((d) => [ + String(d.id || ''), + String(d.fullName || ''), + String(d.enCode || ''), + d.hasDelete ? 'yes' : 'no', + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`app list 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { purpose: '列出所有应用 (JNPF 多 app 生命周期, 不同于当前登录 appCode). v3.0+ 走 webapi/system.getSystemList', diff --git a/src/commands/bigscreen/list.ts b/src/commands/bigscreen/list.ts index 496c938..cc63333 100644 --- a/src/commands/bigscreen/list.ts +++ b/src/commands/bigscreen/list.ts @@ -14,7 +14,7 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi, loadVisualData } from '../../webapi/visualdata.ts' -import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface ListOpts { keyword?: string @@ -26,62 +26,54 @@ export function buildBigscreenListCommand(): Command { const cmd = new Command('list') .description('列出大屏 (大屏设计器产物)') .option('--keyword ', '按名称/编码模糊搜索') - .option('--verbose', '完整输出 (含 API 调用过程日志)', false) - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { // 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON setupOutputFilter(opts) const c = await JnpfClient.fromToken() - const startTime = Date.now() - let cmdError: string | undefined - let cmdSummary: Record = {} - try { - // v0.14+ webapi 化 (走 /api/blade-visual/visual/list, 真大屏端点 — jnpf-visualdata 微服务) - // 注意: web 端 baseURL=window.$website.url='/api/blade-visual', 跟 v0.13 §8.1 写的 '/api/visual/*' 不一致 - await initWebapi(c) - // web 端 getList(params) → axios request(method='get', url=baseUrl+'/list', params) - // params 是 query string. web 端字段名: current/size/title (不是 keyword) - // axios shim 已 unwrap envelope + 包成 {data: }, 所以 r.data = 后端 data 字段 - const r = (await loadVisualData.getList({ - title: opts.keyword, - current: 1, - size: 50, - })) as { data?: { records?: Record[]; total?: number; current?: number; size?: number } } - const list = r.data?.records || [] - cmdSummary = { keyword: opts.keyword, total: list.length, serverTotal: r.data?.total || 0 } + await wrapCommand({ + command: 'bigscreen list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + // v0.14+ webapi 化 (走 /api/blade-visual/visual/list, 真大屏端点 — jnpf-visualdata 微服务) + // 注意: web 端 baseURL=window.$website.url='/api/blade-visual', 跟 v0.13 §8.1 写的 '/api/visual/*' 不一致 + await initWebapi(c) + // web 端 getList(params) → axios request(method='get', url=baseUrl+'/list', params) + // params 是 query string. web 端字段名: current/size/title (不是 keyword) + // axios shim 已 unwrap envelope + 包成 {data: }, 所以 r.data = 后端 data 字段 + const r = (await loadVisualData.getList({ + title: opts.keyword, + current: 1, + size: 50, + })) as { data?: { records?: Record[]; total?: number; current?: number; size?: number } } + const list = r.data?.records || [] + const summary = { keyword: opts.keyword, total: list.length, serverTotal: r.data?.total || 0 } - if (opts.json) { - printJson(r.data) - return + if (opts.json) { + printJson(r.data) + return ctx.success(summary) + } + log.info(`共 ${list.length} 张大屏 (total=${r.data?.total || 0})`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'CATEGORY'], + list.map((d) => [ + String(d.id || ''), + String(d.fullName || ''), + String(d.enCode || ''), + String(d.category || ''), + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`bigscreen list 失败: ${(e as Error).message?.slice(0, 200)}`) } - log.info(`共 ${list.length} 张大屏 (total=${r.data?.total || 0})`) - console.log('ID FULL_NAME ENCODE CATEGORY') - console.log('-'.repeat(90)) - for (const d of list) { - const id = String(d.id || '').padEnd(30) - const name = String(d.fullName || '').padEnd(23) - const code = String(d.enCode || '').padEnd(21) - const cat = String(d.category || '') - console.log(`${id}${name}${code}${cat}`) - } - } catch (e) { - cmdError = (e as Error).message?.slice(0, 200) - log.error(`bigscreen list 失败: ${cmdError}`) - throw e - } finally { - // v2.1+ (2026-07-21): 落 CommandLog (L3) - printCommandEnd({ - command: 'bigscreen list', - appCode: c.appCode, - result: cmdError ? 'failure' : 'success', - error: cmdError, - summary: cmdSummary, - duration_ms: Date.now() - startTime, - verbose: opts.verbose, - json: opts.json, - }) - } + }) }) installHelpHook(cmd, { purpose: '列出大屏 (大屏设计器产物)', diff --git a/src/commands/portal/list.ts b/src/commands/portal/list.ts index 36b4aad..8a2a8da 100644 --- a/src/commands/portal/list.ts +++ b/src/commands/portal/list.ts @@ -12,41 +12,65 @@ import { JnpfClient } from '../../core/client.ts' import { installHelpHook } from '../../core/help.ts' import { log, printJson } from '../../core/log.ts' import { initWebapi as initPortalWebapi, loadPortal } from '../../webapi/portal.ts' +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c interface ListOpts { keyword?: string json?: boolean + /** v2.1+ (2026-07-21): --verbose, addOutputOptions 注入 */ + verbose?: boolean } export function buildPortalListCommand(): Command { const cmd = new Command('list') .description('列出门户 (门户设计器产物)') .option('--keyword ', '按名称/编码模糊搜索') - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: ListOpts) => { + setupOutputFilter(opts) const c = await JnpfClient.fromToken() - await initPortalWebapi(c) - // 镜像 web getPortalList(data): 返回 { data: list, total, ... } - // webapi getPortalList 已 unwrap: 返回 { pagination, list } 直接 - const r = (await loadPortal.getPortalList({ - keyword: opts.keyword, - })) as { pagination?: { total?: number }; list?: Record[] } - const list = r.list || [] - const total = r.pagination?.total ?? list.length - if (opts.json) { - printJson(r) - return - } - log.info(`共 ${list.length} 个门户 (pagination.total=${total})`) - console.log('ID FULL_NAME ENCODE CATEGORY') - console.log('-'.repeat(90)) - for (const d of list) { - const id = String(d.id || '').padEnd(30) - const name = String(d.fullName || '').padEnd(23) - const code = String(d.enCode || '').padEnd(21) - const cat = String(d.category || '') - console.log(`${id}${name}${code}${cat}`) - } + + await wrapCommand({ + command: 'portal list', + appCode: c.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + await initPortalWebapi(c) + // 镜像 web getPortalList(data): 返回 { data: list, total, ... } + // webapi getPortalList 已 unwrap: 返回 { pagination, list } 直接 + const r = (await loadPortal.getPortalList({ + keyword: opts.keyword, + })) as { pagination?: { total?: number }; list?: Record[] } + const list = r.list || [] + const total = r.pagination?.total ?? list.length + const summary = { + keyword: opts.keyword, + total, + returned: list.length, + } + if (opts.json) { + printJson(r) + return ctx.success(summary) + } + log.info(`共 ${list.length} 个门户 (pagination.total=${total})`) + log.printRawTable( + ['ID', 'FULL_NAME', 'ENCODE', 'CATEGORY'], + list.map((d) => [ + String(d.id || ''), + String(d.fullName || ''), + String(d.enCode || ''), + String(d.category || ''), + ]), + ) + ctx.success(summary) + } catch (e) { + ctx.fail(`portal list 失败: ${(e as Error).message?.slice(0, 200)}`) + } + }) }) installHelpHook(cmd, { purpose: '列出门户 (门户设计器产物)',