fix AMP pixel (hopefully)

assets/js/analytics.js

@@ -181,7 +181,7 @@
     );
     /** endif **/
 
-    var sendBeaconText = "sendBeacon";
+    // var sendBeaconText = "sendBeacon";
 
     var sendOnLeave = function (id, push) {
       var append = { type: "append", original_id: push ? id : lastPageId };

functions/send_view.js

@@ -1,23 +1,35 @@
 const request = require("request");
 
 exports.handler = function (event, context, callback) {
+  // if triggered as an image without JS (i.e. from AMP pages) set `?noscript=true`
+  const noScript = event.queryStringParameters["noscript"] === "true";
+
+  // https://docs.simpleanalytics.com/without-javascript
+  const endpointPath = noScript ? "noscript.gif" : "simple.gif";
+  const endpointUrl = "https://queue.simpleanalyticscdn.com/" + endpointPath;
+
+  // pass these headers along to SA
   const reqHeaders = {
     referer: event.headers["referer"],
     "user-agent": event.headers["user-agent"],
   };
 
+  // pass these URL parameters along to SA
   const reqQuery = event.queryStringParameters;
-  reqQuery["ignore-dnt"] = true; // this isn't nefarious, we're not tracking in the first place!
+  reqQuery["ignore-dnt"] = "true"; // this isn't nefarious, we're not tracking in the first place!
 
   const reqOptions = {
     method: "GET",
-    url: "https://queue.simpleanalyticscdn.com/simple.gif",
+    url: endpointUrl,
     headers: reqHeaders,
     qs: reqQuery,
   };
 
   request(reqOptions, (error, response, body) => {
+    console.info(`Proxying ${event.queryStringParameters["type"]} to ${endpointPath} ...`);
+
     if (error) {
+      // this indicates a function error, NOT an error returned from SA
       console.error(error);
 
       callback(null, {
@@ -26,6 +38,7 @@ exports.handler = function (event, context, callback) {
     } else {
       console.info(response.statusCode, response.headers["simple-analytics-feedback"]);
 
+      // imitate the headers that would normally be sent back from SA's pixel
       const resHeaders = {
         "content-type": response.headers["content-type"],
         "cache-control": "no-cache, no-store, must-revalidate",

layouts/_default/single.amp.html

@@ -257,7 +257,7 @@
 
     {{ if eq hugo.Environment "production" }}
     <!-- https://docs.simpleanalytics.com/without-javascript -->
-    <amp-pixel src="{{ "api/send_view" | absURL }}?hostname=CANONICAL_HOSTNAME&amp;path=CANONICAL_PATH&amp;referrer=DOCUMENT_REFERRER&amp;https=true&amp;ua=USER_AGENT&amp;width=VIEWPORT_WIDTH&amp;type=pageview" layout="nodisplay"></amp-pixel>
+    <amp-pixel src="{{ "api/send_view" | absURL }}?noscript=true&amp;type=pageview&amp;hostname=CANONICAL_HOSTNAME&amp;path=CANONICAL_PATH&amp;referrer=DOCUMENT_REFERRER&amp;https=true&amp;ua=USER_AGENT&amp;width=VIEWPORT_WIDTH" layout="nodisplay"></amp-pixel>
     {{ end }}
   </body>
 </html>