@hlw-uni/mp-vue 2.1.51 → 2.1.54

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "2.1.51",
+    "version": "2.1.54",
     "description": "hlw-uni 小程序运行时 — Vue 组件 + composables + theme + http + 工具集（合并自原 mp-core）",
     "main": "dist/index.js",
     "module": "dist/index.mjs",
@@ -32,6 +32,7 @@
     },
     "devDependencies": {
         "@dcloudio/types": "^3.4.30",
+        "@dcloudio/uni-app": "3.0.0-5000720260410001",
         "@types/md5": "^2.3.6",
         "@types/node": "^20.19.39",
         "@vitejs/plugin-vue": "^5.2.4",

package/src/app.ts

@@ -1,34 +1,12 @@
 /**
  * useApp - 应用根上下文
- * 生命周期、Pinia、拦截器、hlw 注入全部收敛在此。
+ * 生命周期、Pinia、hlw 注入收敛在此。
  */
 import { createSSRApp, type App, type Component } from 'vue';
 import { hlw } from '@/hlw';
-import { http } from '@/composables/http';
-import { useDevice } from '@/composables/device';
-import md5 from 'md5';
-import type { ApiResponse, RequestConfig } from '@/composables/http/types';
+import { useRequest } from '@/composables/request';
 
 let _installed = false;
-let _interceptorCleanup: Array<() => void> = [];
-
-export interface InterceptorOptions {
-    /** API 基础地址 */
-    baseURL?: string;
-    /** 自动注入 Token 的 header 键名 */
-    tokenHeader?: string;
-    /** Token 来源函数 */
-    getToken?: () => string;
-    /** 登录失效时的处理函数 */
-    onLogout?: () => void;
-    /** 接口业务错误码是否自动 toast */
-    autoToastError?: boolean;
-}
-
-const _defaultOpts: InterceptorOptions = {
-    tokenHeader: 'x-token',
-    autoToastError: true,
-};
 
 /**
  * 创建 uni-app 应用入口工具。
@@ -66,123 +44,5 @@ export function useApp() {
         return createApp;
     }
 
-    return { install, use, hlw, http };
-}
-
-/**
- * 提取 URL 中的 query 参数，排序后拼接为签名字符串。
- */
-function buildSignString(url: string): string {
-    try {
-        const [path, query] = url.split('?');
-        if (!query) return path + '&';
-        const params = query.split('&').filter(Boolean);
-        params.sort();
-        return params.join('&') + '&';
-    } catch {
-        return url;
-    }
-}
-
-/** sig 签名密钥。 */
-let _sigSecret = '';
-
-/**
- * 注册默认请求、响应和错误拦截器。
- */
-export function setupInterceptors(options: InterceptorOptions & { sigSecret?: string } = {}) {
-    const opts = { ..._defaultOpts, ...options };
-    if (opts.sigSecret) _sigSecret = opts.sigSecret;
-    if (opts.baseURL) http.setBaseURL(opts.baseURL);
-
-    _interceptorCleanup.forEach((dispose) => dispose());
-    _interceptorCleanup = [];
-
-    /**
-     * 请求拦截：注入设备信息、签名和 token。
-     */
-    const offRequest = http.onRequest((config: RequestConfig) => {
-        // GET 请求：把 cfg.data 合并到 url query，并清空 cfg.data。
-        // 否则 uni.request 会在 sig 之后再把 data 自动拼到 URL，导致后端 raw query
-        // 多了未参与签名的字段（如 id/cate_id），sig 校验必然失败。
-        const method = (config.method ?? 'GET').toUpperCase();
-        if (method === 'GET' && config.data && typeof config.data === 'object') {
-            const qs = Object.entries(config.data as Record<string, unknown>)
-                .filter(([, v]) => v !== undefined && v !== null)
-                .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(String(v))}`)
-                .join('&');
-            if (qs) {
-                config.url = config.url + (config.url.includes('?') ? '&' : '?') + qs;
-            }
-            config.data = undefined;
-        }
-
-        const device = useDevice();
-        if (device.value) {
-            const d = device.value;
-            const query = [
-                ['appid', d.appid],
-                ['device_brand', d.device_brand],
-                ['device_model', d.device_model],
-                ['device_id', d.device_id],
-                ['device_type', d.device_type],
-                ['device_orientation', d.device_orientation],
-                ['platform', d.platform],
-                ['system', d.system],
-                ['os', d.os],
-                ['version', d.version],
-                ['sdk_version', d.sdk_version],
-                ['host_name', d.host_name],
-                ['host_version', d.host_version],
-                ['host_language', d.host_language],
-                ['language', d.language],
-                ['app_version', d.app_version],
-                ['app_version_code', d.app_version_code],
-                ['screen_width', String(d.screen_width)],
-                ['screen_height', String(d.screen_height)],
-            ]
-                .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v ?? '')}`)
-                .join('&');
-            config.url = config.url + (config.url.includes('?') ? '&' : '?') + query;
-            config.headers = { ...config.headers, 'X-Appid': d.appid };
-        }
-
-        if (_sigSecret) {
-            const signStr = buildSignString(config.url);
-            const sig = md5(signStr + _sigSecret);
-            config.url = config.url + '&sig=' + sig;
-        }
-
-        if (opts.getToken) {
-            const token = opts.getToken();
-            if (token) {
-                config.headers = {
-                    ...config.headers,
-                    [opts.tokenHeader!]: token,
-                };
-            }
-        }
-        return config;
-    });
-
-    /**
-     * 响应拦截：处理业务错误提示。
-     */
-    const offResponse = http.onResponse((res: ApiResponse<unknown>) => {
-        if (opts.autoToastError && res.code !== 1) {
-            uni.showToast({ title: res.info || '请求失败', icon: 'none' });
-        }
-        return res;
-    });
-
-    /**
-     * 错误拦截：处理未授权场景。
-     */
-    const offError = http.onError((err: Error) => {
-        if (err.message.includes('401')) {
-            opts.onLogout?.();
-        }
-    });
-
-    _interceptorCleanup = [offRequest, offResponse, offError];
+    return { install, use, hlw, request: useRequest() };
 }

package/src/components/hlw-ad/index.vue

@@ -1,7 +1,7 @@
 <!--
     HlwAd — 小程序展示型广告原子组件
     ------------------------------------------------------------------
-    用法（业务方从 mp-core useAd().config 取对应 unit_id 传入）：
+    用法（业务方从自己的接口配置取对应 unit_id 传入）：
         hlw-ad type="banner" :unit-id="config.banner_unit_id"
         hlw-ad type="grid"   :unit-id="config.grid_unit_id"
         hlw-ad type="custom" :unit-id="config.custom_unit_id"
@@ -11,7 +11,7 @@
       - grid / custom → ad-custom unit-id="..."（原生模板广告）
 
     video / reward / popup 不走这个组件：
-      - reward / popup → useAd().showReward() / showPopup()
+      - reward / popup → 业务方自行调用小程序广告 API
       - video（贴片）须嵌在 video 标签内，业务侧自己用 <ad type="video">
 -->
 <template>

package/src/components/hlw-page/index.vue

@@ -35,7 +35,7 @@
 <script setup lang="ts">
 /**
  * hlw-page 不再负责主题 style 注入。
- * 业务页面请在 template 顶部放 `<page-meta :page-style="themePageStyle" />`（配合 useThemePageStyle）
+ * 业务项目可通过 @hlw-uni/mp-vite-plugin 的 themePageMeta 自动注入 page-meta。
  * —— 这样才能把 CSS 变量注入到 page 根，scroll-view 等小程序原生组件内部也能继承。
  *
  * provide("hlwPageScroll") —— 给 hlw-back-top 等子组件用：

package/src/composables/device/index.ts

@@ -1,8 +1,7 @@
 /**
- * useDevice — 设备信息 composable（单例缓存）
- * 使用微信 3.7.0+ 推荐的新 API 替代废弃的 getSystemInfoSync
+ * useDevice - 设备信息与接口 query
  */
-import { ref } from "vue";
+import { useUtils } from "../utils";
 
 export interface DeviceInfo {
     /** 小程序 appId */
@@ -63,106 +62,134 @@ export interface DeviceInfo {
     version: string;
 }
 
-const _info = ref<DeviceInfo | null>(null);
+export type DeviceQueryInfo = Pick<DeviceInfo,
+    | "appid"
+    | "device_brand"
+    | "device_model"
+    | "device_id"
+    | "device_type"
+    | "device_orientation"
+    | "platform"
+    | "system"
+    | "os"
+    | "version"
+    | "sdk_version"
+    | "host_name"
+    | "host_version"
+    | "host_language"
+    | "language"
+    | "app_version"
+    | "app_version_code"
+    | "screen_width"
+    | "screen_height"
+>;
 
-/**
- * 安全调用 uni API，失败时返回空对象，避免平台差异导致中断。
- */
-function tryCall(fn: (() => unknown) | undefined): Record<string, unknown> {
-    try { return (fn?.() ?? {}) as Record<string, unknown>; } catch { return {}; }
+let deviceCache: DeviceInfo | null = null;
+
+function readSafe(fn: (() => unknown) | undefined): Record<string, unknown> {
+    try {
+        return (fn?.() ?? {}) as Record<string, unknown>;
+    } catch {
+        return {};
+    }
 }
 
-/**
- * 收集当前设备、窗口与宿主应用信息并归一化字段。
- */
-function collect(): DeviceInfo {
-    // @ts-ignore — 新 API 在旧版 @dcloudio/types 中可能未声明
-    let deviceInfo = tryCall(uni.getDeviceInfo);
+function collectDevice(): DeviceInfo {
+    // @ts-ignore - 新 API 在旧版 @dcloudio/types 中可能未声明。
+    let device = readSafe(uni.getDeviceInfo);
     // @ts-ignore
-    let windowInfo = tryCall(uni.getWindowInfo);
-    let appBaseInfo = tryCall(uni.getAppBaseInfo);
+    let window = readSafe(uni.getWindowInfo);
+    let app = readSafe(uni.getAppBaseInfo);
 
-    if (!deviceInfo.brand && !deviceInfo.model) {
-        const sys = tryCall(() => uni.getSystemInfoSync());
-        deviceInfo = { ...sys };
-        windowInfo = { ...sys };
-        appBaseInfo = { ...sys };
+    if (!device.brand && !device.model) {
+        const system = readSafe(() => uni.getSystemInfoSync());
+        device = { ...system };
+        window = { ...system };
+        app = { ...system };
     }
 
-    let appid = "";
-    try {
-        const accountInfo = uni.getAccountInfoSync() as { miniProgram?: { appId?: string } };
-        appid = accountInfo?.miniProgram?.appId || "";
-    } catch {
-        appid = (deviceInfo.appId as string) || "";
-    }
-
-    const system = (deviceInfo.system as string) || "";
+    const system = (device.system as string) || "";
 
     return {
-        appid,
-        app_name: (appBaseInfo.appName as string) || "",
-        app_version: (appBaseInfo.appVersion as string) || "",
-        app_version_code: (appBaseInfo.appVersionCode as string) || "",
-        app_channel: (appBaseInfo.appChannel as string) || "",
-        device_brand: (deviceInfo.brand as string) || "",
-        device_model: (deviceInfo.model as string) || "",
-        device_id: (deviceInfo.deviceId as string) || "",
-        device_type: (deviceInfo.deviceType as string) || "",
-        device_orientation: (windowInfo.deviceOrientation as "portrait" | "landscape") || "portrait",
-        brand: (deviceInfo.brand as string) || "",
-        model: (deviceInfo.model as string) || "",
+        appid: getAppid(device),
+        app_name: (app.appName as string) || "",
+        app_version: (app.appVersion as string) || "",
+        app_version_code: (app.appVersionCode as string) || "",
+        app_channel: (app.appChannel as string) || "",
+        device_brand: (device.brand as string) || "",
+        device_model: (device.model as string) || "",
+        device_id: (device.deviceId as string) || "",
+        device_type: (device.deviceType as string) || "",
+        device_orientation: (window.deviceOrientation as "portrait" | "landscape") || "portrait",
+        brand: (device.brand as string) || "",
+        model: (device.model as string) || "",
         system,
         os: system.split(" ")[0] || "",
-        pixel_ratio: (windowInfo.pixelRatio as number) || 0,
-        screen_width: (windowInfo.screenWidth as number) || 0,
-        screen_height: (windowInfo.screenHeight as number) || 0,
-        window_width: (windowInfo.windowWidth as number) || 0,
-        window_height: (windowInfo.windowHeight as number) || 0,
-        status_bar_height: (windowInfo.statusBarHeight as number) || 0,
-        sdk_version: (appBaseInfo.SDKVersion as string) || "",
-        host_name: (appBaseInfo.hostName as string) || "",
-        host_version: (appBaseInfo.hostVersion as string) || "",
-        host_language: (appBaseInfo.hostLanguage as string) || "",
-        host_theme: (appBaseInfo.hostTheme as string) || "",
-        platform: (deviceInfo.platform as string) || "",
-        language: (appBaseInfo.language as string) || "",
-        version: (appBaseInfo.version as string) || "",
+        pixel_ratio: (window.pixelRatio as number) || 0,
+        screen_width: (window.screenWidth as number) || 0,
+        screen_height: (window.screenHeight as number) || 0,
+        window_width: (window.windowWidth as number) || 0,
+        window_height: (window.windowHeight as number) || 0,
+        status_bar_height: (window.statusBarHeight as number) || 0,
+        sdk_version: (app.SDKVersion as string) || "",
+        host_name: (app.hostName as string) || "",
+        host_version: (app.hostVersion as string) || "",
+        host_language: (app.hostLanguage as string) || "",
+        host_theme: (app.hostTheme as string) || "",
+        platform: (device.platform as string) || "",
+        language: (app.language as string) || "",
+        version: (app.version as string) || "",
     };
 }
 
-/**
- * 确保设备信息只在首次访问时采集一次。
- */
-function ensure() {
-    if (!_info.value) {
-        _info.value = collect();
+function getAppid(device: Record<string, unknown>) {
+    try {
+        const account = uni.getAccountInfoSync() as { miniProgram?: { appId?: string } };
+        return account?.miniProgram?.appId || "";
+    } catch {
+        return (device.appId as string) || "";
     }
 }
 
-/**
- * 获取单例缓存的设备信息。
- */
-export function useDevice() {
-    ensure();
-    return _info;
+function getDevice() {
+    deviceCache ??= collectDevice();
+    return deviceCache;
 }
 
-/**
- * 把 deviceInfo 对象转成 URL query string（不含前导 ?）
- */
-export function deviceToQuery(): string {
-    ensure();
-    if (!_info.value) return "";
-    return Object.entries(_info.value)
-        .filter(([, v]) => v !== "" && v !== 0)
-        .map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
-        .join("&");
+function getQueryInfo(info: DeviceInfo): DeviceQueryInfo {
+    return {
+        appid: info.appid,
+        device_brand: info.device_brand,
+        device_model: info.device_model,
+        device_id: info.device_id,
+        device_type: info.device_type,
+        device_orientation: info.device_orientation,
+        platform: info.platform,
+        system: info.system,
+        os: info.os,
+        version: info.version,
+        sdk_version: info.sdk_version,
+        host_name: info.host_name,
+        host_version: info.host_version,
+        host_language: info.host_language,
+        language: info.language,
+        app_version: info.app_version,
+        app_version_code: info.app_version_code,
+        screen_width: info.screen_width,
+        screen_height: info.screen_height,
+    };
+}
+
+export function useDevice() {
+    const info = getDevice();
+    const { toQuery } = useUtils();
+
+    return {
+        info,
+        query: toQuery(getQueryInfo(info)),
+    };
 }
 
-/**
- * 手动清除缓存（切换账号等场景可能需要）
- */
 export function clearDeviceCache(): void {
-    _info.value = null;
+    deviceCache = null;
 }

package/src/composables/index.ts

@@ -1,51 +1,21 @@
 /**
  * Composables 统一导出
  */
-export * from "./http";
-export { useLoading } from "./loading";
+export * from "./request";
 export { useMsg, type HlwMsg, type ToastOptions, type ModalOptions, type ToastIcon } from "./msg";
-export { useDevice, deviceToQuery, clearDeviceCache, type DeviceInfo } from "./device";
-export { useRefs } from "./refs";
-export { usePageMeta } from "./page-meta";
-export { useStorage, type StorageInstance } from "./storage";
-export { useValidate } from "./validate";
-export { useFormat } from "./format";
 export {
-    useAd,
-    setConfigAd,
-    destroyAds,
-    type AdType,
-    type AdConfig,
-    type AdError,
-    type AdAdapter,
-    type AdCloseResult,
-} from "./ad";
+    useDevice,
+    clearDeviceCache,
+    type DeviceInfo,
+    type DeviceQueryInfo,
+} from "./device";
+export { useRefs } from "./refs";
 export {
     useShare,
-    useShareConfig,
-    setConfigShare,
     type ShareConfig,
-    type ShareConfigResolver,
-    type ShareFrom,
-    type ShareAppMessageContent,
-    type ShareTimelineContent,
-    type ShareConfigMap,
-    type ShareConfigAdapter,
-    type PageShareItem,
-    type PageShareFallback,
-    type SharePayload,
 } from "./share";
-export {
-    useContact,
-    setConfigContact,
-    type ContactConfig,
-    type ContactAdapter,
-    type ContactBindProps,
-} from "./contact";
-export { useUtils, type DownloadFileOptions, type DownloadFileResult, type TapEvent } from "./utils";
-export { useColor } from "./color";
-export { useRouter, type NavigateType, type NavigateOptions } from "./navigator";
-export { useUuid } from "./algo";
+export { useUtils, type DownloadOpt, type DownloadRes } from "./utils";
+export { useNavigate, type NavigateType, type NavigateOptions } from "./navigator";
 
 // Theme（mp-vue 自带）
 export type { FontScale, FontPreset } from "./theme";