@jant/core 0.3.25 → 0.3.26

package/src/lib/timezones.ts

@@ -0,0 +1,325 @@
+/**
+ * Timezone List
+ *
+ * Provides a curated list of timezones for the settings UI
+ * and a helper to map IANA timezone names to our list entries.
+ */
+
+export interface TimezoneEntry {
+  /** Display value stored in settings */
+  value: string;
+  /** Human-readable label for the select UI */
+  label: string;
+  /** UTC offset string, e.g. "+08:00" */
+  offset: string;
+  /** IANA timezone names that map to this entry */
+  iana: string[];
+}
+
+export const TIMEZONES: TimezoneEntry[] = [
+  {
+    value: "International Date Line West",
+    label: "(UTC-12:00) International Date Line West",
+    offset: "-12:00",
+    iana: ["Etc/GMT+12"],
+  },
+  {
+    value: "American Samoa",
+    label: "(UTC-11:00) American Samoa",
+    offset: "-11:00",
+    iana: ["Pacific/Pago_Pago", "Pacific/Midway", "Etc/GMT+11"],
+  },
+  {
+    value: "Hawaii",
+    label: "(UTC-10:00) Hawaii",
+    offset: "-10:00",
+    iana: ["Pacific/Honolulu", "Etc/GMT+10"],
+  },
+  {
+    value: "Alaska",
+    label: "(UTC-09:00) Alaska",
+    offset: "-09:00",
+    iana: ["America/Anchorage", "America/Juneau", "America/Nome"],
+  },
+  {
+    value: "Pacific Time (US & Canada)",
+    label: "(UTC-08:00) Pacific Time (US & Canada)",
+    offset: "-08:00",
+    iana: ["America/Los_Angeles", "America/Vancouver", "America/Tijuana"],
+  },
+  {
+    value: "Mountain Time (US & Canada)",
+    label: "(UTC-07:00) Mountain Time (US & Canada)",
+    offset: "-07:00",
+    iana: [
+      "America/Denver",
+      "America/Edmonton",
+      "America/Phoenix",
+      "America/Boise",
+    ],
+  },
+  {
+    value: "Central Time (US & Canada)",
+    label: "(UTC-06:00) Central Time (US & Canada)",
+    offset: "-06:00",
+    iana: [
+      "America/Chicago",
+      "America/Winnipeg",
+      "America/Mexico_City",
+      "America/Guatemala",
+    ],
+  },
+  {
+    value: "Eastern Time (US & Canada)",
+    label: "(UTC-05:00) Eastern Time (US & Canada)",
+    offset: "-05:00",
+    iana: [
+      "America/New_York",
+      "America/Toronto",
+      "America/Detroit",
+      "America/Indiana/Indianapolis",
+      "America/Bogota",
+      "America/Lima",
+    ],
+  },
+  {
+    value: "Atlantic Time (Canada)",
+    label: "(UTC-04:00) Atlantic Time (Canada)",
+    offset: "-04:00",
+    iana: [
+      "America/Halifax",
+      "America/Caracas",
+      "America/Santiago",
+      "America/La_Paz",
+    ],
+  },
+  {
+    value: "Newfoundland",
+    label: "(UTC-03:30) Newfoundland",
+    offset: "-03:30",
+    iana: ["America/St_Johns"],
+  },
+  {
+    value: "Buenos Aires",
+    label: "(UTC-03:00) Buenos Aires",
+    offset: "-03:00",
+    iana: [
+      "America/Argentina/Buenos_Aires",
+      "America/Sao_Paulo",
+      "America/Montevideo",
+    ],
+  },
+  {
+    value: "Mid-Atlantic",
+    label: "(UTC-02:00) Mid-Atlantic",
+    offset: "-02:00",
+    iana: ["Atlantic/South_Georgia", "Etc/GMT+2"],
+  },
+  {
+    value: "Azores",
+    label: "(UTC-01:00) Azores",
+    offset: "-01:00",
+    iana: ["Atlantic/Azores", "Atlantic/Cape_Verde"],
+  },
+  {
+    value: "UTC",
+    label: "(UTC+00:00) UTC",
+    offset: "+00:00",
+    iana: ["Etc/UTC", "UTC", "Etc/GMT", "Africa/Accra"],
+  },
+  {
+    value: "London",
+    label: "(UTC+00:00) London",
+    offset: "+00:00",
+    iana: ["Europe/London", "Europe/Dublin", "Europe/Lisbon"],
+  },
+  {
+    value: "Central European Time",
+    label: "(UTC+01:00) Central European Time",
+    offset: "+01:00",
+    iana: [
+      "Europe/Paris",
+      "Europe/Berlin",
+      "Europe/Amsterdam",
+      "Europe/Rome",
+      "Europe/Madrid",
+      "Europe/Brussels",
+      "Europe/Vienna",
+      "Europe/Warsaw",
+      "Europe/Prague",
+      "Europe/Stockholm",
+      "Europe/Oslo",
+      "Europe/Copenhagen",
+      "Europe/Zurich",
+      "Africa/Lagos",
+    ],
+  },
+  {
+    value: "Eastern European Time",
+    label: "(UTC+02:00) Eastern European Time",
+    offset: "+02:00",
+    iana: [
+      "Europe/Helsinki",
+      "Europe/Athens",
+      "Europe/Bucharest",
+      "Europe/Istanbul",
+      "Africa/Cairo",
+      "Africa/Johannesburg",
+      "Asia/Jerusalem",
+      "Asia/Beirut",
+    ],
+  },
+  {
+    value: "Moscow",
+    label: "(UTC+03:00) Moscow",
+    offset: "+03:00",
+    iana: [
+      "Europe/Moscow",
+      "Europe/Minsk",
+      "Asia/Baghdad",
+      "Asia/Riyadh",
+      "Africa/Nairobi",
+      "Asia/Kuwait",
+    ],
+  },
+  {
+    value: "Tehran",
+    label: "(UTC+03:30) Tehran",
+    offset: "+03:30",
+    iana: ["Asia/Tehran"],
+  },
+  {
+    value: "Dubai",
+    label: "(UTC+04:00) Dubai",
+    offset: "+04:00",
+    iana: ["Asia/Dubai", "Asia/Muscat", "Asia/Baku", "Asia/Tbilisi"],
+  },
+  {
+    value: "Kabul",
+    label: "(UTC+04:30) Kabul",
+    offset: "+04:30",
+    iana: ["Asia/Kabul"],
+  },
+  {
+    value: "Karachi",
+    label: "(UTC+05:00) Karachi",
+    offset: "+05:00",
+    iana: ["Asia/Karachi", "Asia/Tashkent", "Asia/Yekaterinburg"],
+  },
+  {
+    value: "Mumbai",
+    label: "(UTC+05:30) Mumbai",
+    offset: "+05:30",
+    iana: ["Asia/Kolkata", "Asia/Calcutta", "Asia/Colombo"],
+  },
+  {
+    value: "Kathmandu",
+    label: "(UTC+05:45) Kathmandu",
+    offset: "+05:45",
+    iana: ["Asia/Kathmandu"],
+  },
+  {
+    value: "Dhaka",
+    label: "(UTC+06:00) Dhaka",
+    offset: "+06:00",
+    iana: ["Asia/Dhaka", "Asia/Almaty", "Asia/Omsk"],
+  },
+  {
+    value: "Yangon",
+    label: "(UTC+06:30) Yangon",
+    offset: "+06:30",
+    iana: ["Asia/Yangon", "Asia/Rangoon"],
+  },
+  {
+    value: "Bangkok",
+    label: "(UTC+07:00) Bangkok",
+    offset: "+07:00",
+    iana: [
+      "Asia/Bangkok",
+      "Asia/Jakarta",
+      "Asia/Ho_Chi_Minh",
+      "Asia/Krasnoyarsk",
+    ],
+  },
+  {
+    value: "Beijing",
+    label: "(UTC+08:00) Beijing",
+    offset: "+08:00",
+    iana: [
+      "Asia/Shanghai",
+      "Asia/Hong_Kong",
+      "Asia/Taipei",
+      "Asia/Singapore",
+      "Asia/Kuala_Lumpur",
+      "Asia/Makassar",
+      "Asia/Irkutsk",
+      "Australia/Perth",
+    ],
+  },
+  {
+    value: "Tokyo",
+    label: "(UTC+09:00) Tokyo",
+    offset: "+09:00",
+    iana: ["Asia/Tokyo", "Asia/Seoul", "Asia/Yakutsk"],
+  },
+  {
+    value: "Adelaide",
+    label: "(UTC+09:30) Adelaide",
+    offset: "+09:30",
+    iana: ["Australia/Adelaide", "Australia/Darwin"],
+  },
+  {
+    value: "Sydney",
+    label: "(UTC+10:00) Sydney",
+    offset: "+10:00",
+    iana: [
+      "Australia/Sydney",
+      "Australia/Melbourne",
+      "Australia/Brisbane",
+      "Australia/Hobart",
+      "Pacific/Guam",
+      "Asia/Vladivostok",
+    ],
+  },
+  {
+    value: "Noumea",
+    label: "(UTC+11:00) Noumea",
+    offset: "+11:00",
+    iana: ["Pacific/Noumea", "Asia/Magadan", "Pacific/Guadalcanal"],
+  },
+  {
+    value: "Auckland",
+    label: "(UTC+12:00) Auckland",
+    offset: "+12:00",
+    iana: ["Pacific/Auckland", "Pacific/Fiji", "Asia/Kamchatka"],
+  },
+  {
+    value: "Nuku'alofa",
+    label: "(UTC+13:00) Nuku'alofa",
+    offset: "+13:00",
+    iana: ["Pacific/Tongatapu", "Pacific/Apia"],
+  },
+];
+
+/**
+ * Maps an IANA timezone name (e.g. "Asia/Shanghai") to our timezone list value
+ * (e.g. "Beijing"). Returns "UTC" if no match found.
+ *
+ * @param iana - IANA timezone identifier from Intl.DateTimeFormat
+ * @returns The matching timezone value from TIMEZONES
+ *
+ * @example
+ * ```ts
+ * mapIanaToTimezone("Asia/Shanghai"); // "Beijing"
+ * mapIanaToTimezone("America/New_York"); // "Eastern Time (US & Canada)"
+ * mapIanaToTimezone("Unknown/Zone"); // "UTC"
+ * ```
+ */
+export function mapIanaToTimezone(iana: string): string {
+  for (const tz of TIMEZONES) {
+    if (tz.iana.includes(iana)) {
+      return tz.value;
+    }
+  }
+  return "UTC";
+}

package/src/lib/view.ts

@@ -77,7 +77,7 @@ export function toMediaView(media: Media, ctx: MediaContext): MediaView {
     ctx.r2PublicUrl,
     ctx.s3PublicUrl,
   );
-  const url = getMediaUrl(media.id, media.storageKey, publicUrl);
+  const url = getMediaUrl(media.storageKey, publicUrl);
   const thumbnailUrl = getImageUrl(url, ctx.imageTransformUrl, {
     width: 400,
     quality: 80,

package/src/routes/api/posts.ts

@@ -36,7 +36,7 @@ function toMediaAttachment(
     r2PublicUrl,
     s3PublicUrl,
   );
-  const url = getMediaUrl(m.id, m.storageKey, publicUrl);
+  const url = getMediaUrl(m.storageKey, publicUrl);
   const previewUrl = getImageUrl(url, imageTransformUrl, {
     width: 400,
     quality: 80,

package/src/routes/api/upload.ts

@@ -40,7 +40,7 @@ function renderMediaCard(
   publicUrl?: string,
   imageTransformUrl?: string,
 ): string {
-  const fullUrl = getMediaUrl(media.id, media.storageKey, publicUrl);
+  const fullUrl = getMediaUrl(media.storageKey, publicUrl);
   const thumbnailUrl = getImageUrl(fullUrl, imageTransformUrl, {
     width: 300,
     quality: 80,
@@ -229,7 +229,7 @@ uploadApiRoutes.post("/", async (c) => {
       c.env.R2_PUBLIC_URL,
       c.env.S3_PUBLIC_URL,
     );
-    const publicUrl = getMediaUrl(media.id, storageKey, mediaPublicUrl);
+    const publicUrl = getMediaUrl(storageKey, mediaPublicUrl);
     return c.json({
       id: media.id,
       filename: media.filename,
@@ -263,7 +263,6 @@ uploadApiRoutes.get("/", async (c) => {
       id: m.id,
       filename: m.filename,
       url: getMediaUrl(
-        m.id,
         m.storageKey,
         getPublicUrlForProvider(m.provider, r2PublicUrl, s3PublicUrl),
       ),

package/src/routes/auth/reset.tsx

@@ -0,0 +1,239 @@
+/**
+ * Password Reset Routes
+ *
+ * One-time token-based password reset flow.
+ */
+
+import { Hono } from "hono";
+import type { FC } from "hono/jsx";
+import { useLingui } from "@lingui/react/macro";
+import { hashPassword } from "better-auth/crypto";
+import type { Bindings } from "../../types.js";
+import type { AppVariables } from "../../app.js";
+import { BaseLayout } from "../../ui/layouts/BaseLayout.js";
+import { dsRedirect, dsToast } from "../../lib/sse.js";
+import { SETTINGS_KEYS } from "../../lib/constants.js";
+import { ResetPasswordSchema } from "../../lib/schemas.js";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+const ResetContent: FC<{ token: string }> = ({ token }) => {
+  const { t } = useLingui();
+  const signals = JSON.stringify({
+    password: "",
+    confirmPassword: "",
+    token,
+  }).replace(/</g, "\\u003c");
+
+  return (
+    <div class="min-h-screen flex items-center justify-center">
+      <div class="card max-w-md w-full">
+        <header>
+          <h2>
+            {t({
+              message: "Reset Password",
+              comment: "@context: Password reset page heading",
+            })}
+          </h2>
+          <p>
+            {t({
+              message: "Enter your new password.",
+              comment: "@context: Password reset page description",
+            })}
+          </p>
+        </header>
+        <section>
+          <form
+            data-signals={signals}
+            data-on:submit__prevent="@post('/reset')"
+            data-indicator="_loading"
+            class="flex flex-col gap-4"
+          >
+            <div class="field">
+              <label class="label">
+                {t({
+                  message: "New Password",
+                  comment: "@context: Password reset form field",
+                })}
+              </label>
+              <input
+                type="password"
+                data-bind="password"
+                class="input"
+                required
+                minLength={8}
+                autocomplete="new-password"
+              />
+            </div>
+            <div class="field">
+              <label class="label">
+                {t({
+                  message: "Confirm Password",
+                  comment: "@context: Password reset form field",
+                })}
+              </label>
+              <input
+                type="password"
+                data-bind="confirmPassword"
+                class="input"
+                required
+                minLength={8}
+                autocomplete="new-password"
+              />
+            </div>
+            <button type="submit" class="btn" data-attr:disabled="$_loading">
+              <svg
+                data-show="$_loading"
+                style="display:none"
+                class="animate-spin size-4"
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                role="status"
+              >
+                <path d="M21 12a9 9 0 1 1-6.219-8.56" />
+              </svg>
+              {t({
+                message: "Reset Password",
+                comment: "@context: Password reset form submit button",
+              })}
+            </button>
+          </form>
+        </section>
+      </div>
+    </div>
+  );
+};
+
+const ResetErrorContent: FC = () => {
+  const { t } = useLingui();
+
+  return (
+    <div class="min-h-screen flex items-center justify-center">
+      <div class="card max-w-md w-full">
+        <header>
+          <h2>
+            {t({
+              message: "Invalid or Expired Link",
+              comment: "@context: Password reset error heading",
+            })}
+          </h2>
+        </header>
+        <section>
+          <p class="text-muted-foreground">
+            {t({
+              message:
+                "This password reset link is invalid or has expired. Please generate a new one.",
+              comment: "@context: Password reset error description",
+            })}
+          </p>
+        </section>
+      </div>
+    </div>
+  );
+};
+
+/**
+ * Validate a password reset token against the stored value.
+ * Returns true if the token is valid and not expired.
+ */
+async function validateResetToken(
+  settings: { get(key: string): Promise<string | null> },
+  token: string,
+): Promise<boolean> {
+  const stored = await settings.get(SETTINGS_KEYS.PASSWORD_RESET_TOKEN);
+  if (!stored) return false;
+
+  const separatorIndex = stored.lastIndexOf(":");
+  const storedToken = stored.substring(0, separatorIndex);
+  const expiry = parseInt(stored.substring(separatorIndex + 1), 10);
+  const now = Math.floor(Date.now() / 1000);
+
+  return token === storedToken && now <= expiry;
+}
+
+export const resetRoutes = new Hono<Env>();
+
+resetRoutes.get("/reset", async (c) => {
+  const token = c.req.query("token");
+  if (!token) {
+    return c.html(
+      <BaseLayout title="Reset Password - Jant" c={c}>
+        <ResetErrorContent />
+      </BaseLayout>,
+    );
+  }
+
+  const isValid = await validateResetToken(c.var.services.settings, token);
+  if (!isValid) {
+    return c.html(
+      <BaseLayout title="Reset Password - Jant" c={c}>
+        <ResetErrorContent />
+      </BaseLayout>,
+    );
+  }
+
+  return c.html(
+    <BaseLayout title="Reset Password - Jant" c={c}>
+      <ResetContent token={token} />
+    </BaseLayout>,
+  );
+});
+
+resetRoutes.post("/reset", async (c) => {
+  const body = await c.req.json();
+  const parsed = ResetPasswordSchema.safeParse(body);
+
+  if (!parsed.success) {
+    const msg = parsed.error.errors[0]?.message ?? "Invalid input";
+    return dsToast(msg, "error");
+  }
+
+  const { password, token } = parsed.data;
+
+  // Validate token
+  const isValid = await validateResetToken(c.var.services.settings, token);
+  if (!isValid) {
+    return dsToast("Invalid or expired reset link.", "error");
+  }
+
+  try {
+    const hashedPassword = await hashPassword(password);
+    const db = c.env.DB.withSession() as unknown as D1Database;
+
+    // Get admin user
+    const userResult = await db
+      .prepare("SELECT id FROM user LIMIT 1")
+      .first<{ id: string }>();
+    if (!userResult) {
+      return dsToast("No user account found.", "error");
+    }
+
+    // Update password
+    await db
+      .prepare(
+        "UPDATE account SET password = ? WHERE user_id = ? AND provider_id = 'credential'",
+      )
+      .bind(hashedPassword, userResult.id)
+      .run();
+
+    // Delete all sessions
+    await db
+      .prepare("DELETE FROM session WHERE user_id = ?")
+      .bind(userResult.id)
+      .run();
+
+    // Delete the reset token
+    await c.var.services.settings.remove(SETTINGS_KEYS.PASSWORD_RESET_TOKEN);
+
+    return dsRedirect("/signin?reset");
+  } catch (err) {
+    // eslint-disable-next-line no-console -- Error logging is intentional
+    console.error("Password reset error:", err);
+    return dsToast("Failed to reset password.", "error");
+  }
+});