@access-dlsu/leapify 0.260605.2 → 0.260608.1

package/dist/index.js

@@ -21,6 +21,8 @@ var LeapifyError = class extends Error {
     this.code = code;
     this.name = "LeapifyError";
   }
+  statusCode;
+  code;
 };
 var unauthorized = (message = "Unauthorized") => new LeapifyError(401, "UNAUTHORIZED", message);
 var domainRestricted = () => new LeapifyError(
@@ -315,7 +317,7 @@ function createCorsMiddleware(allowedOrigins) {
         );
       }
     }
-    if (c.req.path.startsWith("/api/uploads/images")) {
+    if (c.req.path.startsWith("/api/uploads")) {
       c.header("Access-Control-Allow-Origin", "*");
       c.header("Access-Control-Allow-Methods", "GET, OPTIONS");
       if (c.req.method === "OPTIONS") {
@@ -767,6 +769,7 @@ var CacheService = class {
   constructor(kv) {
     this.kv = kv;
   }
+  kv;
   async get(key) {
     return this.kv.get(key, "json");
   }
@@ -806,71 +809,48 @@ var CacheService = class {
     return `"${hashArray.map((b) => b.toString(16).padStart(2, "0")).join("")}"`;
   }
 };
-var SLOT_KV_PREFIX = "slots:";
 var SlotsService = class {
-  constructor(db, cache) {
+  constructor(db) {
     this.db = db;
-    this.cache = cache;
-  }
-  kvKey(slug) {
-    return `${SLOT_KV_PREFIX}${slug}`;
   }
+  db;
   /**
-   * Read current slot info — KV first, D1 on miss.
+   * Read current slot info from D1.
    */
   async getSlots(slug) {
-    const cached = await this.cache.get(this.kvKey(slug));
-    if (cached) return cached;
-    return this.refreshFromDb(slug);
+    const event = await this.db.query.events.findFirst({
+      where: eq(events.slug, slug),
+      columns: { maxSlots: true, registeredSlots: true }
+    });
+    if (!event) return null;
+    return {
+      total: event.maxSlots,
+      registered: event.registeredSlots
+    };
   }
   /**
-   * Atomically increment registered_slots in D1 and update KV.
+   * Atomically increment registered_slots in D1.
    * Called by the Google Forms Watch webhook handler.
    */
   async increment(slug) {
     await this.db.update(events).set({ registeredSlots: sql`${events.registeredSlots} + 1` }).where(eq(events.slug, slug));
-    return this.refreshFromDb(slug);
+    return this.getSlots(slug);
   }
   /**
-   * Atomically decrement registered_slots in D1 and update KV.
+   * Atomically decrement registered_slots in D1.
    * Used during reconciliation drift correction (not from user actions).
    */
   async decrement(slug) {
     await this.db.update(events).set({
       registeredSlots: sql`MAX(0, ${events.registeredSlots} - 1)`
     }).where(eq(events.slug, slug));
-    return this.refreshFromDb(slug);
+    return this.getSlots(slug);
   }
   /**
    * Set registered_slots to a specific value (used by reconciliation cron).
    */
   async correctCount(slug, actualCount) {
     await this.db.update(events).set({ registeredSlots: actualCount }).where(eq(events.slug, slug));
-    await this.invalidate(slug);
-  }
-  /**
-   * Read from D1, write to KV, and return slot info.
-   */
-  async refreshFromDb(slug) {
-    const event = await this.db.query.events.findFirst({
-      where: eq(events.slug, slug),
-      columns: { maxSlots: true, registeredSlots: true }
-    });
-    if (!event) return null;
-    const info = {
-      total: event.maxSlots,
-      registered: event.registeredSlots,
-      available: Math.max(0, event.maxSlots - event.registeredSlots),
-      isFull: event.registeredSlots >= event.maxSlots
-    };
-    await this.cache.set(this.kvKey(slug), info);
-    return info;
-  }
-  /**
-   * Invalidate the KV cache for a specific event.
-   */
-  async invalidate(slug) {
-    await this.cache.del(this.kvKey(slug));
   }
 };
 
@@ -1107,7 +1087,7 @@ var adminEventsRateLimit = createRateLimitMiddleware({
 // src/routes/classes.ts
 var EVENTS_LIST_KV_KEY = "events:list";
 var EVENTS_ETAG_KV_KEY = "events:etag";
-var EVENTS_LIST_TTL = 300;
+var EVENTS_LIST_TTL = 3600;
 var createEventSchema = z.object({
   themeId: z.string().min(1),
   organizationId: z.string().optional(),
@@ -1246,17 +1226,12 @@ classesRoute.get(
           registrationClosesAt: true,
           isSpotlight: true,
           maxSlots: true,
-          registeredSlots: true,
           gformsUrl: true
         }
       }),
       EVENTS_LIST_TTL
     );
     c.header("ETag", etag);
-    c.header(
-      "Cache-Control",
-      "public, max-age=604800, stale-while-revalidate=86400"
-    );
     return c.json({ data: serializeEvents(data) });
   }
 );
@@ -1280,7 +1255,8 @@ classesRoute.get(
       }
     });
     if (!event) throw notFound("Event");
-    return c.json({ data: serializeEvent(event) });
+    const { registeredSlots: _, ...rest } = event;
+    return c.json({ data: serializeEvent(rest) });
   }
 );
 classesRoute.get(
@@ -1297,11 +1273,10 @@ classesRoute.get(
   async (c) => {
     const { slug } = c.req.param();
     const db = createDb(c.env.DB);
-    const cache = new CacheService(c.env.KV);
-    const slotsService = new SlotsService(db, cache);
+    const slotsService = new SlotsService(db);
     const info = await slotsService.getSlots(slug);
     if (!info) throw notFound("Event");
-    c.header("Cache-Control", "public, max-age=5, stale-while-revalidate=5");
+    c.header("Cache-Control", "public, max-age=3, stale-while-revalidate=3");
     return c.json({ data: info });
   }
 );
@@ -1322,9 +1297,8 @@ classesRoute.post(
   async (c) => {
     const { slug } = c.req.param();
     const db = createDb(c.env.DB);
-    const cache = new CacheService(c.env.KV);
     const gforms = new GFormsService(c.env.GFORMS_SERVICE_ACCOUNT_JSON);
-    const slots = new SlotsService(db, cache);
+    const slots = new SlotsService(db);
     const event = await db.query.events.findFirst({
       where: eq(events.slug, slug),
       columns: { gformsId: true }
@@ -1666,7 +1640,7 @@ siteConfigRoute.patch(
   }
 );
 var FAQS_KV_KEY = "faqs:active";
-var FAQS_TTL = 600;
+var FAQS_TTL = 86400;
 var faqSchema = z.object({
   question: z.string().min(1),
   answer: z.string().min(1),
@@ -1691,7 +1665,8 @@ faqsRoute.get(
       }),
       FAQS_TTL
     );
-    return c.json({ data });
+    const serialized = data.map(({ sortOrder, ...rest }) => rest);
+    return c.json({ data: serialized });
   }
 );
 faqsRoute.post(
@@ -1798,7 +1773,6 @@ gformsWebhookRoute.post(
     const { formId } = payload;
     if (!formId) return c.json({ error: "Missing formId" }, 400);
     const db = createDb(c.env.DB);
-    const cache = new CacheService(c.env.KV);
     const event = await db.query.events.findFirst({
       where: eq(events.gformsId, formId),
       columns: { slug: true, maxSlots: true, registeredSlots: true }
@@ -1807,7 +1781,7 @@ gformsWebhookRoute.post(
       console.warn(`[gforms-webhook] Unknown formId: ${formId}`);
       return c.json({ ok: true });
     }
-    const slotsService = new SlotsService(db, cache);
+    const slotsService = new SlotsService(db);
     const updated = await slotsService.increment(event.slug);
     console.log(
       `[gforms-webhook] Incremented "${event.slug}": ${updated?.registered}/${updated?.total}`
@@ -1844,7 +1818,7 @@ async function reconcileSlots(env) {
   const db = createDb(env.DB);
   const cache = new CacheService(env.KV);
   const gforms = new GFormsService(env.GFORMS_SERVICE_ACCOUNT_JSON);
-  const slots = new SlotsService(db, cache);
+  const slots = new SlotsService(db);
   const lock = await cache.get(LOCK_KEY);
   if (lock) {
     console.log("[reconcile-slots] Lock held, skipping.");
@@ -2078,7 +2052,7 @@ var ALLOWED_MIME_TYPES = /* @__PURE__ */ new Set([
 var MAX_FILE_SIZE = 10 * 1024 * 1024;
 var uploadsRoute = new Hono();
 uploadsRoute.get(
-  "/images/*",
+  "/*",
   describeRoute({
     tags: ["Uploads"],
     summary: "Serve an image from R2 storage",
@@ -2092,7 +2066,7 @@ uploadsRoute.get(
     if (!bucket) {
       throw serviceUnavailable("File storage (R2) is not configured.");
     }
-    const path = c.req.path.split("/uploads/images/")[1];
+    const path = c.req.path.split("/uploads/")[1];
     if (!path) throw notFound("Image");
     const object = await bucket.get(path);
     if (!object) throw notFound("Image");
@@ -2111,7 +2085,7 @@ uploadsRoute.get(
   }
 );
 uploadsRoute.post(
-  "/images",
+  "/",
   describeRoute({
     tags: ["Uploads"],
     summary: "Upload an image to R2 storage (admin)",
@@ -2158,7 +2132,7 @@ uploadsRoute.post(
       customMetadata: { uploadedAt: (/* @__PURE__ */ new Date()).toISOString() }
     });
     const url = new URL(c.req.url);
-    url.pathname = `${url.pathname.replace(/\/$/, "")}/${key}`;
+    url.pathname = `/${key}`;
     url.search = "";
     return c.json(
       {
@@ -2215,7 +2189,8 @@ themesRoute.get(
   async (c) => {
     const db = createDb(c.env.DB);
     const data = await db.select().from(themes).orderBy(asc(themes.sortOrder), asc(themes.createdAt));
-    return c.json({ data });
+    const serialized = data.map(({ sortOrder, ...rest }) => rest);
+    return c.json({ data: serialized });
   }
 );
 themesRoute.post(
@@ -2462,7 +2437,7 @@ function createApp(options = {}) {
       documentation: {
         info: {
           title: "Leapify API",
-          version: "0.260605.2" ,
+          version: "0.260608.1" ,
           description: "DLSU CSO LEAP backend API"
         },
         openapi: "3.1.0"
@@ -2580,6 +2555,7 @@ var SesError = class extends Error {
     this.status = status;
     this.name = "SesError";
   }
+  status;
   /**
    * True for errors that are permanent (not worth retrying via SES again).
    * 400 BadRequest, 403 Forbidden, 404 NotFound → non-retryable.
@@ -3112,7 +3088,7 @@ function defaultGetRuntimeConfig(env) {
   };
 }
 function injectConfig(html, config) {
-  const configScript = `<script>window.__CONFIG__=${JSON.stringify(config)};</script>`;
+  const configScript = `<script>window.__CONFIG__=${JSON.stringify(config)};<\/script>`;
   return html.replace("</head>", `${configScript}</head>`);
 }
 function createWorkerHandler(options) {
@@ -3234,10 +3210,10 @@ function getRuntimeConfig(env) {
   };
 }
 function injectConfig2(html, config) {
-  const configScript = `<script>window.__CONFIG__=${JSON.stringify(config)};</script>`;
+  const configScript = `<script>window.__CONFIG__=${JSON.stringify(config)};<\/script>`;
   return html.replace("</head>", `${configScript}</head>`);
 }
 
 export { authAccount, authSession, authUser, authVerification, bookmarks, bookmarksRelations, createDb, createLeapify, createQueueHandler, createWorkerHandler, ensureDatabase, events, eventsRelations, faqs, getRuntimeConfig, injectConfig2 as injectConfig, organizations, organizationsRelations, siteConfig, themes, themesRelations, users };
 //# sourceMappingURL=index.js.map
-//# sourceMappingURL=index.js.mapap
+//# sourceMappingURL=index.js.map