@hlw-uni/mp-vue 2.1.11 → 2.1.13

package/dist/composables/ad/index.d.ts

@@ -1,5 +1,5 @@
 import { AdapterPayload } from '../_internal/unwrap';
-import { Ref } from 'vue';
+import { ComputedRef, Ref } from 'vue';
 
 /** 6 种广告类型 */
 export type AdType = "banner" | "grid" | "custom" | "video" | "reward" | "popup";
@@ -11,6 +11,8 @@ export interface AdConfig {
     video_unit_id: string;
     reward_unit_id: string;
     popup_unit_id: string;
+    /** VIP 屏蔽展示型广告（reward 除外）：0=否，1=屏蔽 banner/grid/custom/video/popup */
+    vip_no_ad?: 0 | 1;
 }
 /** 广告错误对象（onError 回调参数） */
 export interface AdError {
@@ -31,6 +33,8 @@ export interface AdAdapter {
     getConfig: () => Promise<AdapterPayload<AdConfig>>;
     /** 是否已登录；不传 = 不校验（showReward 调用前会问一次） */
     isAuth?: () => boolean;
+    /** 是否 VIP；配合 config.vip_no_ad=1 时屏蔽展示型广告（reward 不受影响） */
+    isVip?: () => boolean;
 }
 /** 激励视频关闭回调返回 */
 export interface AdCloseResult {
@@ -43,21 +47,7 @@ export interface AdCloseResult {
  */
 export declare function setConfigAd(a: AdAdapter): void;
 export declare function useAd(): {
-    config: Ref<{
-        banner_unit_id: string;
-        grid_unit_id: string;
-        custom_unit_id: string;
-        video_unit_id: string;
-        reward_unit_id: string;
-        popup_unit_id: string;
-    }, AdConfig | {
-        banner_unit_id: string;
-        grid_unit_id: string;
-        custom_unit_id: string;
-        video_unit_id: string;
-        reward_unit_id: string;
-        popup_unit_id: string;
-    }>;
+    config: ComputedRef<AdConfig>;
     loaded: Ref<boolean, boolean>;
     loadConfig: (force?: boolean) => Promise<void>;
     getUnitId: (type: AdType) => string;

package/dist/composables/algo/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 算法集：把通用算法包成 useXxx composable，业务侧统一从这里取。
+ *
+ * 已有：
+ *   - useUuid  RFC 4122 v4，32 字符 hex
+ */
+export { useUuid } from './uuid';

package/dist/composables/algo/uuid.d.ts

@@ -0,0 +1,17 @@
+/**
+ * UUID v4 生成器（RFC 4122 v4 算法），返回 32 字符 hex（无连字符）。
+ *
+ * 用途：当 nonce、idempotency key、临时唯一标识用。
+ *
+ * 算法：
+ *   1. 生成 16 字节随机源
+ *   2. byte 6 高 4 位置成 0100 标版本号 v4
+ *   3. byte 8 高 2 位置成 10 标变体（RFC 4122）
+ *   4. 16 字节转 hex 拼成 32 字符串
+ *
+ * 注意：随机源用 Math.random（小程序兼容兜底），加密强度有限，
+ * 不能用于密钥派生 / token 签发，只能挡重放。
+ */
+export declare function useUuid(): {
+    v4: () => string;
+};

package/dist/composables/index.d.ts

@@ -16,6 +16,7 @@ export { useContact, setConfigContact, type ContactConfig, type ContactAdapter,
 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 type { FontScale, FontPreset } from './theme';
 export { FONT_SCALE_KEY, FONT_PRESETS, getCurrentFontScale, getCurrentFontVars, THEME_CHANGE_EVENT, buildThemeStyle, useThemePageStyle, } from './theme';
 export type { ThemeColor } from './theme';

package/dist/index.js

@@ -637,7 +637,8 @@ var __publicField = (obj, key, value) => {
     custom_unit_id: "",
     video_unit_id: "",
     reward_unit_id: "",
-    popup_unit_id: ""
+    popup_unit_id: "",
+    vip_no_ad: 0
   };
   let adapter$1 = null;
   let pending$1 = null;
@@ -655,7 +656,15 @@ var __publicField = (obj, key, value) => {
   const interstitialCache = /* @__PURE__ */ new Map();
   function useAd() {
     const store = useAdStore();
-    const { config: config2, loaded } = pinia.storeToRefs(store);
+    const { loaded } = pinia.storeToRefs(store);
+    const config2 = vue.computed(() => {
+      var _a;
+      const raw = store.config;
+      if (raw.vip_no_ad === 1 && ((_a = adapter$1 == null ? void 0 : adapter$1.isVip) == null ? void 0 : _a.call(adapter$1))) {
+        return { ...EMPTY, reward_unit_id: raw.reward_unit_id, vip_no_ad: 1 };
+      }
+      return raw;
+    });
     async function loadConfig2(force = false) {
       if (loaded.value && !force)
         return;
@@ -684,7 +693,7 @@ var __publicField = (obj, key, value) => {
       return flight;
     }
     function getUnitId(type) {
-      return store.config[`${type}_unit_id`] || "";
+      return config2.value[`${type}_unit_id`] || "";
     }
     async function showReward(onClose) {
       const unitId = getUnitId("reward");
@@ -1138,6 +1147,18 @@ var __publicField = (obj, key, value) => {
       navigate: doNavigate
     };
   }
+  function useUuid() {
+    function v4() {
+      const bytes = [];
+      for (let i = 0; i < 16; i++) {
+        bytes.push(Math.floor(Math.random() * 256));
+      }
+      bytes[6] = bytes[6] & 15 | 64;
+      bytes[8] = bytes[8] & 63 | 128;
+      return bytes.map((b) => b.toString(16).padStart(2, "0")).join("");
+    }
+    return { v4 };
+  }
   const useThemeStore = pinia.defineStore(
     "theme",
     () => {
@@ -1940,6 +1961,7 @@ var __publicField = (obj, key, value) => {
   exports2.useThemeStore = useThemeStore;
   exports2.useUpload = useUpload;
   exports2.useUtils = useUtils;
+  exports2.useUuid = useUuid;
   exports2.useValidate = useValidate;
   exports2.vCopy = vCopy;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });

package/dist/index.mjs

@@ -636,7 +636,8 @@ const EMPTY = {
   custom_unit_id: "",
   video_unit_id: "",
   reward_unit_id: "",
-  popup_unit_id: ""
+  popup_unit_id: "",
+  vip_no_ad: 0
 };
 let adapter$1 = null;
 let pending$1 = null;
@@ -654,7 +655,15 @@ const rewardedCache = /* @__PURE__ */ new Map();
 const interstitialCache = /* @__PURE__ */ new Map();
 function useAd() {
   const store = useAdStore();
-  const { config: config2, loaded } = storeToRefs(store);
+  const { loaded } = storeToRefs(store);
+  const config2 = computed(() => {
+    var _a;
+    const raw = store.config;
+    if (raw.vip_no_ad === 1 && ((_a = adapter$1 == null ? void 0 : adapter$1.isVip) == null ? void 0 : _a.call(adapter$1))) {
+      return { ...EMPTY, reward_unit_id: raw.reward_unit_id, vip_no_ad: 1 };
+    }
+    return raw;
+  });
   async function loadConfig2(force = false) {
     if (loaded.value && !force)
       return;
@@ -683,7 +692,7 @@ function useAd() {
     return flight;
   }
   function getUnitId(type) {
-    return store.config[`${type}_unit_id`] || "";
+    return config2.value[`${type}_unit_id`] || "";
   }
   async function showReward(onClose) {
     const unitId = getUnitId("reward");
@@ -1137,6 +1146,18 @@ function useRouter() {
     navigate: doNavigate
   };
 }
+function useUuid() {
+  function v4() {
+    const bytes = [];
+    for (let i = 0; i < 16; i++) {
+      bytes.push(Math.floor(Math.random() * 256));
+    }
+    bytes[6] = bytes[6] & 15 | 64;
+    bytes[8] = bytes[8] & 63 | 128;
+    return bytes.map((b) => b.toString(16).padStart(2, "0")).join("");
+  }
+  return { v4 };
+}
 const useThemeStore = defineStore(
   "theme",
   () => {
@@ -1940,6 +1961,7 @@ export {
   useThemeStore,
   useUpload,
   useUtils,
+  useUuid,
   useValidate,
   vCopy
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "2.1.11",
+    "version": "2.1.13",
     "description": "hlw-uni 小程序运行时 — Vue 组件 + composables + theme + http + 工具集（合并自原 mp-core）",
     "main": "dist/index.js",
     "module": "dist/index.mjs",

package/src/composables/ad/index.ts

@@ -43,7 +43,7 @@
  */
 
 import { defineStore, storeToRefs } from "pinia";
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import { useMsg, type HlwMsg } from "../msg";
 import { unwrapPayload, type AdapterPayload } from "../_internal/unwrap";
 
@@ -61,6 +61,8 @@ export interface AdConfig {
     video_unit_id: string;
     reward_unit_id: string;
     popup_unit_id: string;
+    /** VIP 屏蔽展示型广告（reward 除外）：0=否，1=屏蔽 banner/grid/custom/video/popup */
+    vip_no_ad?: 0 | 1;
 }
 
 /** 广告错误对象（onError 回调参数） */
@@ -83,6 +85,8 @@ export interface AdAdapter {
     getConfig: () => Promise<AdapterPayload<AdConfig>>;
     /** 是否已登录；不传 = 不校验（showReward 调用前会问一次） */
     isAuth?: () => boolean;
+    /** 是否 VIP；配合 config.vip_no_ad=1 时屏蔽展示型广告（reward 不受影响） */
+    isVip?: () => boolean;
 }
 
 /** 激励视频关闭回调返回 */
@@ -98,6 +102,7 @@ const EMPTY: AdConfig = {
     video_unit_id: "",
     reward_unit_id: "",
     popup_unit_id: "",
+    vip_no_ad: 0,
 };
 
 let adapter: AdAdapter | null = null;
@@ -140,7 +145,16 @@ const interstitialCache = new Map<string, any>();
 
 export function useAd() {
     const store = useAdStore();
-    const { config, loaded } = storeToRefs(store);
+    const { loaded } = storeToRefs(store);
+
+    /** 真实生效的广告配置：VIP + vip_no_ad=1 命中时屏蔽展示型 unit_id（reward 保留） */
+    const config = computed<AdConfig>(() => {
+        const raw = store.config;
+        if (raw.vip_no_ad === 1 && adapter?.isVip?.()) {
+            return { ...EMPTY, reward_unit_id: raw.reward_unit_id, vip_no_ad: 1 };
+        }
+        return raw;
+    });
 
     /**
      * 拉取广告配置（小程序冷启动后调一次即可）。
@@ -171,9 +185,9 @@ export function useAd() {
         return flight;
     }
 
-    /** 取指定类型的 unit_id（hlw-ad 组件 / 业务直接调时用） */
+    /** 取指定类型的 unit_id（hlw-ad 组件 / 业务直接调时用），自动应用 VIP 屏蔽 */
     function getUnitId(type: AdType): string {
-        return store.config[`${type}_unit_id` as keyof AdConfig] || "";
+        return (config.value[`${type}_unit_id` as keyof AdConfig] as string) || "";
     }
 
     /**

package/src/composables/algo/index.ts

@@ -0,0 +1,7 @@
+/**
+ * 算法集：把通用算法包成 useXxx composable，业务侧统一从这里取。
+ *
+ * 已有：
+ *   - useUuid  RFC 4122 v4，32 字符 hex
+ */
+export { useUuid } from "./uuid";

package/src/composables/algo/uuid.ts

@@ -0,0 +1,27 @@
+/**
+ * UUID v4 生成器（RFC 4122 v4 算法），返回 32 字符 hex（无连字符）。
+ *
+ * 用途：当 nonce、idempotency key、临时唯一标识用。
+ *
+ * 算法：
+ *   1. 生成 16 字节随机源
+ *   2. byte 6 高 4 位置成 0100 标版本号 v4
+ *   3. byte 8 高 2 位置成 10 标变体（RFC 4122）
+ *   4. 16 字节转 hex 拼成 32 字符串
+ *
+ * 注意：随机源用 Math.random（小程序兼容兜底），加密强度有限，
+ * 不能用于密钥派生 / token 签发，只能挡重放。
+ */
+export function useUuid() {
+    function v4(): string {
+        const bytes: number[] = [];
+        for (let i = 0; i < 16; i++) {
+            bytes.push(Math.floor(Math.random() * 256));
+        }
+        bytes[6] = (bytes[6] & 0x0f) | 0x40;
+        bytes[8] = (bytes[8] & 0x3f) | 0x80;
+        return bytes.map((b) => b.toString(16).padStart(2, "0")).join("");
+    }
+
+    return { v4 };
+}

package/src/composables/index.ts

@@ -45,6 +45,7 @@ export {
 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";
 
 // Theme（mp-vue 自带）
 export type { FontScale, FontPreset } from "./theme";