weaver-work-cli 0.1.36 → 0.1.39

package/dist/internal/e10/request-runtime.js

@@ -1,8 +1,10 @@
 import { CliError, ExitCode } from '../../core/errors.js';
-import { isE10AuthenticationRequired, recoverXiaoEAuthSession, sameE10SessionIdentity, } from './auth-recovery.js';
+import { classifyE10Redirect, isE10AuthenticationRequired, recoverXiaoEAuthSession, sameE10SessionIdentity, } from './auth-recovery.js';
 import { startFetchTiming } from './fetch-timing.js';
 const DEFAULT_TIMEOUT_MS = 30_000;
 const DEFAULT_BIG_INT_STRINGS = true;
+/** 下载直传最多跟几跳：E10 -> 对象存储通常 1 跳，留一点余量但不允许成环。 */
+const MAX_DOWNLOAD_REDIRECTS = 3;
 const RESERVED_HEADERS = [
     'authorization',
     'cookie',
@@ -63,16 +65,18 @@ export class E10RequestRuntime {
             }
             stripReservedHeaders(mutable.headers);
             const requestEteamsId = this.session.eteamsId;
-            let parsed = await this.executeRequest(mutable, request.trustedHeaders);
+            let attempt = await this.executeRequest(mutable, request.trustedHeaders);
             if (!mutable.streamBody
-                && isE10AuthenticationRequired(parsed)
+                // 已交接给文件服务的响应不是 E10 的接口回答，登录态不该由它判定。
+                && !attempt.fromFileRedirect
+                && isE10AuthenticationRequired(authenticationProbe(mutable, attempt.parsed))
                 && await this.recoverExpiredSession(requestEteamsId)) {
                 // Authentication rejection is a definitive pre-business failure. Retry
                 // exactly once with the new session; never retry transport/partial errors.
-                parsed = await this.executeRequest(mutable, request.trustedHeaders);
+                attempt = await this.executeRequest(mutable, request.trustedHeaders);
             }
-            await this.runAfterResponse(mutable, this.sessionContext(), parsed);
-            return parsed;
+            await this.runAfterResponse(mutable, this.sessionContext(), attempt.parsed);
+            return attempt.parsed;
         }
         catch (error) {
             await this.runOnError(mutable, this.sessionContext(), error);
@@ -84,7 +88,74 @@ export class E10RequestRuntime {
         const headers = this.composeHeaders(request, trustedHeaders);
         const init = this.buildFetchInit(request, headers);
         const response = await this.fetchWithTimeout(url, init, request.timeoutMs);
-        return this.readResponse(response, request.responseType, request.bigIntStrings, request.maxResponseBytes, request.timeoutMs);
+        // 二进制下载：E10 常以 302 把文件交接给文件服务/对象存储。这里直接跟过去
+        // 取字节，既不会把「文件流」当成登录失效，也不会触发无谓的重新登录。
+        const followed = request.responseType === 'binary'
+            ? await this.followDownloadRedirect(response, request, url)
+            : { response, followed: false };
+        if (followed.followed && (followed.response.status === 401 || followed.response.status === 403)) {
+            // 这是文件服务对直链的回答（签名过期/无权限），与 E10 登录态无关：
+            // 报清楚，别让调用方误以为要重新登录。
+            throw new E10ApiError('network', 'download_file_service_denied', `文件服务拒绝下载（HTTP ${followed.response.status}），直链可能已过期，请重试下载`, {
+                retryable: true,
+                exitCode: ExitCode.NetworkError,
+                details: { status: followed.response.status },
+            });
+        }
+        return {
+            parsed: await this.readResponse(followed.response, request.responseType, request.bigIntStrings, request.maxResponseBytes, request.timeoutMs),
+            fromFileRedirect: followed.followed,
+        };
+    }
+    /**
+     * 跟随下载直传的 3xx。仅当跳转目标是文件服务（非登录页）时才跟随，最多
+     * `MAX_DOWNLOAD_REDIRECTS` 跳；登录类跳转原样返回，交给上层认证恢复处理。
+     * 凭证规则：同源才继续带 Cookie/eteamsid，跨域（对象存储）不带任何鉴权头。
+     */
+    async followDownloadRedirect(response, request, requestUrl) {
+        const baseOrigin = safeOrigin(this.session.getBaseUrl());
+        let current = response;
+        let currentUrl = requestUrl;
+        let followed = false;
+        for (let hop = 0; hop < MAX_DOWNLOAD_REDIRECTS; hop += 1) {
+            const kind = classifyE10Redirect({
+                status: current.status,
+                headers: current.headers,
+                requestPath: request.path,
+            });
+            if (kind !== 'file')
+                return { response: current, followed };
+            const location = current.headers.get('location');
+            if (!location)
+                return { response: current, followed };
+            let next;
+            try {
+                next = new URL(location, currentUrl);
+            }
+            catch {
+                return { response: current, followed };
+            }
+            if (!/^https?:$/u.test(next.protocol))
+                return { response: current, followed };
+            const sameOrigin = baseOrigin !== '' && safeOrigin(next.toString()) === baseOrigin;
+            current = await this.fetchWithTimeout(next, this.buildDownloadRedirectInit(sameOrigin), request.timeoutMs);
+            currentUrl = next;
+            followed = true;
+        }
+        return { response: current, followed };
+    }
+    buildDownloadRedirectInit(sameOrigin) {
+        const headers = {
+            Accept: 'application/octet-stream, */*',
+            'User-Agent': this.session.uaHeader(),
+        };
+        if (sameOrigin) {
+            headers.Cookie = this.attachSessionTicket
+                ? this.session.cookieHeaderWithSessionTicket()
+                : this.session.cookieHeader();
+            headers.eteamsid = this.session.eteamsId;
+        }
+        return { method: 'GET', headers, redirect: 'manual' };
     }
     async recoverExpiredSession(requestEteamsId) {
         // Another concurrent request may already have refreshed the shared session
@@ -130,6 +201,7 @@ export class E10RequestRuntime {
             timeoutMs: request.timeoutMs || DEFAULT_TIMEOUT_MS,
             responseType: request.responseType || 'json',
             bigIntStrings: request.bigIntStrings ?? DEFAULT_BIG_INT_STRINGS,
+            followRedirects: request.followRedirects === true,
         };
     }
     sessionContext() {
@@ -199,7 +271,8 @@ export class E10RequestRuntime {
         const init = {
             method: request.method,
             headers,
-            redirect: 'manual',
+            // 文件下载允许跟随重定向（302 → 文件服务）；其余请求保持 manual 以便识别登录跳转
+            redirect: request.followRedirects ? 'follow' : 'manual',
         };
         if (request.streamBody) {
             init.body = request.streamBody;
@@ -276,6 +349,31 @@ export class E10RequestRuntime {
 export function parseJsonPreservingBigInts(text) {
     return JSON.parse(quoteLargeJsonIntegers(text));
 }
+/**
+ * 组装认证探测入参。二进制响应不能把文件字节交给关键词扫描（乱码里出现
+ * 「login」会误判成登录失效），只保留状态码与跳转目标；同时带上请求路径，
+ * 让「下载接口 -> 文件服务」的 3xx 能被识别为交接而不是失效。
+ */
+function authenticationProbe(request, response) {
+    if ('content' in response) {
+        return { status: response.status, headers: response.headers, requestPath: request.path };
+    }
+    return {
+        status: response.status,
+        headers: response.headers,
+        requestPath: request.path,
+        text: response.text,
+        value: response.value,
+    };
+}
+function safeOrigin(rawUrl) {
+    try {
+        return new URL(rawUrl).origin.toLowerCase();
+    }
+    catch {
+        return '';
+    }
+}
 const LONG_INTEGER_MIN_DIGITS = 16;
 // 一趟扫描把 JSON 拆成「字符串字面量」与「数字」两类 token：字符串整体跳过，
 // 数字只在它是纯整数且位数够长时补引号。逐字符拼串在 MB 级响应上要 100 ms 以上，

package/dist/shortcuts/archive/host.js

@@ -2,6 +2,7 @@ import { E10_SESSION_EXPIRED_MESSAGE } from '../../internal/e10/auth/messages.js
 import { requireE10Session } from '../../internal/e10/context.js';
 import { getActiveProfile } from '../../internal/e10/auth/session.js';
 import { E10ApiError, createE10RequestRuntime } from '../../internal/e10/request-runtime.js';
+import { isE10SessionExpiredResponse } from '../../internal/e10/auth-recovery.js';
 import { ArchiveCliError, archiveAuthError, archiveNetworkError, archiveValidationError, } from './errors.js';
 function inferProfile(ctx) {
     const options = ctx.getGlobalOptions();
@@ -134,6 +135,8 @@ export function createArchiveHost(ctx, dependencies = {}) {
                 formData: multipart,
                 headers: { 'X-Requested-With': 'XMLHttpRequest', ...extraHeaders },
                 timeoutMs,
+                // 下载接口常 302 重定向到文件服务/CDN，需跟随，避免被误判为登录失效
+                followRedirects: true,
             })
             : await rt.requestJson({
                 module: 'archive',
@@ -151,7 +154,7 @@ export function createArchiveHost(ctx, dependencies = {}) {
     }
     async function request(request) {
         const response = await doRequest(request, false).catch((error) => mapRuntimeNetworkError(error));
-        if (response.status === 401 || response.status === 302) {
+        if (isE10SessionExpiredResponse(response)) {
             throw archiveAuthError('session_expired', E10_SESSION_EXPIRED_MESSAGE, { httpStatus: response.status });
         }
         if (response.parseError) {
@@ -182,7 +185,7 @@ export function createArchiveHost(ctx, dependencies = {}) {
     }
     async function requestBinary(request) {
         const response = await doRequest(request, true).catch((error) => mapRuntimeNetworkError(error));
-        if (response.status === 401 || response.status === 302) {
+        if (isE10SessionExpiredResponse(response)) {
             throw archiveAuthError('session_expired', E10_SESSION_EXPIRED_MESSAGE, { httpStatus: response.status });
         }
         if (response.status < 200 || response.status >= 300) {

package/dist/shortcuts/archive/manifest.js

@@ -25,7 +25,7 @@ export const archiveManifest = {
     rules: [
         '写操作（*.apply）必须先执行同名的 prepare 拿到 continuation，再带 confirm=true 执行 apply；CLI 用 --yes 表示确认。',
         '借阅单下载为异步任务：apply 会轮询打包进度，完成后把 zip 保存到当前用户的「下载」目录（可用 output 指定路径）。',
-        '发起借阅/续借只返回流程创建页 URL，CLI 不自动打开浏览器，需由用户或上层在浏览器中打开。',
+        '发起借阅/续借只返回流程创建页 URL，CLI 不自动打开浏览器；应以 Markdown 超链接（a 标签）返回，由客户端决定打开方式。',
         '借阅车/借阅单列表优先自定义接口，接口未发布时自动回退 ebuilder 列表链路，回退时行的字段更少（提供 fields/display）。',
     ],
     operations: archiveOperations,

package/dist/shortcuts/archive/operations/borrow-list.js

@@ -194,7 +194,19 @@ const borrowListDetail = {
         }
         const session = await host.getSession();
         const detail = await fetchBorrowDetail(host, session.userId, String(dataId));
-        return archiveSuccess('archive.borrow-list.detail', detail, { count: detail.details.length });
+        // 档案题名补可点击链接：arcDangan.id 形如 {档案ID}_{表单ID}，拼成与全文检索一致的 archiveView
+        const root = String(session?.baseUrl ?? '').replace(/\/+$/, '');
+        const details = detail.details.map((item) => ({
+            ...item,
+            arcDangan: item.arcDangan.map((arc) => {
+                const [arcId, arcFormId = ''] = String(arc.id ?? '').split('_');
+                if (!arcId || !arcFormId)
+                    return arc;
+                const viewPath = `/sp/custom/archive/archiveView?arcId=${arcId}&arcFormId=${arcFormId}`;
+                return { ...arc, viewPath, url: root ? `${root}${viewPath}` : viewPath };
+            }),
+        }));
+        return archiveSuccess('archive.borrow-list.detail', { ...detail, details }, { count: details.length });
     },
 };
 export const borrowListOperations = [borrowListList, borrowListDetail];

package/dist/shortcuts/archive/operations/flow-url.js

@@ -67,7 +67,7 @@ function flowResult(action, baseUrl, workflowId, params, extra = {}) {
         workflowId,
         url: buildFlowUrl(baseUrl, workflowId, params),
         params,
-        hint: 'CLI 不自动打开浏览器，请在浏览器中打开该 URL 完成后续填写与提交',
+        hint: 'CLI 不自动打开浏览器，也不要执行 open/start 自动打开；请把 url 以 Markdown 超链接（a 标签）返回，由客户端决定打开方式',
     }, { wrote: true });
 }
 const flowBorrowCarPrepare = {