npm - @hasna/shortlinks - Versions diffs - 0.1.17 → 0.1.18 - Mend

@hasna/shortlinks 0.1.17 → 0.1.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/cli/index.js CHANGED Viewed

@@ -9702,6 +9702,110 @@ function json(data, status = 200) {
     headers: { "content-type": "application/json; charset=utf-8" }
   });
 }
+function htmlEscape(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function publicErrorPage(input) {
+  const detail = input.detail ? `<p class="detail">${htmlEscape(input.detail)}</p>` : "";
+  const slug = input.slug ? `<p class="slug">${htmlEscape(input.slug)}</p>` : "";
+  const body = `<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>${htmlEscape(input.title)} - Shortlink</title>
+  <style>
+    :root { color-scheme: light dark; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
+    body { margin: 0; min-height: 100vh; display: grid; place-items: center; background: #f5f7f8; color: #172026; }
+    main { width: min(92vw, 520px); border: 1px solid #d7dee3; border-radius: 8px; background: #fff; padding: 28px; box-shadow: 0 18px 48px rgb(23 32 38 / 10%); }
+    .status { display: inline-flex; align-items: center; min-height: 28px; padding: 0 10px; border-radius: 999px; background: #eef2f5; color: #46545f; font-size: 13px; font-weight: 700; }
+    h1 { margin: 18px 0 10px; font-size: 24px; line-height: 1.2; letter-spacing: 0; }
+    p { margin: 0; color: #46545f; line-height: 1.55; }
+    .detail { margin-top: 12px; color: #6a7780; font-size: 14px; }
+    .slug { margin-top: 18px; padding: 10px 12px; border: 1px solid #d7dee3; border-radius: 6px; background: #fafbfc; color: #172026; font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", monospace; overflow-wrap: anywhere; }
+    @media (prefers-color-scheme: dark) {
+      body { background: #101417; color: #f4f7f8; }
+      main { background: #171d21; border-color: #2b363d; box-shadow: none; }
+      .status { background: #263139; color: #cbd5db; }
+      p { color: #bac6cc; }
+      .detail { color: #8c9aa3; }
+      .slug { background: #101417; border-color: #2b363d; color: #f4f7f8; }
+    }
+  </style>
+</head>
+<body>
+  <main>
+    <div class="status">${input.status}</div>
+    <h1>${htmlEscape(input.title)}</h1>
+    <p>${htmlEscape(input.message)}</p>
+    ${detail}
+    ${slug}
+  </main>
+</body>
+</html>`;
+  return new Response(body, {
+    status: input.status,
+    headers: { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" }
+  });
+}
+function publicShortlinkError(kind, slug, host) {
+  if (kind === "disabled") {
+    return publicErrorPage({
+      title: "This shortlink is disabled",
+      message: "The owner has turned this shortlink off.",
+      detail: "Ask the sender for a new link if you still need access.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "expired") {
+    return publicErrorPage({
+      title: "This shortlink has expired",
+      message: "The owner set an expiration time for this shortlink, and it is no longer available.",
+      detail: "Ask the sender to create a fresh link.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "used") {
+    return publicErrorPage({
+      title: "This shortlink has already been used",
+      message: "The owner limited how many times this shortlink can be opened, and that limit has been reached.",
+      detail: "Ask the sender for a new link if you still need access.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "reserved") {
+    return publicErrorPage({
+      title: "This path is reserved",
+      message: "This address is reserved for another has.na feature.",
+      status: 404,
+      slug
+    });
+  }
+  if (kind === "invalid") {
+    return publicErrorPage({
+      title: "Invalid shortlink",
+      message: "This shortlink address is not valid.",
+      status: 400
+    });
+  }
+  if (kind === "missing") {
+    return publicErrorPage({
+      title: "Missing shortlink",
+      message: "No shortlink slug was provided.",
+      status: 404
+    });
+  }
+  return publicErrorPage({
+    title: "Shortlink not found",
+    message: "This shortlink does not exist or is no longer available.",
+    detail: "Check the address or ask the sender for a new link.",
+    status: 404,
+    slug: slug ? `${host ?? ""}/${slug}` : undefined
+  });
+}
 function apiToken(options) {
   return options.apiToken || process.env.SHORTLINKS_API_TOKEN || process.env.HASNA_SHORTLINKS_API_TOKEN || null;
 }
@@ -9852,30 +9956,34 @@ function createShortlinksHandler(options = {}) {
     try {
       slug = decodeURIComponent(url.pathname.replace(/^\/+/, "").split("/")[0] || "");
     } catch {
-      return json({ error: "Invalid slug." }, 400);
+      return publicShortlinkError("invalid", "");
     }
     if (!slug)
-      return json({ error: "Missing slug." }, 404);
+      return publicShortlinkError("missing", "");
     if (reservedPathPrefixes.has(slug.toLowerCase())) {
-      return json({ error: "Reserved path prefix.", slug }, 404);
+      return publicShortlinkError("reserved", slug);
     }
     const host = getHost(request, options.defaultHost);
     if (!host)
-      return json({ error: "Missing Host header." }, 400);
+      return publicErrorPage({
+        title: "Invalid shortlink request",
+        message: "This request did not include a host name.",
+        status: 400
+      });
     let link = null;
     try {
       link = await store.resolve(host, slug);
     } catch {
-      return json({ error: "Shortlink not found.", slug, host }, 404);
+      return publicShortlinkError("not_found", slug, host);
     }
     if (!link)
-      return json({ error: "Shortlink not found.", slug, host }, 404);
+      return publicShortlinkError("not_found", slug, host);
     if (!link.active)
-      return json({ error: "Shortlink is disabled.", slug, host }, 410);
+      return publicShortlinkError("disabled", slug, host);
     if (isExpired(link))
-      return json({ error: "Shortlink is expired.", slug, host }, 410);
+      return publicShortlinkError("expired", slug, host);
     if (link.max_uses !== null && link.used_count >= link.max_uses) {
-      return json({ error: "Shortlink max uses reached.", slug, host }, 410);
+      return publicShortlinkError("used", slug, host);
     }
     if (request.method.toUpperCase() === "HEAD") {
       return new Response(null, {
@@ -9885,7 +9993,7 @@ function createShortlinksHandler(options = {}) {
     }
     const consumed = store.consumeLinkUse ? await store.consumeLinkUse(link) : link;
     if (!consumed) {
-      return json({ error: "Shortlink max uses reached.", slug, host }, 410);
+      return publicShortlinkError("used", slug, host);
     }
     await store.recordClick(consumed, {
       ip: getClientIp(request),

package/dist/index.js CHANGED Viewed

@@ -6283,6 +6283,110 @@ function json(data, status = 200) {
     headers: { "content-type": "application/json; charset=utf-8" }
   });
 }
+function htmlEscape(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function publicErrorPage(input) {
+  const detail = input.detail ? `<p class="detail">${htmlEscape(input.detail)}</p>` : "";
+  const slug = input.slug ? `<p class="slug">${htmlEscape(input.slug)}</p>` : "";
+  const body = `<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>${htmlEscape(input.title)} - Shortlink</title>
+  <style>
+    :root { color-scheme: light dark; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
+    body { margin: 0; min-height: 100vh; display: grid; place-items: center; background: #f5f7f8; color: #172026; }
+    main { width: min(92vw, 520px); border: 1px solid #d7dee3; border-radius: 8px; background: #fff; padding: 28px; box-shadow: 0 18px 48px rgb(23 32 38 / 10%); }
+    .status { display: inline-flex; align-items: center; min-height: 28px; padding: 0 10px; border-radius: 999px; background: #eef2f5; color: #46545f; font-size: 13px; font-weight: 700; }
+    h1 { margin: 18px 0 10px; font-size: 24px; line-height: 1.2; letter-spacing: 0; }
+    p { margin: 0; color: #46545f; line-height: 1.55; }
+    .detail { margin-top: 12px; color: #6a7780; font-size: 14px; }
+    .slug { margin-top: 18px; padding: 10px 12px; border: 1px solid #d7dee3; border-radius: 6px; background: #fafbfc; color: #172026; font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", monospace; overflow-wrap: anywhere; }
+    @media (prefers-color-scheme: dark) {
+      body { background: #101417; color: #f4f7f8; }
+      main { background: #171d21; border-color: #2b363d; box-shadow: none; }
+      .status { background: #263139; color: #cbd5db; }
+      p { color: #bac6cc; }
+      .detail { color: #8c9aa3; }
+      .slug { background: #101417; border-color: #2b363d; color: #f4f7f8; }
+    }
+  </style>
+</head>
+<body>
+  <main>
+    <div class="status">${input.status}</div>
+    <h1>${htmlEscape(input.title)}</h1>
+    <p>${htmlEscape(input.message)}</p>
+    ${detail}
+    ${slug}
+  </main>
+</body>
+</html>`;
+  return new Response(body, {
+    status: input.status,
+    headers: { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" }
+  });
+}
+function publicShortlinkError(kind, slug, host) {
+  if (kind === "disabled") {
+    return publicErrorPage({
+      title: "This shortlink is disabled",
+      message: "The owner has turned this shortlink off.",
+      detail: "Ask the sender for a new link if you still need access.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "expired") {
+    return publicErrorPage({
+      title: "This shortlink has expired",
+      message: "The owner set an expiration time for this shortlink, and it is no longer available.",
+      detail: "Ask the sender to create a fresh link.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "used") {
+    return publicErrorPage({
+      title: "This shortlink has already been used",
+      message: "The owner limited how many times this shortlink can be opened, and that limit has been reached.",
+      detail: "Ask the sender for a new link if you still need access.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "reserved") {
+    return publicErrorPage({
+      title: "This path is reserved",
+      message: "This address is reserved for another has.na feature.",
+      status: 404,
+      slug
+    });
+  }
+  if (kind === "invalid") {
+    return publicErrorPage({
+      title: "Invalid shortlink",
+      message: "This shortlink address is not valid.",
+      status: 400
+    });
+  }
+  if (kind === "missing") {
+    return publicErrorPage({
+      title: "Missing shortlink",
+      message: "No shortlink slug was provided.",
+      status: 404
+    });
+  }
+  return publicErrorPage({
+    title: "Shortlink not found",
+    message: "This shortlink does not exist or is no longer available.",
+    detail: "Check the address or ask the sender for a new link.",
+    status: 404,
+    slug: slug ? `${host ?? ""}/${slug}` : undefined
+  });
+}
 function apiToken(options) {
   return options.apiToken || process.env.SHORTLINKS_API_TOKEN || process.env.HASNA_SHORTLINKS_API_TOKEN || null;
 }
@@ -6433,30 +6537,34 @@ function createShortlinksHandler(options = {}) {
     try {
       slug = decodeURIComponent(url.pathname.replace(/^\/+/, "").split("/")[0] || "");
     } catch {
-      return json({ error: "Invalid slug." }, 400);
+      return publicShortlinkError("invalid", "");
     }
     if (!slug)
-      return json({ error: "Missing slug." }, 404);
+      return publicShortlinkError("missing", "");
     if (reservedPathPrefixes.has(slug.toLowerCase())) {
-      return json({ error: "Reserved path prefix.", slug }, 404);
+      return publicShortlinkError("reserved", slug);
     }
     const host = getHost(request, options.defaultHost);
     if (!host)
-      return json({ error: "Missing Host header." }, 400);
+      return publicErrorPage({
+        title: "Invalid shortlink request",
+        message: "This request did not include a host name.",
+        status: 400
+      });
     let link = null;
     try {
       link = await store.resolve(host, slug);
     } catch {
-      return json({ error: "Shortlink not found.", slug, host }, 404);
+      return publicShortlinkError("not_found", slug, host);
     }
     if (!link)
-      return json({ error: "Shortlink not found.", slug, host }, 404);
+      return publicShortlinkError("not_found", slug, host);
     if (!link.active)
-      return json({ error: "Shortlink is disabled.", slug, host }, 410);
+      return publicShortlinkError("disabled", slug, host);
     if (isExpired(link))
-      return json({ error: "Shortlink is expired.", slug, host }, 410);
+      return publicShortlinkError("expired", slug, host);
     if (link.max_uses !== null && link.used_count >= link.max_uses) {
-      return json({ error: "Shortlink max uses reached.", slug, host }, 410);
+      return publicShortlinkError("used", slug, host);
     }
     if (request.method.toUpperCase() === "HEAD") {
       return new Response(null, {
@@ -6466,7 +6574,7 @@ function createShortlinksHandler(options = {}) {
     }
     const consumed = store.consumeLinkUse ? await store.consumeLinkUse(link) : link;
     if (!consumed) {
-      return json({ error: "Shortlink max uses reached.", slug, host }, 410);
+      return publicShortlinkError("used", slug, host);
     }
     await store.recordClick(consumed, {
       ip: getClientIp(request),

package/dist/server.js CHANGED Viewed

@@ -570,6 +570,110 @@ function json(data, status = 200) {
     headers: { "content-type": "application/json; charset=utf-8" }
   });
 }
+function htmlEscape(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function publicErrorPage(input) {
+  const detail = input.detail ? `<p class="detail">${htmlEscape(input.detail)}</p>` : "";
+  const slug = input.slug ? `<p class="slug">${htmlEscape(input.slug)}</p>` : "";
+  const body = `<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>${htmlEscape(input.title)} - Shortlink</title>
+  <style>
+    :root { color-scheme: light dark; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
+    body { margin: 0; min-height: 100vh; display: grid; place-items: center; background: #f5f7f8; color: #172026; }
+    main { width: min(92vw, 520px); border: 1px solid #d7dee3; border-radius: 8px; background: #fff; padding: 28px; box-shadow: 0 18px 48px rgb(23 32 38 / 10%); }
+    .status { display: inline-flex; align-items: center; min-height: 28px; padding: 0 10px; border-radius: 999px; background: #eef2f5; color: #46545f; font-size: 13px; font-weight: 700; }
+    h1 { margin: 18px 0 10px; font-size: 24px; line-height: 1.2; letter-spacing: 0; }
+    p { margin: 0; color: #46545f; line-height: 1.55; }
+    .detail { margin-top: 12px; color: #6a7780; font-size: 14px; }
+    .slug { margin-top: 18px; padding: 10px 12px; border: 1px solid #d7dee3; border-radius: 6px; background: #fafbfc; color: #172026; font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", monospace; overflow-wrap: anywhere; }
+    @media (prefers-color-scheme: dark) {
+      body { background: #101417; color: #f4f7f8; }
+      main { background: #171d21; border-color: #2b363d; box-shadow: none; }
+      .status { background: #263139; color: #cbd5db; }
+      p { color: #bac6cc; }
+      .detail { color: #8c9aa3; }
+      .slug { background: #101417; border-color: #2b363d; color: #f4f7f8; }
+    }
+  </style>
+</head>
+<body>
+  <main>
+    <div class="status">${input.status}</div>
+    <h1>${htmlEscape(input.title)}</h1>
+    <p>${htmlEscape(input.message)}</p>
+    ${detail}
+    ${slug}
+  </main>
+</body>
+</html>`;
+  return new Response(body, {
+    status: input.status,
+    headers: { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" }
+  });
+}
+function publicShortlinkError(kind, slug, host) {
+  if (kind === "disabled") {
+    return publicErrorPage({
+      title: "This shortlink is disabled",
+      message: "The owner has turned this shortlink off.",
+      detail: "Ask the sender for a new link if you still need access.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "expired") {
+    return publicErrorPage({
+      title: "This shortlink has expired",
+      message: "The owner set an expiration time for this shortlink, and it is no longer available.",
+      detail: "Ask the sender to create a fresh link.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "used") {
+    return publicErrorPage({
+      title: "This shortlink has already been used",
+      message: "The owner limited how many times this shortlink can be opened, and that limit has been reached.",
+      detail: "Ask the sender for a new link if you still need access.",
+      status: 410,
+      slug: slug ? `${host ?? ""}/${slug}` : undefined
+    });
+  }
+  if (kind === "reserved") {
+    return publicErrorPage({
+      title: "This path is reserved",
+      message: "This address is reserved for another has.na feature.",
+      status: 404,
+      slug
+    });
+  }
+  if (kind === "invalid") {
+    return publicErrorPage({
+      title: "Invalid shortlink",
+      message: "This shortlink address is not valid.",
+      status: 400
+    });
+  }
+  if (kind === "missing") {
+    return publicErrorPage({
+      title: "Missing shortlink",
+      message: "No shortlink slug was provided.",
+      status: 404
+    });
+  }
+  return publicErrorPage({
+    title: "Shortlink not found",
+    message: "This shortlink does not exist or is no longer available.",
+    detail: "Check the address or ask the sender for a new link.",
+    status: 404,
+    slug: slug ? `${host ?? ""}/${slug}` : undefined
+  });
+}
 function apiToken(options) {
   return options.apiToken || process.env.SHORTLINKS_API_TOKEN || process.env.HASNA_SHORTLINKS_API_TOKEN || null;
 }
@@ -720,30 +824,34 @@ function createShortlinksHandler(options = {}) {
     try {
       slug = decodeURIComponent(url.pathname.replace(/^\/+/, "").split("/")[0] || "");
     } catch {
-      return json({ error: "Invalid slug." }, 400);
+      return publicShortlinkError("invalid", "");
     }
     if (!slug)
-      return json({ error: "Missing slug." }, 404);
+      return publicShortlinkError("missing", "");
     if (reservedPathPrefixes.has(slug.toLowerCase())) {
-      return json({ error: "Reserved path prefix.", slug }, 404);
+      return publicShortlinkError("reserved", slug);
     }
     const host = getHost(request, options.defaultHost);
     if (!host)
-      return json({ error: "Missing Host header." }, 400);
+      return publicErrorPage({
+        title: "Invalid shortlink request",
+        message: "This request did not include a host name.",
+        status: 400
+      });
     let link = null;
     try {
       link = await store.resolve(host, slug);
     } catch {
-      return json({ error: "Shortlink not found.", slug, host }, 404);
+      return publicShortlinkError("not_found", slug, host);
     }
     if (!link)
-      return json({ error: "Shortlink not found.", slug, host }, 404);
+      return publicShortlinkError("not_found", slug, host);
     if (!link.active)
-      return json({ error: "Shortlink is disabled.", slug, host }, 410);
+      return publicShortlinkError("disabled", slug, host);
     if (isExpired(link))
-      return json({ error: "Shortlink is expired.", slug, host }, 410);
+      return publicShortlinkError("expired", slug, host);
     if (link.max_uses !== null && link.used_count >= link.max_uses) {
-      return json({ error: "Shortlink max uses reached.", slug, host }, 410);
+      return publicShortlinkError("used", slug, host);
     }
     if (request.method.toUpperCase() === "HEAD") {
       return new Response(null, {
@@ -753,7 +861,7 @@ function createShortlinksHandler(options = {}) {
     }
     const consumed = store.consumeLinkUse ? await store.consumeLinkUse(link) : link;
     if (!consumed) {
-      return json({ error: "Shortlink max uses reached.", slug, host }, 410);
+      return publicShortlinkError("used", slug, host);
     }
     await store.recordClick(consumed, {
       ip: getClientIp(request),

package/package.json CHANGED Viewed

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