@heycar/heycars-map 2.8.2 → 2.9.0

package/dist/v2/types/global.d.ts

@@ -16,6 +16,7 @@ declare global {
     let wx: Wx;
     let my: AlipayMy;
     let ap: AlipayAp;
+    let HEYCAR_GEOLOCATION_GET_CURRENT_POSITION: Geolocation["getCurrentPosition"] | undefined;
     interface WindowEventMap {
         deviceorientationabsolute: DeviceOrientationEvent;
     }

package/dist/v2/utils/compatibleWatchPosition.js

@@ -5,6 +5,7 @@ import { createReadOnce, sleep, createRunOnce } from "./helper.js";
 import { detectBrowserPlatform, BRWOSER_PLATFORM, OS_PLATFORM, detectAlipayWallet, ALIPAY_WALLET, detectOSPlatform } from "./platform.js";
 import { QueryWxSignatureStatus } from "./QueryWxSignatureStatus.js";
 import { isGeoPositionEqual, alipayMyGetLocationSuccessResponse2GeolocationPosition, alipayMyGetLocationError2GeolocationPositionErrorCode, wxGetLocationSuccessResponse2GeolocationPosition } from "./transform.js";
+import { toGeolocationGetCurrentPosition } from "./typeChecking.js";
 const WX_INITIAL_GET_LOCATION_TIME_RATIO = 4;
 const WX_SIGNATURE_TIMEOUT = 20 * 1e3;
 const WX_GET_LOCATION_INTERVAL = 1 * 1e3;
@@ -200,7 +201,7 @@ const apGetLocation = ({ type, cacheTimeout, success, fail }) => {
   const apType = type >= 2 ? 0 : type === 0 ? 2 : 1;
   ap.getLocation({ type: apType, cacheTimeout }).then(success).catch(fail);
 };
-function androidWatchPosition(onSuccess, onError, option) {
+function androidWatchPosition(onSuccess, onError, option, getLocationFn) {
   let enable = true;
   let prevGeoPosition = void 0;
   let geoErrorMessage = void 0;
@@ -213,7 +214,7 @@ function androidWatchPosition(onSuccess, onError, option) {
       }
       const geoPosition = await new Promise((resolve) => {
         let isHandled = false;
-        navigator.geolocation.getCurrentPosition(
+        getLocationFn(
           function onSuccess2(geoLocationPosition) {
             if (isHandled)
               return;
@@ -290,7 +291,12 @@ function compatibleWathPosition(onSuccess, onError, option) {
   if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
     return alipayWatchPosition(onSuccess, onError, option, (props) => my.getLocation(props));
   }
-  return androidWatchPosition(onSuccess, onError, option);
+  return androidWatchPosition(onSuccess, onError, option, (...args) => {
+    return typeof HEYCAR_GEOLOCATION_GET_CURRENT_POSITION === "function" ? toGeolocationGetCurrentPosition(
+      HEYCAR_GEOLOCATION_GET_CURRENT_POSITION,
+      "HEYCAR_GEOLOCATION_GET_CURRENT_POSITION"
+    )(...args) : navigator.geolocation.getCurrentPosition(...args);
+  });
 }
 function compatibleGeoPositionTransform(position, transform) {
   const platform = detectBrowserPlatform();

package/dist/v2/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.8.2";
+const pkgVersion = "2.9.0";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/v2/utils/transform.d.ts

@@ -48,4 +48,5 @@ export declare const signal2promise: (signal?: AbortSignal) => Promise<any>;
 export declare const googleEncodedPolyline2googleLatLng: (value: string) => google.maps.LatLng[];
 export declare const gaodePolyline2amapLngLat: (value: string) => AMap.LngLat[];
 export declare const amapTraffic2trafficStatus: (value?: AMap.TMC["status"]) => TrafficStatus;
+export declare const error2beautifyString: (error: unknown) => string;
 export {};

package/dist/v2/utils/transform.js

@@ -306,6 +306,15 @@ const amapTraffic2trafficStatus = (value) => {
       return "HEAVY_TRAFFIC_JAM";
   }
 };
+const error2beautifyString = (error) => {
+  if (typeof error === "string")
+    return error;
+  if (error instanceof GeolocationPositionError) {
+    const { code, message } = error;
+    return `GeolocationPositionError: code: ${code}, message: ${message}`;
+  }
+  return JSON.stringify(error, Object.getOwnPropertyNames(error), 2).replace(/\\n/g, "\n").replace(/\\"/g, '"');
+};
 export {
   alipayMyGetLocationError2GeolocationPositionErrorCode,
   alipayMyGetLocationSuccessResponse2GeolocationPosition,
@@ -316,6 +325,7 @@ export {
   decodeAsterisk,
   deltaZoom2animationDuration,
   distanceVw2animationDuration,
+  error2beautifyString,
   gaodePointsStringify,
   gaodePolyline2amapLngLat,
   geoPositionError2businessTimeout,

package/dist/v2/utils/typeChecking.d.ts

@@ -42,4 +42,13 @@ interface MaybeCoordinateTrackPoint {
 }
 export declare const toCoordinateTrackPoint: (value?: MaybeCoordinateTrackPoint) => CoordinateTrackPoint;
 export declare function isProxyServiceError(error: unknown): error is ProxyServiceError;
+export declare function toGeolocationPositionError(error: unknown, prefix?: string): GeolocationPositionError;
+/**
+ * @warning: 目前只用到
+ *  * GeolocationPosition.coords.latitude
+ *  * GeolocationPosition.coords.longitude
+ * 如果将来用到其他属性，需要修补充
+ */
+export declare function assertGeolocationPosition(position: unknown): asserts position is GeolocationPosition;
+export declare function toGeolocationGetCurrentPosition(fn: Geolocation["getCurrentPosition"], fnName?: string): Geolocation["getCurrentPosition"];
 export {};

package/dist/v2/utils/typeChecking.js

@@ -1,3 +1,4 @@
+import { error2beautifyString } from "./transform.js";
 const createTypeError = (typeName, value, detail) => {
   if (detail)
     return new Error(
@@ -109,7 +110,62 @@ const toCoordinateTrackPoint = (value) => {
 function isProxyServiceError(error) {
   return !!error && typeof error === "object" && "msg" in error && "code" in error;
 }
+function toGeolocationPositionError(error, prefix = "") {
+  if (error instanceof GeolocationPositionError)
+    return error;
+  if (typeof error === "object" && error !== null && "code" in error && (error.code === 1 || error.code === 2 || error.code === 3) && "message" in error && typeof error.message === "string") {
+    return error;
+  }
+  return {
+    code: 2,
+    message: prefix + `GeolocationPositionError 格式错误, origin error: 
+${error2beautifyString(error)}`
+  };
+}
+function assertGeolocationPosition(position) {
+  if (position instanceof GeolocationPosition)
+    return;
+  if (typeof position !== "object" || position === null)
+    throw Error("GeolocationPosition 格式错误, 应当是一个非 null 的 object");
+  if (!("coords" in position) || typeof position.coords !== "object" || position.coords === null)
+    throw Error("GeolocationPosition 格式错误, coords 应当是非 null 的 object");
+  if (!("latitude" in position.coords) || typeof position.coords.latitude !== "number")
+    throw Error("GeolocationPosition 格式错误, latitude 应当是 number");
+  if (!("longitude" in position.coords) || typeof position.coords.longitude !== "number")
+    throw Error("GeolocationPosition 格式错误, longitude 应当是 number");
+}
+function toGeolocationGetCurrentPosition(fn, fnName = fn.name) {
+  const prefix = "ASSERT_GEOLOCATION_GET_CURRENT_POSITION_ERROR\n";
+  if (typeof fn !== "function")
+    throw Error(prefix + "Geolocation.getCurrentPosition 类型必须是一个 function");
+  return function assertedGetCurrentPosition(onSuccess, onError, options) {
+    const asseertedOnSuccess = (position) => {
+      try {
+        assertGeolocationPosition(position);
+      } catch (err) {
+        const { message } = err;
+        onError({
+          code: 2,
+          message: prefix + `${fnName} onSuccess 回调错误: ${message}`
+        });
+        return;
+      }
+      onSuccess(position);
+    };
+    const asseertedOnError = (error) => onError(toGeolocationPositionError(error, prefix));
+    try {
+      fn(asseertedOnSuccess, asseertedOnError, options);
+    } catch (err) {
+      onError({
+        code: 2,
+        message: prefix + `${fnName} 运行异常: 
+${error2beautifyString(err)}`
+      });
+    }
+  };
+}
 export {
+  assertGeolocationPosition,
   assertNoConflictTypeAndZone,
   createTypeError,
   isCoordinatePoint,
@@ -121,5 +177,7 @@ export {
   toCoordinateRecommendZonePlacesType,
   toCoordinateTrackPoint,
   toCoordinateZoneType,
+  toGeolocationGetCurrentPosition,
+  toGeolocationPositionError,
   toRecommendType
 };

package/dist/v3/types/global.d.ts

@@ -16,6 +16,7 @@ declare global {
     let wx: Wx;
     let my: AlipayMy;
     let ap: AlipayAp;
+    let HEYCAR_GEOLOCATION_GET_CURRENT_POSITION: Geolocation["getCurrentPosition"] | undefined;
     interface WindowEventMap {
         deviceorientationabsolute: DeviceOrientationEvent;
     }

package/dist/v3/utils/compatibleWatchPosition.js

@@ -5,6 +5,7 @@ import { createReadOnce, sleep, createRunOnce } from "./helper.js";
 import { detectBrowserPlatform, BRWOSER_PLATFORM, OS_PLATFORM, detectAlipayWallet, ALIPAY_WALLET, detectOSPlatform } from "./platform.js";
 import { QueryWxSignatureStatus } from "./QueryWxSignatureStatus.js";
 import { isGeoPositionEqual, alipayMyGetLocationSuccessResponse2GeolocationPosition, alipayMyGetLocationError2GeolocationPositionErrorCode, wxGetLocationSuccessResponse2GeolocationPosition } from "./transform.js";
+import { toGeolocationGetCurrentPosition } from "./typeChecking.js";
 const WX_INITIAL_GET_LOCATION_TIME_RATIO = 4;
 const WX_SIGNATURE_TIMEOUT = 20 * 1e3;
 const WX_GET_LOCATION_INTERVAL = 1 * 1e3;
@@ -200,7 +201,7 @@ const apGetLocation = ({ type, cacheTimeout, success, fail }) => {
   const apType = type >= 2 ? 0 : type === 0 ? 2 : 1;
   ap.getLocation({ type: apType, cacheTimeout }).then(success).catch(fail);
 };
-function androidWatchPosition(onSuccess, onError, option) {
+function androidWatchPosition(onSuccess, onError, option, getLocationFn) {
   let enable = true;
   let prevGeoPosition = void 0;
   let geoErrorMessage = void 0;
@@ -213,7 +214,7 @@ function androidWatchPosition(onSuccess, onError, option) {
       }
       const geoPosition = await new Promise((resolve) => {
         let isHandled = false;
-        navigator.geolocation.getCurrentPosition(
+        getLocationFn(
           function onSuccess2(geoLocationPosition) {
             if (isHandled)
               return;
@@ -290,7 +291,12 @@ function compatibleWathPosition(onSuccess, onError, option) {
   if (browserPlatform === BRWOSER_PLATFORM.ALIPAY || browserPlatform == BRWOSER_PLATFORM.ALIPAY_MINIPROGRAM) {
     return alipayWatchPosition(onSuccess, onError, option, (props) => my.getLocation(props));
   }
-  return androidWatchPosition(onSuccess, onError, option);
+  return androidWatchPosition(onSuccess, onError, option, (...args) => {
+    return typeof HEYCAR_GEOLOCATION_GET_CURRENT_POSITION === "function" ? toGeolocationGetCurrentPosition(
+      HEYCAR_GEOLOCATION_GET_CURRENT_POSITION,
+      "HEYCAR_GEOLOCATION_GET_CURRENT_POSITION"
+    )(...args) : navigator.geolocation.getCurrentPosition(...args);
+  });
 }
 function compatibleGeoPositionTransform(position, transform) {
   const platform = detectBrowserPlatform();

package/dist/v3/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.8.2";
+const pkgVersion = "2.9.0";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/v3/utils/transform.d.ts

@@ -48,4 +48,5 @@ export declare const signal2promise: (signal?: AbortSignal) => Promise<any>;
 export declare const googleEncodedPolyline2googleLatLng: (value: string) => google.maps.LatLng[];
 export declare const gaodePolyline2amapLngLat: (value: string) => AMap.LngLat[];
 export declare const amapTraffic2trafficStatus: (value?: AMap.TMC["status"]) => TrafficStatus;
+export declare const error2beautifyString: (error: unknown) => string;
 export {};

package/dist/v3/utils/transform.js

@@ -306,6 +306,15 @@ const amapTraffic2trafficStatus = (value) => {
       return "HEAVY_TRAFFIC_JAM";
   }
 };
+const error2beautifyString = (error) => {
+  if (typeof error === "string")
+    return error;
+  if (error instanceof GeolocationPositionError) {
+    const { code, message } = error;
+    return `GeolocationPositionError: code: ${code}, message: ${message}`;
+  }
+  return JSON.stringify(error, Object.getOwnPropertyNames(error), 2).replace(/\\n/g, "\n").replace(/\\"/g, '"');
+};
 export {
   alipayMyGetLocationError2GeolocationPositionErrorCode,
   alipayMyGetLocationSuccessResponse2GeolocationPosition,
@@ -316,6 +325,7 @@ export {
   decodeAsterisk,
   deltaZoom2animationDuration,
   distanceVw2animationDuration,
+  error2beautifyString,
   gaodePointsStringify,
   gaodePolyline2amapLngLat,
   geoPositionError2businessTimeout,

package/dist/v3/utils/typeChecking.d.ts

@@ -42,4 +42,13 @@ interface MaybeCoordinateTrackPoint {
 }
 export declare const toCoordinateTrackPoint: (value?: MaybeCoordinateTrackPoint) => CoordinateTrackPoint;
 export declare function isProxyServiceError(error: unknown): error is ProxyServiceError;
+export declare function toGeolocationPositionError(error: unknown, prefix?: string): GeolocationPositionError;
+/**
+ * @warning: 目前只用到
+ *  * GeolocationPosition.coords.latitude
+ *  * GeolocationPosition.coords.longitude
+ * 如果将来用到其他属性，需要修补充
+ */
+export declare function assertGeolocationPosition(position: unknown): asserts position is GeolocationPosition;
+export declare function toGeolocationGetCurrentPosition(fn: Geolocation["getCurrentPosition"], fnName?: string): Geolocation["getCurrentPosition"];
 export {};

package/dist/v3/utils/typeChecking.js

@@ -1,3 +1,4 @@
+import { error2beautifyString } from "./transform.js";
 const createTypeError = (typeName, value, detail) => {
   if (detail)
     return new Error(
@@ -109,7 +110,62 @@ const toCoordinateTrackPoint = (value) => {
 function isProxyServiceError(error) {
   return !!error && typeof error === "object" && "msg" in error && "code" in error;
 }
+function toGeolocationPositionError(error, prefix = "") {
+  if (error instanceof GeolocationPositionError)
+    return error;
+  if (typeof error === "object" && error !== null && "code" in error && (error.code === 1 || error.code === 2 || error.code === 3) && "message" in error && typeof error.message === "string") {
+    return error;
+  }
+  return {
+    code: 2,
+    message: prefix + `GeolocationPositionError 格式错误, origin error: 
+${error2beautifyString(error)}`
+  };
+}
+function assertGeolocationPosition(position) {
+  if (position instanceof GeolocationPosition)
+    return;
+  if (typeof position !== "object" || position === null)
+    throw Error("GeolocationPosition 格式错误, 应当是一个非 null 的 object");
+  if (!("coords" in position) || typeof position.coords !== "object" || position.coords === null)
+    throw Error("GeolocationPosition 格式错误, coords 应当是非 null 的 object");
+  if (!("latitude" in position.coords) || typeof position.coords.latitude !== "number")
+    throw Error("GeolocationPosition 格式错误, latitude 应当是 number");
+  if (!("longitude" in position.coords) || typeof position.coords.longitude !== "number")
+    throw Error("GeolocationPosition 格式错误, longitude 应当是 number");
+}
+function toGeolocationGetCurrentPosition(fn, fnName = fn.name) {
+  const prefix = "ASSERT_GEOLOCATION_GET_CURRENT_POSITION_ERROR\n";
+  if (typeof fn !== "function")
+    throw Error(prefix + "Geolocation.getCurrentPosition 类型必须是一个 function");
+  return function assertedGetCurrentPosition(onSuccess, onError, options) {
+    const asseertedOnSuccess = (position) => {
+      try {
+        assertGeolocationPosition(position);
+      } catch (err) {
+        const { message } = err;
+        onError({
+          code: 2,
+          message: prefix + `${fnName} onSuccess 回调错误: ${message}`
+        });
+        return;
+      }
+      onSuccess(position);
+    };
+    const asseertedOnError = (error) => onError(toGeolocationPositionError(error, prefix));
+    try {
+      fn(asseertedOnSuccess, asseertedOnError, options);
+    } catch (err) {
+      onError({
+        code: 2,
+        message: prefix + `${fnName} 运行异常: 
+${error2beautifyString(err)}`
+      });
+    }
+  };
+}
 export {
+  assertGeolocationPosition,
   assertNoConflictTypeAndZone,
   createTypeError,
   isCoordinatePoint,
@@ -121,5 +177,7 @@ export {
   toCoordinateRecommendZonePlacesType,
   toCoordinateTrackPoint,
   toCoordinateZoneType,
+  toGeolocationGetCurrentPosition,
+  toGeolocationPositionError,
   toRecommendType
 };

package/package.json

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