@heycar/heycars-map 0.9.20-timeout3 → 0.9.21-alpha

package/dist/index.cjs

@@ -19,7 +19,7 @@ if (typeof GeolocationPositionError === "undefined") {
   };
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.20-timeout3";
+const version = "0.9.21-alpha";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -4554,7 +4554,8 @@ function wechatWatchPosition(onSuccess, onError, option) {
   const { timeout } = option;
   let enable = true;
   let prevGeoPosition = void 0;
-  const isGeoWorkingRef = Vue.ref(true);
+  let lastSuccessfulResponse = void 0;
+  let geoErrorMessage = void 0;
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     try {
@@ -4583,26 +4584,24 @@ function wechatWatchPosition(onSuccess, onError, option) {
             if (isHandled)
               return;
             isHandled = true;
-            isGeoWorkingRef.value = true;
+            lastSuccessfulResponse = res;
+            geoErrorMessage = void 0;
             resolve(wxGetLocationSuccessResponse2GeolocationPosition(res));
           },
           fail(res) {
             if (isHandled)
               return;
             isHandled = true;
-            const isGeoWorking = isGeoWorkingRef.value;
-            isGeoWorkingRef.value = false;
-            console.warn(
-              "MyWarning: wx.getLocation failed errcode, errmsg = ",
-              res.errCode,
-              res.errMsg
-            );
+            const { errMsg: message, errCode: code } = res;
+            const prevMessage = geoErrorMessage;
+            geoErrorMessage = message;
             resolve(void 0);
-            if (!isGeoWorking)
+            if (prevMessage === message)
               return;
+            console.warn("MyWarning: wx.getLocation failed code, message = ", code, message);
             onError == null ? void 0 : onError(
               createCustomGeolocationPositionError(
-                res.errMsg,
+                message,
                 GeolocationPositionError.PERMISSION_DENIED
               )
             );
@@ -4613,12 +4612,21 @@ function wechatWatchPosition(onSuccess, onError, option) {
         setTimeout(() => {
           if (isHandled)
             return;
+          if (lastSuccessfulResponse) {
+            console.warn("警告: my.getLocation failed with errcode 13 which has been bypassed");
+            return resolve(
+              wxGetLocationSuccessResponse2GeolocationPosition(lastSuccessfulResponse)
+            );
+          }
+          const message = `Custom Timeout: exceed ${timeout}s`;
+          const prevMessage = geoErrorMessage;
+          geoErrorMessage = message;
           resolve(void 0);
+          if (prevMessage === message)
+            return;
+          console.warn("MyWarning: wx.getLocation 触发自定义超时, message = ", message);
           onError == null ? void 0 : onError(
-            createCustomGeolocationPositionError(
-              `Custom Timeout: exceed ${timeout}s`,
-              GeolocationPositionError.TIMEOUT
-            )
+            createCustomGeolocationPositionError(message, GeolocationPositionError.TIMEOUT)
           );
         }, timeout);
       });
@@ -4637,9 +4645,9 @@ function wechatWatchPosition(onSuccess, onError, option) {
 function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
   let enable = true;
   let prevGeoPosition = void 0;
+  let lastSuccessfulResponse = void 0;
+  let geoErrorMessage = void 0;
   const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
-  const isGeoWorkingRef = Vue.ref(true);
-  const lastSuccessfulResponseRef = Vue.ref();
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     do {
@@ -4649,8 +4657,8 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
       }
       const geoPosition = await new Promise((resolve) => {
         const handleSuccess = (res) => {
-          lastSuccessfulResponseRef.value = res;
-          isGeoWorkingRef.value = true;
+          lastSuccessfulResponse = res;
+          geoErrorMessage = void 0;
           resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
         };
         getLocationFn({
@@ -4658,25 +4666,21 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
           cacheTimeout: timeout / 1e3,
           success: handleSuccess,
           fail(res) {
-            if (res.error === 13 && lastSuccessfulResponseRef.value) {
-              console.warn(
-                "MyWarning: my.getLocation failed with errcode 13 which has been bypassed"
+            if (res.error === 13 && lastSuccessfulResponse) {
+              console.warn("警告: my.getLocation failed with errcode 13 which has been bypassed");
+              return resolve(
+                alipayMyGetLocationSuccessResponse2GeolocationPosition(lastSuccessfulResponse)
               );
-              return handleSuccess(lastSuccessfulResponseRef.value);
             }
-            const isGeoWorking = isGeoWorkingRef.value;
-            isGeoWorkingRef.value = false;
+            const { errorMessage: message, error: code } = res;
+            const prevMessage = geoErrorMessage;
+            geoErrorMessage = message;
             resolve(void 0);
-            if (!isGeoWorking)
+            if (prevMessage === message)
               return;
-            const { error, errorMessage } = res;
-            console.warn(
-              "MyWarning: my.getLocation failed errcode, errmsg = ",
-              error,
-              errorMessage
-            );
-            const geoErrorCode = alipayMyGetLocationError2GeolocationPositionErrorCode(error);
-            onError == null ? void 0 : onError(createCustomGeolocationPositionError(errorMessage, geoErrorCode));
+            console.warn("MyWarning: my.getLocation failed code, message = ", code, message);
+            const geoErrorCode = alipayMyGetLocationError2GeolocationPositionErrorCode(code);
+            onError == null ? void 0 : onError(createCustomGeolocationPositionError(message, geoErrorCode));
           }
         });
       });
@@ -4699,7 +4703,7 @@ const apGetLocation = ({ type: type2, cacheTimeout, success, fail }) => {
 function androidWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let prevGeoPosition = void 0;
-  const isGeoWorkingRef = Vue.ref(true);
+  let geoErrorMessage = void 0;
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     do {
@@ -4710,19 +4714,22 @@ function androidWatchPosition(onSuccess, onError, option) {
       const geoPosition = await new Promise((resolve) => {
         navigator.geolocation.getCurrentPosition(
           function onSuccess2(geoLocationPosition) {
-            isGeoWorkingRef.value = true;
+            geoErrorMessage = void 0;
             resolve(geoLocationPosition);
           },
           function onFail(geoError) {
-            const isGeoWorking = isGeoWorkingRef.value;
-            isGeoWorkingRef.value = false;
+            if (geoError.code === 3 && !!prevGeoPosition) {
+              console.warn("警告: navigator.geolocation.getCurrentPosition 超时跳过");
+              resolve(prevGeoPosition);
+              return;
+            }
+            const { message } = geoError;
+            const prevMessage = geoErrorMessage;
+            geoErrorMessage = message;
             resolve(void 0);
-            if (!isGeoWorking)
+            if (prevMessage === message)
               return;
-            console.warn(
-              "MyWarning: navigator.geolocation.getCurrentPosition failed: ",
-              geoError.message
-            );
+            console.warn("MyWarning: navigator.geolocation.getCurrentPosition failed: ", message);
             onError == null ? void 0 : onError(geoError);
           },
           option
@@ -4743,8 +4750,8 @@ function androidWatchPosition(onSuccess, onError, option) {
 function compatibleWathPosition(onSuccess, onError, option) {
   const isForceBrowserGeo = takeIsForceBrowserGeo();
   if (isForceBrowserGeo) {
-    const watchId2 = navigator.geolocation.watchPosition(onSuccess, onError, option);
-    return () => navigator.geolocation.clearWatch(watchId2);
+    const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+    return () => navigator.geolocation.clearWatch(watchId);
   }
   const browserPlatform = detectBrowserPlatform();
   const osPlatform = detectOSPlatform();
@@ -4758,11 +4765,7 @@ function compatibleWathPosition(onSuccess, onError, option) {
   if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
     return alipayWatchPosition(onSuccess, onError, option, (props) => my.getLocation(props));
   }
-  if (osPlatform === OS_PLATFORM.ANDROID) {
-    return androidWatchPosition(onSuccess, onError, option);
-  }
-  const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
-  return () => navigator.geolocation.clearWatch(watchId);
+  return androidWatchPosition(onSuccess, onError, option);
 }
 function compatibleGeoPositionTransform(position, transform2) {
   const os = detectOSPlatform();
@@ -6835,10 +6838,14 @@ const useAmapGCJ02 = () => {
   async function toGcj02Points(points) {
     await readyPromise;
     return new Promise((resolve) => {
+      let isHandled = false;
       AMap.convertFrom(
-        points,
+        [...points],
         "gps",
         (_, result) => {
+          if (isHandled)
+            return;
+          isHandled = true;
           if (result.info === "ok") {
             resolve(result.locations.map(lnglat2point));
           } else {
@@ -6848,6 +6855,9 @@ const useAmapGCJ02 = () => {
         }
       );
       setTimeout(() => {
+        if (isHandled)
+          return;
+        isHandled = true;
         console.warn("警告: 高德坐标转换请求超时，启用本地转换");
         resolve(toLocalGcj02Points(points));
       }, AMAP_TO_GCJ02_TIMEOUT);

package/dist/index.js

@@ -17,7 +17,7 @@ if (typeof GeolocationPositionError === "undefined") {
   };
 }
 const name = "@heycar/heycars-map";
-const version = "0.9.20-timeout3";
+const version = "0.9.21-alpha";
 const type = "module";
 const bin = {
   checkVersion: "./bin/checkVersion.js"
@@ -4552,7 +4552,8 @@ function wechatWatchPosition(onSuccess, onError, option) {
   const { timeout } = option;
   let enable = true;
   let prevGeoPosition = void 0;
-  const isGeoWorkingRef = ref(true);
+  let lastSuccessfulResponse = void 0;
+  let geoErrorMessage = void 0;
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     try {
@@ -4581,26 +4582,24 @@ function wechatWatchPosition(onSuccess, onError, option) {
             if (isHandled)
               return;
             isHandled = true;
-            isGeoWorkingRef.value = true;
+            lastSuccessfulResponse = res;
+            geoErrorMessage = void 0;
             resolve(wxGetLocationSuccessResponse2GeolocationPosition(res));
           },
           fail(res) {
             if (isHandled)
               return;
             isHandled = true;
-            const isGeoWorking = isGeoWorkingRef.value;
-            isGeoWorkingRef.value = false;
-            console.warn(
-              "MyWarning: wx.getLocation failed errcode, errmsg = ",
-              res.errCode,
-              res.errMsg
-            );
+            const { errMsg: message, errCode: code } = res;
+            const prevMessage = geoErrorMessage;
+            geoErrorMessage = message;
             resolve(void 0);
-            if (!isGeoWorking)
+            if (prevMessage === message)
               return;
+            console.warn("MyWarning: wx.getLocation failed code, message = ", code, message);
             onError == null ? void 0 : onError(
               createCustomGeolocationPositionError(
-                res.errMsg,
+                message,
                 GeolocationPositionError.PERMISSION_DENIED
               )
             );
@@ -4611,12 +4610,21 @@ function wechatWatchPosition(onSuccess, onError, option) {
         setTimeout(() => {
           if (isHandled)
             return;
+          if (lastSuccessfulResponse) {
+            console.warn("警告: my.getLocation failed with errcode 13 which has been bypassed");
+            return resolve(
+              wxGetLocationSuccessResponse2GeolocationPosition(lastSuccessfulResponse)
+            );
+          }
+          const message = `Custom Timeout: exceed ${timeout}s`;
+          const prevMessage = geoErrorMessage;
+          geoErrorMessage = message;
           resolve(void 0);
+          if (prevMessage === message)
+            return;
+          console.warn("MyWarning: wx.getLocation 触发自定义超时, message = ", message);
           onError == null ? void 0 : onError(
-            createCustomGeolocationPositionError(
-              `Custom Timeout: exceed ${timeout}s`,
-              GeolocationPositionError.TIMEOUT
-            )
+            createCustomGeolocationPositionError(message, GeolocationPositionError.TIMEOUT)
           );
         }, timeout);
       });
@@ -4635,9 +4643,9 @@ function wechatWatchPosition(onSuccess, onError, option) {
 function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
   let enable = true;
   let prevGeoPosition = void 0;
+  let lastSuccessfulResponse = void 0;
+  let geoErrorMessage = void 0;
   const { timeout = ALIPAY_GEO_CACHE_TIMEOUT } = option;
-  const isGeoWorkingRef = ref(true);
-  const lastSuccessfulResponseRef = ref();
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     do {
@@ -4647,8 +4655,8 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
       }
       const geoPosition = await new Promise((resolve) => {
         const handleSuccess = (res) => {
-          lastSuccessfulResponseRef.value = res;
-          isGeoWorkingRef.value = true;
+          lastSuccessfulResponse = res;
+          geoErrorMessage = void 0;
           resolve(alipayMyGetLocationSuccessResponse2GeolocationPosition(res));
         };
         getLocationFn({
@@ -4656,25 +4664,21 @@ function alipayWatchPosition(onSuccess, onError, option, getLocationFn) {
           cacheTimeout: timeout / 1e3,
           success: handleSuccess,
           fail(res) {
-            if (res.error === 13 && lastSuccessfulResponseRef.value) {
-              console.warn(
-                "MyWarning: my.getLocation failed with errcode 13 which has been bypassed"
+            if (res.error === 13 && lastSuccessfulResponse) {
+              console.warn("警告: my.getLocation failed with errcode 13 which has been bypassed");
+              return resolve(
+                alipayMyGetLocationSuccessResponse2GeolocationPosition(lastSuccessfulResponse)
               );
-              return handleSuccess(lastSuccessfulResponseRef.value);
             }
-            const isGeoWorking = isGeoWorkingRef.value;
-            isGeoWorkingRef.value = false;
+            const { errorMessage: message, error: code } = res;
+            const prevMessage = geoErrorMessage;
+            geoErrorMessage = message;
             resolve(void 0);
-            if (!isGeoWorking)
+            if (prevMessage === message)
               return;
-            const { error, errorMessage } = res;
-            console.warn(
-              "MyWarning: my.getLocation failed errcode, errmsg = ",
-              error,
-              errorMessage
-            );
-            const geoErrorCode = alipayMyGetLocationError2GeolocationPositionErrorCode(error);
-            onError == null ? void 0 : onError(createCustomGeolocationPositionError(errorMessage, geoErrorCode));
+            console.warn("MyWarning: my.getLocation failed code, message = ", code, message);
+            const geoErrorCode = alipayMyGetLocationError2GeolocationPositionErrorCode(code);
+            onError == null ? void 0 : onError(createCustomGeolocationPositionError(message, geoErrorCode));
           }
         });
       });
@@ -4697,7 +4701,7 @@ const apGetLocation = ({ type: type2, cacheTimeout, success, fail }) => {
 function androidWatchPosition(onSuccess, onError, option) {
   let enable = true;
   let prevGeoPosition = void 0;
-  const isGeoWorkingRef = ref(true);
+  let geoErrorMessage = void 0;
   const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
   const startWatch = async () => {
     do {
@@ -4708,19 +4712,22 @@ function androidWatchPosition(onSuccess, onError, option) {
       const geoPosition = await new Promise((resolve) => {
         navigator.geolocation.getCurrentPosition(
           function onSuccess2(geoLocationPosition) {
-            isGeoWorkingRef.value = true;
+            geoErrorMessage = void 0;
             resolve(geoLocationPosition);
           },
           function onFail(geoError) {
-            const isGeoWorking = isGeoWorkingRef.value;
-            isGeoWorkingRef.value = false;
+            if (geoError.code === 3 && !!prevGeoPosition) {
+              console.warn("警告: navigator.geolocation.getCurrentPosition 超时跳过");
+              resolve(prevGeoPosition);
+              return;
+            }
+            const { message } = geoError;
+            const prevMessage = geoErrorMessage;
+            geoErrorMessage = message;
             resolve(void 0);
-            if (!isGeoWorking)
+            if (prevMessage === message)
               return;
-            console.warn(
-              "MyWarning: navigator.geolocation.getCurrentPosition failed: ",
-              geoError.message
-            );
+            console.warn("MyWarning: navigator.geolocation.getCurrentPosition failed: ", message);
             onError == null ? void 0 : onError(geoError);
           },
           option
@@ -4741,8 +4748,8 @@ function androidWatchPosition(onSuccess, onError, option) {
 function compatibleWathPosition(onSuccess, onError, option) {
   const isForceBrowserGeo = takeIsForceBrowserGeo();
   if (isForceBrowserGeo) {
-    const watchId2 = navigator.geolocation.watchPosition(onSuccess, onError, option);
-    return () => navigator.geolocation.clearWatch(watchId2);
+    const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+    return () => navigator.geolocation.clearWatch(watchId);
   }
   const browserPlatform = detectBrowserPlatform();
   const osPlatform = detectOSPlatform();
@@ -4756,11 +4763,7 @@ function compatibleWathPosition(onSuccess, onError, option) {
   if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
     return alipayWatchPosition(onSuccess, onError, option, (props) => my.getLocation(props));
   }
-  if (osPlatform === OS_PLATFORM.ANDROID) {
-    return androidWatchPosition(onSuccess, onError, option);
-  }
-  const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
-  return () => navigator.geolocation.clearWatch(watchId);
+  return androidWatchPosition(onSuccess, onError, option);
 }
 function compatibleGeoPositionTransform(position, transform2) {
   const os = detectOSPlatform();
@@ -6833,10 +6836,14 @@ const useAmapGCJ02 = () => {
   async function toGcj02Points(points) {
     await readyPromise;
     return new Promise((resolve) => {
+      let isHandled = false;
       AMap.convertFrom(
-        points,
+        [...points],
         "gps",
         (_, result) => {
+          if (isHandled)
+            return;
+          isHandled = true;
           if (result.info === "ok") {
             resolve(result.locations.map(lnglat2point));
           } else {
@@ -6846,6 +6853,9 @@ const useAmapGCJ02 = () => {
         }
       );
       setTimeout(() => {
+        if (isHandled)
+          return;
+        isHandled = true;
         console.warn("警告: 高德坐标转换请求超时，启用本地转换");
         resolve(toLocalGcj02Points(points));
       }, AMAP_TO_GCJ02_TIMEOUT);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.20-timeout3",
+  "version": "0.9.21-alpha",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js"