@hlw-uni/mp-vue 2.0.7 → 2.0.9

package/dist/index.js

@@ -639,6 +639,7 @@ var __publicField = (obj, key, value) => {
     popup_unit_id: ""
   };
   let adapter$1 = null;
+  let pending$1 = null;
   function setConfigAd(a) {
     adapter$1 = a;
   }
@@ -657,24 +658,35 @@ var __publicField = (obj, key, value) => {
     async function loadConfig2(force = false) {
       if (loaded.value && !force)
         return;
+      if (pending$1 && !force)
+        return pending$1;
       if (!(adapter$1 == null ? void 0 : adapter$1.getConfig)) {
         console.warn("[useAd] adapter.getConfig 未注入；先调用 setConfigAd()");
         return;
       }
-      try {
-        const cfg = unwrapPayload(await adapter$1.getConfig());
-        if (cfg) {
-          store.config = cfg;
-          store.loaded = true;
+      const fn = adapter$1.getConfig;
+      const flight = (async () => {
+        try {
+          const cfg = unwrapPayload(await fn());
+          if (cfg) {
+            store.config = cfg;
+            store.loaded = true;
+          }
+        } catch (e) {
+          console.warn("[useAd] load config failed", e);
+        } finally {
+          if (pending$1 === flight)
+            pending$1 = null;
         }
-      } catch (e) {
-        console.warn("[useAd] load config failed", e);
-      }
+      })();
+      pending$1 = flight;
+      return flight;
     }
     function getUnitId(type) {
       return store.config[`${type}_unit_id`] || "";
     }
     async function showReward(onClose) {
+      await loadConfig2();
       const unitId = getUnitId("reward");
       if (!unitId) {
         msg().toast("激励广告未配置");
@@ -689,6 +701,7 @@ var __publicField = (obj, key, value) => {
         await onClose(closeRes);
     }
     async function showPopup() {
+      await loadConfig2();
       const unitId = getUnitId("popup");
       if (!unitId)
         return false;

package/dist/index.mjs

@@ -638,6 +638,7 @@ const EMPTY = {
   popup_unit_id: ""
 };
 let adapter$1 = null;
+let pending$1 = null;
 function setConfigAd(a) {
   adapter$1 = a;
 }
@@ -656,24 +657,35 @@ function useAd() {
   async function loadConfig2(force = false) {
     if (loaded.value && !force)
       return;
+    if (pending$1 && !force)
+      return pending$1;
     if (!(adapter$1 == null ? void 0 : adapter$1.getConfig)) {
       console.warn("[useAd] adapter.getConfig 未注入；先调用 setConfigAd()");
       return;
     }
-    try {
-      const cfg = unwrapPayload(await adapter$1.getConfig());
-      if (cfg) {
-        store.config = cfg;
-        store.loaded = true;
+    const fn = adapter$1.getConfig;
+    const flight = (async () => {
+      try {
+        const cfg = unwrapPayload(await fn());
+        if (cfg) {
+          store.config = cfg;
+          store.loaded = true;
+        }
+      } catch (e) {
+        console.warn("[useAd] load config failed", e);
+      } finally {
+        if (pending$1 === flight)
+          pending$1 = null;
       }
-    } catch (e) {
-      console.warn("[useAd] load config failed", e);
-    }
+    })();
+    pending$1 = flight;
+    return flight;
   }
   function getUnitId(type) {
     return store.config[`${type}_unit_id`] || "";
   }
   async function showReward(onClose) {
+    await loadConfig2();
     const unitId = getUnitId("reward");
     if (!unitId) {
       msg().toast("激励广告未配置");
@@ -688,6 +700,7 @@ function useAd() {
       await onClose(closeRes);
   }
   async function showPopup() {
+    await loadConfig2();
     const unitId = getUnitId("popup");
     if (!unitId)
       return false;

package/package.json

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

package/src/composables/ad/index.ts

@@ -99,6 +99,9 @@ const EMPTY: AdConfig = {
 
 let adapter: AdAdapter | null = null;
 
+/** 进行中的 loadConfig promise；并发调用时复用，避免冷启动多发请求 */
+let pending: Promise<void> | null = null;
+
 /**
  * 注入业务回调，应用启动时调用一次。
  * 不调用也不会崩，但 loadConfig / showReward 会无效。
@@ -136,22 +139,33 @@ export function useAd() {
     const store = useAdStore();
     const { config, loaded } = storeToRefs(store);
 
-    /** 拉取广告配置（小程序冷启动后调一次即可） */
+    /**
+     * 拉取广告配置（小程序冷启动后调一次即可）。
+     * 并发调用复用同一次请求；`force=true` 跳过 loaded/pending 短路重新拉。
+     */
     async function loadConfig(force = false): Promise<void> {
         if (loaded.value && !force) return;
+        if (pending && !force) return pending;
         if (!adapter?.getConfig) {
             console.warn("[useAd] adapter.getConfig 未注入；先调用 setConfigAd()");
             return;
         }
-        try {
-            const cfg = unwrapPayload(await adapter.getConfig());
-            if (cfg) {
-                store.config = cfg;
-                store.loaded = true;
+        const fn = adapter.getConfig;
+        const flight = (async () => {
+            try {
+                const cfg = unwrapPayload(await fn());
+                if (cfg) {
+                    store.config = cfg;
+                    store.loaded = true;
+                }
+            } catch (e) {
+                console.warn("[useAd] load config failed", e);
+            } finally {
+                if (pending === flight) pending = null;
             }
-        } catch (e) {
-            console.warn("[useAd] load config failed", e);
-        }
+        })();
+        pending = flight;
+        return flight;
     }
 
     /** 取指定类型的 unit_id（hlw-ad 组件 / 业务直接调时用） */
@@ -170,6 +184,7 @@ export function useAd() {
      * @param onClose 关闭回调；不传则只播。retry / toast / 发奖全在业务侧自己写。
      */
     async function showReward(onClose?: (res: AdCloseResult) => void | Promise<void>): Promise<void> {
+        await loadConfig();
         const unitId = getUnitId("reward");
         if (!unitId) {
             msg().toast("激励广告未配置");
@@ -188,6 +203,7 @@ export function useAd() {
      * @returns true=展示成功；false=配置缺失 / show 失败（如近期已展示过）
      */
     async function showPopup(): Promise<boolean> {
+        await loadConfig();
         const unitId = getUnitId("popup");
         if (!unitId) return false;
         return await showInterstitialAd(unitId);