OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
fix: load geo db once
Carl-Gerhard Lindesvärd9665a2593f06
diff --git a/packages/geo/src/geo.ts b/packages/geo/src/geo.tsindex 30ca21998..610386cbd 100644--- a/packages/geo/src/geo.ts+++ b/packages/geo/src/geo.ts@@ -15,24 +15,33 @@ const dbPath = path.join(__dirname, `../../../packages/geo/${filename}`);// From local packageconst dbPathLocal = path.join(__dirname, `../${filename}`);-let reader: ReaderModel | null = null;+// Singleton promise - initialized once, awaited on every call+let readerPromise: Promise<ReaderModel | null> | null = null;-async function loadDatabase(dbPath: string) {+async function loadDatabase(): Promise<ReaderModel | null> {try {const dbBuffer = await readFile(dbPath);- reader = Reader.openBuffer(dbBuffer);console.log('GeoLite2-City.mmdb loaded (dist)');- } catch (error) {+ return Reader.openBuffer(dbBuffer);+ } catch {try {const dbBuffer = await readFile(dbPathLocal);- reader = Reader.openBuffer(dbBuffer);console.log('GeoLite2-City.mmdb loaded (local)');- } catch (error) {+ return Reader.openBuffer(dbBuffer);+ } catch {console.error('GeoLite2-City.mmdb not found');+ return null;}}}+function getReader(): Promise<ReaderModel | null> {+ if (!readerPromise) {+ readerPromise = loadDatabase();+ }+ return readerPromise;+}+export interface GeoLocation {country: string | undefined;city: string | undefined;@@ -67,12 +76,10 @@ export async function getGeoLocation(ip?: string): Promise<GeoLocation> {return cached;}- if (!reader) {- await loadDatabase(dbPath);- }+ const reader = await getReader();try {- const response = await reader?.city(ip);+ const response = reader?.city(ip);const res = {city: response?.city?.names.en,country: response?.country?.isoCode,