update dependencies without breaking utm source/medium in URL tracking

package.json

@@ -47,13 +47,13 @@
   },
   "dependencies": {
     "@hebcal/core": "^5.8.3",
-    "@hebcal/geo-sqlite": "^5.0.6",
+    "@hebcal/geo-sqlite": "^5.1.0",
     "@hebcal/hdate": "^0.12.0",
-    "@hebcal/icalendar": "^6.0.2",
+    "@hebcal/icalendar": "^6.1.1",
     "@hebcal/learning": "^5.1.2",
     "@hebcal/leyning": "^9.0.2",
     "@hebcal/locales": "^5.0.2",
-    "@hebcal/rest-api": "^6.0.2",
+    "@hebcal/rest-api": "^6.1.0",
     "@hebcal/triennial": "^6.0.1",
     "better-sqlite3": "^11.7.0",
     "dayjs": "^1.11.13",

src/hebcal-download.js

@@ -52,8 +52,8 @@ export async function hebcalDownload(ctx) {
     if (!icalOpt.calendarColor) {
       icalOpt.calendarColor = '#800002';
     }
-    icalOpt.utmSource = query.utm_source || 'ical';
-    icalOpt.utmMedium = query.utm_medium || 'icalendar';
+    icalOpt.utmSource = query.utm_source;
+    icalOpt.utmMedium = query.utm_medium;
     icalOpt.utmCampaign = query.utm_campaign || 'ical-' + campaignName(events, icalOpt);
     if (!query.subscribe) {
       ctx.response.attachment(basename(path));
@@ -93,8 +93,8 @@ export async function hebcalDownload(ctx) {
     ctx.response.type = 'application/pdf';
     const title = getCalendarTitle(events, options);
     const doc = ctx.body = createPdfDoc(title, options);
-    options.utmSource = query.utm_source || 'pdf';
-    options.utmMedium = query.utm_medium || 'document';
+    options.utmSource = query.utm_source; // OK if undefined
+    options.utmMedium = query.utm_medium; // OK if undefined
     options.utmCampaign = query.utm_campaign || 'pdf-' + campaignName(events, options);
     renderPdf(doc, events, options);
     doc.end();

src/matomoTrack.js

@@ -104,6 +104,10 @@ export function matomoTrack(ctx, category, action, name=null) {
       args.set('cid', vid);
     }
   }
+  const utmSource = ctx.request?.query?.utm_source;
+  if (utmSource) {
+    args.set('_rcn', utmSource);
+  }
   const postData = args.toString();
   const postLen = Buffer.byteLength(postData);
   let path = '/ma/matomo.php';

src/pdf.js

@@ -235,7 +235,13 @@ function renderPdfEvent(doc, evt, x, y, rtl, options) {
   const textOptions = {};
   const url = evt.url();
   if (url) {
-    const utmSource = options.utmSource || 'pdf';
+    let utmSource = options.utmSource;
+    if (!utmSource) {
+      const u = new URL(url);
+      if (u.host === 'www.hebcal.com') {
+        utmSource = 'pdf';
+      }
+    }
     const utmMedium = options.utmMedium || 'document';
     const utmCampaign = options.utmCampaign || 'pdf-' + evt.getDate().getFullYear();
     textOptions.link = appendIsraelAndTracking(url, options.il, utmSource, utmMedium, utmCampaign);