diff --git a/.gitignore b/.gitignore index fd1c82d..97ded40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.env +1.env .github/ node_modules/ dist/ diff --git a/frontend/public/offline.html b/frontend/public/offline.html new file mode 100644 index 0000000..5cbd6ae --- /dev/null +++ b/frontend/public/offline.html @@ -0,0 +1,47 @@ + + + + + + ออฟไลน์ | Atroute + + + + +
+ +

ไม่มีการเชื่อมต่อ

+

หน้านี้ต้องใช้อินเทอร์เน็ต — หน้ำที่เคยเปิดไว้จะยังใช้งานได้ตอนออฟไลน์

+ +
+ + diff --git a/frontend/public/sw.js b/frontend/public/sw.js new file mode 100644 index 0000000..4a8784b --- /dev/null +++ b/frontend/public/sw.js @@ -0,0 +1,123 @@ +/* ============================================================ + Atroute — Service Worker (Next.js) + + ทำไมต้องมี: + Chrome/Edge/Samsung Internet จะ "ติดตั้งเป็นแอป" ได้ก็ต่อเมื่อ + 1) เสิร์ฟผ่าน HTTPS (หรือ localhost) + 2) มี manifest ที่ถูกต้อง (192 + 512 icon, start_url, display) + 3) ★ มี service worker ที่มี fetch handler ควบคุมหน้าเว็บ + ข้อ 3 คือสิ่งที่ Next.js ไม่มีให้เอง — ไฟล์นี้คือคำตอบ + + กลยุทธ์ + - นำทาง (HTML) → network-first (ออนไลน์ได้ของใหม่, ออฟไลน์ใช้ cache) + - /_next/static, /image, /vendor, ฟอนต์ → cache-first (เร็ว + ออฟไลน์ได้) + - /api → ไม่แตะ (ให้ network จัดการ) + - SW ใหม่ → skipWaiting + clients.claim + แจ้งหน้าเว็บ + ============================================================ */ + +const VERSION = "1.0.0"; +const CACHE = `atroute-${VERSION}`; +const OFFLINE_URL = "/offline.html"; + +/* ไฟล์ที่ precache ไว้ใช้ตอนออฟไลน์ (เฉพาะที่ path คงที่) */ +const PRECACHE = [ + "/", + OFFLINE_URL, + "/ui-manifest.json", + "/image/icons/minibus-192x192.png", + "/image/icons/minibus-512x512.png", + "/image/icons/minibus-maskable-512x512.png", + "/logo.svg", + "/vendor/fonts/k2d.css", + "/vendor/leaflet/leaflet.css", +]; + +self.addEventListener("install", (event) => { + event.waitUntil( + caches + .open(CACHE) + .then((cache) => cache.addAll(PRECACHE).catch(() => undefined)) + .then(() => self.skipWaiting()), + ); +}); + +self.addEventListener("activate", (event) => { + event.waitUntil( + caches + .keys() + .then((keys) => Promise.all(keys.filter((k) => k !== CACHE).map((k) => caches.delete(k)))) + .then(() => self.clients.claim()) + .then(() => { + self.clients.matchAll({ type: "window" }).then((cs) => { + cs.forEach((c) => c.postMessage({ type: "SW_ACTIVATED", version: VERSION })); + }); + }), + ); +}); + +self.addEventListener("message", (event) => { + if (event.data === "SKIP_WAITING") self.skipWaiting(); +}); + +/** ไฟล์ static ที่ cache-first ได้ (path มี hash หรือไม่เปลี่ยนบ่อย) */ +function isStaticAsset(url) { + return ( + url.pathname.startsWith("/_next/static/") || + url.pathname.startsWith("/image/") || + url.pathname.startsWith("/vendor/") || + url.pathname.startsWith("/content/") || + /\.(?:png|jpe?g|webp|avif|svg|ico|woff2?|ttf|css|js)$/i.test(url.pathname) + ); +} + +self.addEventListener("fetch", (event) => { + const req = event.request; + if (req.method !== "GET") return; + + const url = new URL(req.url); + + /* ไม่ยุ่งกับ API และ cross-origin */ + if (url.origin !== self.location.origin) return; + if (url.pathname.startsWith("/api/") || url.pathname.startsWith("/files/")) return; + + /* ---- นำทาง: network-first + offline fallback ---- */ + if (req.mode === "navigate") { + event.respondWith( + fetch(req) + .then((res) => { + const copy = res.clone(); + caches.open(CACHE).then((c) => c.put(req, copy)).catch(() => undefined); + return res; + }) + .catch(async () => { + const cached = await caches.match(req); + return cached || (await caches.match(OFFLINE_URL)) || Response.error(); + }), + ); + return; + } + + /* ---- static: cache-first แล้วค่อยเติม cache ---- */ + if (isStaticAsset(url)) { + event.respondWith( + caches.match(req).then((cached) => { + if (cached) return cached; + return fetch(req).then((res) => { + if (res.ok && res.type === "basic") { + const copy = res.clone(); + caches.open(CACHE).then((c) => c.put(req, copy)).catch(() => undefined); + } + return res; + }); + }), + ); + return; + } + + /* ---- อื่น ๆ: network-first ---- */ + event.respondWith( + fetch(req) + .then((res) => res) + .catch(() => caches.match(req).then((r) => r || Response.error())), + ); +}); diff --git a/frontend/public/ui-manifest.json b/frontend/public/ui-manifest.json index 75179b9..5ce126c 100644 --- a/frontend/public/ui-manifest.json +++ b/frontend/public/ui-manifest.json @@ -10,28 +10,50 @@ "orientation": "any", "background_color": "#fcfbff", "theme_color": "#7a4cc0", - "categories": ["travel", "navigation", "transportation"], + "categories": [ + "travel", + "navigation", + "transportation" + ], "shortcuts": [ { "name": "เช็กเวลาเดินรถ", "short_name": "เช็กเวลา", "description": "ดูตารางเวลาเดินรถทุกจุดจอด", "url": "/check", - "icons": [{ "src": "/image/icons/minibus-192x192.png", "sizes": "192x192", "type": "image/png" }] + "icons": [ + { + "src": "/image/icons/minibus-192x192.png", + "sizes": "192x192", + "type": "image/png" + } + ] }, { "name": "ป้ายหยุดรถ", "short_name": "ป้ายหยุดรถ", "description": "ค้นหาป้ายหยุดรถทั้งหมด", "url": "/stops", - "icons": [{ "src": "/image/icons/minibus-192x192.png", "sizes": "192x192", "type": "image/png" }] + "icons": [ + { + "src": "/image/icons/minibus-192x192.png", + "sizes": "192x192", + "type": "image/png" + } + ] }, { "name": "รายละเอียดสายรถ", "short_name": "สายรถ", "description": "ดูรายละเอียดเส้นทางเดินรถ", "url": "/routes", - "icons": [{ "src": "/image/icons/minibus-192x192.png", "sizes": "192x192", "type": "image/png" }] + "icons": [ + { + "src": "/image/icons/minibus-192x192.png", + "sizes": "192x192", + "type": "image/png" + } + ] } ], "icons": [ @@ -52,6 +74,34 @@ "sizes": "512x512", "type": "image/png", "purpose": "maskable" + }, + { + "src": "/image/icons/minibus-maskable-512x512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "any" + } + ], + "id": "/", + "display_override": [ + "standalone", + "minimal-ui", + "browser" + ], + "prefer_related_applications": false, + "launch_handler": { + "client_mode": "navigate-existing" + }, + "handle_links": "preferred", + "scope_extensions": [], + "edge_side_panel": {}, + "screenshots": [ + { + "src": "/image/network/overview-map.png", + "sizes": "1440x1080", + "type": "image/png", + "form_factor": "wide", + "label": "แผนที่เครือข่ายป้าย Atroute" } ] } diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx index 4a9a67b..44372fc 100644 --- a/frontend/src/app/layout.tsx +++ b/frontend/src/app/layout.tsx @@ -1,5 +1,6 @@ import type { Metadata, Viewport } from "next"; import IconSprite from "@/components/IconSprite"; +import PwaBoot from "@/components/PwaBoot"; import SiteBoot from "@/components/SiteBoot"; import SiteFooter from "@/components/SiteFooter"; import SiteHeader from "@/components/SiteHeader"; @@ -19,12 +20,31 @@ export const metadata: Metadata = { }, description: "ศูนย์รวมข้อมูลตารางเดินรถ จุดจอด และเส้นทางในจังหวัดอ่างทองและจังหวัดใกล้เคียง", + applicationName: "Atroute", manifest: "/ui-manifest.json", - icons: { icon: "/image/icons/minibus-512x512.png" }, + icons: { + icon: [ + { url: "/image/icons/minibus-512x512.png", sizes: "512x512", type: "image/png" }, + { url: "/image/icons/minibus-192x192.png", sizes: "192x192", type: "image/png" }, + ], + apple: [{ url: "/image/icons/minibus-192x192.png", sizes: "192x192", type: "image/png" }], + }, + appleWebApp: { + capable: true, + title: "Atroute", + statusBarStyle: "default", + }, + formatDetection: { telephone: false, address: false, email: false }, }; export const viewport: Viewport = { themeColor: "#7a4cc0", + width: "device-width", + initialScale: 1, + // ห้าม maximumScale:1 / userScalable:false — ปิดการซูมจะไม่ผ่าน WCAG 1.4.4 + maximumScale: 5, + viewportFit: "cover", + interactiveWidget: "resizes-content", }; export default function RootLayout({ children }: { children: React.ReactNode }) { @@ -38,10 +58,9 @@ export default function RootLayout({ children }: { children: React.ReactNode }) rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Noto+Sans+Thai:wght@400;500;600;700;800&family=Prompt:wght@400;500;600;700&display=swap" /> - - - - + {/* theme-color / apple-touch-icon / apple-mobile-web-app-* / mobile-web-app-capable + ถูก emit อัตโนมัติจาก metadata.appleWebApp + metadata.icons + viewport.themeColor + — อย่าใส่ซ้ำที่นี่ (จะได้ meta ซ้ำ 2 ชุด) */}