@hasna/shortlinks 0.1.19 → 0.1.21

package/dist/cli/index.js

@@ -3335,7 +3335,9 @@ function normalizeHostname(input) {
     throw new Error(`Invalid domain: ${input}`);
   }
   hostname = hostname.replace(/\.$/, "");
-  if (!/^[a-z0-9.-]+$/.test(hostname) || hostname.includes("..")) {
+  const labels = hostname.split(".");
+  const labelsAreValid = labels.every((label) => label.length >= 1 && label.length <= 63 && /^[a-z0-9-]+$/.test(label) && !label.startsWith("-") && !label.endsWith("-"));
+  if (hostname.length > 253 || !labelsAreValid) {
     throw new Error(`Invalid domain: ${input}`);
   }
   return hostname;
@@ -4138,6 +4140,9 @@ function getClientIp(request) {
 function isExpired(link) {
   return Boolean(link.expires_at && new Date(link.expires_at).getTime() <= Date.now());
 }
+function logRecordClickError(link) {
+  console.error(`[shortlinks] Click analytics recording failed for ${link.hostname}/${link.slug}.`);
+}
 function createShortlinksHandler(options = {}) {
   const store = options.store || new ShortlinksStore(options.dbPath);
   const redirectStatus = options.redirectStatus || 302;
@@ -4176,16 +4181,28 @@ function createShortlinksHandler(options = {}) {
     if (isExpired(link))
       return json({ error: "Shortlink is expired.", slug, host }, 410);
     if (request.method === "GET") {
-      await store.recordClick(link, {
-        ip: getClientIp(request),
-        userAgent: request.headers.get("user-agent"),
-        referer: request.headers.get("referer"),
-        country: request.headers.get("cf-ipcountry"),
-        metadata: {
-          path: url.pathname,
-          query: url.search
+      try {
+        await store.recordClick(link, {
+          ip: getClientIp(request),
+          userAgent: request.headers.get("user-agent"),
+          referer: request.headers.get("referer"),
+          country: request.headers.get("cf-ipcountry"),
+          metadata: {
+            path: url.pathname,
+            query: url.search
+          }
+        });
+      } catch (error) {
+        if (options.onRecordClickError) {
+          try {
+            await options.onRecordClickError(error, { link, request });
+          } catch {
+            logRecordClickError(link);
+          }
+        } else {
+          logRecordClickError(link);
         }
-      });
+      }
     }
     return Response.redirect(link.destination_url, redirectStatus);
   };

package/dist/cloudflare.js

@@ -20,7 +20,9 @@ function normalizeHostname(input) {
     throw new Error(`Invalid domain: ${input}`);
   }
   hostname = hostname.replace(/\.$/, "");
-  if (!/^[a-z0-9.-]+$/.test(hostname) || hostname.includes("..")) {
+  const labels = hostname.split(".");
+  const labelsAreValid = labels.every((label) => label.length >= 1 && label.length <= 63 && /^[a-z0-9-]+$/.test(label) && !label.startsWith("-") && !label.endsWith("-"));
+  if (hostname.length > 253 || !labelsAreValid) {
     throw new Error(`Invalid domain: ${input}`);
   }
   return hostname;

package/dist/index.js

@@ -71,7 +71,9 @@ function normalizeHostname(input) {
     throw new Error(`Invalid domain: ${input}`);
   }
   hostname = hostname.replace(/\.$/, "");
-  if (!/^[a-z0-9.-]+$/.test(hostname) || hostname.includes("..")) {
+  const labels = hostname.split(".");
+  const labelsAreValid = labels.every((label) => label.length >= 1 && label.length <= 63 && /^[a-z0-9-]+$/.test(label) && !label.startsWith("-") && !label.endsWith("-"));
+  if (hostname.length > 253 || !labelsAreValid) {
     throw new Error(`Invalid domain: ${input}`);
   }
   return hostname;
@@ -874,6 +876,9 @@ function getClientIp(request) {
 function isExpired(link) {
   return Boolean(link.expires_at && new Date(link.expires_at).getTime() <= Date.now());
 }
+function logRecordClickError(link) {
+  console.error(`[shortlinks] Click analytics recording failed for ${link.hostname}/${link.slug}.`);
+}
 function createShortlinksHandler(options = {}) {
   const store = options.store || new ShortlinksStore(options.dbPath);
   const redirectStatus = options.redirectStatus || 302;
@@ -912,16 +917,28 @@ function createShortlinksHandler(options = {}) {
     if (isExpired(link))
       return json({ error: "Shortlink is expired.", slug, host }, 410);
     if (request.method === "GET") {
-      await store.recordClick(link, {
-        ip: getClientIp(request),
-        userAgent: request.headers.get("user-agent"),
-        referer: request.headers.get("referer"),
-        country: request.headers.get("cf-ipcountry"),
-        metadata: {
-          path: url.pathname,
-          query: url.search
+      try {
+        await store.recordClick(link, {
+          ip: getClientIp(request),
+          userAgent: request.headers.get("user-agent"),
+          referer: request.headers.get("referer"),
+          country: request.headers.get("cf-ipcountry"),
+          metadata: {
+            path: url.pathname,
+            query: url.search
+          }
+        });
+      } catch (error) {
+        if (options.onRecordClickError) {
+          try {
+            await options.onRecordClickError(error, { link, request });
+          } catch {
+            logRecordClickError(link);
+          }
+        } else {
+          logRecordClickError(link);
         }
-      });
+      }
     }
     return Response.redirect(link.destination_url, redirectStatus);
   };

package/dist/server.d.ts

@@ -12,11 +12,16 @@ export interface ShortlinksRuntimeStore {
     resolve(hostname: string, slug: string): Link | null | Promise<Link | null>;
     recordClick(link: Link, input?: ClickInput): unknown | Promise<unknown>;
 }
+export interface RecordClickErrorContext {
+    link: Link;
+    request: Request;
+}
 export interface ShortlinksHandlerOptions {
     store?: ShortlinksRuntimeStore;
     dbPath?: string;
     defaultHost?: string;
     redirectStatus?: 301 | 302 | 307 | 308;
+    onRecordClickError?: (error: unknown, context: RecordClickErrorContext) => void | Promise<void>;
 }
 export declare function createShortlinksHandler(options?: ShortlinksHandlerOptions): (request: Request) => Response | Promise<Response>;
 export declare function serveShortlinks(options?: ShortlinksHandlerOptions & {

package/dist/server.js

@@ -72,7 +72,9 @@ function normalizeHostname(input) {
     throw new Error(`Invalid domain: ${input}`);
   }
   hostname = hostname.replace(/\.$/, "");
-  if (!/^[a-z0-9.-]+$/.test(hostname) || hostname.includes("..")) {
+  const labels = hostname.split(".");
+  const labelsAreValid = labels.every((label) => label.length >= 1 && label.length <= 63 && /^[a-z0-9-]+$/.test(label) && !label.startsWith("-") && !label.endsWith("-"));
+  if (hostname.length > 253 || !labelsAreValid) {
     throw new Error(`Invalid domain: ${input}`);
   }
   return hostname;
@@ -555,6 +557,9 @@ function getClientIp(request) {
 function isExpired(link) {
   return Boolean(link.expires_at && new Date(link.expires_at).getTime() <= Date.now());
 }
+function logRecordClickError(link) {
+  console.error(`[shortlinks] Click analytics recording failed for ${link.hostname}/${link.slug}.`);
+}
 function createShortlinksHandler(options = {}) {
   const store = options.store || new ShortlinksStore(options.dbPath);
   const redirectStatus = options.redirectStatus || 302;
@@ -593,16 +598,28 @@ function createShortlinksHandler(options = {}) {
     if (isExpired(link))
       return json({ error: "Shortlink is expired.", slug, host }, 410);
     if (request.method === "GET") {
-      await store.recordClick(link, {
-        ip: getClientIp(request),
-        userAgent: request.headers.get("user-agent"),
-        referer: request.headers.get("referer"),
-        country: request.headers.get("cf-ipcountry"),
-        metadata: {
-          path: url.pathname,
-          query: url.search
+      try {
+        await store.recordClick(link, {
+          ip: getClientIp(request),
+          userAgent: request.headers.get("user-agent"),
+          referer: request.headers.get("referer"),
+          country: request.headers.get("cf-ipcountry"),
+          metadata: {
+            path: url.pathname,
+            query: url.search
+          }
+        });
+      } catch (error) {
+        if (options.onRecordClickError) {
+          try {
+            await options.onRecordClickError(error, { link, request });
+          } catch {
+            logRecordClickError(link);
+          }
+        } else {
+          logRecordClickError(link);
         }
-      });
+      }
     }
     return Response.redirect(link.destination_url, redirectStatus);
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/shortlinks",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "CLI-only shortlink manager for custom domains, click tracking, Cloudflare setup, and @hasna cloud sync",
   "type": "module",
   "main": "dist/index.js",