v0.0.1

Author: samestrin

netlify.toml

@@ -4,6 +4,10 @@
 [build.environment]
   NODE_VERSION = "20"
 
+[[edge_functions]]
+  path = "/*"
+  function = "redirect"
+
 [[edge_functions]]
   path = "/shorten"
   function = "shorten"
@@ -15,9 +19,3 @@
 [[edge_functions]]
   path = "/latest"
   function = "latest"
-
-
-[[edge_functions]]
-  path = "/:shortUrl"
-  function = "redirect"
-

netlify/edge-functions/redirect.ts

@@ -1,22 +1,27 @@
 import handler from "./utils.ts";
 const { fetchFromSupabase } = handler();
+
 export default async (request: Request): Promise<Response> => {
   try {
     const shortUrl = new URL(request.url).pathname.replace("/", "");
+
     const data = await fetchFromSupabase(
       `urls?select=long_url&short_url=eq.${shortUrl}`,
       { method: "GET" }
     );
+
     if (data.length === 0) {
       return new Response(JSON.stringify({ error: "URL not found" }), {
         status: 404,
       });
     }
+
     return new Response(null, {
       status: 301,
       headers: { Location: data[0].long_url },
     });
   } catch (error) {
+    console.error("Error:", error);
     return new Response(
       JSON.stringify({
         error: "Internal server error",
@@ -26,4 +31,3 @@ export default async (request: Request): Promise<Response> => {
     );
   }
 };
-export const config = { path: "/" };

netlify/edge-functions/shorten.ts

@@ -16,7 +16,8 @@ export default async (request: Request): Promise<Response> => {
       });
     }
 
-    let shortUrl = urlBase + (await generateShortUrl(url));
+    let shortUrl = await generateShortUrl(url);
+    shortUrl = urlBase + shortUrl;
 
     return new Response(JSON.stringify({ shortUrl }), { status: 200, headers });
   } catch (error) {

netlify/edge-functions/utils.ts

@@ -5,7 +5,6 @@ export async function fetchFromSupabase(
   endpoint: string,
   options: RequestInit
 ) {
-  console.log("options", options);
   const response = await fetch(`${SUPABASE_URL}/rest/v1/${endpoint}`, {
     ...options,
     headers: {
@@ -19,26 +18,22 @@ export async function fetchFromSupabase(
     throw new Error(`Supabase request failed: ${response.statusText}`);
   }
   let jsonResponse = await response.json();
-  console.log("jsonResponse", jsonResponse);
+
   return jsonResponse;
 }
-import {
-  fetchFromSupabase,
-  generateShortUrl as generateUuidShort,
-} from "./utils.ts";
+
 export async function generateShortUrl(longUrl: string): Promise<string> {
   try {
-    let { data, error } = await fetchFromSupabase(
+    const data = await fetchFromSupabase(
       "urls?select=short_url&long_url=eq." + longUrl,
       { method: "GET" }
     );
-    if (error) {
-      console.error("Error checking for existing long URL:", error);
+
+    if (!data) {
+      console.error("Error checking for existing long URL.");
       throw error;
     }
     if (data && data[0]?.short_url) {
-      console.log("data");
-      console.log(data);
       return data[0].short_url;
     }
     let shortUrl: string;
@@ -53,8 +48,6 @@ export async function generateShortUrl(longUrl: string): Promise<string> {
         console.error("Error checking for collision:", error);
         throw error;
       }
-      console.log("data");
-      console.log(data);
       isCollision = !!data;
     }
     ({ data, error } = await fetchFromSupabase("urls", {