KrikoriosandClaude Opus 5
8807ff41c5
Driver onboarding now photographs the licence, ID card and vehicle
registration and reads the credential fields off them, plus a camera-only
profile selfie riders check the arriving driver against. Adds in-app chat
and WebRTC calls, push-backed ride offers, ratings, cancellation and
payment sheets, settlement, and the owner dashboard endpoints behind them.
Camera permission on Android:
- Declare CAMERA and READ_MEDIA_IMAGES in the manifest. expo-image-picker's
own plugin never declares CAMERA, and Android denies a request for an
undeclared permission instantly and silently — no dialog is ever shown,
which is indistinguishable from the app not asking at all.
- Handle canAskAgain: once Android stops showing the dialog, repeating why
we need it is a dead end, so offer Open Settings instead (lib/capture-
permission.ts), matching what the location flow already did.
Session: a 401 on a request that carried a token now ends the session
instead of being reinterpreted per-screen — driver-home had been reading it
as "this user has no driver profile" and showing an onboarding form to an
already-onboarded driver. Requests without a token are exempt so a failed
sign-in doesn't sign you out, and the notification is latched per token so
concurrent polls tear the session down once. (root) gains the auth guard
that turns that into the sign-in screen; app/index.tsx only guarded the way
in, leaving a session that ended mid-screen with nowhere to go.
Also ignore .uploads/ — it holds driver licence, ID and vehicle scans plus
profile photos, which are personal data and must not be committed.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
89 lines
3.2 KiB
TypeScript
89 lines
3.2 KiB
TypeScript
import { requireAuth } from "@/lib/jwt";
|
|
import { sql } from "@/lib/db";
|
|
import { boundingBox, haversine } from "@/lib/utils";
|
|
import { DRIVER_STALE_SECONDS } from "@/constants/dispatch";
|
|
|
|
// GET — online drivers of `service` near (lat,lng), for the rider map and the
|
|
// "drivers near you" count on the request screen. Only vetted, logged-in
|
|
// drivers (approved + 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
|
|
//
|
|
// The radius is enforced, not decorative. Returning every online driver in the
|
|
// country to any signed-in account turns this endpoint into a live tracker for
|
|
// the whole fleet; bounding it means a caller only ever learns about cars they
|
|
// could plausibly hail. A coarse bounding box does the work in the index, then
|
|
// a great-circle pass trims the corners.
|
|
const DEFAULT_RADIUS_M = 8000;
|
|
const MAX_RADIUS_M = 20000;
|
|
// Drivers are returned at ~11m precision (4 decimal places). That is well
|
|
// inside "which street is the car on" for a map pin, and stops the endpoint
|
|
// from being a metre-accurate trace of someone's working day.
|
|
const COORD_PRECISION = 1e4;
|
|
|
|
const snap = (value: number): number =>
|
|
Math.round(value * COORD_PRECISION) / COORD_PRECISION;
|
|
|
|
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 requested = Number(url.searchParams.get("radius"));
|
|
const radius =
|
|
Number.isFinite(requested) && requested > 0
|
|
? Math.min(requested, MAX_RADIUS_M)
|
|
: DEFAULT_RADIUS_M;
|
|
|
|
const box = boundingBox(lat, lng, radius);
|
|
|
|
const rows = await sql<{
|
|
id: number;
|
|
latitude: number;
|
|
longitude: number;
|
|
heading: number | null;
|
|
speed_kph: number | null;
|
|
}>`
|
|
SELECT id, first_name, last_name, profile_image_url, car_image_url,
|
|
car_seats, rating, service, car_model, latitude, longitude,
|
|
heading, speed_kph, last_seen
|
|
FROM drivers
|
|
WHERE service = ${service}
|
|
AND online = TRUE
|
|
AND approval_status = 'approved'
|
|
AND user_id IS NOT NULL
|
|
AND last_seen > CURRENT_TIMESTAMP - make_interval(secs => ${DRIVER_STALE_SECONDS})
|
|
AND latitude IS NOT NULL
|
|
AND longitude IS NOT NULL
|
|
AND latitude BETWEEN ${box.minLat} AND ${box.maxLat}
|
|
AND longitude BETWEEN ${box.minLng} AND ${box.maxLng}
|
|
`;
|
|
|
|
const nearby = rows
|
|
.filter((d) => haversine(lat, lng, d.latitude, d.longitude) <= radius)
|
|
.map((d) => ({
|
|
...d,
|
|
latitude: snap(d.latitude),
|
|
longitude: snap(d.longitude),
|
|
}));
|
|
|
|
return Response.json({ data: nearby });
|
|
} catch (error) {
|
|
console.error("[DRIVER_NEARBY]: ", error);
|
|
return Response.json({ error: "Internal Server Error" }, { status: 500 });
|
|
}
|
|
}
|