react-native-maplibre-lite 0.2.1 → 0.2.3

package/src/components/MapView.tsx

@@ -122,6 +122,13 @@ interface MapViewProps {
      * стороне. Без него озвучка и FAB выбора голоса отключены.
      */
     navigatorVoiceUrl?: string;
+    /**
+     * Dev-only: автоматически вести маркер по построенному маршруту
+     * (симуляция поездки для отладки). Требует `navigator: true`. Пока
+     * включено, реальный GPS в WebView не пробрасывается, чтобы не
+     * конфликтовать с симуляцией.
+     */
+    navigatorSimulate?: boolean;
     onNavigatorRouteSet?: (params: NavigatorRouteSetParams) => void;
     onNavigatorInstruction?: (params: NavigatorInstructionParams) => void;
     onNavigatorPositionSet?: (params: NavigatorPositionSetParams) => void;
@@ -150,6 +157,8 @@ export type MapViewRef = {
     setNavigatorPosition: (latitude: number, longitude: number, accuracy?: number) => void;
     /** Режим «клик по карте = новая позиция» (удобно в dev). */
     pickNavigatorPosition: () => void;
+    /** Dev-only: включить/выключить симуляцию поездки по маршруту. */
+    setNavigatorSimulation: (enabled: boolean) => void;
 };
 
 type MapViewRegistry = {
@@ -437,6 +446,10 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>((props, ref) => {
         sendToWebView({ function: 'recenterNavigatorCamera', params: {} });
     };
 
+    const setNavigatorSimulation = (enabled: boolean) => {
+        sendToWebView({ function: 'setNavigatorSimulation', params: { enabled } });
+    };
+
     useImperativeHandle(ref, () => ({
         fitBounds,
         flyTo,
@@ -444,6 +457,7 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>((props, ref) => {
         advanceNavigatorInstruction,
         setNavigatorPosition,
         pickNavigatorPosition,
+        setNavigatorSimulation,
     }), [fitBounds]);
 
 
@@ -563,7 +577,17 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>((props, ref) => {
     };
 
     useEffect(() => {
-        if (!props.navigator) {
+        if (!inited || !props.navigator) {
+            return;
+        }
+        sendToWebViewRef.current({
+            function: 'setNavigatorSimulation',
+            params: { enabled: !!props.navigatorSimulate },
+        });
+    }, [inited, props.navigator, props.navigatorSimulate]);
+
+    useEffect(() => {
+        if (!props.navigator || props.navigatorSimulate) {
             return;
         }
 
@@ -615,7 +639,7 @@ export const MapView = forwardRef<MapViewRef, MapViewProps>((props, ref) => {
         return () => {
             Geolocation.clearWatch(watchId);
         };
-    }, [props.navigator]);
+    }, [props.navigator, props.navigatorSimulate]);
 
     return (
         <View style={props.style}>

package/src/components/navigatorVoiceCatalog.ts

@@ -95,32 +95,73 @@ export async function writeVoicePref(pref: VoicePref): Promise<void> {
     }
 }
 
+const HTTP_URL_PREFIX_RE = /^https?:\/\//i;
+
+function trimTrailingSlashes(s: string): string {
+    return s.replace(/\/+$/, '');
+}
+
+/** Strips `?query` and `#hash` — catalog URLs are plain paths. */
+function stripUrlQueryAndHash(url: string): string {
+    const q = url.indexOf('?');
+    const h = url.indexOf('#');
+    let end = url.length;
+    if (q >= 0) end = Math.min(end, q);
+    if (h >= 0) end = Math.min(end, h);
+    return url.slice(0, end);
+}
+
+function pathnameSegments(pathname: string): string[] {
+    return pathname.split('/').filter(Boolean);
+}
+
+/**
+ * Parses `http(s)://host[:port]/path` without the URL API (Hermes-safe).
+ */
+function parseHttpUrl(url: string): { origin: string; pathname: string } | null {
+    const bare = stripUrlQueryAndHash(url.trim());
+    if (!HTTP_URL_PREFIX_RE.test(bare)) return null;
+
+    const schemeEnd = bare.indexOf('://');
+    const rest = bare.slice(schemeEnd + 3);
+    const slash = rest.indexOf('/');
+    const authority = slash === -1 ? rest : rest.slice(0, slash);
+    if (!authority) return null;
+
+    const pathname = slash === -1 ? '/' : rest.slice(slash);
+    const origin = bare.slice(0, schemeEnd + 3) + authority;
+    return { origin, pathname };
+}
+
 export function resolveVoiceCatalogUrl(url: string): string | null {
     const t = url.trim();
     if (!t) return null;
-    try {
-        // eslint-disable-next-line no-new
-        new URL(t);
-        return t;
-    } catch {
-        return null;
-    }
+    return parseHttpUrl(t) ? t : null;
 }
 
 /** Base URL for a voice directory: `.../voices/{dir}`. */
 export function voiceDirBaseUrl(catalogUrl: string, dir: string): string {
-    const u = new URL(catalogUrl);
-    const parts = u.pathname.split('/').filter(Boolean);
+    const parsed = parseHttpUrl(catalogUrl);
+    if (!parsed) {
+        throw new Error('voiceDirBaseUrl: invalid catalog URL');
+    }
+
+    const parts = pathnameSegments(parsed.pathname);
     if (parts.length > 0 && parts[parts.length - 1]!.toLowerCase().endsWith('.json')) {
         parts.pop();
     }
-    parts.push(dir);
-    u.pathname = `/${parts.join('/')}`;
-    return u.toString().replace(/\/+$/, '');
+
+    const safeDir = dir.trim().replace(/[/\\]+/g, '');
+    if (!safeDir) {
+        throw new Error('voiceDirBaseUrl: empty dir');
+    }
+    parts.push(safeDir);
+
+    return trimTrailingSlashes(`${parsed.origin}/${parts.join('/')}`);
 }
 
 function voiceManifestUrl(baseUrl: string): string {
-    return `${baseUrl.replace(/\/+$/, '')}/data.json`;
+    return `${trimTrailingSlashes(baseUrl)}/data.json`;
 }
 
 export async function fetchVoiceCatalog(catalogUrl: string): Promise<VoiceCatalogEntry[]> {
@@ -257,7 +298,7 @@ export function keysToClipUrls(
     clipBaseUrl: string,
     keys: string[]
 ): string[] {
-    const base = clipBaseUrl.replace(/\/+$/, '');
+    const base = trimTrailingSlashes(clipBaseUrl);
     const variants = new Map<VoicePhraseKey, string>();
     const urls: string[] = [];
     for (const raw of keys) {

package/src/components/types.ts

@@ -238,6 +238,11 @@ export type MapLiteSetNavigatorPositionParams = {
     accuracy?: number,
 }
 
+/** RN → Web: `setNavigatorSimulation`. Отладочная симуляция поездки по маршруту. */
+export type MapLiteSetNavigatorSimulationParams = {
+    enabled: boolean,
+}
+
 /** RN → Web: JSON в `WebView.postMessage` (`webProject/src/map/MapLiteController.receive`). */
 export type NativeToWebCommand =
     | { function: 'init', params: MapLiteInitParams }
@@ -255,6 +260,7 @@ export type NativeToWebCommand =
     | { function: 'setNavigatorPosition', params: MapLiteSetNavigatorPositionParams }
     | { function: 'pickNavigatorPosition', params: Record<string, never> }
     | { function: 'recenterNavigatorCamera', params: Record<string, never> }
+    | { function: 'setNavigatorSimulation', params: MapLiteSetNavigatorSimulationParams }
 
 /** Web → RN: `postToNative` (`webProject/src/map/types.ts`). */
 export type WebToNativeMessage =