@bagelink/vue 1.14.0 → 1.14.10

package/src/utils/index.ts

@@ -210,8 +210,8 @@ export type { ShowdownConverter, ShowdownOptions } from './showdown'
 
 const URL_REGEX = /^https?:\/\/|^\/\//
 
-export function pathKeyToURL(pathKey?: string) {
-	if (pathKey === undefined || pathKey === '' || URL_REGEX.test(pathKey)) {
+export function pathKeyToURL(pathKey?: string | null) {
+	if (pathKey == null || pathKey === '' || URL_REGEX.test(pathKey)) {
 		return pathKey
 	}
 

package/src/utils/ipapi.ts

@@ -1,11 +1,24 @@
 import axios from 'axios'
 
+let pendingRequest: Promise<any> | null = null
+
 export async function ipapi() {
-	let apiData = sessionStorage.getItem('ipapi')
-	if (!apiData) {
-		apiData = (await axios.get('https://ipapi.co/json/')).data
-		apiData = JSON.stringify(apiData)
-		sessionStorage.setItem('ipapi', apiData)
+	const apiData = sessionStorage.getItem('ipapi')
+	if (apiData) {
+		return JSON.parse(apiData)
+	}
+
+	// Deduplicate concurrent calls — share a single in-flight request
+	if (!pendingRequest) {
+		pendingRequest = axios.get('https://ipapi.co/json/').then(res => {
+			const data = JSON.stringify(res.data)
+			sessionStorage.setItem('ipapi', data)
+			pendingRequest = null
+			return res.data
+		}).catch(err => {
+			pendingRequest = null
+			throw err
+		})
 	}
-	return JSON.parse(apiData)
+	return pendingRequest
 }