Driver side (was a stub): - In-app driver onboarding: a driver-role user creates their own linked drivers profile (driver/profile+api GET/POST/PATCH). - Driver dashboard: online/offline toggle, today's earnings, incoming request cards (accept/decline), active ride panel (start/complete trip). Polls /driver/rides every 4s while online. - Location heartbeat (use-driver-location): watchPositionAsync pings /driver/location every ~5s; restarts the watch on app foreground so a backgrounded driver doesn't go permanently stale and miss requests. Dispatch (auto-match nearest, Uber-style): - Ride state machine: requested -> accepted -> en_route -> completed/cancelled with a nullable driver_id until matched (lib/dispatch.matchNextDriver). - matchNextDriver locks the ride (SELECT FOR UPDATE), expires 15s-stale offers, picks the nearest eligible driver of the matching service by haversine, offers one at a time. Called from ride/create, ride/[id] GET (lazy match on the rider's poll), and ride/[id]/respond (on decline). - ride/create is now a request endpoint (driver_id NULL, status=requested, service); drops the pre-match driver_id payment reconciliation. - ride/[id] GET returns status/service/nullable driver; PATCH handles rider cancel + driver en_route/completed. ride/list backs the history tabs. Rider flow (best experience): - confirm-ride is now a request screen: single trip fare + nearest-driver ETA + cash/card + Request Ride -> live status. Periodically polls online drivers of the selected service and disables Request when none are online (prevents the "stuck searching forever" state). - book-ride is the live ride-status screen (searching -> accepted -> en_route -> completed/cancelled + Cancel), polling every 3s. - lib/request-ride unifies the Areeba card flow + cash path. - Map reads /driver/nearby (real positions, service-filtered); lib/map adds calculateTripFare + service-aware fares. POI suggestions: - lib/places (Google Nearby Search) + nearby-suggestions chips for mall/hospital/pharmacy/restaurant on the home screen. Service categories now drive both matching and a per-service fare multiplier (car 1.0 / moto 0.7 / courier 0.85 / chauffeur 1.5). Map tiles: react-native-maps rendered blank on Android because no Google Maps key was set. Switched app.json -> app.config.js so android.config.googleMaps.apiKey is injected from EXPO_PUBLIC_GOOGLE_API_KEY at build time (keeps the key out of git). Requires a native rebuild (expo run:android) to take effect. Also includes the prior payment/auth hardening (server-authoritative payment_orders ledger with double-spend guards, peppered OTP, register TOCTOU fix, stats cents fix) that was left uncommitted. Co-Authored-By: Claude <noreply@anthropic.com>
45 lines
1.5 KiB
TypeScript
45 lines
1.5 KiB
TypeScript
import { requireAuth } from "@/lib/jwt";
|
|
import { sql } from "@/lib/db";
|
|
|
|
// GET — online drivers of `service` near (lat,lng), for the rider map and the
|
|
// "nearest driver ETA" estimate on confirm-ride. Only real, logged-in drivers
|
|
// (user_id IS NOT NULL) with a fresh location ping are returned; legacy seed
|
|
// rows have no position and are never shown to riders.
|
|
//
|
|
// Query: ?service=car&lat=33.89&lng=35.50&radius=8000
|
|
export async function GET(req: Request) {
|
|
const auth = requireAuth(req);
|
|
if ("error" in auth) return auth.error;
|
|
|
|
try {
|
|
const url = new URL(req.url);
|
|
const service = url.searchParams.get("service") ?? "car";
|
|
const lat = Number(url.searchParams.get("lat"));
|
|
const lng = Number(url.searchParams.get("lng"));
|
|
|
|
if (Number.isNaN(lat) || Number.isNaN(lng)) {
|
|
return Response.json(
|
|
{ error: "lat and lng query params are required numbers." },
|
|
{ status: 400 },
|
|
);
|
|
}
|
|
|
|
const rows = await sql`
|
|
SELECT id, first_name, last_name, profile_image_url, car_image_url,
|
|
car_seats, rating, service, car_model, latitude, longitude,
|
|
last_seen
|
|
FROM drivers
|
|
WHERE service = ${service}
|
|
AND online = TRUE
|
|
AND user_id IS NOT NULL
|
|
AND last_seen > CURRENT_TIMESTAMP - INTERVAL '60 seconds'
|
|
AND latitude IS NOT NULL
|
|
AND longitude IS NOT NULL
|
|
`;
|
|
|
|
return Response.json({ data: rows });
|
|
} catch (error) {
|
|
console.error("[DRIVER_NEARBY]: ", error);
|
|
return Response.json({ error: "Internal Server Error" }, { status: 500 });
|
|
}
|
|
} |