Merge pull request #223 from RafDevX/pastebin-then-corsanywhere

feat: prefer direct Pastebin fetching to proxying

Author: taibeled

src/lib/utils.ts

@@ -4,6 +4,7 @@ import { twMerge } from "tailwind-merge";
 import {
     PASTEBIN_API_POST_URL,
     PASTEBIN_API_RAW_URL,
+    PASTEBIN_API_RAW_URL_PROXIED,
 } from "@/maps/api/constants";
 
 export function cn(...inputs: ClassValue[]) {
@@ -84,7 +85,14 @@ export async function uploadToPastebin(
 }
 
 export async function fetchFromPastebin(pasteId: string): Promise<string> {
-    const response = await fetch(PASTEBIN_API_RAW_URL + pasteId);
+    let response;
+    try {
+        // prefer querying Pastebin directly since CORS proxy is unreliable
+        response = await fetch(PASTEBIN_API_RAW_URL + pasteId);
+    } catch {
+        // CORS error; happens if the paste is not owned by a Pastebin Pro user
+        response = await fetch(PASTEBIN_API_RAW_URL_PROXIED + pasteId);
+    }
 
     if (!response.ok) {
         throw new Error(

src/maps/api/constants.ts

@@ -6,7 +6,8 @@ export const OVERPASS_API_FALLBACK =
 export const GEOCODER_API = "https://photon.komoot.io/api/";
 export const PASTEBIN_API_POST_URL =
     "https://cors-anywhere.com/https://pastebin.com/api/api_post.php";
-export const PASTEBIN_API_RAW_URL =
+export const PASTEBIN_API_RAW_URL = "https://pastebin.com/raw/";
+export const PASTEBIN_API_RAW_URL_PROXIED =
     "https://cors-anywhere.com/https://pastebin.com/raw/";
 
 export const ICON_COLORS = {