@acms-subir/core 0.3.33 → 0.3.34

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @acms-subir/core
 
+## 0.3.34
+
+### Patch Changes
+
+- 2e58587: The privacy notice (English and Spanish) now says that, on Android, the app reports which notification channels it created, and that important notices such as cancellations may reach every device with notifications on whatever topics it chose. With announcements on, it names urgent announcements and says the app remembers on the phone which announcements were read or closed, which is never sent to the site. The App store answers list the channels too. Sites with push get a new automatic "last updated" date.
+
+  The public app API (`/api/v1/*`) now tells browsers to revalidate it every time (`Cache-Control: public, max-age=0, s-maxage=60`) and gives CDNs the stale-while-revalidate policy in `CDN-Cache-Control`. An Expo web build or web app no longer starts once from an old `/site` copy after the site updates. Native apps and pages are unchanged.
+
 ## 0.3.33
 
 ### Patch Changes

package/integration.mjs

@@ -653,7 +653,8 @@ function acmsVitePlugin(userConfig) {
  * @param {false | {maxAge?: number, staleWhileRevalidate?: number, memory?: boolean}} [options.cache]
  *   Shared caching of public pages and the public app API (`/api/v1/*`):
  *   `Cache-Control: public, s-maxage=<maxAge>, stale-while-revalidate=<staleWhileRevalidate>`
- *   (defaults 60 and 86400). Admin, previews, signed-in visitors, bookings,
+ *   (defaults 60 and 86400); the API sends that as `CDN-Cache-Control` and
+ *   `public, max-age=0, s-maxage=<maxAge>` to browsers, which revalidate it. Admin, previews, signed-in visitors, bookings,
  *   forms and every non-GET request stay `private, no-store`. Every content
  *   change clears the cache (Workers Cache, or the Cloudflare zone when
  *   CLOUDFLARE_ZONE_ID + CLOUDFLARE_API_TOKEN are set). `memory: false` turns

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acms-subir/core",
-  "version": "0.3.33",
+  "version": "0.3.34",
   "publishConfig": {
     "access": "public"
   },

package/src/lib/cache/policy.ts

@@ -8,6 +8,12 @@ import { I18N } from '../i18n';
 
 export const PRIVATE_CACHE_CONTROL = 'private, no-store';
 export const publicCacheControl = () => `public, s-maxage=${CACHE.maxAge}, stale-while-revalidate=${CACHE.staleWhileRevalidate}`;
+// The public app API: browsers (Expo web, web apps) revalidate by ETag every
+// time, since stale-while-revalidate would hand them an old /site without a
+// feature the app just got. CDNs that read CDN-Cache-Control (RFC 9213, e.g.
+// Cloudflare) still serve it stale while they refresh, like pages; others fall
+// back to s-maxage.
+export const apiCacheControl = () => `public, max-age=0, s-maxage=${CACHE.maxAge}`;
 // publicResponse's own header: browsers/apps always revalidate by ETag. The
 // policy upgrades it with s-maxage so a CDN can share it.
 export const API_REVALIDATE = 'public, max-age=0, must-revalidate';
@@ -64,12 +70,13 @@ export function applyCachePolicy(request: Request, response: Response, pathname
   if (!CACHE.enabled) return response;
   if (OWN_HEADERS.test(pathname)) return response;
   const current = response.headers.get('cache-control');
-  const set = (value: string) => {
-    try { response.headers.set('Cache-Control', value); return response; }
+  const set = (value: string, cdn?: string) => {
+    const write = (h: Headers) => { h.set('Cache-Control', value); if (cdn) h.set('CDN-Cache-Control', cdn); };
+    try { write(response.headers); return response; }
     catch {
       // immutable headers (a proxied/fetched response): copy it
       const copy = new Response(response.body, response);
-      copy.headers.set('Cache-Control', value);
+      write(copy.headers);
       return copy;
     }
   };
@@ -85,5 +92,6 @@ export function applyCachePolicy(request: Request, response: Response, pathname
     warnCookie(pathname);
     return set(PRIVATE_CACHE_CONTROL);
   }
+  if (pathname.startsWith('/api/v1/')) return set(apiCacheControl(), publicCacheControl());
   return set(publicCacheControl());
 }

package/src/lib/legal/app-privacy.ts

@@ -29,7 +29,7 @@ export function appPrivacyAnswers(f: LegalFacts, privacyUrl: string): AppPrivacy
     google: 'Personal info → Email address. Collected, not shared. Purpose: App functionality, Account management. Optional.',
   });
   if (f.push.enabled) rows.push({
-    data: 'Push token, platform, language and chosen topics', when: 'When someone turns on notifications',
+    data: 'Push token, platform, language, chosen topics and Android notification channels', when: 'When someone turns on notifications',
     apple: 'Identifiers → Device ID. Purpose: App Functionality. Linked to the user. Not used for tracking.',
     google: 'Device or other IDs. Collected, not shared (Expo, Apple and Google deliver on your behalf). Purpose: App functionality, Developer communications. Optional.',
   });

package/src/lib/legal/facts.ts

@@ -3,6 +3,7 @@ import type { ContentRepository } from '../repo/types';
 import type { Settings } from '../schema';
 import { CALENDAR, bookingsEnabled } from '../calendar/config';
 import { PUSH } from '../push/config';
+import { ANNOUNCEMENTS } from '../announcements/config';
 import { AUTH } from '../auth/config';
 import { EDITOR } from '../editor/config';
 import { SITE_ROLES } from '../roles';
@@ -39,6 +40,8 @@ export interface LegalFacts {
   /** maps provider name, or '' */
   maps: string;
   live: boolean;
+  /** acms({ announcements }): urgent ones reach every device; read and closed state stays in the app */
+  announcements: boolean;
   analytics: { umami: boolean; replay: boolean; meta: boolean; tiktok: boolean };
   ai: boolean;
   offsiteBackups: boolean;
@@ -79,6 +82,7 @@ export async function legalFacts(repo: ContentRepository, settings: Settings, lo
     email: email && !email.error && email.provider !== 'none' && email.config.enabled ? EMAIL_NAMES[email.provider] ?? email.provider : '',
     maps: (() => { const m = mapsStatus(locals); return m.enabled ? m.label.replace(/ \(self-hosted\)$/, '') : ''; })(),
     live: settings.live.mode !== 'off',
+    announcements: ANNOUNCEMENTS.enabled,
     analytics: {
       umami: a.umami.enabled && !!a.umami.websiteId,
       replay: a.umami.enabled && !!a.umami.websiteId && a.umami.replay.enabled,

package/src/lib/legal/text-en.ts

@@ -52,8 +52,8 @@ export function privacyEn(f: LegalFacts, country: string): PolicySection[] {
     'To see your bookings in our app, you can sign in with your email address. We email you a six-digit code that expires after 10 minutes. We keep your email address and that sign-in on your device until you sign out or don’t use it for 90 days.',
   ] });
   if (f.push.enabled) s.push({ id: 'push', title: 'Our app and notifications', text: [
-    'If you turn on notifications in our app, we store a push token for your device (an identifier that lets Apple or Google deliver notifications to it), whether it’s iOS or Android, your language and the topics you choose. We use them only to send the notifications you asked for, in your language. Notifications are delivered through Expo’s push service (expo.dev), Apple Push Notification service and Firebase Cloud Messaging.',
-    `You choose the topics in the app and can change them at any time; we never add a topic without asking you. To stop, turn notifications off in the app or in your phone’s settings. Turning them off in the app removes your device from our list right away. Devices that haven’t opened the app for ${days(f.push.retentionDays)}, and devices whose app was removed, are deleted automatically. We keep a record of each notification sent (its text, link and number of recipients, not who received it) for one year. The app works fully without notifications.`,
+    'If you turn on notifications in our app, we store a push token for your device (an identifier that lets Apple or Google deliver notifications to it), whether it’s iOS or Android, your language, the topics you choose and, on Android, which notification channels the app created (such as one for urgent notices). We use them only to send the notifications you asked for, in your language. Notifications are delivered through Expo’s push service (expo.dev), Apple Push Notification service and Firebase Cloud Messaging.',
+    `You choose the topics in the app and can change them at any time; we never add a topic without asking you. ${f.announcements ? 'Urgent announcements, such as cancellations, go to every device with notifications turned on, whatever topics it chose.' : 'Important notices, such as cancellations, may go to every device with notifications turned on, whatever topics it chose.'} To stop, turn notifications off in the app or in your phone’s settings. Turning them off in the app removes your device from our list right away. Devices that haven’t opened the app for ${days(f.push.retentionDays)}, and devices whose app was removed, are deleted automatically. We keep a record of each notification sent (its text, link and number of recipients, not who received it) for one year. The app works fully without notifications.`,
   ] });
   if (f.email) s.push({ id: 'email', title: 'Email', text: [
     `We send email through ${f.email}, which processes your email address and the message. We keep a delivery record (recipient and status) for 30 days, and keep addresses that bounce or report our email as spam on a list so we stop writing to them.`,
@@ -79,7 +79,9 @@ export function privacyEn(f: LegalFacts, country: string): PolicySection[] {
   ] });
   s.push({ id: 'cookies', title: 'Cookies and storage on your device', text: [
     `${f.auth === 'clerk' ? 'Clerk’s sign-in cookies' : 'A sign-in cookie (up to seven days)'} for people who sign in; a preview cookie only for staff previews and design share links (up to 30 days); and, in your browser, your light or dark mode choice, the announcements you close and, for one visit, the live video notices you close.${pixels ? ` ${pixelNames} ${f.analytics.meta && f.analytics.tiktok ? 'set their' : 'sets its'} own advertising cookies.` : ' We don’t use cookies for advertising.'}`,
-    ...(app ? ['Our app may keep the content it last loaded on your phone so it works offline, and remembers your notification choice there.'] : []),
+    ...(app ? [f.announcements
+      ? 'Our app may keep the content it last loaded on your phone so it works offline, and remembers there your notification choice and which announcements you’ve read or closed. That stays on your phone and is never sent to us.'
+      : 'Our app may keep the content it last loaded on your phone so it works offline, and remembers your notification choice there.'] : []),
   ] });
   s.push({ id: 'sharing', title: 'Who receives your information', text: [
     `We don’t sell your personal information${pixels ? '' : ' or share it for advertising'}. These service providers process it on our behalf and only for the purposes above: ${list(processors(f))}. They must protect it at least as this notice describes. Some of them may store it outside your country, including in the United States.`,

package/src/lib/legal/text-es.ts

@@ -53,8 +53,8 @@ export function privacyEs(f: LegalFacts, country: string): PolicySection[] {
     'Para ver sus reservaciones en nuestra app, puede iniciar sesión con su correo electrónico. Le enviamos un código de seis dígitos que vence a los 10 minutos. Guardamos su correo y esa sesión en su dispositivo hasta que la cierre o pasen 90 días sin usarla.',
   ] });
   if (f.push.enabled) s.push({ id: 'push', title: 'Nuestra app y las notificaciones', text: [
-    'Si activa las notificaciones en nuestra app, guardamos un identificador de notificaciones de su dispositivo (que permite a Apple o Google entregárselas), si es iOS o Android, su idioma y los temas que elija. Solo los usamos para enviarle las notificaciones que pidió, en su idioma. Las notificaciones se entregan a través del servicio de Expo (expo.dev), Apple Push Notification service y Firebase Cloud Messaging.',
-    `Usted elige los temas en la app y puede cambiarlos cuando quiera; nunca agregamos un tema sin preguntarle. Para dejar de recibirlas, desactive las notificaciones en la app o en los ajustes de su teléfono. Al desactivarlas en la app, su dispositivo se elimina de nuestra lista de inmediato. Los dispositivos que no han abierto la app en ${days(f.push.retentionDays)}, y aquellos en los que se borró la app, se eliminan automáticamente. Guardamos un registro de cada notificación enviada (su texto, su enlace y el número de destinatarios, no quiénes la recibieron) durante un año. La app funciona por completo sin notificaciones.`,
+    'Si activa las notificaciones en nuestra app, guardamos un identificador de notificaciones de su dispositivo (que permite a Apple o Google entregárselas), si es iOS o Android, su idioma, los temas que elija y, en Android, qué canales de notificación creó la app (por ejemplo, uno para avisos urgentes). Solo los usamos para enviarle las notificaciones que pidió, en su idioma. Las notificaciones se entregan a través del servicio de Expo (expo.dev), Apple Push Notification service y Firebase Cloud Messaging.',
+    `Usted elige los temas en la app y puede cambiarlos cuando quiera; nunca agregamos un tema sin preguntarle. ${f.announcements ? 'Los anuncios urgentes, como una cancelación, llegan a todos los dispositivos con las notificaciones activadas, sin importar los temas que eligieron.' : 'Los avisos importantes, como una cancelación, pueden llegar a todos los dispositivos con las notificaciones activadas, sin importar los temas que eligieron.'} Para dejar de recibirlas, desactive las notificaciones en la app o en los ajustes de su teléfono. Al desactivarlas en la app, su dispositivo se elimina de nuestra lista de inmediato. Los dispositivos que no han abierto la app en ${days(f.push.retentionDays)}, y aquellos en los que se borró la app, se eliminan automáticamente. Guardamos un registro de cada notificación enviada (su texto, su enlace y el número de destinatarios, no quiénes la recibieron) durante un año. La app funciona por completo sin notificaciones.`,
   ] });
   if (f.email) s.push({ id: 'email', title: 'Correo electrónico', text: [
     `Enviamos correos a través de ${f.email}, que trata su dirección de correo y el mensaje. Guardamos un registro de entrega (destinatario y estado) durante 30 días, y mantenemos en una lista las direcciones que rebotan o marcan nuestros correos como spam para dejar de escribirles.`,
@@ -80,7 +80,9 @@ export function privacyEs(f: LegalFacts, country: string): PolicySection[] {
   ] });
   s.push({ id: 'cookies', title: 'Cookies y almacenamiento en su dispositivo', text: [
     `${f.auth === 'clerk' ? 'Las cookies de inicio de sesión de Clerk' : 'Una cookie de inicio de sesión (hasta siete días)'} para quienes inician sesión; una cookie de vista previa solo para las vistas previas del personal y los enlaces para compartir diseños (hasta 30 días); y, en su navegador, su preferencia de modo claro u oscuro, los anuncios que cierra y, durante una visita, los avisos de video en vivo que cierra.${pixels ? ` ${pixelNames} ${both ? 'guardan sus propias' : 'guarda sus propias'} cookies de publicidad.` : ' No usamos cookies con fines publicitarios.'}`,
-    ...(app ? ['Nuestra app puede guardar en su teléfono el contenido que cargó por última vez para funcionar sin conexión, y recuerda ahí su preferencia de notificaciones.'] : []),
+    ...(app ? [f.announcements
+      ? 'Nuestra app puede guardar en su teléfono el contenido que cargó por última vez para funcionar sin conexión, y recuerda ahí su preferencia de notificaciones y qué anuncios leyó o cerró. Eso se queda en su teléfono y nunca se nos envía.'
+      : 'Nuestra app puede guardar en su teléfono el contenido que cargó por última vez para funcionar sin conexión, y recuerda ahí su preferencia de notificaciones.'] : []),
   ] });
   s.push({ id: 'sharing', title: 'Quién recibe sus datos', text: [
     `No vendemos sus datos personales${pixels ? '' : ' ni los compartimos con fines publicitarios'}. Estos proveedores los tratan por cuenta nuestra y solo para los fines descritos: ${list(processors(f))}. Deben protegerlos al menos como lo describe este aviso. Algunos pueden guardarlos fuera de su país, incluido Estados Unidos.`,