@heycar/heycars-map 0.9.23-alpha1 → 0.9.23-alpha3

package/dist/index.cjs

@@ -19,7 +19,7 @@ if (typeof GeolocationPositionError === "undefined") {
   };
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.23-alpha1";
+const version = "0.9.23-alpha3";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1406,86 +1406,6 @@ createComparator(function() {
 });
 createComparator(createCircularEqualCreator());
 createComparator(createCircularEqualCreator(sameValueZeroEqual));
-const isPlace = (place) => {
-  return place.lng !== void 0 && place.lat !== void 0;
-};
-const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
-function assertNotEmptyArray(value, name2) {
-  if (Array.isArray(value) && value.length > 0)
-    return;
-  throw new Error(
-    `Assertion Error: expect ${name2} to be not empty array, actual is ${JSON.stringify(value)}`
-  );
-}
-const isLatLngLiteral = (value) => {
-  return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
-};
-function defered() {
-  const defer = {};
-  const promise = new Promise((resolve, reject) => {
-    defer.state = "pending";
-    defer.resolve = async (value) => {
-      try {
-        const result = await value;
-        defer.state = "fulfilled";
-        return resolve(result);
-      } catch (err) {
-        defer.state = "rejected";
-        reject(err);
-      }
-    };
-    defer.reject = (reason) => {
-      defer.state = "rejected";
-      return reject(reason);
-    };
-  });
-  return Object.assign(promise, defer);
-}
-const pausableSleep = (milliSeconds) => {
-  const sleepDefered = defered();
-  let id = setTimeout(sleepDefered.resolve, milliSeconds);
-  let isPaused = false;
-  const pause = () => {
-    if (isPaused || sleepDefered.state === "fulfilled")
-      return;
-    console.log("pause");
-    isPaused = true;
-    clearTimeout(id);
-  };
-  const restart = () => {
-    if (sleepDefered.state === "fulfilled")
-      return;
-    console.log("restart");
-    isPaused = false;
-    clearTimeout(id);
-    id = setTimeout(sleepDefered.resolve, milliSeconds);
-  };
-  return { sleepPromise: sleepDefered, pause, restart };
-};
-const createRunOnce = (fn) => {
-  let isExcuted = false;
-  let result;
-  return function runOnce(...args) {
-    if (isExcuted)
-      return result;
-    isExcuted = true;
-    result = fn(...args);
-    return result;
-  };
-};
-const createAsyncNoFailNonNullable = (fn, defaultValue) => {
-  return function noFailNoNullable(...args) {
-    return fn(...args).then((result) => result != null ? result : defaultValue).catch(() => defaultValue);
-  };
-};
-const pipeTimeout = (fn, defaultValue, timeout) => {
-  return function pipedTimeoutedFunction(...args) {
-    return new Promise((resolve, reject) => {
-      setTimeout(() => resolve(defaultValue), timeout);
-      fn(...args).then(resolve).catch(reject);
-    });
-  };
-};
 var BRWOSER_PLATFORM = /* @__PURE__ */ ((BRWOSER_PLATFORM2) => {
   BRWOSER_PLATFORM2["WECHAT"] = "WECHAT";
   BRWOSER_PLATFORM2["WECHAT_MINIPROGRAM"] = "WECHAT_MINIPROGRAM";
@@ -1794,6 +1714,89 @@ const geoPositionError2businessTimeout = (error, platform) => {
   return platform !== BRWOSER_PLATFORM.WECHAT && platform !== BRWOSER_PLATFORM.WECHAT_MINIPROGRAM && error.code === GeolocationPositionError.TIMEOUT;
 };
 const businessCandidatesToAdsorptionPlace = (places) => places[0];
+const isPlace = (place) => {
+  return place.lng !== void 0 && place.lat !== void 0;
+};
+const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+function assertNotEmptyArray(value, name2) {
+  if (Array.isArray(value) && value.length > 0)
+    return;
+  throw new Error(
+    `Assertion Error: expect ${name2} to be not empty array, actual is ${JSON.stringify(value)}`
+  );
+}
+const isLatLngLiteral = (value) => {
+  return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
+};
+const isPlacesInclude = (places, place) => {
+  return places.some((p) => isPlaceEqual(p, place));
+};
+function defered() {
+  const defer = {};
+  const promise = new Promise((resolve, reject) => {
+    defer.state = "pending";
+    defer.resolve = async (value) => {
+      try {
+        const result = await value;
+        defer.state = "fulfilled";
+        return resolve(result);
+      } catch (err) {
+        defer.state = "rejected";
+        reject(err);
+      }
+    };
+    defer.reject = (reason) => {
+      defer.state = "rejected";
+      return reject(reason);
+    };
+  });
+  return Object.assign(promise, defer);
+}
+const pausableSleep = (milliSeconds) => {
+  const sleepDefered = defered();
+  let id = setTimeout(sleepDefered.resolve, milliSeconds);
+  let isPaused = false;
+  const pause = () => {
+    if (isPaused || sleepDefered.state === "fulfilled")
+      return;
+    console.log("pause");
+    isPaused = true;
+    clearTimeout(id);
+  };
+  const restart = () => {
+    if (sleepDefered.state === "fulfilled")
+      return;
+    console.log("restart");
+    isPaused = false;
+    clearTimeout(id);
+    id = setTimeout(sleepDefered.resolve, milliSeconds);
+  };
+  return { sleepPromise: sleepDefered, pause, restart };
+};
+const createRunOnce = (fn) => {
+  let isExcuted = false;
+  let result;
+  return function runOnce(...args) {
+    if (isExcuted)
+      return result;
+    isExcuted = true;
+    result = fn(...args);
+    return result;
+  };
+};
+const createAsyncNoFailNonNullable = (fn, defaultValue) => {
+  return function noFailNoNullable(...args) {
+    return fn(...args).then((result) => result != null ? result : defaultValue).catch(() => defaultValue);
+  };
+};
+const pipeTimeout = (fn, defaultValue, timeout) => {
+  return function pipedTimeoutedFunction(...args) {
+    return new Promise((resolve, reject) => {
+      setTimeout(() => resolve(defaultValue), timeout);
+      fn(...args).then(resolve).catch(reject);
+    });
+  };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a2, b) => {
   if (isLatLngLiteral(a2) && isLatLngLiteral(b)) {
     const result = isPlaceEqual(a2, b);
@@ -4444,11 +4447,41 @@ const watchVisibilityState = () => {
   document.addEventListener("visibilitychange", handleVisibilityChange);
   return { visibilityStateRef, unwatchVisibilityState };
 };
+class QueryWxSignatureStatus {
+  constructor(timeout) {
+    __publicField(this, "error");
+    __publicField(this, "timeout");
+    __publicField(this, "status", "PENDING");
+    __publicField(this, "pendingStatusPromise", new Promise((resolve, reject) => {
+      wx == null ? void 0 : wx.ready(() => {
+        this.status = "READY";
+        resolve("READY");
+      });
+      wx == null ? void 0 : wx.error((error) => {
+        this.status = "FAIL";
+        this.error = error;
+        reject(error);
+      });
+      setTimeout(() => {
+        if (this.status !== "PENDING")
+          return;
+        this.status = "TIMEOUT";
+        resolve("TIMEOUT");
+      }, this.timeout);
+    }));
+    __publicField(this, "timoutStatusPromise", Promise.resolve("TIMEOUT"));
+    this.timeout = timeout;
+  }
+  get statusPromise() {
+    return this.status === "TIMEOUT" ? this.timoutStatusPromise : this.pendingStatusPromise;
+  }
+}
 function createCustomGeolocationPositionError(message, code) {
   const error = new Error(message);
   error.code = code;
   return error;
 }
+const WX_SIGNATURE_TIMEOUT = 5e3;
 const WX_GET_LOCATION_INTERVAL = 1 * 1e3;
 const ALIPAY_GET_LOCATION_INTERVAL = 1 * 1e3;
 const ALIPAY_GEO_CACHE_TIMEOUT = 5e3;
@@ -4458,10 +4491,6 @@ const takeIsForceBrowserGeo = () => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`force-browser-geo`);
 };
-const wxReady = () => new Promise((resolve, reject) => {
-  wx.ready(resolve);
-  wx.error(reject);
-});
 function wechatWatchPosition(onSuccess, onError, option) {
   const { timeout } = option;
   let enable = true;
@@ -4469,25 +4498,44 @@ function wechatWatchPosition(onSuccess, onError, option) {
   let lastSuccessfulResponse = void 0;
   let geoErrorMessage = void 0;
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
+  const onWxSignatureTimeoutErrorOnce = createRunOnce((error) => {
+    console.warn("警告：微信签名超时");
+    onError(error);
+  });
+  const onWxSignatureErrorOnce = createRunOnce((error) => {
+    console.error("微信签名失败：", error);
+    onError(error);
+  });
+  const queryWxSignatureStatus = new QueryWxSignatureStatus(WX_SIGNATURE_TIMEOUT);
   const startWatch = async () => {
-    try {
-      await wxReady();
-    } catch (err) {
-      console.error(err);
-      onError == null ? void 0 : onError(
-        createCustomGeolocationPositionError(
-          err.errMsg,
-          // 签名失败，也算无权限的一种
-          GeolocationPositionError.PERMISSION_DENIED
-        )
-      );
-      return;
-    }
     do {
       if (visibilityStateRef.value === "hidden") {
         await sleep(WX_GET_LOCATION_INTERVAL);
         continue;
       }
+      try {
+        const status = await queryWxSignatureStatus.statusPromise;
+        if (status === "TIMEOUT") {
+          onWxSignatureTimeoutErrorOnce == null ? void 0 : onWxSignatureTimeoutErrorOnce(
+            createCustomGeolocationPositionError(
+              "Custom wx ready timeout",
+              GeolocationPositionError.TIMEOUT
+            )
+          );
+          await sleep(WX_GET_LOCATION_INTERVAL);
+          continue;
+        }
+      } catch (err) {
+        onWxSignatureErrorOnce == null ? void 0 : onWxSignatureErrorOnce(
+          createCustomGeolocationPositionError(
+            err.errMsg,
+            // 签名失败，也算无权限的一种
+            GeolocationPositionError.PERMISSION_DENIED
+          )
+        );
+        await sleep(WX_GET_LOCATION_INTERVAL);
+        continue;
+      }
       const geoPosition = await new Promise((resolve) => {
         let isHandled = false;
         wx.getLocation({
@@ -7262,12 +7310,6 @@ const useMapRecomendPlace = (props) => {
     name: "",
     displayName: ""
   });
-  const isElectedRef = Vue.computed(() => {
-    const recomendPoint = place2point(recomendPlace);
-    return placeCandidatesRef.value.some(
-      (candidate) => isPointEqual(place2point(candidate), recomendPoint)
-    );
-  });
   const isQueryingRef = Vue.ref(false);
   const getRecomendPlaceNoFail = pipeTimeout(
     createAsyncNoFailNonNullable(getRecomendPlace, {}),
@@ -7453,7 +7495,7 @@ const useMapRecomendPlace = (props) => {
   }) => {
     const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
     availableRef.value = true;
-    forceRef.value = true;
+    forceRef.value = !!zone;
     zoneRef.value = zone ? zone : void 0;
     placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
   };
@@ -7463,7 +7505,6 @@ const useMapRecomendPlace = (props) => {
     placeCandidates: placeCandidatesRef,
     availableRef,
     forceRef,
-    isElectedRef,
     isQueryingRef,
     updateRecommendPlace,
     updateRecommendPlaceOnlyInZone,
@@ -8514,7 +8555,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     placeCandidates,
     zoneRef,
     availableRef,
-    isElectedRef,
     isQueryingRef
   } = useMapRecomendPlace({
     defaultPoint: place2point(centerPlace),
@@ -8583,8 +8623,9 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       disableLocator,
       disableLocatorPhoto
     } = props;
+    const isElected = isPlacesInclude(placeCandidates.value, centerPlace);
     const title = geoLoading.value ? geoLoadingTitle2 : !availableRef.value ? unavailableTitle : centerPlace.displayName;
-    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
+    const description = !availableRef.value ? void 0 : isElected ? recomendDescription : void 0;
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": place2point(centerPlace),
@@ -8769,7 +8810,6 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     placeCandidates,
     zoneRef,
     availableRef,
-    isElectedRef,
     isQueryingRef
   } = useMapRecomendPlace({
     defaultPoint: place2point(centerPlace),
@@ -8835,8 +8875,9 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       unavailableTitle,
       disableLocatorPhoto
     } = props;
+    const isElected = isPlacesInclude(placeCandidates.value, centerPlace);
     const title = !availableRef.value ? unavailableTitle : centerPlace.displayName;
-    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
+    const description = !availableRef.value ? void 0 : isElected ? recomendDescription : void 0;
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": place2point(centerPlace),

package/dist/index.js

@@ -17,7 +17,7 @@ if (typeof GeolocationPositionError === "undefined") {
   };
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.23-alpha1";
+const version = "0.9.23-alpha3";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -1404,86 +1404,6 @@ createComparator(function() {
 });
 createComparator(createCircularEqualCreator());
 createComparator(createCircularEqualCreator(sameValueZeroEqual));
-const isPlace = (place) => {
-  return place.lng !== void 0 && place.lat !== void 0;
-};
-const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
-function assertNotEmptyArray(value, name2) {
-  if (Array.isArray(value) && value.length > 0)
-    return;
-  throw new Error(
-    `Assertion Error: expect ${name2} to be not empty array, actual is ${JSON.stringify(value)}`
-  );
-}
-const isLatLngLiteral = (value) => {
-  return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
-};
-function defered() {
-  const defer = {};
-  const promise = new Promise((resolve, reject) => {
-    defer.state = "pending";
-    defer.resolve = async (value) => {
-      try {
-        const result = await value;
-        defer.state = "fulfilled";
-        return resolve(result);
-      } catch (err) {
-        defer.state = "rejected";
-        reject(err);
-      }
-    };
-    defer.reject = (reason) => {
-      defer.state = "rejected";
-      return reject(reason);
-    };
-  });
-  return Object.assign(promise, defer);
-}
-const pausableSleep = (milliSeconds) => {
-  const sleepDefered = defered();
-  let id = setTimeout(sleepDefered.resolve, milliSeconds);
-  let isPaused = false;
-  const pause = () => {
-    if (isPaused || sleepDefered.state === "fulfilled")
-      return;
-    console.log("pause");
-    isPaused = true;
-    clearTimeout(id);
-  };
-  const restart = () => {
-    if (sleepDefered.state === "fulfilled")
-      return;
-    console.log("restart");
-    isPaused = false;
-    clearTimeout(id);
-    id = setTimeout(sleepDefered.resolve, milliSeconds);
-  };
-  return { sleepPromise: sleepDefered, pause, restart };
-};
-const createRunOnce = (fn) => {
-  let isExcuted = false;
-  let result;
-  return function runOnce(...args) {
-    if (isExcuted)
-      return result;
-    isExcuted = true;
-    result = fn(...args);
-    return result;
-  };
-};
-const createAsyncNoFailNonNullable = (fn, defaultValue) => {
-  return function noFailNoNullable(...args) {
-    return fn(...args).then((result) => result != null ? result : defaultValue).catch(() => defaultValue);
-  };
-};
-const pipeTimeout = (fn, defaultValue, timeout) => {
-  return function pipedTimeoutedFunction(...args) {
-    return new Promise((resolve, reject) => {
-      setTimeout(() => resolve(defaultValue), timeout);
-      fn(...args).then(resolve).catch(reject);
-    });
-  };
-};
 var BRWOSER_PLATFORM = /* @__PURE__ */ ((BRWOSER_PLATFORM2) => {
   BRWOSER_PLATFORM2["WECHAT"] = "WECHAT";
   BRWOSER_PLATFORM2["WECHAT_MINIPROGRAM"] = "WECHAT_MINIPROGRAM";
@@ -1792,6 +1712,89 @@ const geoPositionError2businessTimeout = (error, platform) => {
   return platform !== BRWOSER_PLATFORM.WECHAT && platform !== BRWOSER_PLATFORM.WECHAT_MINIPROGRAM && error.code === GeolocationPositionError.TIMEOUT;
 };
 const businessCandidatesToAdsorptionPlace = (places) => places[0];
+const isPlace = (place) => {
+  return place.lng !== void 0 && place.lat !== void 0;
+};
+const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+function assertNotEmptyArray(value, name2) {
+  if (Array.isArray(value) && value.length > 0)
+    return;
+  throw new Error(
+    `Assertion Error: expect ${name2} to be not empty array, actual is ${JSON.stringify(value)}`
+  );
+}
+const isLatLngLiteral = (value) => {
+  return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
+};
+const isPlacesInclude = (places, place) => {
+  return places.some((p) => isPlaceEqual(p, place));
+};
+function defered() {
+  const defer = {};
+  const promise = new Promise((resolve, reject) => {
+    defer.state = "pending";
+    defer.resolve = async (value) => {
+      try {
+        const result = await value;
+        defer.state = "fulfilled";
+        return resolve(result);
+      } catch (err) {
+        defer.state = "rejected";
+        reject(err);
+      }
+    };
+    defer.reject = (reason) => {
+      defer.state = "rejected";
+      return reject(reason);
+    };
+  });
+  return Object.assign(promise, defer);
+}
+const pausableSleep = (milliSeconds) => {
+  const sleepDefered = defered();
+  let id = setTimeout(sleepDefered.resolve, milliSeconds);
+  let isPaused = false;
+  const pause = () => {
+    if (isPaused || sleepDefered.state === "fulfilled")
+      return;
+    console.log("pause");
+    isPaused = true;
+    clearTimeout(id);
+  };
+  const restart = () => {
+    if (sleepDefered.state === "fulfilled")
+      return;
+    console.log("restart");
+    isPaused = false;
+    clearTimeout(id);
+    id = setTimeout(sleepDefered.resolve, milliSeconds);
+  };
+  return { sleepPromise: sleepDefered, pause, restart };
+};
+const createRunOnce = (fn) => {
+  let isExcuted = false;
+  let result;
+  return function runOnce(...args) {
+    if (isExcuted)
+      return result;
+    isExcuted = true;
+    result = fn(...args);
+    return result;
+  };
+};
+const createAsyncNoFailNonNullable = (fn, defaultValue) => {
+  return function noFailNoNullable(...args) {
+    return fn(...args).then((result) => result != null ? result : defaultValue).catch(() => defaultValue);
+  };
+};
+const pipeTimeout = (fn, defaultValue, timeout) => {
+  return function pipedTimeoutedFunction(...args) {
+    return new Promise((resolve, reject) => {
+      setTimeout(() => resolve(defaultValue), timeout);
+      fn(...args).then(resolve).catch(reject);
+    });
+  };
+};
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a2, b) => {
   if (isLatLngLiteral(a2) && isLatLngLiteral(b)) {
     const result = isPlaceEqual(a2, b);
@@ -4442,11 +4445,41 @@ const watchVisibilityState = () => {
   document.addEventListener("visibilitychange", handleVisibilityChange);
   return { visibilityStateRef, unwatchVisibilityState };
 };
+class QueryWxSignatureStatus {
+  constructor(timeout) {
+    __publicField(this, "error");
+    __publicField(this, "timeout");
+    __publicField(this, "status", "PENDING");
+    __publicField(this, "pendingStatusPromise", new Promise((resolve, reject) => {
+      wx == null ? void 0 : wx.ready(() => {
+        this.status = "READY";
+        resolve("READY");
+      });
+      wx == null ? void 0 : wx.error((error) => {
+        this.status = "FAIL";
+        this.error = error;
+        reject(error);
+      });
+      setTimeout(() => {
+        if (this.status !== "PENDING")
+          return;
+        this.status = "TIMEOUT";
+        resolve("TIMEOUT");
+      }, this.timeout);
+    }));
+    __publicField(this, "timoutStatusPromise", Promise.resolve("TIMEOUT"));
+    this.timeout = timeout;
+  }
+  get statusPromise() {
+    return this.status === "TIMEOUT" ? this.timoutStatusPromise : this.pendingStatusPromise;
+  }
+}
 function createCustomGeolocationPositionError(message, code) {
   const error = new Error(message);
   error.code = code;
   return error;
 }
+const WX_SIGNATURE_TIMEOUT = 5e3;
 const WX_GET_LOCATION_INTERVAL = 1 * 1e3;
 const ALIPAY_GET_LOCATION_INTERVAL = 1 * 1e3;
 const ALIPAY_GEO_CACHE_TIMEOUT = 5e3;
@@ -4456,10 +4489,6 @@ const takeIsForceBrowserGeo = () => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`force-browser-geo`);
 };
-const wxReady = () => new Promise((resolve, reject) => {
-  wx.ready(resolve);
-  wx.error(reject);
-});
 function wechatWatchPosition(onSuccess, onError, option) {
   const { timeout } = option;
   let enable = true;
@@ -4467,25 +4496,44 @@ function wechatWatchPosition(onSuccess, onError, option) {
   let lastSuccessfulResponse = void 0;
   let geoErrorMessage = void 0;
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
+  const onWxSignatureTimeoutErrorOnce = createRunOnce((error) => {
+    console.warn("警告：微信签名超时");
+    onError(error);
+  });
+  const onWxSignatureErrorOnce = createRunOnce((error) => {
+    console.error("微信签名失败：", error);
+    onError(error);
+  });
+  const queryWxSignatureStatus = new QueryWxSignatureStatus(WX_SIGNATURE_TIMEOUT);
   const startWatch = async () => {
-    try {
-      await wxReady();
-    } catch (err) {
-      console.error(err);
-      onError == null ? void 0 : onError(
-        createCustomGeolocationPositionError(
-          err.errMsg,
-          // 签名失败，也算无权限的一种
-          GeolocationPositionError.PERMISSION_DENIED
-        )
-      );
-      return;
-    }
     do {
       if (visibilityStateRef.value === "hidden") {
         await sleep(WX_GET_LOCATION_INTERVAL);
         continue;
       }
+      try {
+        const status = await queryWxSignatureStatus.statusPromise;
+        if (status === "TIMEOUT") {
+          onWxSignatureTimeoutErrorOnce == null ? void 0 : onWxSignatureTimeoutErrorOnce(
+            createCustomGeolocationPositionError(
+              "Custom wx ready timeout",
+              GeolocationPositionError.TIMEOUT
+            )
+          );
+          await sleep(WX_GET_LOCATION_INTERVAL);
+          continue;
+        }
+      } catch (err) {
+        onWxSignatureErrorOnce == null ? void 0 : onWxSignatureErrorOnce(
+          createCustomGeolocationPositionError(
+            err.errMsg,
+            // 签名失败，也算无权限的一种
+            GeolocationPositionError.PERMISSION_DENIED
+          )
+        );
+        await sleep(WX_GET_LOCATION_INTERVAL);
+        continue;
+      }
       const geoPosition = await new Promise((resolve) => {
         let isHandled = false;
         wx.getLocation({
@@ -7260,12 +7308,6 @@ const useMapRecomendPlace = (props) => {
     name: "",
     displayName: ""
   });
-  const isElectedRef = computed(() => {
-    const recomendPoint = place2point(recomendPlace);
-    return placeCandidatesRef.value.some(
-      (candidate) => isPointEqual(place2point(candidate), recomendPoint)
-    );
-  });
   const isQueryingRef = ref(false);
   const getRecomendPlaceNoFail = pipeTimeout(
     createAsyncNoFailNonNullable(getRecomendPlace, {}),
@@ -7451,7 +7493,7 @@ const useMapRecomendPlace = (props) => {
   }) => {
     const placeCandidates = inputPlaceCandidates == null ? void 0 : inputPlaceCandidates.map(toPlaceType);
     availableRef.value = true;
-    forceRef.value = true;
+    forceRef.value = !!zone;
     zoneRef.value = zone ? zone : void 0;
     placeCandidatesRef.value = placeCandidates != null ? placeCandidates : [];
   };
@@ -7461,7 +7503,6 @@ const useMapRecomendPlace = (props) => {
     placeCandidates: placeCandidatesRef,
     availableRef,
     forceRef,
-    isElectedRef,
     isQueryingRef,
     updateRecommendPlace,
     updateRecommendPlaceOnlyInZone,
@@ -8512,7 +8553,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     placeCandidates,
     zoneRef,
     availableRef,
-    isElectedRef,
     isQueryingRef
   } = useMapRecomendPlace({
     defaultPoint: place2point(centerPlace),
@@ -8581,8 +8621,9 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       disableLocator,
       disableLocatorPhoto
     } = props;
+    const isElected = isPlacesInclude(placeCandidates.value, centerPlace);
     const title = geoLoading.value ? geoLoadingTitle2 : !availableRef.value ? unavailableTitle : centerPlace.displayName;
-    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
+    const description = !availableRef.value ? void 0 : isElected ? recomendDescription : void 0;
     return h(HeycarMap, {
       "attrs": {
         "center": place2point(centerPlace),
@@ -8767,7 +8808,6 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     placeCandidates,
     zoneRef,
     availableRef,
-    isElectedRef,
     isQueryingRef
   } = useMapRecomendPlace({
     defaultPoint: place2point(centerPlace),
@@ -8833,8 +8873,9 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       unavailableTitle,
       disableLocatorPhoto
     } = props;
+    const isElected = isPlacesInclude(placeCandidates.value, centerPlace);
     const title = !availableRef.value ? unavailableTitle : centerPlace.displayName;
-    const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
+    const description = !availableRef.value ? void 0 : isElected ? recomendDescription : void 0;
     return h(HeycarMap, {
       "attrs": {
         "center": place2point(centerPlace),

package/dist/src/hooks/useMapRecomendPlace.d.ts

@@ -35,7 +35,6 @@ export declare const useMapRecomendPlace: <C>(props: UseMapRecomendPlaceProps<C>
     }[]>;
     availableRef: import("vue-demi").Ref<boolean>;
     forceRef: import("vue-demi").Ref<boolean>;
-    isElectedRef: import("vue-demi").ComputedRef<boolean>;
     isQueryingRef: import("vue-demi").Ref<boolean>;
     updateRecommendPlace: (place: Place) => Promise<void>;
     updateRecommendPlaceOnlyInZone: (place: Place) => Promise<void>;

package/dist/src/utils/QueryWxSignatureStatus.d.ts

@@ -0,0 +1,10 @@
+export type WxSignatureStatus = "PENDING" | "READY" | "TIMEOUT" | "FAIL";
+export declare class QueryWxSignatureStatus {
+    private error;
+    private timeout;
+    private status;
+    private pendingStatusPromise;
+    private timoutStatusPromise;
+    constructor(timeout: number);
+    get statusPromise(): Promise<WxSignatureStatus>;
+}

package/dist/src/utils/helper.d.ts

@@ -6,6 +6,7 @@ export declare function assertAngle(angle: unknown): asserts angle is number | u
 export declare function assertZone(zone: any): asserts zone is Zone;
 export declare function assertNotEmptyArray(value: unknown, name: string): void;
 export declare const isLatLngLiteral: (value: any) => boolean;
+export declare const isPlacesInclude: (places: Place[], place: Place) => boolean;
 interface Defered<T> extends Promise<T> {
     state: "pending" | "fulfilled" | "rejected";
     resolve: (value: T | PromiseLike<T>) => void;
@@ -24,4 +25,5 @@ export declare const pausableSleep: (milliSeconds: number) => {
 export declare const createRunOnce: <P extends any[], R>(fn: (...args: P) => R) => (...args: P) => R;
 export declare const createAsyncNoFailNonNullable: <P extends any[], R>(fn: (...args: P) => Promise<R>, defaultValue: NonNullable<R>) => (...args: P) => Promise<NonNullable<R>>;
 export declare const pipeTimeout: <P extends any[], R>(fn: (...args: P) => Promise<R>, defaultValue: R, timeout: number) => (...args: P) => Promise<R>;
+export declare const retryUntilSuccess: <P extends any[], R>(fn: (...args: P) => Promise<R>) => (...args: P) => Promise<R>;
 export {};

package/dist/src/utils/mockWx.d.ts

@@ -1,6 +1,7 @@
 import type { Wx } from "../types/wx";
+import type { WxSignatureStatus } from "./QueryWxSignatureStatus";
 interface CreateMockWxProps {
-    configOk: boolean;
+    signatureStatus: WxSignatureStatus;
     getLocation: {
         timeout: number;
         lng?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.23-alpha1",
+  "version": "0.9.23-alpha3",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js"