@scalemule/news-publication 0.0.76 → 0.0.77

package/dist/meet-view.d.cts

@@ -18,7 +18,7 @@ declare function MeetupDetail({ meetup, joined }: {
     joined: boolean;
 }): React.JSX.Element;
 declare function activityChoices(): {
-    value: "other" | "walk" | "games" | "coffee" | "hike" | "pickleball" | "tennis" | "soccer" | "bike" | "dogs" | "books" | "kids" | "volunteer";
+    value: "walk" | "other" | "games" | "coffee" | "hike" | "pickleball" | "tennis" | "soccer" | "bike" | "dogs" | "books" | "kids" | "volunteer";
     label: string;
 }[];
 

package/dist/meet-view.d.ts

@@ -18,7 +18,7 @@ declare function MeetupDetail({ meetup, joined }: {
     joined: boolean;
 }): React.JSX.Element;
 declare function activityChoices(): {
-    value: "other" | "walk" | "games" | "coffee" | "hike" | "pickleball" | "tennis" | "soccer" | "bike" | "dogs" | "books" | "kids" | "volunteer";
+    value: "walk" | "other" | "games" | "coffee" | "hike" | "pickleball" | "tennis" | "soccer" | "bike" | "dogs" | "books" | "kids" | "volunteer";
     label: string;
 }[];
 

package/dist/reader-sso-client.cjs

@@ -150,19 +150,64 @@ function greetingText(profile, now = /* @__PURE__ */ new Date(), fallback = "Wel
   if (!name) return fallback;
   return `${greetingWord(localHour(now, profile.time_zone, profile.locale))}, ${name}`;
 }
+var READER_GREETING_POLL_MS = 3e4;
+var READER_GREETING_TIMEOUT_MS = 8e3;
+var READER_IDENTITY_CHANGED_EVENT = "scalemule:reader-identity-changed";
 function ReaderGreeting({ endpoint = "/api/news/session", className, fallback = "Welcome back", as: Tag = "span" }) {
   const [text, setText] = react.useState(null);
   react.useEffect(() => {
     let alive = true;
-    const controller = new AbortController();
-    fetch(endpoint, { credentials: "same-origin", cache: "no-store", signal: controller.signal }).then((response) => response.ok ? response.json() : null).then((summary) => {
-      if (!alive || !summary || summary.authenticated !== true) return;
-      setText(greetingText(summary, /* @__PURE__ */ new Date(), fallback));
-    }).catch(() => {
-    });
+    let generation = 0;
+    let authenticated = false;
+    let controller;
+    let deadline;
+    const refresh = (clear = false) => {
+      if (!alive) return;
+      if (clear) {
+        authenticated = false;
+        setText(null);
+      }
+      const current = ++generation;
+      controller?.abort();
+      if (deadline !== void 0) window.clearTimeout(deadline);
+      if (document.visibilityState === "hidden") return;
+      const request = new AbortController();
+      controller = request;
+      const timeout = window.setTimeout(() => {
+        if (!alive || current !== generation) return;
+        generation++;
+        authenticated = false;
+        setText(null);
+        request.abort();
+      }, READER_GREETING_TIMEOUT_MS);
+      deadline = timeout;
+      fetch(endpoint, { credentials: "same-origin", cache: "no-store", signal: request.signal }).then((response) => response.ok ? response.json() : null).then((summary) => {
+        if (!alive || current !== generation) return;
+        authenticated = summary?.authenticated === true;
+        setText(authenticated && summary ? greetingText(summary, /* @__PURE__ */ new Date(), fallback) : null);
+      }).catch(() => {
+        if (!alive || current !== generation) return;
+        authenticated = false;
+        setText(null);
+      }).finally(() => window.clearTimeout(timeout));
+    };
+    const recheck = () => refresh(true);
+    const timer = window.setInterval(() => {
+      if (authenticated) refresh();
+    }, READER_GREETING_POLL_MS);
+    window.addEventListener("focus", recheck);
+    document.addEventListener("visibilitychange", recheck);
+    document.addEventListener(READER_IDENTITY_CHANGED_EVENT, recheck);
+    refresh(true);
     return () => {
       alive = false;
-      controller.abort();
+      generation++;
+      controller?.abort();
+      if (deadline !== void 0) window.clearTimeout(deadline);
+      window.clearInterval(timer);
+      window.removeEventListener("focus", recheck);
+      document.removeEventListener("visibilitychange", recheck);
+      document.removeEventListener(READER_IDENTITY_CHANGED_EVENT, recheck);
     };
   }, [endpoint, fallback]);
   if (text === null) return null;
@@ -350,6 +395,9 @@ exports.AccountLinkForm = AccountLinkForm;
 exports.AccountSwitchPrompt = AccountSwitchPrompt;
 exports.LEDVERY_BUTTON_LABELS = LEDVERY_BUTTON_LABELS;
 exports.LedveryButton = LedveryButton;
+exports.READER_GREETING_POLL_MS = READER_GREETING_POLL_MS;
+exports.READER_GREETING_TIMEOUT_MS = READER_GREETING_TIMEOUT_MS;
+exports.READER_IDENTITY_CHANGED_EVENT = READER_IDENTITY_CHANGED_EVENT;
 exports.READER_SSO_ATTEMPT_WINDOW_MS = READER_SSO_ATTEMPT_WINDOW_MS;
 exports.READER_SSO_BOT_PATTERN = READER_SSO_BOT_PATTERN;
 exports.READER_SSO_PRIVATE_PATHS = READER_SSO_PRIVATE_PATHS;

package/dist/reader-sso-client.d.cts

@@ -64,6 +64,9 @@ type SessionSummaryResponse = {
     locale?: string;
     time_zone?: string;
 };
+declare const READER_GREETING_POLL_MS = 30000;
+declare const READER_GREETING_TIMEOUT_MS = 8000;
+declare const READER_IDENTITY_CHANGED_EVENT = "scalemule:reader-identity-changed";
 declare function ReaderGreeting({ endpoint, className, fallback, as: Tag }: {
     endpoint?: string;
     className?: string;
@@ -128,4 +131,4 @@ declare function AccountSwitchPrompt({ currentName, pendingName, endpoint, class
     onDone?: (result: SwitchResult) => void;
 }): React.JSX.Element;
 
-export { AccountLinkForm, AccountSwitchPrompt, type GreetingProfile, LEDVERY_BUTTON_LABELS, LedveryButton, type LinkResult, READER_SSO_ATTEMPT_WINDOW_MS, READER_SSO_BOT_PATTERN, READER_SSO_PRIVATE_PATHS, ReaderGreeting, ReaderSsoBoot, type ReaderSsoClassNames, type ReaderSsoProvider, type SessionSummaryResponse, type SilentSignInDecision, type SilentSignInEnvironment, type SwitchChoice, type SwitchResult, firstName, greetingText, greetingWord, isFormField, localHour, silentSignInDecision, silentSignInUrl };
+export { AccountLinkForm, AccountSwitchPrompt, type GreetingProfile, LEDVERY_BUTTON_LABELS, LedveryButton, type LinkResult, READER_GREETING_POLL_MS, READER_GREETING_TIMEOUT_MS, READER_IDENTITY_CHANGED_EVENT, READER_SSO_ATTEMPT_WINDOW_MS, READER_SSO_BOT_PATTERN, READER_SSO_PRIVATE_PATHS, ReaderGreeting, ReaderSsoBoot, type ReaderSsoClassNames, type ReaderSsoProvider, type SessionSummaryResponse, type SilentSignInDecision, type SilentSignInEnvironment, type SwitchChoice, type SwitchResult, firstName, greetingText, greetingWord, isFormField, localHour, silentSignInDecision, silentSignInUrl };

package/dist/reader-sso-client.d.ts

@@ -64,6 +64,9 @@ type SessionSummaryResponse = {
     locale?: string;
     time_zone?: string;
 };
+declare const READER_GREETING_POLL_MS = 30000;
+declare const READER_GREETING_TIMEOUT_MS = 8000;
+declare const READER_IDENTITY_CHANGED_EVENT = "scalemule:reader-identity-changed";
 declare function ReaderGreeting({ endpoint, className, fallback, as: Tag }: {
     endpoint?: string;
     className?: string;
@@ -128,4 +131,4 @@ declare function AccountSwitchPrompt({ currentName, pendingName, endpoint, class
     onDone?: (result: SwitchResult) => void;
 }): React.JSX.Element;
 
-export { AccountLinkForm, AccountSwitchPrompt, type GreetingProfile, LEDVERY_BUTTON_LABELS, LedveryButton, type LinkResult, READER_SSO_ATTEMPT_WINDOW_MS, READER_SSO_BOT_PATTERN, READER_SSO_PRIVATE_PATHS, ReaderGreeting, ReaderSsoBoot, type ReaderSsoClassNames, type ReaderSsoProvider, type SessionSummaryResponse, type SilentSignInDecision, type SilentSignInEnvironment, type SwitchChoice, type SwitchResult, firstName, greetingText, greetingWord, isFormField, localHour, silentSignInDecision, silentSignInUrl };
+export { AccountLinkForm, AccountSwitchPrompt, type GreetingProfile, LEDVERY_BUTTON_LABELS, LedveryButton, type LinkResult, READER_GREETING_POLL_MS, READER_GREETING_TIMEOUT_MS, READER_IDENTITY_CHANGED_EVENT, READER_SSO_ATTEMPT_WINDOW_MS, READER_SSO_BOT_PATTERN, READER_SSO_PRIVATE_PATHS, ReaderGreeting, ReaderSsoBoot, type ReaderSsoClassNames, type ReaderSsoProvider, type SessionSummaryResponse, type SilentSignInDecision, type SilentSignInEnvironment, type SwitchChoice, type SwitchResult, firstName, greetingText, greetingWord, isFormField, localHour, silentSignInDecision, silentSignInUrl };

package/dist/reader-sso-client.js

@@ -148,19 +148,64 @@ function greetingText(profile, now = /* @__PURE__ */ new Date(), fallback = "Wel
   if (!name) return fallback;
   return `${greetingWord(localHour(now, profile.time_zone, profile.locale))}, ${name}`;
 }
+var READER_GREETING_POLL_MS = 3e4;
+var READER_GREETING_TIMEOUT_MS = 8e3;
+var READER_IDENTITY_CHANGED_EVENT = "scalemule:reader-identity-changed";
 function ReaderGreeting({ endpoint = "/api/news/session", className, fallback = "Welcome back", as: Tag = "span" }) {
   const [text, setText] = useState(null);
   useEffect(() => {
     let alive = true;
-    const controller = new AbortController();
-    fetch(endpoint, { credentials: "same-origin", cache: "no-store", signal: controller.signal }).then((response) => response.ok ? response.json() : null).then((summary) => {
-      if (!alive || !summary || summary.authenticated !== true) return;
-      setText(greetingText(summary, /* @__PURE__ */ new Date(), fallback));
-    }).catch(() => {
-    });
+    let generation = 0;
+    let authenticated = false;
+    let controller;
+    let deadline;
+    const refresh = (clear = false) => {
+      if (!alive) return;
+      if (clear) {
+        authenticated = false;
+        setText(null);
+      }
+      const current = ++generation;
+      controller?.abort();
+      if (deadline !== void 0) window.clearTimeout(deadline);
+      if (document.visibilityState === "hidden") return;
+      const request = new AbortController();
+      controller = request;
+      const timeout = window.setTimeout(() => {
+        if (!alive || current !== generation) return;
+        generation++;
+        authenticated = false;
+        setText(null);
+        request.abort();
+      }, READER_GREETING_TIMEOUT_MS);
+      deadline = timeout;
+      fetch(endpoint, { credentials: "same-origin", cache: "no-store", signal: request.signal }).then((response) => response.ok ? response.json() : null).then((summary) => {
+        if (!alive || current !== generation) return;
+        authenticated = summary?.authenticated === true;
+        setText(authenticated && summary ? greetingText(summary, /* @__PURE__ */ new Date(), fallback) : null);
+      }).catch(() => {
+        if (!alive || current !== generation) return;
+        authenticated = false;
+        setText(null);
+      }).finally(() => window.clearTimeout(timeout));
+    };
+    const recheck = () => refresh(true);
+    const timer = window.setInterval(() => {
+      if (authenticated) refresh();
+    }, READER_GREETING_POLL_MS);
+    window.addEventListener("focus", recheck);
+    document.addEventListener("visibilitychange", recheck);
+    document.addEventListener(READER_IDENTITY_CHANGED_EVENT, recheck);
+    refresh(true);
     return () => {
       alive = false;
-      controller.abort();
+      generation++;
+      controller?.abort();
+      if (deadline !== void 0) window.clearTimeout(deadline);
+      window.clearInterval(timer);
+      window.removeEventListener("focus", recheck);
+      document.removeEventListener("visibilitychange", recheck);
+      document.removeEventListener(READER_IDENTITY_CHANGED_EVENT, recheck);
     };
   }, [endpoint, fallback]);
   if (text === null) return null;
@@ -344,4 +389,4 @@ function AccountSwitchPrompt({
   ] });
 }
 
-export { AccountLinkForm, AccountSwitchPrompt, LEDVERY_BUTTON_LABELS, LedveryButton, READER_SSO_ATTEMPT_WINDOW_MS, READER_SSO_BOT_PATTERN, READER_SSO_PRIVATE_PATHS, ReaderGreeting, ReaderSsoBoot, firstName, greetingText, greetingWord, isFormField, localHour, silentSignInDecision, silentSignInUrl };
+export { AccountLinkForm, AccountSwitchPrompt, LEDVERY_BUTTON_LABELS, LedveryButton, READER_GREETING_POLL_MS, READER_GREETING_TIMEOUT_MS, READER_IDENTITY_CHANGED_EVENT, READER_SSO_ATTEMPT_WINDOW_MS, READER_SSO_BOT_PATTERN, READER_SSO_PRIVATE_PATHS, ReaderGreeting, ReaderSsoBoot, firstName, greetingText, greetingWord, isFormField, localHour, silentSignInDecision, silentSignInUrl };

package/dist/reader-sso.cjs

@@ -195,7 +195,7 @@ async function startSignIn(config, input) {
   }
   const staleSession = [];
   if (input.cookies(c.names.session)) {
-    const current = await currentUser(c, input.cookies(c.names.session));
+    const current = await currentUser(c, input.cookies(c.names.session), mode === "silent" ? "passive" : "active");
     if (current && current.email_verified) {
       if (mode === "silent" && (!current.needsSsoUpgrade || keepsLocal(input.cookies(c.names.ssoChecked), input.cookies(c.names.session)))) return { ok: false, status: 204, error: "", reason: "session", redirect, cookies: [] };
     } else {
@@ -237,9 +237,9 @@ async function startSignIn(config, input) {
     return { ok: false, status: 503, error: "Ledvery sign-in is temporarily unavailable. Please try again shortly or use your existing reader account.", reason: "unavailable", redirect, cookies: [] };
   }
 }
-async function currentUser(c, token) {
+async function currentUser(c, token, activity = "active") {
   if (!token || !SESSION_TOKEN.test(token)) return null;
-  const response = await c.request("/v1/auth/me", { method: "GET", token });
+  const response = await c.request(activity === "passive" ? "/v1/auth/me?passive=true" : "/v1/auth/me", { method: "GET", token });
   if (failed(response)) return null;
   const me = payload(response);
   if (typeof me.id !== "string" || !me.id) return null;
@@ -468,7 +468,7 @@ async function signOut(config, input) {
 }
 async function sessionSummary(config, cookies) {
   const c = resolve(config);
-  const user = await currentUser(c, cookies(c.names.session));
+  const user = await currentUser(c, cookies(c.names.session), "passive");
   if (!user || !user.email_verified) return { authenticated: false };
   return { authenticated: true, full_name: user.full_name, locale: user.locale, time_zone: user.time_zone, ...user.needsSsoUpgrade && !keepsLocal(cookies(c.names.ssoChecked), cookies(c.names.session)) ? { session_upgrade_required: true } : {} };
 }

package/dist/reader-sso.js

@@ -180,7 +180,7 @@ async function startSignIn(config, input) {
   }
   const staleSession = [];
   if (input.cookies(c.names.session)) {
-    const current = await currentUser(c, input.cookies(c.names.session));
+    const current = await currentUser(c, input.cookies(c.names.session), mode === "silent" ? "passive" : "active");
     if (current && current.email_verified) {
       if (mode === "silent" && (!current.needsSsoUpgrade || keepsLocal(input.cookies(c.names.ssoChecked), input.cookies(c.names.session)))) return { ok: false, status: 204, error: "", reason: "session", redirect, cookies: [] };
     } else {
@@ -222,9 +222,9 @@ async function startSignIn(config, input) {
     return { ok: false, status: 503, error: "Ledvery sign-in is temporarily unavailable. Please try again shortly or use your existing reader account.", reason: "unavailable", redirect, cookies: [] };
   }
 }
-async function currentUser(c, token) {
+async function currentUser(c, token, activity = "active") {
   if (!token || !SESSION_TOKEN.test(token)) return null;
-  const response = await c.request("/v1/auth/me", { method: "GET", token });
+  const response = await c.request(activity === "passive" ? "/v1/auth/me?passive=true" : "/v1/auth/me", { method: "GET", token });
   if (failed(response)) return null;
   const me = payload(response);
   if (typeof me.id !== "string" || !me.id) return null;
@@ -453,7 +453,7 @@ async function signOut(config, input) {
 }
 async function sessionSummary(config, cookies) {
   const c = resolve(config);
-  const user = await currentUser(c, cookies(c.names.session));
+  const user = await currentUser(c, cookies(c.names.session), "passive");
   if (!user || !user.email_verified) return { authenticated: false };
   return { authenticated: true, full_name: user.full_name, locale: user.locale, time_zone: user.time_zone, ...user.needsSsoUpgrade && !keepsLocal(cookies(c.names.ssoChecked), cookies(c.names.session)) ? { session_upgrade_required: true } : {} };
 }

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@scalemule/news-publication",
-  "version": "0.0.76",
+  "version": "0.0.77",
   "description": "Shared server framework for ScaleMule local news publications. Walnut Creek Times is the broadsheet default; each paper supplies its own identity and feature flags.",
   "type": "module",
-  "bin": { "scalemule-article": "./bin/scalemule-article.mjs" },
+  "bin": {
+    "scalemule-article": "./bin/scalemule-article.mjs"
+  },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",