@openeventkit/event-site 2.1.18 → 2.1.21

package/src/workers/synch.worker.js

@@ -1,125 +1,160 @@
 import SynchStrategyFactory from "./sync_strategies/synch_strategy_factory";
-// internal state
-const queue = [];
+
+// ---- Internal state (persisted across messages while draining) ----
 let busy = false;
 let localSummit = null;
 let localAllEvents = null;
 let localAllIDXEvents = null;
 let localAllSpeakers = null;
 let localAllIDXSpeakers = null;
+let currentAccessToken = null;
 
-/* eslint-disable-next-line no-restricted-globals */
-self.onmessage =  async (e) => {
-    if(busy) {
-        // wait
-        queue.push(e);
-        return;
-    }
-    // run
-    busy = true;
-    await run(e);
-};
+// Dedup/backpressure pool: key -> { payload, seq }
+const pool = new Map();
+let seq = 0;
 
-const run = async ( {
-                  data: {
-                      accessToken,
-                      noveltiesArray,
-                      summit,
-                      allEvents,
-                      allIDXEvents,
-                      allSpeakers,
-                      allIDXSpeakers
-                  }
-              } ) => {
+// Helper: coalescing precedence
+function mergePayload(oldEntry, newPayload) {
+    if (!oldEntry) return newPayload; // nothing to merge
+    const oldOp = oldEntry.entity_operator;
+    const newOp = newPayload.entity_operator;
 
-    noveltiesArray = JSON.parse(noveltiesArray);
+    // DELETE always wins
+    if (newOp === "DELETE") return newPayload;
+    if (oldOp === "DELETE") return oldEntry;
 
-    if(localSummit === null)
-        localSummit = JSON.parse(summit);
+    // Otherwise, last write wins (INSERT/UPDATE)
+    return newPayload;
+}
 
-    if(localAllEvents === null)
-        localAllEvents = JSON.parse(allEvents);
+// Helper: parse value only if it's a string
+function maybeParseJSON(val) {
+    return typeof val === "string" ? JSON.parse(val) : val;
+}
 
-    if(localAllIDXEvents === null)
-        localAllIDXEvents = JSON.parse(allIDXEvents);
+/* eslint-disable-next-line no-restricted-globals */
+self.onmessage = (e) => {
+    const {
+        accessToken,
+        noveltiesArray,
+        summit,
+        allEvents,
+        allIDXEvents,
+        allSpeakers,
+        allIDXSpeakers,
+    } = e.data || {};
+
+    // Initialize persistent state once
+    if (localSummit === null)      localSummit       = maybeParseJSON(summit);
+    if (localAllEvents === null)   localAllEvents    = maybeParseJSON(allEvents);
+    if (localAllIDXEvents === null)localAllIDXEvents = maybeParseJSON(allIDXEvents);
+    if (localAllSpeakers === null) localAllSpeakers  = maybeParseJSON(allSpeakers);
+    if (localAllIDXSpeakers === null) localAllIDXSpeakers = maybeParseJSON(allIDXSpeakers);
+
+    currentAccessToken = accessToken ?? currentAccessToken;
+
+    // Coalesce incoming payloads into the pool (backpressure)
+    const items = maybeParseJSON(noveltiesArray) || [];
+    for (const payload of items) {
+        const key = `${payload.entity_type}|${payload.entity_id}`;
+        const existing = pool.get(key)?.payload;
+        const merged = mergePayload(existing, payload);
+        // Assign new seq if it's a new key or we changed the payload
+        if (!existing || merged !== existing) {
+            pool.set(key, { payload: merged, seq: ++seq });
+        }
+    }
 
-    if(localAllSpeakers === null)
-        localAllSpeakers = JSON.parse(allSpeakers);
+    if (!busy) void drain();
+};
 
-    if(localAllIDXSpeakers === null)
-        localAllIDXSpeakers = JSON.parse(allIDXSpeakers);
+async function drain() {
+    busy = true;
+    try {
+        // Keep draining while there is work (new messages can keep adding to pool)
+        // We snapshot-and-clear each iteration to process a stable batch.
+        while (pool.size) {
+            const batch = Array.from(pool.values())
+                .sort((a, b) => a.seq - b.seq) // stable arrival order
+                .map((e) => e.payload);
 
-    console.log(`synch worker running for ${localSummit.id} ....`)
+            pool.clear();
 
-    let lastPayload = null;
+            await runBatch(batch);
+        }
+        console.log("synch worker: pool empty");
+    } catch (err) {
+        console.log("synch worker fatal error", err);
+    } finally {
+        // Reset after everything in the pool is processed (or on fatal error)
+        busy = false;
+        localSummit = null;
+        localAllEvents = null;
+        localAllIDXEvents = null;
+        localAllSpeakers = null;
+        localAllIDXSpeakers = null;
+        // keep currentAccessToken as-is; next message can refresh it
+    }
+}
 
-    for (const payload of noveltiesArray) {
+async function runBatch(batch) {
+    if (!batch || !batch.length) return;
 
-        console.log(`synch worker processing payload `, payload);
+    console.log(`synch worker running for ${localSummit?.id} ... batch size=${batch.length}`);
 
-        const {entity_operator, entity_type, entity_id} = payload;
+    let lastPayload = null;
 
+    for (const payload of batch) {
+        // Skip exact adjacent duplicates (cheap guard)
         if (
             lastPayload &&
-            lastPayload.entity_type === entity_type &&
-            lastPayload.entity_operator === entity_operator &&
-            lastPayload.entity_id === entity_id) {
-            console.log('synch worker skipping payload (already processed)');
+            lastPayload.entity_type === payload.entity_type &&
+            lastPayload.entity_operator === payload.entity_operator &&
+            lastPayload.entity_id === payload.entity_id
+        ) {
+            console.log("synch worker: skip adjacent duplicate", payload);
             continue;
         }
 
-        // micro updates logic goes here ...
-        console.log(`synch worker trying to create process strategy for payload `, payload);
-
-        let s = SynchStrategyFactory.build(localSummit, localAllEvents, localAllIDXEvents, localAllSpeakers, localAllIDXSpeakers, accessToken, payload);
+        console.log("synch worker: building strategy for", payload);
+        const s = SynchStrategyFactory.build(
+            localSummit,
+            localAllEvents,
+            localAllIDXEvents,
+            localAllSpeakers,
+            localAllIDXSpeakers,
+            currentAccessToken,
+            payload
+        );
         lastPayload = payload;
-        if (s === null) {
-            console.log(`synch worker missing process strategy for payload`, payload);
+
+        if (!s) {
+            console.log("synch worker: missing strategy, skipping", payload);
             continue;
         }
 
         try {
-            let res = await s.process(payload);
-            console.log(`synch worker postMessage`);
-            let {
-                summit : resSummit,
-                eventsData: resAllEvents,
-                allIDXEvents : resAllIDXEvents,
-                allSpeakers : resAllSpeakers,
-                allIDXSpeakers : resAllIDXSpeakers
-            } = res;
-
-            // update internal state for next run
-            if(resSummit)
-                localSummit = resSummit;
-            if(resAllEvents)
-                localAllEvents = resAllEvents;
-            if(resAllIDXEvents)
-                localAllIDXEvents = resAllIDXEvents;
-            if(resAllSpeakers)
-                localAllSpeakers = resAllSpeakers;
-            if(resAllIDXSpeakers)
-                localAllIDXSpeakers = resAllIDXSpeakers;
+            const res = await s.process(payload);
+            const {
+                summit:        resSummit,
+                eventsData:    resAllEvents,
+                allIDXEvents:  resAllIDXEvents,
+                allSpeakers:   resAllSpeakers,
+                allIDXSpeakers:resAllIDXSpeakers,
+            } = res || {};
+
+            // Carry state forward
+            if (resSummit)        localSummit = resSummit;
+            if (resAllEvents)     localAllEvents = resAllEvents;
+            if (resAllIDXEvents)  localAllIDXEvents = resAllIDXEvents;
+            if (resAllSpeakers)   localAllSpeakers = resAllSpeakers;
+            if (resAllIDXSpeakers)localAllIDXSpeakers = resAllIDXSpeakers;
 
             /* eslint-disable-next-line no-restricted-globals */
             self.postMessage(res);
-        } catch (error) {
-             console.log(error);
+        } catch (err) {
+            console.log("synch worker payload error", payload, err);
+            // keep going with next payload
         }
     }
-
-    if(queue.length) {
-        // run the next queued item
-        await run(queue.shift());
-        return;
-    }
-
-    console.log('synch worker queue is empty!.')
-    // reset internal state
-    busy = false;
-    localSummit = null;
-    localAllEvents = null;
-    localAllIDXEvents = null;
-    localAllSpeakers = null;
-    localAllIDXSpeakers = null;
 }

package/static/fonts/fonts.css

@@ -1,65 +1,165 @@
 /**
- * Generated using google-webfonts-helper
- * @see http://google-webfonts-helper.herokuapp.com/fonts/nunito-sans?subsets=latin
+ * Nunito Sans Font Family - Version 18
+ * Weights: 200, 300, 400, 500, 600, 700, 800, 900
+ * Styles: normal, italic
  */
 
+/* nunito-sans-200 - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-200.woff2") format("woff2");
+}
+
+/* nunito-sans-200italic - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: italic;
+  font-weight: 200;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-200italic.woff2") format("woff2");
+}
+
 /* nunito-sans-300 - latin */
 @font-face {
   font-family: "Nunito Sans";
   font-style: normal;
   font-weight: 300;
+  font-display: swap;
   src: local(""),
-    url("nunito-sans/nunito-sans-v12-latin-300.woff2") format("woff2"),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-      url("nunito-sans/nunito-sans-v12-latin-300.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url("nunito-sans/nunito-sans-v18-latin-300.woff2") format("woff2");
 }
+
 /* nunito-sans-300italic - latin */
 @font-face {
   font-family: "Nunito Sans";
   font-style: italic;
   font-weight: 300;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-300italic.woff2") format("woff2");
+}
+
+/* nunito-sans-400 - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-400.woff2") format("woff2");
+}
+
+/* nunito-sans-400italic - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: italic;
+  font-weight: 400;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-400italic.woff2") format("woff2");
+}
+
+/* nunito-sans-500 - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-500.woff2") format("woff2");
+}
+
+/* nunito-sans-500italic - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: italic;
+  font-weight: 500;
+  font-display: swap;
   src: local(""),
-    url("nunito-sans/nunito-sans-v12-latin-300italic.woff2") format("woff2"),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-      url("nunito-sans/nunito-sans-v12-latin-300italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url("nunito-sans/nunito-sans-v18-latin-500italic.woff2") format("woff2");
 }
+
 /* nunito-sans-600 - latin */
 @font-face {
   font-family: "Nunito Sans";
   font-style: normal;
   font-weight: 600;
+  font-display: swap;
   src: local(""),
-    url("nunito-sans/nunito-sans-v12-latin-600.woff2") format("woff2"),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-      url("nunito-sans/nunito-sans-v12-latin-600.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url("nunito-sans/nunito-sans-v18-latin-600.woff2") format("woff2");
 }
+
 /* nunito-sans-600italic - latin */
 @font-face {
   font-family: "Nunito Sans";
   font-style: italic;
   font-weight: 600;
+  font-display: swap;
   src: local(""),
-    url("nunito-sans/nunito-sans-v12-latin-600italic.woff2") format("woff2"),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-      url("nunito-sans/nunito-sans-v12-latin-600italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url("nunito-sans/nunito-sans-v18-latin-600italic.woff2") format("woff2");
 }
+
 /* nunito-sans-700 - latin */
 @font-face {
   font-family: "Nunito Sans";
   font-style: normal;
   font-weight: 700;
+  font-display: swap;
   src: local(""),
-    url("nunito-sans/nunito-sans-v12-latin-700.woff2") format("woff2"),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-      url("nunito-sans/nunito-sans-v12-latin-700.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url("nunito-sans/nunito-sans-v18-latin-700.woff2") format("woff2");
 }
+
 /* nunito-sans-700italic - latin */
 @font-face {
   font-family: "Nunito Sans";
   font-style: italic;
   font-weight: 700;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-700italic.woff2") format("woff2");
+}
+
+/* nunito-sans-800 - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: normal;
+  font-weight: 800;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-800.woff2") format("woff2");
+}
+
+/* nunito-sans-800italic - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: italic;
+  font-weight: 800;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-800italic.woff2") format("woff2");
+}
+
+/* nunito-sans-900 - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
   src: local(""),
-    url("nunito-sans/nunito-sans-v12-latin-700italic.woff2") format("woff2"),
-    /* Chrome 26+, Opera 23+, Firefox 39+ */
-      url("nunito-sans/nunito-sans-v12-latin-700italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url("nunito-sans/nunito-sans-v18-latin-900.woff2") format("woff2");
 }
+
+/* nunito-sans-900italic - latin */
+@font-face {
+  font-family: "Nunito Sans";
+  font-style: italic;
+  font-weight: 900;
+  font-display: swap;
+  src: local(""),
+    url("nunito-sans/nunito-sans-v18-latin-900italic.woff2") format("woff2");
+}