-
Notifications
You must be signed in to change notification settings - Fork 24
Redesign Light & Sun end to end #1556
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
760891c
Redesign Light and Sun
elkimek 02e7cdf
Satisfy strict-null checks
elkimek a2a6c0f
Stay within JS size guardrail
elkimek 00fc310
Address review and CI findings
elkimek d79be60
Isolate Light setup delegate test
elkimek 285553f
Finish Light and Sun CI repairs
elkimek bed9b31
Release aborted postal queue slots
elkimek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // @ts-check | ||
|
|
||
| import { fetchWithValidatedRedirects, readResponseTextWithCap } from '../lib/proxy-upstream.js'; | ||
|
|
||
| const CACHE_TTL_MS = 30 * 24 * 60 * 60 * 1000; | ||
| const CACHE_MAX = 512; | ||
| const cache = new Map(); | ||
| let requestQueue = Promise.resolve(); | ||
| let lastRequestStartedAt = 0; | ||
|
|
||
| function fetchPostalGeocodeUpstream(url, options, signal) { | ||
| const run = async () => { | ||
| const waitMs = Math.max(0, 1100 - (Date.now() - lastRequestStartedAt)); | ||
| if (waitMs) await new Promise(resolve => setTimeout(resolve, waitMs)); | ||
| lastRequestStartedAt = Date.now(); | ||
| return fetchWithValidatedRedirects(url, options, { signal }); | ||
| }; | ||
| const pending = requestQueue.then(run, run); | ||
| requestQueue = pending.then(() => undefined, () => undefined); | ||
|
greptile-apps[bot] marked this conversation as resolved.
|
||
| return pending; | ||
| } | ||
|
|
||
| /** | ||
| * @param {Record<string, any>} payload | ||
| * @param {any} req | ||
| * @param {{ corsHeaders: (req: any) => Record<string, string>, proxyUpstreamErrorResponse: (req: any, error: unknown, fallback: string) => Response }} helpers | ||
| */ | ||
| export async function handlePostalGeocode(payload, req, helpers) { | ||
| const country = typeof payload.country === 'string' ? payload.country.trim() : ''; | ||
| const postalCode = typeof payload.postalCode === 'string' ? payload.postalCode.trim() : ''; | ||
| const responseHeaders = () => ({ ...helpers.corsHeaders(req), 'Content-Type': 'application/json' }); | ||
| if (!country || !postalCode || country.length > 80 || postalCode.length > 24) { | ||
| return new Response(JSON.stringify({ error: 'Invalid country/postal code' }), { status: 400, headers: responseHeaders() }); | ||
| } | ||
| if (!/^[\p{L}\p{N} .-]+$/u.test(postalCode)) { | ||
| return new Response(JSON.stringify({ error: 'Invalid postal code characters' }), { status: 400, headers: responseHeaders() }); | ||
| } | ||
| const cacheKey = `${country}|${postalCode}`.toLowerCase(); | ||
| const cached = cache.get(cacheKey); | ||
| if (cached && Date.now() - cached.cachedAt <= CACHE_TTL_MS) { | ||
| return new Response(JSON.stringify(cached.value), { | ||
| status: 200, | ||
| headers: { ...responseHeaders(), 'Cache-Control': 'no-store' }, | ||
| }); | ||
| } | ||
| const query = new URLSearchParams({ country, postalcode: postalCode, format: 'jsonv2', limit: '3', addressdetails: '1' }); | ||
| const url = `https://nominatim.openstreetmap.org/search?${query.toString()}`; | ||
| try { | ||
| const upstream = await fetchPostalGeocodeUpstream(url, { | ||
| headers: { 'Accept': 'application/json', 'User-Agent': 'getbased-health-location-proxy/1.0 (+https://getbased.health)' }, | ||
| }, req.signal); | ||
| const text = await readResponseTextWithCap(upstream, 64 * 1024); | ||
| if (!upstream.ok) { | ||
| return new Response(JSON.stringify({ error: 'Location lookup unavailable' }), { status: upstream.status, headers: responseHeaders() }); | ||
| } | ||
| const results = JSON.parse(text); | ||
| const rows = Array.isArray(results) ? results : []; | ||
| const normalizedPostal = postalCode.replace(/\s+/g, '').toLowerCase(); | ||
| const match = rows.find(item => String(item?.address?.postcode || item?.name || '').replace(/\s+/g, '').toLowerCase() === normalizedPostal) || rows[0]; | ||
| const latitude = Number(match?.lat); | ||
| const longitude = Number(match?.lon); | ||
| if (!Number.isFinite(latitude) || !Number.isFinite(longitude)) { | ||
| return new Response(JSON.stringify({ error: 'Location not found' }), { status: 404, headers: responseHeaders() }); | ||
| } | ||
| const value = { | ||
| latitude: Math.round(latitude * 10) / 10, | ||
| longitude: Math.round(longitude * 10) / 10, | ||
| accuracyKm: 11, | ||
| timezone: null, | ||
| label: typeof match.display_name === 'string' ? match.display_name : `${postalCode}, ${country}`, | ||
| source: 'postal-area', | ||
| resolvedAt: Date.now(), | ||
| attribution: '© OpenStreetMap contributors', | ||
| }; | ||
| cache.set(cacheKey, { cachedAt: Date.now(), value }); | ||
| while (cache.size > CACHE_MAX) cache.delete(cache.keys().next().value); | ||
| return new Response(JSON.stringify(value), { status: 200, headers: { ...responseHeaders(), 'Cache-Control': 'no-store' } }); | ||
| } catch (error) { | ||
| return helpers.proxyUpstreamErrorResponse(req, error, 'Location lookup unavailable'); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.