toiljs 0.0.88 → 0.0.89

package/build/devserver/runtime/host.js

@@ -2,7 +2,7 @@ import { devEnvGet, devEnvGetSecure } from '../config/env.js';
 import { ratelimitCheck } from '../config/ratelimit.js';
 import { buildAnalyticsImports } from '../analytics/index.js';
 import { buildDatabaseImports, freshDbState } from '../db/index.js';
-import { EmailStatus, getEmailService } from '../email/index.js';
+import { EmailStatus, getEmailService, recordSentEmail } from '../email/index.js';
 import { parseEmailBlob } from '../email/wire.js';
 import { buildCryptoImports, freshCryptoState } from './crypto.js';
 const MAX_TOTAL_HEADERS_BYTES = 64 * 1024;
@@ -90,6 +90,34 @@ function envLookup(ref, keyPtr, keyLen, outPtr, outCap, secure) {
     bytes.copy(m, outPtr);
     return bytes.length;
 }
+function devEmailSend(ref, reqPtr, reqLen) {
+    const raw = readBytes(ref, reqPtr, reqLen);
+    const svc = getEmailService();
+    if (svc === null) {
+        const parsed = parseEmailBlob(raw);
+        if (parsed !== null)
+            recordSentEmail(parsed);
+        const to = parsed?.to ?? '<unparsed>';
+        process.stdout.write(`  ✉ dev email_send -> ${to} (no email config; not sent)\n`);
+        return EmailStatus.Sent;
+    }
+    const { status, parsed } = svc.prepare(raw);
+    if (parsed === null) {
+        process.stdout.write(`  ✉ dev email_send -> ${EmailStatus[status]}\n`);
+        return status;
+    }
+    recordSentEmail(parsed);
+    void svc
+        .deliver(parsed)
+        .then((s) => {
+        const label = s === EmailStatus.Sent ? 'sent' : EmailStatus[s];
+        process.stdout.write(`  ✉ dev email_send -> ${parsed.to} (${label})\n`);
+    })
+        .catch((e) => {
+        process.stdout.write(`  ✉ dev email_send -> ${parsed.to} (error: ${String(e)})\n`);
+    });
+    return EmailStatus.Sent;
+}
 export function buildEnvImports(ref, _state) {
     return {
         abort: (msgPtr, filePtr, line, col) => {
@@ -99,30 +127,8 @@ export function buildEnvImports(ref, _state) {
         env_get_secure: (keyPtr, keyLen, outPtr, outCap) => envLookup(ref, keyPtr, keyLen, outPtr, outCap, true),
         thread_spawn: (_startArg) => -1,
         'Date.now': () => BigInt(Date.now()),
-        email_send: (reqPtr, reqLen) => {
-            const raw = readBytes(ref, reqPtr, reqLen);
-            const svc = getEmailService();
-            if (svc === null) {
-                const to = parseEmailBlob(raw)?.to ?? '<unparsed>';
-                process.stdout.write(`  ✉ dev email_send -> ${to} (no email config; not sent)\n`);
-                return EmailStatus.Sent;
-            }
-            const { status, parsed } = svc.prepare(raw);
-            if (parsed === null) {
-                process.stdout.write(`  ✉ dev email_send -> ${EmailStatus[status]}\n`);
-                return status;
-            }
-            void svc
-                .deliver(parsed)
-                .then((s) => {
-                const label = s === EmailStatus.Sent ? 'sent' : EmailStatus[s];
-                process.stdout.write(`  ✉ dev email_send -> ${parsed.to} (${label})\n`);
-            })
-                .catch((e) => {
-                process.stdout.write(`  ✉ dev email_send -> ${parsed.to} (error: ${String(e)})\n`);
-            });
-            return EmailStatus.Sent;
-        },
+        email_send: (reqPtr, reqLen) => devEmailSend(ref, reqPtr, reqLen),
+        email_send_detached: (reqPtr, reqLen) => devEmailSend(ref, reqPtr, reqLen),
     };
 }
 export function buildHostImports(ref, state) {
@@ -175,30 +181,8 @@ export function buildHostImports(ref, state) {
                 const d = ratelimitCheck(routeId, strategy, limit, window, identity, Date.now());
                 return d.allowed ? 1 : -Math.max(1, d.retryAfterSecs);
             },
-            email_send: (reqPtr, reqLen) => {
-                const raw = readBytes(ref, reqPtr, reqLen);
-                const svc = getEmailService();
-                if (svc === null) {
-                    const to = parseEmailBlob(raw)?.to ?? '<unparsed>';
-                    process.stdout.write(`  ✉ dev email_send -> ${to} (no email config; not sent)\n`);
-                    return EmailStatus.Sent;
-                }
-                const { status, parsed } = svc.prepare(raw);
-                if (parsed === null) {
-                    process.stdout.write(`  ✉ dev email_send -> ${EmailStatus[status]}\n`);
-                    return status;
-                }
-                void svc
-                    .deliver(parsed)
-                    .then((s) => {
-                    const label = s === EmailStatus.Sent ? 'sent' : EmailStatus[s];
-                    process.stdout.write(`  ✉ dev email_send -> ${parsed.to} (${label})\n`);
-                })
-                    .catch((e) => {
-                    process.stdout.write(`  ✉ dev email_send -> ${parsed.to} (error: ${String(e)})\n`);
-                });
-                return EmailStatus.Sent;
-            },
+            email_send: (reqPtr, reqLen) => devEmailSend(ref, reqPtr, reqLen),
+            email_send_detached: (reqPtr, reqLen) => devEmailSend(ref, reqPtr, reqLen),
             env_get: (keyPtr, keyLen, outPtr, outCap) => envLookup(ref, keyPtr, keyLen, outPtr, outCap, false),
             env_get_secure: (keyPtr, keyLen, outPtr, outCap) => envLookup(ref, keyPtr, keyLen, outPtr, outCap, true),
             thread_spawn: (_startArg) => -1,

package/build/devserver/runtime/module.js

@@ -34,6 +34,7 @@ const PROVIDED_IMPORTS = new Set([
     'client_ip',
     'ratelimit_check',
     'email_send',
+    'email_send_detached',
     'env_get',
     'env_get_secure',
     'analytics_read',

package/examples/basic/client/routes/pq.tsx

@@ -56,6 +56,7 @@ type Note = { kind: 'ok' | 'err'; text: string } | null;
 
 export default function Pq(): React.JSX.Element {
     const [username, setUsername] = useState('ada');
+    const [email, setEmail] = useState('ada@example.com');
     const [password, setPassword] = useState('correct horse battery staple');
     const [busy, setBusy] = useState(false);
     const [note, setNote] = useState<Note>(null);
@@ -70,7 +71,7 @@ export default function Pq(): React.JSX.Element {
         setNote(null);
         setVerified(null);
         try {
-            await Auth.register(username, password);
+            await Auth.register(username, password, email);
             setNote({
                 kind: 'ok',
                 text: 'registered: the server stored only your public key and a proof-of-possession. Now log in to run the ML-KEM-768 mutual-auth step.'
@@ -80,7 +81,7 @@ export default function Pq(): React.JSX.Element {
         } finally {
             setBusy(false);
         }
-    }, [username, password]);
+    }, [username, password, email]);
 
     const doLogin = useCallback(async () => {
         setBusy(true);
@@ -149,6 +150,15 @@ export default function Pq(): React.JSX.Element {
                     Username
                     <input value={username} onChange={(e) => setUsername(e.target.value)} style={{ width: '100%' }} />
                 </label>
+                <label>
+                    Email
+                    <input
+                        type="email"
+                        value={email}
+                        onChange={(e) => setEmail(e.target.value)}
+                        style={{ width: '100%' }}
+                    />
+                </label>
                 <label>
                     Password
                     <input value={password} onChange={(e) => setPassword(e.target.value)} style={{ width: '100%' }} />

package/examples/basic/server/main.ts

@@ -6,7 +6,6 @@ import { AppHandler } from './core/AppHandler';
 // Surface modules: @rest routes and @service/@remote RPC. `toiljs build` discovers every
 // decorated file under server/ on its own; importing them here keeps a direct `toilscript`
 // run (which only sees the toilconfig entries) building the exact same server.
-import './routes/Auth';
 import './routes/Players';
 import './routes/Leaderboard';
 import './routes/Guestbook';

package/examples/basic/server/routes/Session.ts

@@ -24,23 +24,17 @@ import { DataReader, DataWriter } from 'data';
  */
 
 // @user: the authenticated-user shape. Exactly one per program.
+//
+// This app opts into built-in auth (`server: { auth: true }`), so the build runs in EXTEND mode: it
+// injects the reserved `toilUserId` + `username` identity fields into THIS class (via `--authUser`).
+// Only the app-specific extras (`admin`, `score`) are declared here — declaring `username`/`toilUserId`
+// would collide with the injected fields and error. The shipped `/auth/*` controller reuses this shape.
 @user
 class Account {
-    username: string = '';
     admin: bool = false;
     score: u64 = 0;
 }
 
-/** Encode the @user session payload for `username` (admin if `root`). Exported
- * as a FUNCTION (not the class, which would warn AS235 "only ... become WASM
- * exports") so the PQ login can mint a session via the same generated codec. */
-export function encodeSessionUser(username: string): Uint8Array {
-    const u = new Account();
-    u.username = username;
-    u.admin = username == 'root';
-    return u.encode();
-}
-
 @rest('session')
 class Session {
     /** POST /session/dev-login  body: str(username)  -> sets the session cookie.

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "toiljs",
     "type": "module",
-    "version": "0.0.88",
+    "version": "0.0.89",
     "author": "Dacely",
     "description": "The modern React framework: a file-based React frontend and a ToilScript-compiled WebAssembly backend.",
     "repository": {
@@ -136,7 +136,7 @@
         "nodemailer": "^9.0.3",
         "picocolors": "^1.1.1",
         "sharp": "^0.35.3",
-        "toilscript": "^0.1.53",
+        "toilscript": "^0.1.54",
         "typescript-eslint": "^8.62.1",
         "vite": "^8.1.3",
         "vite-imagetools": "^10.0.1",
@@ -147,7 +147,7 @@
         "prettier": ">=3.0.0",
         "react": ">=18.0.0",
         "react-dom": ">=18.0.0",
-        "toilscript": ">=0.1.53",
+        "toilscript": ">=0.1.54",
         "typescript": ">=6.0.0"
     },
     "overrides": {