From 14197518e8a9a95413a11321697cdf81e0c3ad67 Mon Sep 17 00:00:00 2001
From: goenning <me@goenning.net>
Date: Fri, 1 Sep 2023 17:45:59 +0100
Subject: [PATCH] add session back

---
 package-lock.json           | 120 ++++++++++++++++++++++++++++++++++++
 packages/web/src/index.ts   |  20 ++++--
 packages/web/src/session.ts |  18 ++++++
 3 files changed, 154 insertions(+), 4 deletions(-)
 create mode 100644 packages/web/src/session.ts

diff --git a/package-lock.json b/package-lock.json
index 9ab3380..89b8b48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1429,6 +1429,126 @@
       "name": "@aptabase/web",
       "version": "0.1.3",
       "license": "MIT"
+    },
+    "node_modules/@next/swc-darwin-x64": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.19.tgz",
+      "integrity": "sha512-jyzO6wwYhx6F+7gD8ddZfuqO4TtpJdw3wyOduR4fxTUCm3aLw7YmHGYNjS0xRSYGAkLpBkH1E0RcelyId6lNsw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-gnu": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.19.tgz",
+      "integrity": "sha512-vdlnIlaAEh6H+G6HrKZB9c2zJKnpPVKnA6LBwjwT2BTjxI7e0Hx30+FoWCgi50e+YO49p6oPOtesP9mXDRiiUg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-musl": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.19.tgz",
+      "integrity": "sha512-aU0HkH2XPgxqrbNRBFb3si9Ahu/CpaR5RPmN2s9GiM9qJCiBBlZtRTiEca+DC+xRPyCThTtWYgxjWHgU7ZkyvA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-gnu": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.19.tgz",
+      "integrity": "sha512-htwOEagMa/CXNykFFeAHHvMJeqZfNQEoQvHfsA4wgg5QqGNqD5soeCer4oGlCol6NGUxknrQO6VEustcv+Md+g==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-musl": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.19.tgz",
+      "integrity": "sha512-4Gj4vvtbK1JH8ApWTT214b3GwUh9EKKQjY41hH/t+u55Knxi/0wesMzwQRhppK6Ddalhu0TEttbiJ+wRcoEj5Q==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-arm64-msvc": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.19.tgz",
+      "integrity": "sha512-bUfDevQK4NsIAHXs3/JNgnvEY+LRyneDN788W2NYiRIIzmILjba7LaQTfihuFawZDhRtkYCv3JDC3B4TwnmRJw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.19.tgz",
+      "integrity": "sha512-Y5kikILFAr81LYIFaw6j/NrOtmiM4Sf3GtOc0pn50ez2GCkr+oejYuKGcwAwq3jiTKuzF6OF4iT2INPoxRycEA==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-x64-msvc": {
+      "version": "13.4.19",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.19.tgz",
+      "integrity": "sha512-YzA78jBDXMYiINdPdJJwGgPNT3YqBNNGhsthsDoWHL9p24tEJn9ViQf/ZqTbwSpX/RrkPupLfuuTH2sf73JBAw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     }
   }
 }
diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
index c4d6068..db5ef54 100644
--- a/packages/web/src/index.ts
+++ b/packages/web/src/index.ts
@@ -1,3 +1,5 @@
+import { newSessionId } from './session';
+
 export type AptabaseOptions = {
   host?: string;
   appVersion?: string;
@@ -6,6 +8,10 @@ export type AptabaseOptions = {
 const locale = getBrowserLocale();
 const isDebug = getIsDebug();
 
+// Session expires after 1 hour of inactivity
+const SESSION_TIMEOUT = 1 * 60 * 60;
+let _sessionId = newSessionId();
+let _lastTouched = new Date();
 let _appKey = '';
 let _apiUrl = '';
 let _options: AptabaseOptions | undefined;
@@ -35,12 +41,18 @@ export async function trackEvent(eventName: string, props?: Record<string, strin
   if (!_appKey) return;
 
   if (typeof window === 'undefined' || !window.fetch) {
-    console.warn(
-      `Aptabase: this call to "trackEvent" requires a browser environment. Did you import from the wrong package?`,
-    );
+    console.warn(`Aptabase: trackEvent requires a browser environment. Event "${eventName}" will not be tracked.`);
     return;
   }
 
+  let now = new Date();
+  const diffInMs = now.getTime() - _lastTouched.getTime();
+  const diffInSec = Math.floor(diffInMs / 1000);
+  if (diffInSec > SESSION_TIMEOUT) {
+    _sessionId = newSessionId();
+  }
+  _lastTouched = now;
+
   try {
     const response = await window.fetch(_apiUrl, {
       method: 'POST',
@@ -51,7 +63,7 @@ export async function trackEvent(eventName: string, props?: Record<string, strin
       credentials: 'omit',
       body: JSON.stringify({
         timestamp: new Date().toISOString(),
-        sessionId: 'CHANGE-THIS',
+        sessionId: _sessionId,
         eventName: eventName,
         systemProps: {
           isDebug,
diff --git a/packages/web/src/session.ts b/packages/web/src/session.ts
new file mode 100644
index 0000000..d26b29e
--- /dev/null
+++ b/packages/web/src/session.ts
@@ -0,0 +1,18 @@
+export function newSessionId() {
+  if (typeof crypto !== 'undefined' && crypto && crypto.randomUUID) {
+    return crypto.randomUUID();
+  }
+
+  return [randomStr(8), randomStr(4), randomStr(4), randomStr(4), randomStr(12)].join('-');
+}
+
+const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+const charactersLength = characters.length;
+
+function randomStr(len: number) {
+  let result = '';
+  for (let i = 0; i < len; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+  return result;
+}