weaver-work-cli 0.1.33 → 0.1.38

package/dist/chunks/{chunk-6ATGWRZM.js → chunk-UZZBA6PV.js}

@@ -6,8 +6,9 @@ import {
   getActiveProfile,
   hasXiaoEEnv,
   isXiaoERuntimeAgent,
+  startFetchTiming,
   tryXiaoEUnifiedLogin
-} from "./chunk-D223PTXU.js";
+} from "./chunk-OJQUJZQF.js";
 import {
   CliError
 } from "./chunk-LUSPKZKY.js";
@@ -35,6 +36,81 @@ var AUTH_REQUIRED_MARKERS = [
   "not logged in",
   "not login"
 ];
+var REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+var LOGIN_REDIRECT_MARKERS = [
+  "login",
+  "passport",
+  "sso",
+  "oauth",
+  "signin",
+  "sign-in",
+  "authorize",
+  "authn",
+  "atrust",
+  "checkticket"
+];
+var FILE_REDIRECT_MARKERS = [
+  "fileservice",
+  "/file/download",
+  "/file/remotedownload",
+  "/remotedownload/",
+  "/api/file/",
+  "/download/",
+  "aliyuncs.com",
+  "myqcloud.com",
+  "qiniucdn.com",
+  "qbox.me",
+  "jdcloud.com",
+  "amazonaws.com",
+  "blob.core.windows.net",
+  "ctyunapi.cn",
+  "hiclouds.com",
+  "minio",
+  "s3.",
+  "obs.",
+  "ks3"
+];
+var FILE_REQUEST_PATH_MARKERS = [
+  "/api/file/",
+  "/file/download",
+  "/remotedownload/",
+  "/fileservice",
+  "/download"
+];
+var APP_SHELL_REDIRECT = /(?:\.html?(?:[?#]|$)|#\/|wui\/)/u;
+function isE10RedirectStatus(status) {
+  return REDIRECT_STATUSES.has(status);
+}
+function redirectTarget(location) {
+  const raw = location.trim().toLowerCase();
+  if (!raw) return "";
+  try {
+    const url = new URL(raw, "https://e10.invalid");
+    return `${url.hostname}${url.pathname}${url.hash}`.toLowerCase();
+  } catch {
+    return raw.split("?")[0];
+  }
+}
+function classifyE10Redirect(response) {
+  if (!isE10RedirectStatus(response.status)) return "other";
+  const target = redirectTarget(response.headers?.get("location") || "");
+  if (!target) return "other";
+  if (LOGIN_REDIRECT_MARKERS.some((marker) => target.includes(marker))) return "login";
+  if (FILE_REDIRECT_MARKERS.some((marker) => target.includes(marker))) return "file";
+  const requestPath = (response.requestPath || "").toLowerCase();
+  if (requestPath && FILE_REQUEST_PATH_MARKERS.some((marker) => requestPath.includes(marker)) && !APP_SHELL_REDIRECT.test(target)) {
+    return "file";
+  }
+  return "other";
+}
+function isE10FileRedirect(response) {
+  return classifyE10Redirect(response) === "file";
+}
+function isE10SessionExpiredResponse(response) {
+  if (response.status === 401) return true;
+  if (isE10RedirectStatus(response.status)) return !isE10FileRedirect(response);
+  return false;
+}
 var recoveryInFlight = /* @__PURE__ */ new Map();
 function asRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -70,7 +146,7 @@ function responseText(response) {
   return "";
 }
 function isE10AuthenticationRequired(response) {
-  if (response.status === 401 || response.status === 302) return true;
+  if (isE10SessionExpiredResponse(response)) return true;
   if (responseCodes(response.value).some((code) => AUTH_REQUIRED_CODES.has(code))) return true;
   const text = responseText(response).toLowerCase();
   if (!text) return false;
@@ -139,6 +215,7 @@ async function requireE10Session(ctx, load = {}) {
 // src/internal/e10/request-runtime.ts
 var DEFAULT_TIMEOUT_MS = 3e4;
 var DEFAULT_BIG_INT_STRINGS = true;
+var MAX_DOWNLOAD_REDIRECTS = 3;
 var RESERVED_HEADERS = [
   "authorization",
   "cookie",
@@ -198,12 +275,12 @@ var E10RequestRuntime = class {
       }
       stripReservedHeaders(mutable.headers);
       const requestEteamsId = this.session.eteamsId;
-      let parsed = await this.executeRequest(mutable, request.trustedHeaders);
-      if (!mutable.streamBody && isE10AuthenticationRequired(parsed) && await this.recoverExpiredSession(requestEteamsId)) {
-        parsed = await this.executeRequest(mutable, request.trustedHeaders);
+      let attempt = await this.executeRequest(mutable, request.trustedHeaders);
+      if (!mutable.streamBody && !attempt.fromFileRedirect && isE10AuthenticationRequired(authenticationProbe(mutable, attempt.parsed)) && await this.recoverExpiredSession(requestEteamsId)) {
+        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);
       throw error;
@@ -214,13 +291,77 @@ var E10RequestRuntime = class {
     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
-    );
+    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)) {
+      throw new E10ApiError(
+        "network",
+        "download_file_service_denied",
+        `\u6587\u4EF6\u670D\u52A1\u62D2\u7EDD\u4E0B\u8F7D\uFF08HTTP ${followed.response.status}\uFF09\uFF0C\u76F4\u94FE\u53EF\u80FD\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u91CD\u8BD5\u4E0B\u8F7D`,
+        {
+          retryable: true,
+          exitCode: 4 /* 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) {
     if (this.session.eteamsId && this.session.eteamsId !== requestEteamsId) return true;
@@ -352,6 +493,7 @@ var E10RequestRuntime = class {
   async fetchWithTimeout(url, init, timeoutMs) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), timeoutMs);
+    const stopFetchTiming = startFetchTiming();
     try {
       return await this.fetchFn(url, { ...init, signal: controller.signal });
     } catch (error) {
@@ -368,6 +510,7 @@ var E10RequestRuntime = class {
       });
     } finally {
       clearTimeout(timer);
+      stopFetchTiming?.();
     }
   }
   async readResponse(response, responseType, bigIntStrings = DEFAULT_BIG_INT_STRINGS, maxResponseBytes, timeoutMs = DEFAULT_TIMEOUT_MS) {
@@ -399,6 +542,25 @@ var E10RequestRuntime = class {
 function parseJsonPreservingBigInts(text) {
   return JSON.parse(quoteLargeJsonIntegers(text));
 }
+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 "";
+  }
+}
 var LONG_INTEGER_MIN_DIGITS = 16;
 var JSON_STRING_OR_NUMBER = /"(?:[^"\\]|\\.)*"|-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?/g;
 var LONG_DIGIT_RUN = /\d{16}/;
@@ -504,6 +666,7 @@ function cloneForHook(value) {
 }
 
 export {
+  isE10SessionExpiredResponse,
   requireE10Session,
   E10ApiError,
   createE10RequestRuntime

package/dist/chunks/{chunk-GFPXQIY2.js → chunk-VRYHGG6O.js}

@@ -19,7 +19,7 @@ import {
 } from "./chunk-AJ62BGAW.js";
 import {
   clearInvoiceTokenForSession
-} from "./chunk-EEWPQE3O.js";
+} from "./chunk-FUWVHMVV.js";
 import {
   E10AuthSession,
   XIAOE_AGENT_TYPE,
@@ -48,7 +48,7 @@ import {
   setActiveProfile,
   switchActiveProfile,
   tryXiaoEUnifiedLogin
-} from "./chunk-D223PTXU.js";
+} from "./chunk-OJQUJZQF.js";
 import {
   CliError,
   isCliError,

package/dist/chunks/{chunk-NHA62QD7.js → chunk-XJY7G4DD.js}

@@ -12,7 +12,7 @@ import {
   meetingValidationError,
   queryBody,
   toIdCsv
-} from "./chunk-MEEFGWTM.js";
+} from "./chunk-ELYDWBZJ.js";
 
 // src/shortcuts/meeting/operations/eb/conflict.ts
 var ACTIVE_MT_STATUS = "1,2,8,9";
@@ -296,7 +296,7 @@ var ebMeetingWritePreflight = async ({ endpoint, payload, args, env, extras }) =
     const items = rawMembers.split(/[,;，；]+/u).map((item) => item.trim()).filter((item) => item !== "");
     const nameLike = items.filter((item) => !/^\d+$/u.test(item));
     if (nameLike.length > 0) {
-      const { resolveMemberIdsByName } = await import("./schedule-XPFBHPCV.js");
+      const { resolveMemberIdsByName } = await import("./schedule-NIJBTYDO.js");
       const idsByName = await resolveMemberIdsByName(env, nameLike);
       const resolved = items.map((item) => idsByName.get(item) ?? item);
       payload.mainTable.hrm_members = [...new Set(resolved)].join(",");
@@ -610,7 +610,7 @@ async function findCommonFreeSlots(env, input) {
   const scheduleItems = [];
   if (includeSchedule) {
     try {
-      const { runScheduleConflictFlow, parseScheduleConflictMessage, resolveMemberIdsByName } = await import("./schedule-XPFBHPCV.js");
+      const { runScheduleConflictFlow, parseScheduleConflictMessage, resolveMemberIdsByName } = await import("./schedule-NIJBTYDO.js");
       const dayBegin = new Date(rangeStart.getFullYear(), rangeStart.getMonth(), rangeStart.getDate(), 0, 0, 0, 0);
       const dayEnd = new Date(rangeStart.getFullYear(), rangeStart.getMonth(), rangeStart.getDate(), 23, 59, 0, 0);
       const flow = await runScheduleConflictFlow(env, {

package/dist/chunks/{chunk-VBCFFFGT.js → chunk-Z32KWY6G.js}

@@ -5,7 +5,7 @@ import {
   ebBusinessSuccess,
   meetingSuccess,
   meetingValidationError
-} from "./chunk-MEEFGWTM.js";
+} from "./chunk-ELYDWBZJ.js";
 
 // src/shortcuts/meeting/operations/env.ts
 import { existsSync } from "node:fs";
@@ -109,6 +109,9 @@ async function probeAndPersist(host, ctx, knownEbError, options = {}) {
 }
 async function resolveMeetingEnvMode(host, ctx, options = {}) {
   const session = await host.getSession();
+  if (options.refresh !== true && String(process.env.WEAVER_MEETING_LOCK_MODE ?? "").trim().toLowerCase() === "eb") {
+    return { mode: "eb", smokePath: EB_SMOKE_PATH, fromCache: false, assumed: true, locked: true };
+  }
   if (options.refresh === true) {
     return { ...await probeAndPersist(host, ctx), fromCache: false };
   }

package/dist/chunks/{conflict-SFNEVJY5.js → conflict-BQZEQ4SP.js}

@@ -7,8 +7,8 @@ import {
   findCommonFreeSlots,
   meetingEbConflictOperations,
   runEbConflictCheck
-} from "./chunk-NHA62QD7.js";
-import "./chunk-MEEFGWTM.js";
+} from "./chunk-XJY7G4DD.js";
+import "./chunk-ELYDWBZJ.js";
 import "./chunk-LUSPKZKY.js";
 import "./chunk-BUSC6UAE.js";
 export {