@heycar/heycars-map 0.9.23-alpha2 → 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-alpha2";
+const version = "0.9.23-alpha3";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -4447,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;
@@ -4461,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;
@@ -4472,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({

package/dist/index.js

@@ -17,7 +17,7 @@ if (typeof GeolocationPositionError === "undefined") {
   };
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.23-alpha2";
+const version = "0.9.23-alpha3";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -4445,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;
@@ -4459,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;
@@ -4470,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({

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

@@ -25,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-alpha2",
+  "version": "0.9.23-alpha3",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js"