@server/next 0.36.2 → 0.37.1

package/index.d.ts

@@ -10,10 +10,8 @@ declare class UploadPipeline {
     private _limits;
     constructor(bucket?: Bucket | string | null);
     limit(options: LimitOptions): this;
-    store(bucket: Bucket | string): this;
     processFile(originalName: string, data: Buffer, contentType: string): Promise<UploadedFile>;
 }
-declare function upload(bucket?: Bucket | string | null): UploadPipeline;
 
 type CookieOptions = string | string[] | Cookie | Cookie[] | null;
 interface ResponseData {
@@ -31,7 +29,7 @@ declare class Reply$1 {
     cookies(key: string | Record<string, CookieOptions>, value?: CookieOptions): this;
     json(body: unknown): Response;
     redirect(path: string): Response;
-    file(path: string): Promise<Response>;
+    file(path: string | BucketFile): Promise<Response>;
     send(body?: string | Buffer | ReadableStream | any): Response;
 }
 type Params<K extends keyof Reply$1> = Reply$1[K] extends (...args: infer A) => any ? A : never;
@@ -99,6 +97,7 @@ type BucketFile = {
     readonly path: string;
     readonly id: string;
     readonly name: string;
+    readonly type?: string;
     exists(): Promise<boolean>;
     info?(): Promise<FileInfo>;
     write(content: string | Buffer | ReadableStream, options?: {
@@ -120,6 +119,9 @@ type UploadedFile = {
     type: string;
     size: number;
 };
+type UploadOptions = LimitOptions & {
+    bucket: string | Bucket;
+};
 type CorsSettings = {
     origin: string | boolean;
     methods: string;
@@ -204,11 +206,12 @@ type SecuritySettings = {
     hsts: string | null;
 };
 type OnError = (error: Error, ctx: Context) => Response | Promise<Response>;
+type OnResponse = (response: Response, ctx: Context) => Response | void | Promise<Response | void>;
 type Options = {
     port?: number;
     secret?: string;
     public?: string | Bucket;
-    uploads?: string | Bucket | UploadPipeline;
+    uploads?: string | Bucket | UploadOptions;
     store?: KVStore;
     cookies?: KVStore;
     session?: KVStore | {
@@ -218,6 +221,7 @@ type Options = {
     auth?: AuthOption;
     openapi?: any;
     onError?: OnError;
+    onResponse?: OnResponse;
     log?: LogLevel | boolean;
     favicon?: string | BucketFile;
     security?: boolean | SecurityOptions;
@@ -238,6 +242,7 @@ type Settings = {
     auth?: AuthSettings;
     openapi?: any;
     onError?: OnError;
+    onResponse?: OnResponse;
     log: Logger;
     favicon?: string | BucketFile;
     security: SecuritySettings;
@@ -298,7 +303,7 @@ type Context<Params extends Record<string, string | undefined> = Record<string,
     };
     app: Server;
 };
-type InlineReply = Response | Reply | {
+type InlineReply = Response | Reply | BucketFile | {
     body: string;
     headers?: Headers;
 } | SerializableValue | JSX.Element | Buffer | ReadableStream;
@@ -501,4 +506,4 @@ declare class Server<O extends ServerConfig = {}> extends Router<O> {
 }
 declare function server<Session extends Record<string, any> = {}, User extends Record<string, any> = {}>(options?: Options): Server<ServerConfig<Session, User>>;
 
-export { type AuthOption, type AuthSession, type AuthSettings, type AuthUser, type BasicValue, type Body, type BodyMode, type BodyOption, type Bucket, type BucketFile, type BunEnv, type CacheOption, type Context, type Cookie, type CorsSettings, type ExtractPathParams, type FileInfo, type InferParamType, type InlineReply, type KVStore, type LimitOptions, type LogLevel, type Logger, type Method, type Middleware, type Options, type ParamTypeMap, type ParamsToObject, type PathToParams, type Platform, type Provider, type Route, type RouteOptions, type RouterMethod, type SecurityOptions, type SecuritySettings, type SerializableValue, Server, type ServerConfig, TypedServerError as ServerError, type Settings, type Strategy, type Time, UploadPipeline, type UploadedFile, cache, cookies, server as default, download, file, headers, json, redirect, router, send, status, type, upload };
+export { type AuthOption, type AuthSession, type AuthSettings, type AuthUser, type BasicValue, type Body, type BodyMode, type BodyOption, type Bucket, type BucketFile, type BunEnv, type CacheOption, type Context, type Cookie, type CorsSettings, type ExtractPathParams, type FileInfo, type InferParamType, type InlineReply, type KVStore, type LogLevel, type Logger, type Method, type Middleware, type Options, type ParamTypeMap, type ParamsToObject, type PathToParams, type Platform, type Provider, type Route, type RouteOptions, type RouterMethod, type SecurityOptions, type SecuritySettings, type SerializableValue, Server, type ServerConfig, TypedServerError as ServerError, type Settings, type Strategy, type Time, type UploadOptions, type UploadedFile, cache, cookies, server as default, download, file, headers, json, redirect, router, send, status, type };

package/index.js

@@ -89,46 +89,19 @@ if (typeof process !== "undefined") {
   Object.assign(globalThis.env, process.env);
 }
 
-// src/helpers/createId.ts
-var alphabet = "useandom26T198340PX75pxJACKVERYMINDBUSHWOLFGQZbfghjklqvwyzrict";
-var random = (bytes) => crypto.getRandomValues(new Uint8Array(bytes));
-var cyrb53 = (str, seed = 0) => {
-  if (typeof str !== "string") str = String(str);
-  let h1 = 3735928559 ^ seed;
-  let h2 = 1103547991 ^ seed;
-  for (let i = 0, ch; i < str.length; i++) {
-    ch = str.charCodeAt(i);
-    h1 = Math.imul(h1 ^ ch, 2654435761);
-    h2 = Math.imul(h2 ^ ch, 1597334677);
-  }
-  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507);
-  h1 ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
-  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507);
-  h2 ^= Math.imul(h1 ^ h1 >>> 13, 3266489909);
-  return 4294967296 * (2097151 & h2) + (h1 >>> 0);
-};
-var hash = (str, size) => {
-  let chars = "";
-  let num = cyrb53(str);
-  for (let i = 0; i < size; i++) {
-    if (num < alphabet.length) num = cyrb53(str, i);
-    chars += alphabet[num % alphabet.length];
-    num = Math.floor(num / alphabet.length);
-  }
-  return chars;
-};
-var randomId = (size = 16) => {
-  let id = "";
-  const bytes = random(size);
-  while (size--) {
-    id += alphabet[bytes[size] & 61];
+// src/helpers/StatusError.ts
+var StatusError = class extends Error {
+  status;
+  constructor(msg, status2 = 500) {
+    super(msg);
+    this.status = status2;
   }
-  return id;
 };
-function createId(source, size = 16) {
-  if (source) return hash(source, size);
-  return randomId(size);
-}
+
+// src/helpers/bucket.ts
+import * as fs from "fs";
+import * as fsp from "fs/promises";
+import * as path from "path";
 
 // src/helpers/mimes.ts
 var mimes_default = {
@@ -213,9 +186,6 @@ var mimes_default = {
 };
 
 // src/helpers/bucket.ts
-import * as fs from "fs";
-import * as fsp from "fs/promises";
-import * as path from "path";
 function localBucket(root) {
   const base = path.resolve(root);
   const resolveKey = (name) => {
@@ -228,6 +198,7 @@ function localBucket(root) {
   };
   const file2 = (name, win) => {
     const full = resolveKey(name);
+    const type2 = mimes_default[path.extname(name).slice(1).toLowerCase()];
     const read = () => {
       let opts;
       if (win) {
@@ -250,6 +221,7 @@ function localBucket(root) {
       path: full,
       id: name.replace(/^\/+/, ""),
       name: path.basename(name),
+      type: type2,
       async exists() {
         const stats = await fsp.stat(full).catch(() => null);
         return !!stats?.isFile();
@@ -259,7 +231,7 @@ function localBucket(root) {
         const exists = !!stats?.isFile();
         const total = stats?.size ?? 0;
         const size = win ? Math.max(0, Math.min(win.end, total) - win.start) : total;
-        return { exists, size, date: stats?.mtime ?? null };
+        return { exists, size, date: stats?.mtime ?? null, type: type2 };
       },
       // Read-only view of [start, end), composed relative to the current window.
       slice(start, end) {
@@ -311,6 +283,47 @@ function bucket(root) {
   );
 }
 
+// src/helpers/createId.ts
+var alphabet = "useandom26T198340PX75pxJACKVERYMINDBUSHWOLFGQZbfghjklqvwyzrict";
+var random = (bytes) => crypto.getRandomValues(new Uint8Array(bytes));
+var cyrb53 = (str, seed = 0) => {
+  if (typeof str !== "string") str = String(str);
+  let h1 = 3735928559 ^ seed;
+  let h2 = 1103547991 ^ seed;
+  for (let i = 0, ch; i < str.length; i++) {
+    ch = str.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
+  }
+  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507);
+  h1 ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
+  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507);
+  h2 ^= Math.imul(h1 ^ h1 >>> 13, 3266489909);
+  return 4294967296 * (2097151 & h2) + (h1 >>> 0);
+};
+var hash = (str, size) => {
+  let chars = "";
+  let num = cyrb53(str);
+  for (let i = 0; i < size; i++) {
+    if (num < alphabet.length) num = cyrb53(str, i);
+    chars += alphabet[num % alphabet.length];
+    num = Math.floor(num / alphabet.length);
+  }
+  return chars;
+};
+var randomId = (size = 16) => {
+  let id = "";
+  const bytes = random(size);
+  while (size--) {
+    id += alphabet[bytes[size] & 61];
+  }
+  return id;
+};
+function createId(source, size = 16) {
+  if (source) return hash(source, size);
+  return randomId(size);
+}
+
 // src/helpers/upload.ts
 function parseBytes(value) {
   if (typeof value === "number") return value;
@@ -352,10 +365,6 @@ var UploadPipeline = class {
     this._limits = { ...this._limits, ...options };
     return this;
   }
-  store(bucket2) {
-    this._bucket = bucket(bucket2);
-    return this;
-  }
   async processFile(originalName, data, contentType) {
     const { maxSize, minSize, fileType } = this._limits;
     if (maxSize !== void 0 && data.length > parseBytes(maxSize)) {
@@ -381,16 +390,31 @@ var UploadPipeline = class {
       }
     }
     if (!this._bucket) {
-      throw new Error(
-        `No destination configured. Pass a bucket to upload() or call .store()`
-      );
+      throw new Error(`No upload destination configured (missing bucket)`);
     }
     return saveFileToBucket(originalName, data, this._bucket, contentType);
   }
 };
-function upload(bucket2) {
-  return new UploadPipeline(bucket2);
+
+// src/helpers/bodyLimit.ts
+var INF = Number.POSITIVE_INFINITY;
+var DEFAULT_MAX = "1mb";
+var resolveMax = (max) => max === false ? INF : parseBytes(max == null ? DEFAULT_MAX : max);
+var UNITS = ["b", "kb", "mb", "gb", "tb"];
+function human(bytes) {
+  if (!Number.isFinite(bytes) || bytes <= 0) return `${bytes}`;
+  const i = Math.min(
+    Math.floor(Math.log(bytes) / Math.log(1024)),
+    UNITS.length - 1
+  );
+  const value = bytes / 1024 ** i;
+  const rounded = i === 0 ? Math.round(value) : Math.round(value * 10) / 10;
+  return `${rounded}${UNITS[i]}`;
 }
+var tooLarge = (max) => new StatusError(
+  `Request body exceeds the ${human(max)} limit. Raise it with body: { max: '10mb' } on the route or server, or set max: false to disable.`,
+  413
+);
 
 // src/helpers/parseBody.ts
 function getBoundary(header) {
@@ -438,10 +462,18 @@ function toStream(input) {
     }
   });
 }
-async function toBuffer(input) {
-  if (!(input instanceof ReadableStream)) return input;
+async function toBuffer(input, max = INF) {
+  if (!(input instanceof ReadableStream)) {
+    if (input.length > max) throw tooLarge(max);
+    return input;
+  }
   const chunks = [];
-  for await (const chunk of asIterable(input)) chunks.push(Buffer.from(chunk));
+  let total = 0;
+  for await (const chunk of asIterable(input)) {
+    total += chunk.byteLength;
+    if (total > max) throw tooLarge(max);
+    chunks.push(Buffer.from(chunk));
+  }
   return Buffer.concat(chunks);
 }
 function parseUrlEncoded(text) {
@@ -522,13 +554,21 @@ async function endPart(part, body) {
   }
 }
 var BREAK = Buffer.from("\r\n\r\n");
-async function parseMultipart(stream, boundary, dest) {
+async function parseMultipart(stream, boundary, dest, max = INF) {
   const delim = Buffer.from(`\r
 --${boundary}`);
   const body = {};
   let buf = Buffer.from("\r\n");
   let state = "boundary";
   let part = null;
+  let textBytes = 0;
+  const feed = (p, data) => {
+    if (p.kind === "text") {
+      textBytes += data.length;
+      if (textBytes > max) throw tooLarge(max);
+    }
+    feedPart(p, data);
+  };
   for await (const chunk of asIterable(stream)) {
     buf = Buffer.concat([buf, Buffer.from(chunk)]);
     let advanced = true;
@@ -560,13 +600,13 @@ async function parseMultipart(stream, boundary, dest) {
         if (i === -1) {
           const safe = buf.length - (delim.length - 1);
           if (safe > 0 && part) {
-            feedPart(part, buf.subarray(0, safe));
+            feed(part, buf.subarray(0, safe));
             buf = buf.subarray(safe);
           }
           break;
         }
         if (part) {
-          feedPart(part, buf.subarray(0, i));
+          feed(part, buf.subarray(0, i));
           await endPart(part, body);
           part = null;
         }
@@ -599,24 +639,24 @@ async function streamToBucket(stream, type2, bucket2) {
   if (!size) return void 0;
   return { name: id, id, path: file2.path, type: type2, size };
 }
-async function parseBody(input, contentType, dest) {
+async function parseBody(input, contentType, dest, max = INF) {
   const type2 = Array.isArray(contentType) ? contentType[0] : contentType;
   const boundary = type2 && /multipart\/form-data/i.test(type2) ? getBoundary(type2) : null;
-  if (boundary) return parseMultipart(toStream(input), boundary, dest);
+  if (boundary) return parseMultipart(toStream(input), boundary, dest, max);
   if (!type2 || /^text\//i.test(type2)) {
-    const buf = await toBuffer(input);
+    const buf = await toBuffer(input, max);
     return buf.length ? buf.toString("utf-8") : void 0;
   }
   if (/application\/json/i.test(type2)) {
-    const buf = await toBuffer(input);
+    const buf = await toBuffer(input, max);
     return buf.length ? JSON.parse(buf.toString("utf-8")) : void 0;
   }
   if (/application\/x-www-form-urlencoded/i.test(type2)) {
-    const buf = await toBuffer(input);
+    const buf = await toBuffer(input, max);
     return buf.length ? parseUrlEncoded(buf.toString("utf-8")) : void 0;
   }
   if (!dest) {
-    const buf = await toBuffer(input);
+    const buf = await toBuffer(input, max);
     return buf.length ? buf : void 0;
   }
   if (dest instanceof UploadPipeline) {
@@ -626,19 +666,7 @@ async function parseBody(input, contentType, dest) {
   return streamToBucket(toStream(input), type2, dest);
 }
 
-// src/helpers/StatusError.ts
-var StatusError = class extends Error {
-  status;
-  constructor(msg, status2 = 500) {
-    super(msg);
-    this.status = status2;
-  }
-};
-
 // src/helpers/body.ts
-var INF = Number.POSITIVE_INFINITY;
-var resolveMax = (max) => max === false || max == null ? INF : parseBytes(max);
-var tooLarge = (max) => new StatusError(`Request body exceeds the ${max}-byte limit`, 413);
 var sources = /* @__PURE__ */ new WeakMap();
 function setBodySource(ctx, source) {
   sources.set(ctx, source);
@@ -648,8 +676,11 @@ async function resolveBody(ctx, body) {
   if (!source) return void 0;
   const mode = typeof body === "string" ? body : body?.mode ?? "parse";
   const max = resolveMax(typeof body === "object" ? body?.max : void 0);
+  const contentType = String(ctx.headers["content-type"] || "");
+  const isMultipart = /multipart\/form-data/i.test(contentType);
   const declared = Number(ctx.headers["content-length"]);
-  if (max !== INF && declared > max) throw tooLarge(max);
+  const trustDeclared = !isMultipart && !ctx.options.uploads;
+  if (max !== INF && trustDeclared && declared > max) throw tooLarge(max);
   if (mode === "stream") return source.getStream();
   if (mode === "raw") {
     const raw = await source.getBuffer();
@@ -667,7 +698,6 @@ async function resolveBody(ctx, body) {
     new TransformStream({
       transform(chunk, controller) {
         size += chunk.byteLength;
-        if (size > max) return controller.error(tooLarge(max));
         controller.enqueue(chunk);
       }
     })
@@ -675,7 +705,8 @@ async function resolveBody(ctx, body) {
   const parsed = await parseBody(
     counted,
     ctx.headers["content-type"],
-    ctx.options.uploads
+    ctx.options.uploads,
+    max
   );
   if (size && !ctx.headers["content-length"]) {
     ctx.headers["content-length"] = String(size);
@@ -861,6 +892,10 @@ var Reply = class {
     return this.headers("location", path2).status(302).send();
   }
   async file(path2) {
+    if (typeof path2 !== "string") {
+      if (!await path2.exists()) return this.status(404).send();
+      return this.type(path2.type).send(path2.stream());
+    }
     try {
       const fs2 = await import("fs");
       const ext2 = path2.split(".").pop();
@@ -889,7 +924,7 @@ var Reply = class {
       return new Response(body, { status: status2, headers: headers2 });
     }
     const name = body?.constructor?.name;
-    if (name === "Buffer") {
+    if (body instanceof Uint8Array) {
       if (!headers2.has("content-length")) {
         headers2.set("content-length", String(body.length));
       }
@@ -1543,16 +1578,16 @@ var STATUS_TEXT = {
   502: "Bad Gateway",
   503: "Service Unavailable"
 };
-var UNITS = ["b", "kb", "mb", "gb", "tb"];
+var UNITS2 = ["b", "kb", "mb", "gb", "tb"];
 function formatBytes(bytes) {
   if (!bytes || bytes < 0) return "0b";
   const i = Math.min(
     Math.floor(Math.log(bytes) / Math.log(1024)),
-    UNITS.length - 1
+    UNITS2.length - 1
   );
   const value = bytes / 1024 ** i;
   const rounded = i === 0 ? Math.round(value) : Math.round(value * 10) / 10;
-  return `${rounded}${UNITS[i]}`;
+  return `${rounded}${UNITS2[i]}`;
 }
 var SCOPE_COLORS = {
   start: "green",
@@ -1685,9 +1720,20 @@ function config(options = {}) {
     }
     settings.cors = cors2;
   }
-  settings.public = options.public ? bucket(options.public) : null;
-  settings.uploads = options.uploads instanceof UploadPipeline ? options.uploads : options.uploads ? bucket(options.uploads) : null;
-  if (options.favicon) settings.favicon = options.favicon;
+  const publicDir = options.public || env2.PUBLIC;
+  settings.public = publicDir ? bucket(publicDir) : null;
+  const up = options.uploads;
+  if (!up) {
+    settings.uploads = null;
+  } else if (typeof up === "object" && "bucket" in up) {
+    const { bucket: bucket2, maxSize, minSize, fileType } = up;
+    const hasLimits = maxSize != null || minSize != null || fileType != null;
+    settings.uploads = hasLimits ? new UploadPipeline(bucket2).limit({ maxSize, minSize, fileType }) : bucket(bucket2);
+  } else {
+    settings.uploads = bucket(up);
+  }
+  const favicon2 = options.favicon || env2.FAVICON;
+  if (favicon2) settings.favicon = favicon2;
   settings.store = options.store ?? null;
   settings.cookies = options.cookies ?? null;
   if (options.session) {
@@ -1714,6 +1760,7 @@ function config(options = {}) {
       status: error.status || 500
     });
   });
+  settings.onResponse = options.onResponse;
   const loc = (v) => typeof v === "string" ? v : "enabled";
   if (settings.auth) {
     log.message("auth", `${settings.auth.providers.join(", ")} auth enabled`);
@@ -1842,6 +1889,16 @@ async function parseResponse(out, ctx) {
   if (out instanceof Blob) {
     out = new Response(out, { headers: { "Content-Type": out.type } });
   }
+  if (out && typeof out.stream === "function" && typeof out.bytes === "function" && typeof out.exists === "function" && typeof out.name === "string") {
+    if (!await out.exists()) {
+      out = new Response(null, { status: 404 });
+    } else {
+      out = new Response(
+        out.stream(),
+        out.type ? { headers: { "content-type": out.type } } : void 0
+      );
+    }
+  }
   if (out instanceof ReadableStream) {
     out = new Response(out);
   }
@@ -1999,7 +2056,11 @@ function validate(ctx, schema) {
 
 // src/helpers/handleRequest.ts
 async function handleRequest(app, ctx) {
-  const res = await getResponse(app, ctx);
+  let res = await getResponse(app, ctx);
+  if (res && ctx.options.onResponse) {
+    const replaced = await ctx.options.onResponse(res, ctx);
+    if (replaced) res = replaced;
+  }
   if (res) ctx.options.log.request(ctx, res);
   return res;
 }
@@ -3223,6 +3284,5 @@ export {
   router,
   send,
   status,
-  type,
-  upload
+  type
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.36.2",
+  "version": "0.37.1",
   "description": "A fully-fledged web server with routing, file uploads, sessions, static files, schema validation, websockets, testing, etc.",
   "homepage": "https://server-js.com/",
   "repository": "github:franciscop/server-next",