v0.0.1

Author: samestrin

netlify.toml

@@ -1,6 +1,5 @@
 [build]
   publish = "public"
-  functions = "netlify/functions"
 
 [build.environment]
   NODE_VERSION = "20"
@@ -17,6 +16,12 @@
   path = "/latest"
   function = "latest"
 
+[[edge_functions]]
+  path = "/hello"
+  function = "hello"
+
+
 [[edge_functions]]
   path = "/:shortUrl"
-  function = "redirect"
+  function = "redirect"
+

netlify/edge-functions/count.ts

@@ -1,17 +1,23 @@
 import { headers } from "./headers.ts";
 import handler from "./utils.ts";
-
 const { fetchFromSupabase } = handler();
 
 export default async (request: Request): Promise<Response> => {
   try {
-    const data = await fetchFromSupabase("urls?select=id", { method: "GET" });
-    const count = data.length;
+    const response = await fetchFromSupabase("urls?select=id", {
+      method: "GET",
+    });
+    if (!response || !Array.isArray(response)) {
+      throw new Error("Invalid response from Supabase");
+    }
+    const count = response.length;
     return new Response(JSON.stringify({ count }), { status: 200, headers });
   } catch (err) {
+    console.error("Error fetching count:", err);
     return new Response(
       JSON.stringify({ error: "Internal server error", details: err.message }),
       { status: 500, headers }
     );
   }
 };
+export const config = { path: "/count" };

netlify/edge-functions/headers.ts

@@ -1,9 +1,8 @@
 export const headers = {
-  "Access-Control-Allow-Origin": "*",
-  "Access-Control-Allow-Methods": "*",
-  "Access-Control-Allow-Headers": "*",
-  "Access-Control-Max-Age": "86400",
-  "Content-Type": "application/json",
+  'Access-Control-Allow-Origin': '*',
+  'Access-Control-Allow-Methods': '*',
+  'Access-Control-Allow-Headers': '*',
+  'Access-Control-Max-Age': '86400',
+  'Content-Type': 'application/json',
 };
-
 export default () => headers;

netlify/edge-functions/hello.ts

@@ -0,0 +1,12 @@
+export default async (request: Request): Promise<Response> => {
+  console.log("Hello function triggered");
+  return new Response("Hello, World!", {
+    headers: {
+      "Content-Type": "text/plain",
+    },
+  });
+};
+
+export const config = {
+  path: "/hello",
+};

netlify/edge-functions/latest.ts

@@ -1,27 +1,37 @@
 import { headers } from "./headers.ts";
 import handler from "./utils.ts";
-
 const urlBase = Deno.env.get("URL_BASE") ? Deno.env.get("URL_BASE") : "";
 const { fetchFromSupabase } = handler();
 
 export default async (request: Request): Promise<Response> => {
+  console.log("here");
   try {
     const url = new URL(request.url);
     const count = url.searchParams.get("count") || "10";
-    const data = await fetchFromSupabase(
+
+    const response = await fetchFromSupabase(
       `urls?order=created_at.desc&limit=${count}`,
       { method: "GET" }
     );
-    const modifiedData = data.map((item: any) => ({
+
+    if (!response || !Array.isArray(response)) {
+      throw new Error("Invalid response from Supabase");
+    }
+
+    const modifiedResponse = response.map((item: any) => ({
       ...item,
       short_url: `${urlBase}${item.short_url}`,
     }));
 
-    return new Response(JSON.stringify(modifiedData), { status: 200, headers });
+    return new Response(JSON.stringify(modifiedResponse), {
+      status: 200,
+      headers,
+    });
   } catch (err) {
     return new Response(
       JSON.stringify({ error: "Internal server error", details: err.message }),
       { status: 500, headers }
     );
   }
 };
+export const config = { path: "/latest" };

netlify/edge-functions/redirect.ts

@@ -1,7 +1,5 @@
 import handler from "./utils.ts";
-
 const { fetchFromSupabase } = handler();
-
 export default async (request: Request): Promise<Response> => {
   try {
     const shortUrl = new URL(request.url).pathname.replace("/", "");
@@ -18,10 +16,14 @@ export default async (request: Request): Promise<Response> => {
       status: 301,
       headers: { Location: data[0].long_url },
     });
-  } catch (err) {
+  } catch (error) {
     return new Response(
-      JSON.stringify({ error: "Internal server error", details: err.message }),
+      JSON.stringify({
+        error: "Internal server error",
+        details: error.message,
+      }),
       { status: 500 }
     );
   }
 };
+export const config = { path: "/" };

netlify/edge-functions/shorten.ts

@@ -1,9 +1,8 @@
 import { multiParser } from "https://deno.land/x/multiparser@0.114.0/mod.ts";
 import { headers } from "./headers.ts";
 import handler from "./utils.ts";
-
-const urlBase = Deno.env.get("URL_BASE") ? Deno.env.get("URL_BASE") : "";
-const { fetchFromSupabase, generateShortUrl } = handler();
+const urlBase = Deno.env.get("URL_BASE") || "";
+const { generateShortUrl } = handler();
 
 export default async (request: Request): Promise<Response> => {
   try {
@@ -17,20 +16,20 @@ export default async (request: Request): Promise<Response> => {
       });
     }
 
-    let shortUrl = generateShortUrl();
-    shortUrl = urlBase + shortUrl;
-
-    await fetchFromSupabase("urls", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ short_url: shortUrl, long_url: url }),
-    });
+    let shortUrl = urlBase + (await generateShortUrl(url));
 
     return new Response(JSON.stringify({ shortUrl }), { status: 200, headers });
-  } catch (err) {
+  } catch (error) {
+    console.error("Error in function execution:", error);
+
     return new Response(
-      JSON.stringify({ error: "Internal server error", details: err.message }),
+      JSON.stringify({
+        error: "Internal server error",
+        details: error.message,
+      }),
       { status: 500, headers }
     );
   }
 };
+
+export const config = { path: "/shorten" };

netlify/edge-functions/utils.ts

@@ -5,6 +5,7 @@ export async function fetchFromSupabase(
   endpoint: string,
   options: RequestInit
 ) {
+  console.log("options", options);
   const response = await fetch(`${SUPABASE_URL}/rest/v1/${endpoint}`, {
     ...options,
     headers: {
@@ -13,16 +14,67 @@ export async function fetchFromSupabase(
       Authorization: `Bearer ${SUPABASE_KEY}`,
     },
   });
-  return await response.json();
-}
 
-export function generateShortUrl(): string {
+  if (!response.ok) {
+    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(
+      "urls?select=short_url&long_url=eq." + longUrl,
+      { method: "GET" }
+    );
+    if (error) {
+      console.error("Error checking for existing long URL:", error);
+      throw error;
+    }
+    if (data && data[0]?.short_url) {
+      return data[0].short_url;
+    }
+    let shortUrl: string;
+    let isCollision = true;
+    while (isCollision) {
+      shortUrl = generateUuidShort();
+      ({ data, error } = await fetchFromSupabase(
+        "urls?select=short_url&short_url=eq." + shortUrl,
+        { method: "GET" }
+      ));
+      if (error) {
+        console.error("Error checking for collision:", error);
+        throw error;
+      }
+      isCollision = data.length > 0;
+    }
+    ({ data, error } = await fetchFromSupabase("urls", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ short_url: shortUrl, long_url: longUrl }),
+    }));
+    if (error) {
+      console.error("Error inserting new URL:", error);
+      throw error;
+    }
+    return shortUrl;
+  } catch (err) {
+    console.error("Error in generateShortUrl function:", err);
+    throw err;
+  }
+}
+export function generateUuidShort(): string {
   return crypto.randomUUID().substring(0, 7);
 }
-
 export default function handler() {
   return {
     fetchFromSupabase,
     generateShortUrl,
+    generateShortUrl,
   };
 }

package-lock.json

@@ -1,15 +1,34 @@
 {
   "name": "url-shortening-api-netlify-edge-supabase",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "description": "",
-  "main": "index.js",
+  "main": "public/index.html",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
+  "keywords": [
+    "netlify",
+    "lambda",
+    "netlify edge function",
+    "netlify edge",
+    "supabase",
+    "url shortener",
+    "url",
+    "rest",
+    "api"
+  ],
+  "author": "Sam Estrin",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/samestrin/url-shortening-api-netlify-edge-supabase/issues"
+  },
+  "homepage": "https://github.com/samestrin/url-shortening-api-netlify-edge-supabase#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/samestrin/url-shortening-api-netlify-edge-supabase.git"
+  },
   "devDependencies": {
+    "prettier": "^3.2.5",
     "typescript": "^5.4.5"
   }
 }