mihrab-methods 1.0.2 → 1.1.0

package/dist/cjs/server.js

@@ -0,0 +1,132 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpError = void 0;
+exports.handle = handle;
+exports.respond = respond;
+/**
+ * The HTTP API over the library — one handler, served two ways: by
+ * `tools/serve.ts` on Node (`npm run serve`) and by `api/worker.ts` at the
+ * edge (the public API). Nothing is logged or stored; every answer is JSON.
+ *
+ *   GET /                                            the routes, the methods' certification
+ *   GET /v1/methods                                  every method, as methodInfo gives it
+ *   GET /v1/places?authority=algeria                 the authority's places (id, name, country, lat, lon, tz)
+ *   GET /v1/nearest?authority=algeria&lat=36.75&lng=3.06
+ *   GET /v1/times?place=algeria:27&date=2026-10-15   one day, as timesFor gives it
+ *   GET /v1/times?authority=algeria&lat=36.75&lng=3.06&date=2026-10-15
+ *   GET /v1/times?place=algeria:27&from=2026-10-01&to=2026-10-31
+ *   GET /v1/authority?lat=36.75&lng=3.06             defaultAuthorityFor, with the country
+ *
+ * Options on /v1/times: asr=2 for the Hanafi Asr; strict=1 to refuse a date
+ * outside the certified span (HTTP 422) instead of answering 'method-only'.
+ */
+const index_js_1 = require("./index.js");
+const locate_js_1 = require("./locate.js");
+class HttpError extends Error {
+    status;
+    constructor(status, message) {
+        super(message);
+        this.status = status;
+    }
+}
+exports.HttpError = HttpError;
+const isAuthority = (x) => !!x && index_js_1.AUTHORITIES.includes(x);
+const num = (q, k) => {
+    const v = Number(q.get(k));
+    if (q.get(k) === null || !Number.isFinite(v))
+        throw new HttpError(400, `${k}: a number is needed`);
+    return v;
+};
+const authorityOf = (q) => {
+    const a = q.get('authority');
+    if (!isAuthority(a))
+        throw new HttpError(400, `authority: one of ${index_js_1.AUTHORITIES.join(', ')}`);
+    return a;
+};
+const placeOf = (q) => {
+    const id = q.get('place');
+    if (id) {
+        const p = (0, index_js_1.placeById)(id);
+        if (!p)
+            throw new HttpError(404, `no place ${id}`);
+        return p;
+    }
+    const near = (0, index_js_1.nearestPlace)(authorityOf(q), num(q, 'lat'), num(q, 'lng'));
+    if (!near)
+        throw new HttpError(404, 'no place near there');
+    return near.place;
+};
+const brief = (p) => ({ id: p.id, name: p.name, country: p.country, lat: p.lat, lon: p.lon, tz: p.tz });
+const ROUTES = [
+    '/v1/methods',
+    '/v1/places?authority=<authority>',
+    '/v1/nearest?authority=<authority>&lat=<lat>&lng=<lng>',
+    '/v1/times?place=<authority:id>&date=<YYYY-MM-DD>[&asr=2][&strict=1]',
+    '/v1/times?authority=<authority>&lat=<lat>&lng=<lng>&date=<YYYY-MM-DD>',
+    '/v1/times?place=<authority:id>&from=<YYYY-MM-DD>&to=<YYYY-MM-DD>',
+    '/v1/authority?lat=<lat>&lng=<lng>',
+];
+/** The answer to a request path and query. Throws HttpError, UncertifiedMethodError, RangeError or TypeError. */
+function handle(url) {
+    const q = url.searchParams;
+    switch (url.pathname.replace(/\/+$/, '') || '/') {
+        case '/':
+            return {
+                name: 'mihrab-methods',
+                description: 'The prayer-time authorities’ own calculation methods, each reproducing its published timetable to the minute.',
+                docs: 'https://github.com/MihrabHQ/mihrab-methods#readme',
+                routes: ROUTES,
+                authorities: index_js_1.AUTHORITIES,
+                // each method's record, as the library carries it (the feed on main may be newer: methodInfo says the date)
+                methods: index_js_1.AUTHORITIES.map(a => {
+                    const m = (0, index_js_1.methodInfo)(a);
+                    return { authority: a, name: m.name, revision: m.revision, certified: m.certified, checkedAt: m.certification?.checkedAt ?? null, places: m.places };
+                }),
+            };
+        case '/v1/methods':
+            return index_js_1.AUTHORITIES.map(index_js_1.methodInfo);
+        case '/v1/places':
+            return (0, index_js_1.placesOf)(authorityOf(q)).map(brief);
+        case '/v1/nearest': {
+            const near = (0, index_js_1.nearestPlace)(authorityOf(q), num(q, 'lat'), num(q, 'lng'));
+            return near && { place: brief(near.place), distanceKm: Math.round(near.distanceKm * 10) / 10 };
+        }
+        case '/v1/authority': {
+            const lat = num(q, 'lat'), lng = num(q, 'lng');
+            return { country: (0, locate_js_1.countryAt)(lat, lng), authority: (0, locate_js_1.defaultAuthorityFor)(lat, lng) };
+        }
+        case '/v1/times': {
+            const place = placeOf(q);
+            const opts = { asrShadow: q.get('asr') === '2' ? 2 : 1, strict: q.get('strict') === '1' };
+            const from = q.get('from'), to = q.get('to');
+            if (from && to)
+                return { place: brief(place), days: (0, index_js_1.timesForRange)(place, from, to, opts) };
+            return { place: brief(place), ...(0, index_js_1.timesFor)(place, q.get('date') ?? new Date().toISOString().slice(0, 10), opts) };
+        }
+        default:
+            throw new HttpError(404, `no such route; the routes are ${ROUTES.join(' · ')}`);
+    }
+}
+/** Status, body and headers for a request, errors included — what both servers send. */
+function respond(url) {
+    let status = 200;
+    let body;
+    try {
+        body = handle(url);
+    }
+    catch (e) {
+        status = e instanceof HttpError ? e.status : e instanceof index_js_1.UncertifiedMethodError ? 422 : e instanceof RangeError || e instanceof TypeError ? 400 : 500;
+        body = { error: e.message };
+    }
+    return {
+        status,
+        body: JSON.stringify(body),
+        headers: {
+            'content-type': 'application/json; charset=utf-8',
+            'access-control-allow-origin': '*',
+            'access-control-allow-methods': 'GET, OPTIONS',
+            // A day's times never change between releases: let browsers and the edge keep an answer for an hour.
+            'cache-control': status === 200 ? 'public, max-age=3600' : 'no-store',
+        },
+    };
+}

package/dist/esm/authorities/morocco.js

@@ -7,6 +7,7 @@ import points from '../data/generated/moroccoMethodPoints.js';
 import corrections from '../data/generated/moroccoCorrections.js';
 import certification from '../data/generated/moroccoCertification.js';
 import { METHOD_REVISION } from '../methods/revisions.js';
+import { moroccoDipEast, moroccoDipWest } from '../methods/morocco.js';
 import { registerAuthority } from '../core/registry.js';
 const AUTHORITY = 'morocco';
 /**
@@ -16,7 +17,6 @@ const AUTHORITY = 'morocco';
 const MOROCCO_TZ = 'Etc/GMT';
 /** The ministry's clock: GMT+1, then GMT — its tables print GMT from 17 September 2026, three days before the clocks moved. */
 export const MOROCCO_CLOCK = [['2020-01-01', 60], ['2026-09-17', 0]];
-const MOROCCO_DIP_PER_SQRT_M = 0.02;
 function buildPlaces() {
     return cities
         .filter(c => typeof c.lat === 'number' && typeof c.lng === 'number')
@@ -26,7 +26,7 @@ function buildPlaces() {
         const p = points[key];
         return p
             ? { ...base, lat: p[0], lon: p[1], dipDeg: p[2], ...(p.length > 3 ? { dipMaghribDeg: p[3] } : {}) }
-            : { ...base, lat: c.lat, lon: c.lng, dipDeg: MOROCCO_DIP_PER_SQRT_M * Math.sqrt(c.heightM ?? 0) };
+            : { ...base, lat: c.lat, lon: c.lng, dipDeg: moroccoDipEast(c.heightM ?? 0), dipMaghribDeg: moroccoDipWest(c.heightM ?? 0) };
     });
 }
 export const morocco = registerAuthority({
@@ -37,18 +37,19 @@ export const morocco = registerAuthority({
     certification,
     description: {
         name: 'Morocco — Ministry of Habous and Islamic Affairs',
-        method: 'Meeus’s apparent sun taken at each prayer’s own moment; Fajr 19°, Isha 17°, Asr one shadow; Dhuhr five minutes after transit; sunrise 2.85 minutes before and Maghrib 3.7 minutes after the upper limb on the horizon, less each city’s own horizon dip east and west; Fajr rounded down, the rest to the nearest minute; printed on the ministry’s clock (GMT+1 until 17 September 2026, then GMT).',
+        method: 'Meeus’s apparent sun taken at each prayer’s own moment; Fajr 19°, Isha 17°; Asr on the apparent sun — the gnomon’s shadow at noon plus one length, refraction on both altitudes; Dhuhr five minutes after transit; sunrise one minute before and Maghrib 1.8 minutes after the sun on −(34′ + s) less each city’s own horizon allowance east and west (an angle, about 0.32°–0.37° + 0.02°·√height); Fajr rounded down, the rest to the nearest minute; printed on the ministry’s clock (GMT+1 until 17 September 2026, then GMT).',
         countries: ['MA'],
         parameters: {
             fajrAngle: 19,
             ishaAngle: 17,
             asrShadow: 1,
             dhuhrAfterTransitMinutes: 5,
-            sunriseMarginMinutes: -2.85,
-            maghribMarginMinutes: 3.7,
+            sunriseMarginMinutes: -1.0,
+            maghribMarginMinutes: 1.8,
             refractionArcmin: 34,
+            asrRefraction: 'Sæmundsson from the true altitude at noon, Bennett under the apparent altitude at Asr (Meeus 16.4, 16.3)',
             sunSemidiameter: 'by the sun’s distance that day',
-            horizonDip: 'per city and per side, fitted (Place.dipDeg, Place.dipMaghribDeg); else 0.02°·√height, 0.86 of it at Maghrib',
+            horizonDip: 'per city and per side, fitted (Place.dipDeg, Place.dipMaghribDeg); else 0.32° + 0.025°·√height east, 0.37° + 0.021°·√height west',
             rounding: 'Fajr down to the minute, the rest to the nearest',
             sun: 'Meeus, apparent, with the full nutation; chapter-28 equation of time; iterated at each prayer',
         },

package/dist/esm/core/compute.js

@@ -32,7 +32,7 @@ export function candidateInstants(place, year, month, day, asrShadow = 1, opts =
         case 'algeria':
         case 'indonesia': {
             const t = place.authority === 'morocco'
-                ? moroccoTimes(place.lat, place.lon, year, month, day, place.dipDeg ?? 0, asrShadow, place.dipMaghribDeg)
+                ? moroccoTimes(place.lat, place.lon, year, month, day, place.dipDeg, asrShadow, place.dipMaghribDeg)
                 : place.authority === 'algeria'
                     ? algeriaTimes(place.lat, place.lon, year, month, day, asrShadow)
                     : kemenagTimes(place.lat, place.lon, year, month, day, { highland: place.highland, twilightDip: place.twilightDip, asrShadow, afternoon: place.afternoon });

package/dist/esm/data/generated/algeriaCertification.js

@@ -1,2 +1,2 @@
-const data = { "certified": true, "checkedAt": "2026-10-18", "places": 68, "checks": [{ "tables": "Algeria — Ministry of Religious Affairs", "places": 68, "times": 101184, "off": 0, "offWithoutCorrections": 642, "from": "2026-10-01", "to": "2027-06-05" }], "corrections": { "from": "2026-10-01", "to": "2027-06-05", "entries": 642, "sha256": "f8d227cdd88aabe5bcd1775ec0324abfdae07a8a3986fdd19816337c2d4ab3ca" }, "revision": 1 };
+const data = { "certified": true, "checkedAt": "2026-11-04", "places": 68, "checks": [{ "tables": "Algeria — Ministry of Religious Affairs", "places": 68, "times": 101184, "off": 0, "offWithoutCorrections": 642, "from": "2026-10-01", "to": "2027-06-05" }], "corrections": { "from": "2026-10-01", "to": "2027-06-05", "entries": 642, "sha256": "f8d227cdd88aabe5bcd1775ec0324abfdae07a8a3986fdd19816337c2d4ab3ca" }, "revision": 1 };
 export default data;

package/dist/esm/data/generated/diyanetCertification.js

@@ -1,2 +1,2 @@
-const data = { "certified": true, "checkedAt": "2026-10-18", "places": 8132, "checks": [{ "tables": "Diyanet — its tables worldwide", "places": 8132, "times": 69999603, "off": 0, "offWithoutCorrections": 9129, "from": "2024-01-01", "to": "2027-12-31" }], "corrections": { "from": "2024-01-01", "to": "2027-12-31", "entries": 9118, "sha256": "47997767e178ce48babd80f0e4a53460c5d379eb098bff1e7ebbba1e6afdf605" }, "revision": 1 };
+const data = { "certified": true, "checkedAt": "2026-11-04", "places": 8132, "checks": [{ "tables": "Diyanet — its tables worldwide", "places": 8132, "times": 69999603, "off": 0, "offWithoutCorrections": 9129, "from": "2024-01-01", "to": "2027-12-31" }], "corrections": { "from": "2024-01-01", "to": "2027-12-31", "entries": 9118, "sha256": "47997767e178ce48babd80f0e4a53460c5d379eb098bff1e7ebbba1e6afdf605" }, "revision": 1 };
 export default data;