weaver-work-cli 0.1.29 → 0.1.31

package/dist/shortcuts/invoice/operations/reim.js

@@ -24,6 +24,26 @@ function optionalDate(value, name) {
     }
     return text;
 }
+function formatUtcDate(date) {
+    const y = date.getUTCFullYear();
+    const m = String(date.getUTCMonth() + 1).padStart(2, '0');
+    const d = String(date.getUTCDate()).padStart(2, '0');
+    return `${y}-${m}-${d}`;
+}
+/** 按日历日加减，跨月、跨年按公历进位。 */
+export function addCalendarDays(isoDate, offsetDays) {
+    const [year, month, day] = isoDate.split('-').map(Number);
+    return formatUtcDate(new Date(Date.UTC(year, (month ?? 1) - 1, (day ?? 1) + offsetDays)));
+}
+/** 东八区日历日。 */
+export function shanghaiCalendarDate(offsetDays = 0, now = new Date()) {
+    const today = new Intl.DateTimeFormat('en-CA', { timeZone: 'Asia/Shanghai' }).format(now);
+    return offsetDays === 0 ? today : addCalendarDays(today, offsetDays);
+}
+/** 不传结束日用东八区当天；无论是否传入，发给接口前都再加 1 天。 */
+function requestCreateDateEnd(value) {
+    return addCalendarDays(optionalDate(value, 'cusCreateDateEnd') ?? shanghaiCalendarDate(0), 1);
+}
 function responseData(value) {
     return value && typeof value === 'object' && 'data' in value ? value.data : value;
 }
@@ -38,6 +58,32 @@ function resultEnvelope(value, workflowName) {
         },
     };
 }
+const REQUEST_LIST_ITEM_FIELDS = [
+    'requestid',
+    'workflowid',
+    'requestname',
+    'flowStatus',
+    'creatorId',
+    'creatorName',
+    'createTime',
+];
+function projectRequestListItem(item) {
+    const source = item && typeof item === 'object' && !Array.isArray(item) ? item : {};
+    const projected = {};
+    for (const key of REQUEST_LIST_ITEM_FIELDS) {
+        if (source[key] !== undefined)
+            projected[key] = source[key];
+    }
+    return projected;
+}
+function projectRequestListResult(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return value;
+    const record = value;
+    if (!Array.isArray(record.data))
+        return value;
+    return { ...record, data: record.data.map(projectRequestListItem) };
+}
 const UNSAFE_JSON_INTEGER_ID = /("id"\s*:\s*)(-?\d{16,})(?=\s*[,}\]])/g;
 export function quoteEmployeeIdsInJsonText(text) {
     return text.replace(UNSAFE_JSON_INTEGER_ID, '$1"$2"');
@@ -177,18 +223,18 @@ export class InvoiceReimRequestsListOperation {
     async execute(input, { host }) {
         const body = {
             pageNo: integerInput(input.pageNo, 'pageNo', { min: 1, max: 10000 }),
-            pageSize: integerInput(input.pageSize, 'pageSize', { min: 1, max: 200, defaultValue: 20 }),
+            pageSize: integerInput(input.pageSize, 'pageSize', { min: 1, max: 200, defaultValue: 100 }),
         };
         for (const [key, value] of Object.entries({
             requestname: optionalString(input.requestname, 'requestname'),
             cusCreateDateStart: optionalDate(input.cusCreateDateStart, 'cusCreateDateStart'),
-            cusCreateDateEnd: optionalDate(input.cusCreateDateEnd, 'cusCreateDateEnd'),
+            cusCreateDateEnd: requestCreateDateEnd(input.cusCreateDateEnd),
         })) {
             if (value !== undefined)
                 body[key] = value;
         }
         const result = await host.invoiceRequest({ path: '/api/inc/book/getRequestListByTabId', method: 'POST', body, operation: this.name });
-        return resultEnvelope(result, 'invoice.reim.requests.list');
+        return resultEnvelope(projectRequestListResult(result), 'invoice.reim.requests.list');
     }
 }
 export class InvoiceReimWorkflowResolveOperation {
@@ -304,14 +350,30 @@ export class InvoiceReimEmployeeSuperiorsOperation {
         return employeeSuperiorsEnvelope(result);
     }
 }
+function projectFieldSearchItems(value) {
+    const raw = Array.isArray(value) ? value : [];
+    const items = [];
+    const seen = new Set();
+    for (const item of raw) {
+        const record = item && typeof item === 'object' && !Array.isArray(item) ? item : {};
+        const id = String(record.id ?? record.value ?? '').trim();
+        const name = String(record.name ?? '').trim();
+        if (!id || !name || seen.has(id))
+            continue;
+        seen.add(id);
+        items.push({ id, name, value: id });
+    }
+    return items;
+}
 export class InvoiceReimFieldSearchOperation {
     name = 'invoice.reim.field.search';
     async execute(input, { host }) {
+        const keywords = asNonEmptyString(input.keywords, 'keywords');
         const result = await host.invoiceRequest({
             path: '/api/government/formStructure/fieldRelateSearch',
             method: 'GET',
             query: {
-                keywords: asNonEmptyString(input.keywords, 'keywords'),
+                keywords,
                 fieldId: asNonEmptyString(input.fieldId, 'fieldId'),
                 formModeType: 'wf',
                 workflowId: asNonEmptyString(input.workflowId, 'workflowId'),
@@ -319,7 +381,21 @@ export class InvoiceReimFieldSearchOperation {
             },
             operation: this.name,
         });
-        return resultEnvelope(result, 'invoice.reim.field.search');
+        assertBusinessSuccess(result, 'invoice.reim.field.search_failed', '搜索关联字段失败');
+        const items = projectFieldSearchItems(responseData(result));
+        const match = items.length === 0 ? 'none' : items.length === 1 ? 'unique' : 'multiple';
+        return {
+            status: 'COMPLETE',
+            data: {
+                result,
+                data: items,
+                keywords,
+                match,
+                items,
+                selected: match === 'unique' ? items[0] : null,
+                workflow: workflow(this.name, 'COMPLETE'),
+            },
+        };
     }
 }
 export class InvoiceReimFlowCreatePrepareOperation {

package/dist/shortcuts/invoice/operations/shared.js

@@ -15,6 +15,8 @@ const LIST_FIELDS = new Set([
     'date_end',
     'create_tm_begin',
     'create_tm_end',
+    'consumption_tm_begin',
+    'consumption_tm_end',
     'payer_company',
     'buyer_company',
     'payer_taxno',
@@ -780,7 +782,9 @@ export async function listInvoices(input, host, flag) {
     };
 }
 /** 列表查询里 E10 只接受秒级 epoch 的时间字段（契约声明为 integer）。 */
-const EPOCH_FIELDS = new Set(['date_begin', 'date_end', 'create_tm_begin', 'create_tm_end']);
+const EPOCH_FIELDS = new Set(['date_begin', 'date_end', 'create_tm_begin', 'create_tm_end', 'consumption_tm_begin']);
+/** 日期字符串按当天 23:59:59（东八区）换算，已是秒级时间戳则原样透传。 */
+const EPOCH_END_OF_DAY_FIELDS = new Set(['consumption_tm_end']);
 /** 列表查询里契约声明为 integer 的标量字段。 */
 const INTEGER_FIELDS = new Set(['page_size', 'start_pos', 'req_type', 'mask', 'mext']);
 /**
@@ -788,7 +792,7 @@ const INTEGER_FIELDS = new Set(['page_size', 'start_pos', 'req_type', 'mask', 'm
  * 同时接受 `YYYY-MM-DD`（按东八区零点换算，与 `invoice.reim.candidates.list` 一致）和已是秒级 epoch 的数字/数字串，
  * 避免把字符串日期原样透传给 `/api/inc/sync` 后被打成不透明的 400 系统错误。
  */
-export function epochSeconds(value, name) {
+export function epochSeconds(value, name, options = {}) {
     if (typeof value === 'number') {
         if (Number.isInteger(value) && value >= 0)
             return value;
@@ -796,7 +800,8 @@ export function epochSeconds(value, name) {
     }
     const text = typeof value === 'string' ? value.trim() : '';
     if (DATE_PATTERN.test(text)) {
-        const seconds = Math.floor(Date.parse(`${text}T00:00:00+08:00`) / 1000);
+        const clock = options.endOfDay ? 'T23:59:59+08:00' : 'T00:00:00+08:00';
+        const seconds = Math.floor(Date.parse(`${text}${clock}`) / 1000);
         if (!Number.isFinite(seconds))
             throw invoiceValidationError('input_invalid', `${name} 不是有效日期`);
         return seconds;
@@ -809,10 +814,10 @@ export function epochSeconds(value, name) {
     throw invoiceValidationError('input_invalid', `${name} 必须是 YYYY-MM-DD 或秒级时间戳`);
 }
 /** `epochSeconds` 的可选版本：undefined / null / 空串 一律视为未传。 */
-export function optionalEpochSeconds(value, name) {
+export function optionalEpochSeconds(value, name, options = {}) {
     if (value === undefined || value === null || value === '')
         return undefined;
-    return epochSeconds(value, name);
+    return epochSeconds(value, name, options);
 }
 /** 列表查询的整数标量归一：数字串转数字，非法值就地报 input_invalid 而不是透传到 E10 变成 400。 */
 function listInteger(key, value) {
@@ -827,6 +832,8 @@ function listInteger(key, value) {
 function normalizeListField(key, value) {
     if (key === 'sreim')
         return normalizeSreim(value);
+    if (EPOCH_END_OF_DAY_FIELDS.has(key))
+        return epochSeconds(value, key, { endOfDay: true });
     if (EPOCH_FIELDS.has(key))
         return epochSeconds(value, key);
     if (INTEGER_FIELDS.has(key))

package/dist/shortcuts/meeting/host.js

@@ -110,6 +110,46 @@ export function createMeetingHost(ctx, dependencies = {}) {
         await ensureSession();
         return sessionContext;
     }
+    async function download(request) {
+        const session = await ensureSession();
+        const url = new URL(request.path, session.getBaseUrl());
+        for (const [key, value] of Object.entries(request.query ?? {})) {
+            if (value !== undefined && value !== null && String(value) !== '')
+                url.searchParams.set(key, String(value));
+        }
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), request.timeoutMs ?? 60_000);
+        try {
+            const response = await (dependencies.fetch || globalThis.fetch)(url.toString(), {
+                headers: {
+                    accept: '*/*',
+                    cookie: session.cookieHeader(),
+                    eteamsid: session.eteamsId,
+                    'user-agent': session.uaHeader(),
+                    origin: session.getBaseUrl(),
+                },
+                redirect: 'manual',
+                signal: controller.signal,
+            });
+            if (response.status === 401 || response.status === 302) {
+                throw meetingAuthError('session_expired', '登录态已失效：下载需有效登录态，请重新登录后重试', { httpStatus: response.status });
+            }
+            if (response.status !== 200) {
+                throw new MeetingCliError('api', 'download_failed', `下载失败 HTTP ${response.status}`, {
+                    code: response.status,
+                    exitCode: 1,
+                });
+            }
+            return {
+                buffer: Buffer.from(await response.arrayBuffer()),
+                contentType: response.headers.get('content-type') ?? '',
+                contentDisposition: response.headers.get('content-disposition') ?? '',
+            };
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
     async function runtime() {
         return createE10RequestRuntime(ctx, await ensureSession(), {
             interceptors: dependencies.interceptors,
@@ -117,12 +157,12 @@ export function createMeetingHost(ctx, dependencies = {}) {
         });
     }
     async function request(request) {
-        const { method, path, query, body, operation, headers: extraHeaders = {}, timeoutMs = 30_000 } = request;
+        const { method, path, query, body, formData, operation, headers: extraHeaders = {}, timeoutMs = 30_000 } = request;
         assertPath(path);
         // 标准版会议接口硬性约定（standalone skill 实测）：不能带 workflow 专用头
         // （Referer: /workflow/newflow 等），否则 400 系统错误；等价于 standalone
         // 执行器的 --simple-header（仅 Content-Type + Cookie，由 runtime 托管）。
-        const resolvedMethod = method || (body === undefined ? 'GET' : 'POST');
+        const resolvedMethod = method || (body === undefined && formData === undefined ? 'GET' : 'POST');
         let response;
         try {
             response = await (await runtime()).requestJson({
@@ -132,6 +172,8 @@ export function createMeetingHost(ctx, dependencies = {}) {
                 path,
                 query: omitEmptyQueryValues(query),
                 body,
+                // 文件上传：multipart 体由 runtime 直接交给 fetch（不设 Content-Type，交给 fetch 生成 boundary）
+                ...(formData ? { formData } : {}),
                 headers: { ...extraHeaders },
                 // 会议接口存在裸数字长 ID（如 meetingExtend.mtId / creater），超 2^53 会被
                 // JSON.parse 舍入；开启大整数保护后按字符串保留，保证 ID 回查不失真。
@@ -181,5 +223,5 @@ export function createMeetingHost(ctx, dependencies = {}) {
         }
         return response.value;
     }
-    return { request, getSession };
+    return { request, getSession, download };
 }