From 53f0f40aa155aaed341bda37cf74bc1212588ac5 Mon Sep 17 00:00:00 2001
From: goenning <me@goenning.net>
Date: Fri, 20 Oct 2023 09:08:19 +0100
Subject: [PATCH] Added an option to specify `isDebug` at init time

---
 package-lock.json           |  6 +++---
 packages/react/CHANGELOG.md |  4 ++++
 packages/react/package.json |  4 ++--
 packages/web/CHANGELOG.md   |  4 ++++
 packages/web/package.json   |  2 +-
 packages/web/src/index.ts   | 15 ++++++++-------
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2aea31f..15864dc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13333,10 +13333,10 @@
     },
     "packages/react": {
       "name": "@aptabase/react",
-      "version": "0.1.2",
+      "version": "0.2.0",
       "license": "MIT",
       "dependencies": {
-        "@aptabase/web": "0.2.0"
+        "@aptabase/web": "0.3.0"
       },
       "peerDependencies": {
         "react": "^18.0.0"
@@ -13344,7 +13344,7 @@
     },
     "packages/web": {
       "name": "@aptabase/web",
-      "version": "0.2.0",
+      "version": "0.3.0",
       "license": "MIT"
     }
   }
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index 7ddb784..d57fedb 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.0
+
+- Updated dependencies
+
 ## 0.1.2
 
 - Fixed an issue with client-side checking
diff --git a/packages/react/package.json b/packages/react/package.json
index 235b086..0dbe84d 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aptabase/react",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "type": "module",
   "description": "React SDK for Aptabase: Open Source, Privacy-First and Simple Analytics for Mobile, Desktop and Web Apps",
   "main": "./dist/index.cjs",
@@ -34,7 +34,7 @@
     "package.json"
   ],
   "dependencies": {
-    "@aptabase/web": "0.2.0"
+    "@aptabase/web": "0.3.0"
   },
   "peerDependencies": {
     "react": "^18.0.0"
diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md
index 73d50a5..52498bf 100644
--- a/packages/web/CHANGELOG.md
+++ b/packages/web/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.0
+
+- Added an option to specify `isDebug` at init time
+
 ## 0.2.0
 
 - Some internal refactor to support the new `@aptabase/react` package
diff --git a/packages/web/package.json b/packages/web/package.json
index a38e564..8a89cf2 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aptabase/web",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "JavaScript SDK for Aptabase: Open Source, Privacy-First and Simple Analytics for Mobile, Desktop and Web Apps",
   "main": "./dist/index.cjs",
diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
index db5ef54..246726b 100644
--- a/packages/web/src/index.ts
+++ b/packages/web/src/index.ts
@@ -3,10 +3,10 @@ import { newSessionId } from './session';
 export type AptabaseOptions = {
   host?: string;
   appVersion?: string;
+  isDebug?: boolean;
 };
 
 const locale = getBrowserLocale();
-const isDebug = getIsDebug();
 
 // Session expires after 1 hour of inactivity
 const SESSION_TIMEOUT = 1 * 60 * 60;
@@ -14,7 +14,8 @@ let _sessionId = newSessionId();
 let _lastTouched = new Date();
 let _appKey = '';
 let _apiUrl = '';
-let _options: AptabaseOptions | undefined;
+let _isDebug = false;
+let _appVersion = '';
 
 const _hosts: { [region: string]: string } = {
   US: 'https://us.aptabase.com',
@@ -24,9 +25,6 @@ const _hosts: { [region: string]: string } = {
 };
 
 export function init(appKey: string, options?: AptabaseOptions) {
-  _appKey = appKey;
-  _options = options;
-
   const parts = appKey.split('-');
   if (parts.length !== 3 || _hosts[parts[1]] === undefined) {
     console.warn(`The Aptabase App Key "${appKey}" is invalid. Tracking will be disabled.`);
@@ -35,6 +33,9 @@ export function init(appKey: string, options?: AptabaseOptions) {
 
   const baseUrl = getBaseUrl(parts[1], options);
   _apiUrl = `${baseUrl}/api/v0/event`;
+  _appKey = appKey;
+  _isDebug = options?.isDebug ?? getIsDebug();
+  _appVersion = options?.appVersion ?? '';
 }
 
 export async function trackEvent(eventName: string, props?: Record<string, string | number | boolean>): Promise<void> {
@@ -66,9 +67,9 @@ export async function trackEvent(eventName: string, props?: Record<string, strin
         sessionId: _sessionId,
         eventName: eventName,
         systemProps: {
-          isDebug,
           locale,
-          appVersion: _options?.appVersion ?? '',
+          isDebug: _isDebug,
+          appVersion: _appVersion,
           sdkVersion: globalThis.__APTABASE_SDK_VERSION__ ?? `aptabase-web@${process.env.PKG_VERSION}`,
         },
         props: props,