mono-jsx 0.10.0-beta.2 → 0.10.0-beta.4

package/README.md

@@ -1343,17 +1343,39 @@ export default {
 ### Session Storage API
 
 ```ts
-function Component(this: FC) {
-  // set a value in the session
-  this.session.set("user", { name: "John" })
-  // get a value from the session
-  this.session.get<{ name: string }>("user") // { name: "John" }
-  // get all entries from the session
-  this.session.entries() // [["user", { name: "John" }]]
-  // delete a value from the session
-  this.session.delete("user")
-  // destroy the session
-  this.session.destroy()
+export interface Session {
+  /**
+   * The session ID.
+   */
+  readonly sessionId: string;
+  /**
+   * If true, update the session cookie to the client.
+   */
+  readonly isDirty: boolean;
+  /**
+   * If true, the session is expired.
+   */
+  readonly isExpired: boolean;
+  /**
+   * Gets a value from the session.
+   */
+  get<T = unknown>(key: string): T | undefined;
+  /**
+   * Gets all the entries from the session.
+   */
+  all(): Record<string, unknown>;
+  /**
+   * Sets a value in the session.
+   */
+  set(key: string, value: string | number | boolean | any[] | Record<string, unknown>): void;
+  /**
+   * Deletes a value from the session.
+   */
+  delete(key: string): void;
+  /**
+   * Destroys the session.
+   */
+  destroy(): void;
 }
 ```
 
@@ -1402,7 +1424,7 @@ You can access the request info in RPC functions by using the `this` scope:
 - `this.context`: The [context](#using-context) object.
 - `this.session`: The [session](#session-storage-api) storage.
 
-```ts
+```tsx
 type Admin = {
   isAdmin: (id: number) => boolean;
 }

package/jsx-runtime.mjs

@@ -179,7 +179,7 @@ var $setup = /* @__PURE__ */ Symbol.for("mono.setup");
 var $rpc = /* @__PURE__ */ Symbol.for("mono.rpc");
 
 // version.ts
-var VERSION = "0.10.0-beta.1";
+var VERSION = "0.10.0-beta.4";
 
 // render.ts
 var FunctionIdGenerator = class extends Map {
@@ -534,7 +534,7 @@ async function render(node, options, write, writeJS, componentMode, routeForm) {
         if (Object.keys(sessionStore).length > 0) {
           const data = JSON.stringify([
             sessionStore,
-            Math.floor((expires ? expires.getTime() : Date.now() + (maxAge ?? 18e5)) / 1e3)
+            Math.floor((expires ? expires.getTime() : Date.now() + (maxAge ?? 1800) * 1e3) / 1e3)
           ]);
           const signature = await subtle.sign(
             "HMAC",
@@ -830,9 +830,9 @@ async function renderNode(rc, node, stripSlotProp) {
                 const now = Date.now();
                 const value = cache.get(key);
                 if (value && (!value.expiresAt || value.expiresAt > now)) {
-                  write("<!-- cache-hit -->");
+                  write("<!-- " + tag + "(" + (tag === "cache" ? "hit" : "cache-hit") + ") -->");
                   write(value.html);
-                  write("<!-- /cache -->");
+                  write("<!-- /" + tag + " -->");
                 } else {
                   let buf = "";
                   await renderChildren(
@@ -849,6 +849,7 @@ async function renderNode(rc, node, stripSlotProp) {
                   rc.write(buf);
                 }
               } else {
+                console.warn("[mono-jsx] <" + tag + "> The `key` prop is required for caching.");
                 await renderChildren(rc, children, true);
               }
             }
@@ -1373,6 +1374,7 @@ async function createSession(request, options) {
   let sessionId;
   let sessionStore = /* @__PURE__ */ new Map();
   let isDirty = false;
+  let isExpired = false;
   let session = {
     get sessionId() {
       return sessionId ?? "";
@@ -1380,6 +1382,9 @@ async function createSession(request, options) {
     get isDirty() {
       return isDirty;
     },
+    get isExpired() {
+      return isExpired;
+    },
     get: (key) => sessionStore.get(key),
     all: () => Object.fromEntries(sessionStore.entries()),
     set: (key, value) => {
@@ -1414,8 +1419,12 @@ async function createSession(request, options) {
         );
         if (verified) {
           const [map, exp] = JSON.parse(data);
-          if (typeof exp === "number" && exp * 1e3 > Date.now()) {
-            sessionStore = new Map(Object.entries(map));
+          if (typeof exp === "number") {
+            if (exp * 1e3 > Date.now()) {
+              sessionStore = new Map(Object.entries(map));
+            } else {
+              isExpired = true;
+            }
             sessionId = sid;
           }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mono-jsx",
-  "version": "0.10.0-beta.2",
-  "description": "`<html>` as a `Response`.",
+  "version": "0.10.0-beta.4",
+  "description": "`<html>` as a `Response` (Yet another JSX runtime for server-side rendering).",
   "type": "module",
   "module": "./index.mjs",
   "types": "./types/index.d.ts",

package/types/mono.d.ts

@@ -166,6 +166,10 @@ export interface Session {
    * If true, update the session cookie to the client.
    */
   readonly isDirty: boolean;
+  /**
+   * If true, the session is expired.
+   */
+  readonly isExpired: boolean;
   /**
    * Gets a value from the session.
    */

package/types/render.d.ts

@@ -1,5 +1,6 @@
 /// <reference path="./htmx.d.ts" />
 
+import { inflate } from "node:zlib";
 import type { ComponentType } from "./jsx.d.ts";
 
 export type MaybeModule<T> = T | Promise<{ default: T; FormHandler?: Function }>;
@@ -61,7 +62,7 @@ export type SessionOptions = {
    * The cookie options to be used by the session.
    */
   cookie?: CookieOptions;
-  // TODO: add session store options
+  // TODO: add session storage options
 };
 
 /**