gitoriaLog in with ident

tracker

All repositories: gitoria

ReadmeCodePull requestsReleasesTicketsSettings
Commit84e1b3e184e1b3e1tracker: reports 025 + 026mre84e1b3e1/plugins/web/router.hl

5.3 KB

  1. // THE ROUTER — realm-neutral, like view.hl: the same matcher runs on the server
  2. // (which route answers a request) and in the browser (is this link a route of
  3. // this app, and which). Ported from hl:web v1's client/router.hl, itself the port
  4. // of the server matcher: one algorithm, one file, both realms.
  5. //
  6. // A route table is a list of hybrids. The PATTERN is the URLPattern `pathname`
  7. // subset; the second key names the route's KIND (hybrilior 0.3.0's types):
  8. // { pattern = "/posts/:id" component = "./components/post.hl" } a page (SSR + client)
  9. // { pattern = "/health" function = (route, req) => { … } } server code answers
  10. // { pattern = "/robots.txt" direct = "User-agent: *" } a fixed body
  11. // { pattern = "/favicon.ico" file = "./assets/favicon.ico" } one file
  12. // { pattern = "/assets/*" directory = "./assets" } a directory, `*` is the rest
  13. // First match wins: authored order IS priority.
  14. //
  15. // PATTERN SYNTAX: `/a/b` literal segments, `:name` one segment into params.name,
  16. // `:name?` optional (absent ⇒ null), `*` the rest into params["0"], and `*name` the
  17. // rest into params.name (ticket #81): a page component reads it as its member `name`,
  18. // the way it reads a `:name` group — "0" is no name a member can have.
  19. routes = [] // bound by `new Router(routes = …)`
  20. // the route's kind, by which key it carries
  21. kindOf(r) {
  22. if (r.component != null) { return 'component' }
  23. if (r.function != null) { return 'function' }
  24. if (r.direct != null) { return 'direct' }
  25. if (r.file != null) { return 'file' }
  26. if (r.directory != null) { return 'directory' }
  27. return null
  28. }
  29. // Split a URL path into its non-empty segments:
  30. // "/" -> [] ; "/notes/42" -> ["notes","42"] ; "/notes/42/" -> ["notes","42"].
  31. segments(path) {
  32. let raw = path.split("/")
  33. let out = []
  34. for (s of raw) {
  35. if (s.length > 0) { out[] = s }
  36. }
  37. return out
  38. }
  39. // Strip a query string / hash off a URL path before matching ("/a?b=1" -> "/a").
  40. cleanPath(path) {
  41. let p = "" + path
  42. let q = p.indexOf("?")
  43. if (q >= 0) { p = p.slice(0, q) }
  44. let h = p.indexOf("#")
  45. if (h >= 0) { p = p.slice(0, h) }
  46. if (p.length == 0) { return "/" }
  47. return p
  48. }
  49. // Match ONE pattern's segments against the path's. On success the captured
  50. // groups (possibly empty, which is still a MATCH); null on failure. `trailing`
  51. // says the path ended in a slash — segmentation drops the empty tail, and a `*`
  52. // at the end must still match "/files/" with { "0": "" } as the standard does.
  53. matchPattern(pattern, segs, trailing) {
  54. let psegs = segments(pattern)
  55. let groups = {}
  56. let i = 0
  57. while (i < psegs.length) {
  58. let p = psegs[i]
  59. if (p.startsWith("*")) {
  60. let wild = p == "*" ? "0" : p.slice(1)
  61. if (i >= segs.length) {
  62. if (trailing) {
  63. groups[wild] = ""
  64. return groups
  65. }
  66. return null
  67. }
  68. let rest = ""
  69. let j = i
  70. while (j < segs.length) {
  71. if (rest.length > 0) { rest = rest + "/" }
  72. rest = rest + segs[j]
  73. j = j + 1
  74. }
  75. groups[wild] = rest
  76. return groups
  77. }
  78. if (p.startsWith(":")) {
  79. let name = p.slice(1)
  80. let optional = false
  81. if (name.endsWith("?")) {
  82. optional = true
  83. name = name.slice(0, name.length - 1)
  84. }
  85. if (i < segs.length) {
  86. groups[name] = segs[i]
  87. } else {
  88. if (optional == false) { return null }
  89. groups[name] = null // an ABSENT optional group is null
  90. }
  91. } else {
  92. if (i >= segs.length) { return null }
  93. if (p != segs[i]) { return null }
  94. }
  95. i = i + 1
  96. }
  97. if (segs.length > psegs.length) { return null }
  98. return groups
  99. }
  100. // the params key a pattern's `*` fills: "0" for a bare one, the name after it
  101. // otherwise, "" when the pattern has none (no group has that key: `rest` is null)
  102. wildOf(pattern) {
  103. for (p of segments(pattern)) {
  104. if (p.startsWith("*")) { return p == "*" ? "0" : p.slice(1) }
  105. }
  106. return ""
  107. }
  108. // Match a path against the WHOLE table. `rest` is what the `*` took, named or not. Answers { route, kind, params, path } or
  109. // null — in the browser a null is a real navigation, on the server a 404.
  110. // `start` is the index to resume at: a static mount that holds no file for the url
  111. // does not consume it (COMPONENTS §11, D20), so the server asks again past it
  112. match(path, Number start = 0) {
  113. let clean = cleanPath(path)
  114. let segs = segments(clean)
  115. let trailing = false
  116. if (clean.length > 1 && clean.endsWith("/")) { trailing = true }
  117. let i = 0
  118. for (r of routes) {
  119. if (i >= start) {
  120. let groups = matchPattern(r.pattern, segs, trailing)
  121. if (groups != null) {
  122. return { route = r; kind = kindOf(r); params = groups; path = clean; index = i; rest = groups[wildOf(r.pattern)]; }
  123. }
  124. }
  125. i = i + 1
  126. }
  127. return null
  128. }
  129. // The table the BROWSER may hold: the routes it can show itself. A function is
  130. // server code and does not travel; direct, file and directory answers are the
  131. // server's too — the browser reaches those with a plain request, so it only
  132. // needs to know they are not pages.
  133. clientTable() {
  134. let out = []
  135. for (r of routes) {
  136. let k = kindOf(r)
  137. // the client needs only "a page": the component may be a CLASS value, which
  138. // does not survive the wire — the page's module rides the navigation's ack
  139. if (k == 'component') { out.push({ pattern = r.pattern; component = true; }) }
  140. else if (k != 'function') { out.push({ pattern = r.pattern; kind = k; }) }
  141. else { out.push({ pattern = r.pattern; kind = 'function'; }) }
  142. }
  143. return out
  144. }

Branches

Latest commits

  • 84e1b3e1tracker: reports 025 + 026mre
  • dc40d859tracker#31 (mission 026): duplicate titles merged — the 68 type+tmdbId pairs held by 157 records were the old tracker's (all migrated); merge.hl repair job (own clock, before the TMDB jobs) keeps one keeper per title (follows/watches > old short id > oldest), moves follows, watches, seasons, cast, credits, timelines, tombstones the rest (mergedInto, never deleted), slugs + short ids 301 to the keeper; stray seasons merged into their listed twin (Reacher S3 watches) or linked when watched; search import re-checks before its put; deploy.sh waits up to 90 s for 200; real copy 68 -> 0 dup ids, az5b2 follows/watches equal; gates 342/0, 32/0, 52/0mre
  • 2667da05tracker#30 (mission 025): /my/ pages from slim cached title cards, episode rows and watch sets (after the jobs /my/series 1.8 s -> 0.06 s, /my/unwatched 4.1 -> 0.18 s); timeline page shows its name once; franchise widget under the poster/title; movies with TV leftovers (First Contact) go through the details repair; tools/count-tmdb-ids.hl; gates 327/0, 52/0, 32/0mre
  • 3909810dantcolony#40: mission references in README/STATUS/docs point to the moved missionsmre
  • e63b1d28antcolony#40: history (LOG.md), worker briefs (missions/) and reports moved here from antcolony, numbered per project; old numbers in antcolony docs/mission-map.mdmre
  • 1cda451dtracker: Hybriel master 190aa11d (#127 both shapes, GC correctness fc838894) — conductor adopts despite /my/series 2.4x after jobs (memory 8.0 → 1.7 GB boot); see reports/071mre
  • c1fa2f2etracker (mission 071): Hybriel master 190aa11d measured on the real copy vs the live binary 8590df63 — NOT adopted (after the first-start jobs /my/series 2.4x slower, /series 1.6x, RSS swings 7.4-12.2 GB; fresh it is flat at 1.7-2.2 GB and /my/unwatched faster), vendor stays 8efba065, candidate kept in .scratch/w071/vendor-190aa11d; tests/kinds.mjs: collection seed off (its TMDB request broke check 1 in 1 of 4 runs); tests/realdata-071.sh + realdata-071-bench.mjs + tools/realdata-071-table.py; README + STATUS (numbers, how to repeat); gates 325/0, 32/0, 50/0mre
  • 8081350atracker docs (mission 070): README (summary, Config HL_GC_BYTES — kept at Hybriel's default, the 256 MiB setting is taken out of docker-compose.yml again: the jobs grew to 12+ GB with it too, see STATUS), Test (three gates), Deploy (first start ~50 min: kinds then seed, restart once after collections done, memory numbers), Vendored Hybriel 8efba065 + #48 audit, Files; STATUS mission 070 entry (merges, migrated counts, lambda audit, gates, RSS old vs new, how to repeat, open points); docs/kinds.md + docs/franchises.md job order; tests/realdata-070-*.sh, tools/count-migrated.hl, tools/ref-params.py, tools/lambda-audit.pymre
  • 1ad19c8ctracker: re-vendor Hybriel master 8efba065 (#126 GC by bytes, #48 lambda parameters copy) (mission 070): bin/hybriel sha256 50361e95…, plugins core crypto data fetch fs http http1 mpackdb proc smtp time web; lambda audit: 13 lambdas change a passed record/list (11 through a local alias), no caller relies on it — unchanged; 319 read-only lambda parameters get & (no copy per call: /my/schedule 2.35 → 0.46 s, /my/unwatched 13.7 → 5.7 s on the real copy); /my/unwatched one merge sort instead of n² inserts; docker-compose HL_GC_BYTES=268435456; deploy.sh runs kinds.mjs + franchises.mjs too (default ports 8700–8710); tests/realdata-070.mjs; gates browser 325/0, kinds 32/0, franchises 50/0mre
  • 46b21389tracker (mission 070, conductor): the sync never destroys migrated data — the one-time summary step MOVES a copied summary to migratedSummary (marker summaries-moved.txt) instead of clearing it; a migrated record's first title/genres/homepage/tagline TMDB replaces → migratedTitle/migratedGenres/migratedHomepage/migratedTagline, a migrated season's/episode's title/summary → migratedTitle/migratedSummary (set once); tests/peek-shows.hl prints them; gate 325/0mre
  • 749019b0Merge t19 (tracker#19 franchises + timelines) into main (mission 070): conflicts README/STATUS/show.hl/project.hl/browser.mjs/faketmdb.mjs, both sides kept; franchise/timeline pages get #20's typed heading (Franchise | …, Timeline | …), their title links via titlePath (/movies|/series|/shows); the collection seed waits for repair, kinds and credits too; franchises.mjs URLs + 2 new checks; gates browser 323/0, kinds 32/0, franchises 50/0mre
  • daf49feaMerge t20 (tracker#20 typed headings + #21 series/shows split) into main (mission 070): conflicts README/STATUS/show.hl/project.hl/search.hl/components/search.hl/browser.mjs/faketmdb.mjs, both sides kept; clock order backfill → repair → kinds → credits; withDetailsFields stores tmdbType + kind; gates: browser.mjs URLs → /series|/movies, typed h1 selectors; kinds.mjs repair/credits off, fixture name = seed name; browser 323/0, kinds 32/0mre
  • 20e09d89Merge t18 (tracker#18 delta sync) into main (mission 070): conflicts README/STATUS/show.hl/project.hl/browser.mjs, both sides kept; pageShowOf summary = summaryOfmre
  • f83571c3tracker#18 (mission 067): daily sync by change lists — TMDB /tv|movie/changes (since the stored day, paged) + TVmaze /updates/shows → only our changed titles (followed: full step, unfollowed: light step — changed seasons, no TVmaze), full walk on first run / gap > 14 days / failed list; show record refreshed (title, tmdbSummary, tagline, status, genres …; renamed titles re-indexed); summary = the creator's own text (page: summary > tmdbSummary > tvmazeSummary), one-time clear of copied summaries (9,647 on the live copy); gate 261, tests/realdata-018*.mjs, README + STATUSmre
  • 1ed5457etracker#20 + #21 (mission 068): typed headings "<Type> | <name>" in type colours; TV titles split into Series (/series) and Shows (/shows) by TMDB type + Reality/Talk/News genres — kind stored by sync/import/adult backfill + new kind backfill (resumes), /movies/<slug>, /shows/<slug> of a series/movie → 301, /my/series + /my/shows, home 5 tiles + 3 rows, search/filmography labels; gates kinds 32 + browser 266, tests/realdata-068.mjs, tools/count-kinds.hl, docs/kinds.md, README + STATUSmre
  • f2b00674Merge t26 (tracker#26 + #28) into main (mission 062): short ids for every new person (castPersonId, guest route), guest stars stored on the title and created as people only when opened (/person/tmdb/<id>?show=<id> → 302), lean watch/follow clicks (showRow a small object, cast/crew from the slug, watches cached per user, face rows only after a season toggle); gate 311, tests/realdata-062.mjs, README + STATUSmre
  • 0553b51ftracker#19 (mission 066): franchises and timelines — tables, /franchises, /franchises/<slug>, /timelines/<slug> (Timeline | Release sort, series by last episode), the Prequel | Timeline | Sequel widget with the franchise above, the creator's editor, TMDB collection seed in the app (resumes, paced); gate tests/franchises.mjs 48/0 + browser.mjs 266/0, tests/realdata-066.mjs, docs/franchises.md, README + STATUSmre
  • fa1f9dfatracker#29 (mission 063): unwatched check muted grey outline + check (accent only on hover), watched stays solid — no code regression, the accent outline read as ticked; gate checks real checks visibly (computed style + screenshot pixel) on /my/unwatched, show, movie, /my/movies; gate 266, tests/realdata-063.mjs, README + STATUSmre
  • 10bb3f93tracker#28 (mission 061): full cast (all seasons, main cast by episodes, guest stars) + crew (created by, directed by, written by, screenplay, story, music) — stored by the details completion, the daily sync, the search import (one details request) and a background credits job (resumes, RSS limit); show page collapsed after 20 with client-side Show all; showBySlug via a slug map; gate 249, tests/realdata-028.mjs, README + STATUSmre
  • d8b12d67tracker#27 (mission 060): short ids for movies, series and persons — old 702 kept (data/old-short-ids.json), new random [a-z0-9]{5} unique across both, claimed at creation, background backfill (resumes), shown under poster/photo, /<shortId> → 301; gate 259, tests/realdata-060*, README + STATUSmre