zcw-shared 2.4.0 → 2.8.0

package/dist/vue-hooks/dom/useDraggable.d.ts

@@ -1,5 +1,5 @@
 import type { Ref } from 'vue';
-import type { HTMLElement, Document, MouseEvent, TouchEvent } from '../../../references/dom.d';
+import type { Document, MouseEvent, TouchEvent } from '../../../references/dom.d';
 import type { Window } from '../../../references/browser.d';
 import type { VueCompositionAPI } from '../../../types/vue.d';
 export interface Position {
@@ -11,9 +11,14 @@ export interface DraggableEnvironment {
     removeEventListener: Document['removeEventListener'];
     body: Document['body'];
     requestAnimationFrame: Window['requestAnimationFrame'];
-    vue: Pick<Required<VueCompositionAPI>, 'ref' | 'onMounted' | 'onUnmounted'>;
+    vue: Pick<Required<VueCompositionAPI>, 'ref' | 'onMounted' | 'onUnmounted'> & {
+        watch?: NonNullable<VueCompositionAPI['watch']>;
+    };
 }
 export interface UseDraggableOptions {
+    enabled?: boolean;
+    handleRef?: Ref<any>;
+    ignoreInteractiveInHandle?: boolean;
     onDragStart?: (position: Position, event: MouseEvent | TouchEvent) => void;
     onDrag?: (position: Position, event: MouseEvent | TouchEvent) => void;
     onDragEnd?: (position: Position, event: MouseEvent | TouchEvent) => void;
@@ -24,7 +29,7 @@ export interface UseDraggableOptions {
         maxY?: number;
     };
 }
-export declare function useDraggable(targetRef: Ref<HTMLElement | null>, options: UseDraggableOptions | undefined, env: DraggableEnvironment): {
+export declare function useDraggable(targetRef: Ref<any>, options: UseDraggableOptions | undefined, env: DraggableEnvironment): {
     position: Ref<Position, Position>;
     isDragging: Ref<boolean, boolean>;
     style: Ref<Record<string, string>, Record<string, string>>;

package/dist/vue-hooks/dom/useDraggable.js

@@ -1,5 +1,16 @@
 export function useDraggable(targetRef, options = {}, env) {
-    const { onDragStart, onDrag, onDragEnd, boundary } = options;
+    const { enabled = true, handleRef, ignoreInteractiveInHandle = false, onDragStart, onDrag, onDragEnd, boundary } = options;
+    let attachedListenEl = null;
+    let positionInited = false;
+    let stopWatch;
+    const isInteractiveTarget = (evTarget) => {
+        if (evTarget == null || typeof evTarget !== 'object')
+            return false;
+        const el = evTarget;
+        if (typeof el.closest !== 'function')
+            return false;
+        return Boolean(el.closest('button, a, input, textarea, select, [contenteditable="true"], [data-cw-dialog-no-drag]'));
+    };
     const position = env.vue.ref({ x: 0, y: 0 });
     const isDragging = env.vue.ref(false);
     let startX = 0;
@@ -34,7 +45,9 @@ export function useDraggable(targetRef, options = {}, env) {
         updateStyle();
     };
     const onMouseDown = (e) => {
-        if (!targetRef.value)
+        if (!enabled || !targetRef.value)
+            return;
+        if (ignoreInteractiveInHandle && isInteractiveTarget(e.target))
             return;
         e.stopPropagation();
         e.preventDefault();
@@ -78,7 +91,9 @@ export function useDraggable(targetRef, options = {}, env) {
         env.removeEventListener('mouseup', onMouseUp);
     };
     const onTouchStart = (e) => {
-        if (!targetRef.value || e.touches.length !== 1)
+        if (!enabled || !targetRef.value || e.touches.length !== 1)
+            return;
+        if (ignoreInteractiveInHandle && isInteractiveTarget(e.target))
             return;
         e.stopPropagation();
         isDragging.value = true;
@@ -131,25 +146,48 @@ export function useDraggable(targetRef, options = {}, env) {
         env.removeEventListener('touchend', onTouchEnd);
         env.removeEventListener('touchcancel', onTouchEnd);
     };
-    env.vue.onMounted(() => {
-        const element = targetRef.value;
-        if (!element)
+    const detachHandleListeners = () => {
+        if (attachedListenEl) {
+            attachedListenEl.removeEventListener('mousedown', onMouseDown);
+            attachedListenEl.removeEventListener('touchstart', onTouchStart);
+            attachedListenEl = null;
+        }
+    };
+    const attachHandleListeners = () => {
+        detachHandleListeners();
+        if (!enabled)
+            return;
+        const moveEl = targetRef.value;
+        if (!moveEl)
             return;
-        const rect = element.getBoundingClientRect();
-        const offsetParent = element.offsetParent || env.body;
-        const parentRect = offsetParent.getBoundingClientRect();
-        initialX = rect.left - parentRect.left;
-        initialY = rect.top - parentRect.top;
-        position.value = { x: initialX, y: initialY };
-        element.addEventListener('mousedown', onMouseDown);
-        element.addEventListener('touchstart', onTouchStart);
+        const listenEl = (handleRef?.value ?? moveEl);
+        if (!listenEl)
+            return;
+        if (!positionInited) {
+            const rect = moveEl.getBoundingClientRect();
+            const offsetParent = moveEl.offsetParent || env.body;
+            const parentRect = offsetParent.getBoundingClientRect();
+            initialX = rect.left - parentRect.left;
+            initialY = rect.top - parentRect.top;
+            position.value = { x: initialX, y: initialY };
+            updateStyle();
+            positionInited = true;
+        }
+        attachedListenEl = listenEl;
+        listenEl.addEventListener('mousedown', onMouseDown);
+        listenEl.addEventListener('touchstart', onTouchStart);
+    };
+    env.vue.onMounted(() => {
+        attachHandleListeners();
+        if (env.vue.watch) {
+            stopWatch = env.vue.watch(() => [targetRef.value, handleRef?.value ?? targetRef.value], () => {
+                attachHandleListeners();
+            }, { flush: 'post' });
+        }
     });
     env.vue.onUnmounted(() => {
-        const element = targetRef.value;
-        if (element) {
-            element.removeEventListener('mousedown', onMouseDown);
-            element.removeEventListener('touchstart', onTouchStart);
-        }
+        stopWatch?.();
+        detachHandleListeners();
         cleanup();
     });
     return {

package/dist/vue-hooks/dom/useDraggable.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDraggable.js","sourceRoot":"","sources":["../../../src/vue-hooks/dom/useDraggable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDraggable.js","sourceRoot":"","sources":["../../../src/vue-hooks/dom/useDraggable.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zcw-shared",
-  "version": "2.4.0",
+  "version": "2.8.0",
   "files": [
     "references",
     "dist",
@@ -27,6 +27,7 @@
     "@cloudbase/manager-node": "^4.3.2",
     "cos-nodejs-sdk-v5": "^2.14.4",
     "dexie": "^4.3.0",
+    "dotenv": "^17.2.3",
     "jszip": "^3.10.1",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
@@ -82,6 +83,7 @@
     "./functions/android/integrateSinaLogin": "./dist/functions/android/integrateSinaLogin.js",
     "./functions/android/integrateThirdPartyModule": "./dist/functions/android/integrateThirdPartyModule.js",
     "./functions/android/integrateUniAppNativePlugin": "./dist/functions/android/integrateUniAppNativePlugin.js",
+    "./functions/android/integrateUniPushAndroid": "./dist/functions/android/integrateUniPushAndroid.js",
     "./functions/android/integrateUniverifyLogin": "./dist/functions/android/integrateUniverifyLogin.js",
     "./functions/android/integrateWechatLogin": "./dist/functions/android/integrateWechatLogin.js",
     "./functions/android/integrateWechatShare": "./dist/functions/android/integrateWechatShare.js",
@@ -108,6 +110,7 @@
     "./functions/auth/parseJwtPayload": "./dist/functions/auth/parseJwtPayload.js",
     "./functions/browser/detectBrowser": "./dist/functions/browser/detectBrowser.js",
     "./functions/browser/detectOS": "./dist/functions/browser/detectOS.js",
+    "./functions/browser/isElectron": "./dist/functions/browser/isElectron.js",
     "./functions/browser/isMobile": "./dist/functions/browser/isMobile.js",
     "./functions/browser/isWeChat": "./dist/functions/browser/isWeChat.js",
     "./functions/color/colorValidation": "./dist/functions/color/colorValidation.js",
@@ -150,7 +153,9 @@
     "./functions/dom/getMainAxisFlip": "./dist/functions/dom/getMainAxisFlip.js",
     "./functions/dom/getRelativePosition": "./dist/functions/dom/getRelativePosition.js",
     "./functions/dom/getViewportRect": "./dist/functions/dom/getViewportRect.js",
+    "./functions/dom/isTextTruncated": "./dist/functions/dom/isTextTruncated.js",
     "./functions/dom/isValidPlacement": "./dist/functions/dom/isValidPlacement.js",
+    "./functions/dom/localFileInput": "./dist/functions/dom/localFileInput.js",
     "./functions/dom/pickFile": "./dist/functions/dom/pickFile.js",
     "./functions/fake/generateFakeBankCard": "./dist/functions/fake/generateFakeBankCard.js",
     "./functions/fake/generateFakeBusinessLicense": "./dist/functions/fake/generateFakeBusinessLicense.js",
@@ -174,6 +179,7 @@
     "./functions/hybrid/postBridgeMessage": "./dist/functions/hybrid/postBridgeMessage.js",
     "./functions/hybrid/validateBridgeMessage": "./dist/functions/hybrid/validateBridgeMessage.js",
     "./functions/im/formatImChatConversationListTime": "./dist/functions/im/formatImChatConversationListTime.js",
+    "./functions/im/parseImMentionSegments": "./dist/functions/im/parseImMentionSegments.js",
     "./functions/image/compressImageToWidth": "./dist/functions/image/compressImageToWidth.js",
     "./functions/image/compressToTargetSize": "./dist/functions/image/compressToTargetSize.js",
     "./functions/image/generateFavIcon": "./dist/functions/image/generateFavIcon.js",
@@ -197,6 +203,7 @@
     "./functions/ios/integrateQQShare": "./dist/functions/ios/integrateQQShare.js",
     "./functions/ios/integrateSinaShare": "./dist/functions/ios/integrateSinaShare.js",
     "./functions/ios/integrateThirdPartyModule": "./dist/functions/ios/integrateThirdPartyModule.js",
+    "./functions/ios/integrateUniPushIOS": "./dist/functions/ios/integrateUniPushIOS.js",
     "./functions/ios/integrateWechatOauth": "./dist/functions/ios/integrateWechatOauth.js",
     "./functions/ios/integrateWechatShare": "./dist/functions/ios/integrateWechatShare.js",
     "./functions/ios/modifyInfoPlistKeyValue": "./dist/functions/ios/modifyInfoPlistKeyValue.js",
@@ -368,6 +375,7 @@
     "./vue-hooks/browser/useShare": "./dist/vue-hooks/browser/useShare.js",
     "./vue-hooks/browser/useVibration": "./dist/vue-hooks/browser/useVibration.js",
     "./vue-hooks/browser/useWechatJSSDK": "./dist/vue-hooks/browser/useWechatJSSDK.js",
+    "./vue-hooks/dom/useAppendToBody": "./dist/vue-hooks/dom/useAppendToBody.js",
     "./vue-hooks/dom/useAutoUpdate": "./dist/vue-hooks/dom/useAutoUpdate.js",
     "./vue-hooks/dom/useClickOutside": "./dist/vue-hooks/dom/useClickOutside.js",
     "./vue-hooks/dom/useDraggable": "./dist/vue-hooks/dom/useDraggable.js",
@@ -408,6 +416,7 @@
     "./types/hybrid": "./types/hybrid.d.ts",
     "./types/im-api": "./types/im-api.d.ts",
     "./types/im-chat": "./types/im-chat.d.ts",
+    "./types/im-message-display": "./types/im-message-display.d.ts",
     "./types/ios-build": "./types/ios-build.d.ts",
     "./types/music": "./types/music.d.ts",
     "./types/notification": "./types/notification.d.ts",
@@ -446,6 +455,7 @@
     "docs:dev": "vitepress dev docs",
     "docs:build": "NODE_OPTIONS=--max-old-space-size=4096 vitepress build docs",
     "docs:preview": "vitepress preview docs",
+    "deploy:cos:build": "NODE_OPTIONS=--max-old-space-size=4096 vitepress build docs",
     "deploy:tcb": "npx tsx scripts/deploy-tcb.ts",
     "deploy:cos": "npx tsx scripts/deploy-cos.ts"
   }

package/references/dom.d.ts

@@ -25,13 +25,15 @@ export interface Node {
 }
 
 // DOM 元素接口 - 按继承关系组织
+// parentNode 不可标为可选：undefined 会破坏与 Node 的结构兼容，导致 appendChild/removeChild 参数报错
 export interface Element extends Node {
-  parentNode?: Element | null
+  parentNode: Element | null
 }
 
 export interface HTMLElement extends Element {
-  appendChild(node: Element): Element
-  removeChild(node: Element): Element
+  /** 与 `lib.dom` 一致，避免与全局 `HTMLElement` 结构不兼容 */
+  appendChild<T extends Node>(node: T): T
+  removeChild<T extends Node>(child: T): T
   getBoundingClientRect(): {
     width: number
     height: number
@@ -44,6 +46,8 @@ export interface HTMLElement extends Element {
   removeEventListener(event: string, handler: EventListener, options?: boolean | EventListenerOptions): void
   clientWidth: number
   clientHeight: number
+  scrollWidth: number
+  scrollHeight: number
   offsetLeft: number
   offsetTop: number
   offsetWidth: number
@@ -96,6 +100,7 @@ export interface HTMLInputElement extends HTMLElement {
   value: string
   style: CSSStyleDeclaration
   setAttribute(name: string, value: string): void
+  removeAttribute(name: string): void
   hasAttribute(name: string): boolean
 }
 

package/types/im-api.d.ts

@@ -3,7 +3,6 @@
  *
  * - **终端 UI 展示**见 `zcw-shared/types/im-chat`（`ChatMessage` / `ChatConversation`，camelCase、含 sender 对象等），
  *   与本文件的 `ImApiMessage` 在设计上不同：前者是列表/气泡视图模型，后者是接口契约。
- * - 需要兼顾旧代码时可用别名 `ImMessage`、`Conversation` 等（均指向 ImApi*）。
  */
 
 /** 出站投递状态（与送达已读 status 分离）；库内成功落库行一般为 success */
@@ -13,6 +12,18 @@ export type ImOutboundStatus =
   | 'failed'
   | 'success'
 
+/** ImProxy 落库：用户停止或模型/流异常时的助手消息标记 */
+export interface ImApiAiReplyExtra {
+  state: 'aborted'
+  /** 人为停止生成 vs 模型侧/网络/解析等异常 */
+  abort_source: 'user' | 'model'
+  /** 正文是否为已生成片段（非仅占位句） */
+  partial: boolean
+  reply_to_message_id: string
+  run_id: string
+  error_message?: string
+}
+
 /** HTTP / WS 中的消息对象（与 `ImService` 返回结构一致） */
 export interface ImApiMessage {
   /** PostgreSQL BIGSERIAL 为 number；CloudBase 等可能为十六进制字符串文档 id */
@@ -20,7 +31,7 @@ export interface ImApiMessage {
   sender_id: string
   conversation_id: string
   content: string
-  type: 'text' | 'image' | 'file' | 'system' | 'audio' | 'video'
+  type: 'text' | 'markdown' | 'image' | 'file' | 'system' | 'audio' | 'video'
   status: 'sent' | 'delivered' | 'read'
   /** 发送方在该会话中的第几条（由服务端写入；旧数据可由接口补算） */
   sender_seq?: number
@@ -34,6 +45,10 @@ export interface ImApiMessage {
   send_retry_count?: number
   /** 出站状态；仅终端离线队列或后续异步扩展用库内非 success */
   outbound_status?: ImOutboundStatus
+  /**
+   * 可含 attachments、im_display（多段展示，见 types/im-message-display）等。
+   * 智能体中断回复：`extra_data.ai_reply` 见 {@link ImApiAiReplyExtra}。
+   */
   extra_data?: Record<string, any>
   created_at?: string
   updated_at?: string
@@ -44,6 +59,8 @@ export interface ImApiConversation {
   id: string
   type: 'private' | 'group'
   name?: string
+  /** 群公告（可选；私聊通常为空） */
+  announcement?: string | null
   avatar?: string
   members: string[]
   last_message?: ImApiMessage
@@ -57,6 +74,10 @@ export interface ImRegisterMediaOutboundResult {
   attachmentId: string
   message: ImApiMessage
   upload: { bucket: string; path: string }
+  /**
+   * 与 IM 约定一致的上传方式说明（先 POST /oss/signed-upload-url，再对 signedUrl 做 PUT 原始字节，勿 multipart）
+   */
+  uploadInstructions?: string
 }
 
 /** 仓储驱动返回的 `im_messages` 行（字段宽松，需经归一函数转为 `ImApiMessage`） */
@@ -82,8 +103,11 @@ export interface ImDbConversationRow {
   id: string
   type: string
   name?: string
+  announcement?: string | null
   avatar?: string
   members?: string[]
+  /** 冗余：最后一条可见消息主键（PostgreSQL BIGSERIAL；文档库可为字符串） */
+  last_message_id?: string | number | null
   created_at?: string
   updated_at?: string
 }

package/types/im-chat.d.ts

@@ -4,9 +4,18 @@
  * 与接口 JSON 形状不同，后者见 `zcw-shared/types/im-api`（`ImApiMessage` / `ImApiConversation`）。
  * 在仓库层做 `ImApiMessage` → `ChatMessage` 的映射即可两端共类型、各层语义清晰。
  */
+import type { ImMessageDisplaySpec } from './im-message-display'
+
+/** 与 `ImMessage.extra_data.attachments[]` 对齐的列表项（会话消息内联附件） */
+export interface ChatInlineAttachmentListItem {
+  url: string
+  name?: string
+  mimeType?: string
+}
+
 export interface ChatMessage {
   id: string
-  type: 'text' | 'image' | 'video' | 'voice' | 'file'
+  type: 'text' | 'markdown' | 'image' | 'video' | 'voice' | 'file'
   content: string
   timestamp: Date
   sender: {
@@ -25,18 +34,40 @@ export interface ChatMessage {
   mediaUploadStatus?: 'uploading' | 'uploaded' | 'failed'
   /** 本地上传 0–100；仅在前端写入，用于 OSS 上传进度 */
   mediaUploadProgress?: number
+  /**
+   * 媒体出站细分阶段：登记接口尚未返回时没有 OSS 字节进度，勿与实际上传百分比混淆。
+   * server_storage：客户端向 COS 直传时的占位阶段（如 PUT 已发出、等待完成回调）。
+   */
+  mediaUploadPhase?: 'registering' | 'oss' | 'server_storage'
   /** 终端幂等 id，与 ImApiMessage.client_message_id 一致 */
   clientMessageId?: string
   /** 媒体登记时原名（content 尚为空时用于文件气泡标题） */
   mediaOriginalFileName?: string
+  /** 文件体积（字节），来自 extra_data.size_bytes 等 */
+  mediaFileSizeBytes?: number
   /** 图片/视频缩略图 URL；存在时列表气泡优先展示缩略图 */
   mediaThumbnailUrl?: string
   /** 气泡内展示用的原始像素宽（如 extra_data.location_x / image_width） */
   mediaWidth?: number
   /** 气泡内展示用的原始像素高 */
   mediaHeight?: number
+  /**
+   * 与正文同条的附件数量（ImMessage.extra_data.attachments，非独立 image/file 气泡）
+   */
+  inlineAttachmentCount?: number
+  /** 与 `extra_data.attachments` 同步的只读列表（用于附件列表弹窗等） */
+  inlineAttachments?: ChatInlineAttachmentListItem[]
+  /**
+   * `extra_data.im_display`：多段气泡（图文混排等）；存在时气泡层优先按块渲染。
+   */
+  displaySpec?: ImMessageDisplaySpec
+  /** 智能体代理失败且服务端声明可重试时，由前端写入，展示「点击重试」 */
+  agentProxyRetryable?: boolean
+  /** 代理失败时的错误文案（如库不可用、ENOTFOUND） */
+  agentProxyError?: string
 }
 
+
 export interface ChatConversation {
   id: string
   name: string
@@ -46,4 +77,14 @@ export interface ChatConversation {
   timestamp?: Date
   unreadCount?: number
   isOnline?: boolean
+  /** 与 ImConversation.type 对齐，用于会话列表「群聊」等筛选 */
+  kind?: 'private' | 'group'
+  /** 群成员人数（仅群聊） */
+  memberCount?: number
+  /** 群公告（仅群聊） */
+  announcement?: string
+  /** 会话置顶（仅客户端 IndexedDB，右键菜单） */
+  pinned?: boolean
+  /** 消息免打扰：列表不展示未读红点（仅客户端） */
+  muted?: boolean
 }

package/types/im-message-display.d.ts

@@ -0,0 +1,89 @@
+/**
+ * IM 消息「多段展示」：落库在 `ImApiMessage.extra_data.im_display`。
+ *
+ * - **v1**：结构化块 kind + 固定字段
+ * - **v2**：配置驱动，按路径从 JSON 取值填入各渲染器 props
+ */
+
+/** ---------- v1 ---------- */
+
+/** 已解析的展示块 */
+export type ImDisplayBlock =
+  | { kind: 'text'; text: string }
+  | { kind: 'image'; url: string; width?: number; height?: number }
+  | { kind: 'video'; url: string; posterUrl?: string; width?: number; height?: number }
+  | { kind: 'file'; url: string; name?: string; sizeBytes?: number }
+
+export interface ImMessageDisplaySpecV1 {
+  version: 1
+  blocks: ImDisplayBlock[]
+}
+
+/** v1 模板（version 省略或 1） */
+export type ImDisplayBlockTemplate =
+  | { kind: 'text'; text: string }
+  | {
+      kind: 'image'
+      urlPath: string[]
+      widthPath?: string[]
+      heightPath?: string[]
+    }
+  | {
+      kind: 'video'
+      urlPath: string[]
+      posterPath?: string[]
+      widthPath?: string[]
+      heightPath?: string[]
+    }
+  | { kind: 'file'; urlPath: string[]; namePath?: string[]; sizePath?: string[] }
+
+export interface ImToolMessageFormatConfigV1 {
+  version: 1
+  blocks: ImDisplayBlockTemplate[]
+}
+
+/** ---------- v2（配置驱动） ---------- */
+
+/** 单 prop 绑定：路径 + 可选强制类型 */
+export type ImPropBinding =
+  | string[]
+  | {
+      path: string[]
+      /** 默认 string；url 会校验 http(s)；positiveInt 为 1～65536 像素或非负整数（文件大小用 number） */
+      coerce?: 'string' | 'url' | 'positiveInt' | 'number'
+    }
+
+/**
+ * 渲染器 type 白名单（与 vue-ui 注册表一致）：
+ * - im.text → content
+ * - im.markdown → content（Markdown 源文本，由 CwMarkdown 渲染）
+ * - im.image → thumbnailUrl, width?, height?
+ * - im.video → videoUrl, thumbnailUrl?, width?, height?
+ * - im.file → downloadUrl, originalFileName?, fileSizeBytes?
+ */
+export interface ImToolMessageFormatBlockV2 {
+  type: string
+  propsFromResult: Record<string, ImPropBinding>
+}
+
+export interface ImToolMessageFormatConfigV2 {
+  version: 2
+  blocks: ImToolMessageFormatBlockV2[]
+}
+
+/** 写入 im_display 的块（props 已展开） */
+export interface ImFormattedDisplayBlock {
+  type: string
+  props: Record<string, unknown>
+}
+
+export interface ImMessageDisplaySpecV2 {
+  version: 2
+  blocks: ImFormattedDisplayBlock[]
+}
+
+export type ImMessageDisplaySpec = ImMessageDisplaySpecV1 | ImMessageDisplaySpecV2
+
+export type ImToolMessageFormatConfig =
+  | ImToolMessageFormatConfigV1
+  | ImToolMessageFormatConfigV2

package/types/uniapp-android-build.d.ts

@@ -108,6 +108,34 @@ export interface FacebookLoginOptions {
   oauthAarPath: string
 }
 
+/**
+ * uniPush 配置（Android 离线打包，HBuilderX 3.99+ 默认 maven 方式）
+ *
+ * @see https://nativesupport.dcloud.net.cn/AppDocs/usemodule/androidModuleConfig/push.html
+ */
+export interface UniPushAndroidOptions {
+  /** uniPush AppId */
+  appId: string
+  /** uniPush AppKey */
+  appKey: string
+  /** uniPush AppSecret */
+  appSecret: string
+  /** maven（默认）：根工程加个推仓 + gtsdk/gtc-dcloud；aar：仅拷贝本地 aar */
+  integrationMode?: 'maven' | 'aar'
+  /** aar 模式：SDK/libs 等待拷贝的 aar/jar 列表 */
+  aarLibFiles?: Array<{ source: string; targetName?: string }>
+  /** maven 模式额外 implementation 整行 */
+  extraMavenDependencies?: string[]
+  /** maven 是否写入文档中的空厂商 manifestPlaceholders 键，默认 true */
+  includeDefaultOemPlaceholderKeys?: boolean
+  /** 是否同步 dcloud_properties（Push/unipush/push service），默认 true */
+  syncDcloudProperties?: boolean
+  /** 是否添加 unipush deep link 的 intent-filter，默认 true */
+  addUniPushDeepLinkIntentFilter?: boolean
+  /** 是否添加 OPPO 推送 intent-filter，默认 false */
+  addOppoPushIntentFilter?: boolean
+}
+
 /**
  * ShareTrace配置
  */
@@ -195,6 +223,8 @@ export interface UniAppAndroidBuildOptions extends AndroidBuildOptions {
   facebookLogin?: FacebookLoginOptions
   /** ShareTrace配置（可选） */
   shareTrace?: ShareTraceOptions
+  /** uniPush 配置（可选） */
+  uniPush?: UniPushAndroidOptions
   /** UniApp 原生插件配置列表（可选） */
   nativePlugins?: UniAppNativePluginOptions[]
 }
@@ -229,4 +259,5 @@ export interface UniAppAndroidPluginBuildOptions extends Omit<UniAppAndroidBuild
   googleLogin?: never
   facebookLogin?: never
   shareTrace?: never
+  uniPush?: never
 }

package/types/uniapp-ios-build.d.ts

@@ -78,6 +78,30 @@ export interface SinaShareIOSOptions {
   weiboSDKBundlePath?: string
 }
 
+/**
+ * uniPush 配置（iOS 离线打包）
+ *
+ * @see https://nativesupport.dcloud.net.cn/AppDocs/usemodule/iOSModuleConfig/push.html#unipush
+ */
+export interface UniPushIOSOptions {
+  /** Info.plist 根节点 `getui` 字典（与开发者后台字段一致，如 appid、appkey、appsecret） */
+  getui: Record<string, string>
+  /** liblibPush.a 路径 */
+  liblibPushPath?: string
+  /** libUniPush.a 路径 */
+  libUniPushPath?: string
+  /** GTSDK.xcframework 路径 */
+  gtSdkXcframeworkPath?: string
+  /** 是否同步 PandoraApi.bundle/feature.plist 中的 Push 节点为文档标准结构，默认 true */
+  syncFeaturePlistPush?: boolean
+  /** PandoraApi.bundle 目录；默认 `{projectPath}/{projectName}/PandoraApi.bundle` */
+  pandoraApiBundlePath?: string
+  /** 是否自动添加文档中的系统 tbd 与框架（含弱链接 UserNotifications），默认 true */
+  includeDefaultSystemDependencies?: boolean
+  extraSystemFrameworks?: string[]
+  extraSystemTbdLibraries?: string[]
+}
+
 /**
  * Camera/Gallery 配置（iOS）
  */
@@ -152,6 +176,8 @@ export interface UniAppIOSBuildOptions extends IOSBuildOptions {
   sinaShare?: SinaShareIOSOptions
   /** Camera/Gallery 配置（可选） */
   cameraGallery?: CameraGalleryIOSOptions
+  /** uniPush 配置（可选） */
+  uniPush?: UniPushIOSOptions
   /** UniApp 原生插件配置列表（可选） */
   nativePlugins?: UniAppNativePluginIOSOptions[]
   /** 源码目录名称（可选，如果 .xcodeproj 文件名与实际源码目录不一致时需要指定，默认从 .xcodeproj 推断） */

package/types/user.d.ts

@@ -6,7 +6,8 @@ export interface User {
   wechat_openid?: string
   wechat_unionid?: string
   wechat_nickname?: string
-  wechat_avatar?: string
+  /** 用户头像 URL（微信登录等会写入微信头像） */
+  avatar?: string
   created_at?: string
   updated_at?: string
   // 兼容旧字段名

package/dist/functions/async/sleep.d.ts

@@ -1,5 +0,0 @@
-import type { setTimeout } from '../../../references/timer.d';
-export interface SleepDeps {
-    setTimeout: typeof setTimeout;
-}
-export declare function sleep(ms: number, deps: SleepDeps): Promise<void>;

package/dist/functions/async/sleep.js

@@ -1,6 +0,0 @@
-export function sleep(ms, deps) {
-    return new Promise(resolve => {
-        deps.setTimeout(resolve, ms);
-    });
-}
-//# sourceMappingURL=sleep.js.map

package/dist/functions/async/sleep.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../../src/functions/async/sleep.ts"],"names":[],"mappings":"AA+BA,MAAM,UAAU,KAAK,CAAC,EAAU,EAAE,IAAe;IAC/C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAC9B,CAAC,CAAC,CAAA;AACJ,CAAC"}