@eslym/sveltekit-adapter-bun 2.0.0 → 2.0.3

package/README.md

@@ -10,7 +10,8 @@ The built bundle with version `2.0.0` will be ready to compile into single execu
 bun add -d @eslym/sveltekit-adapter-bun
 ```
 
-> [!IMPORTANT] > **Breaking Changes**
+> [!IMPORTANT]  
+> **Breaking Changes**
 >
 > Since version `2.0.0`, the custom hooks (`beforeServe`, `afterServe` and `setupCLI`) and CLI functionality is complemetely removed.
 
@@ -95,10 +96,12 @@ export type AdapterOptions = {
     bundler?: 'rollup' | 'bun';
 
     /**
-     * Enable pre-compress
+     * Enable pre-compress, use number to specify a minimum file size which will be compressed.
+     * When it is true, the minimum size is 1KiB.
+     *
      * @default false
      */
-    precompress?: boolean | PreCompressOptions;
+    precompress?: boolean | PreCompressOptions | number;
 
     /**
      * Serve static assets, set if to false if you want to handle static assets yourself
@@ -142,6 +145,22 @@ export type AdapterOptions = {
               identifiers?: boolean;
           };
 };
+
+export type PreCompressOptions = {
+    /**
+     * Enable specific compression, number means the minimum size to compress.
+     * 1KiB will be used when the value is `true`, set to `0` for always compress.
+     *
+     * @default true;
+     */
+    [k in 'gzip' | 'brotli']?: boolean | number;
+} & {
+    /**
+     * Extensions to pre-compress
+     * @default ['html','js','json','css','svg','xml','wasm']
+     */
+    files?: string[];
+};
 ```
 
 ## Runtime Environments

package/dist/files/index.js

@@ -1,4 +1,6 @@
+#!/usr/bin/env bun
 // @bun
+
 // src/files/server.ts
 import { Server } from "SERVER";
 import { manifest } from "MANIFEST";
@@ -12,7 +14,6 @@ await server.init({
 
 // src/files/utils.ts
 var urls = new WeakMap;
-var basePath = Symbol.for("app.basepath");
 function get_url(request) {
   if (!urls.has(request)) {
     urls.set(request, new URL(request.url));
@@ -23,16 +24,10 @@ function set_url(request, url) {
   urls.set(request, url);
   return url;
 }
-function get_basepath() {
-  return globalThis[basePath] || "";
-}
-function set_basepath(path) {
-  globalThis[basePath] = path;
-}
 
 // src/files/static.ts
 import { normalize } from "path/posix";
-import { assets } from "sveltekit-adapter-bun:assets";
+import { assets } from "ASSETS";
 var headersMap = ["last-modified", "etag", "content-length"];
 var methods = new Set(["HEAD", "GET"]);
 function lookup(pathname) {
@@ -72,7 +67,7 @@ function parse_range(header) {
     return [true, +match[3], null];
   return [true, +match[1], match[2] ? +match[2] + 1 : null];
 }
-function serve(request, basePath2) {
+async function serve_static({ request }) {
   if (!methods.has(request.method))
     return;
   const url = get_url(request);
@@ -166,9 +161,6 @@ function serve(request, basePath2) {
     headers
   });
 }
-var serve_static = SERVE_STATIC ? serve : () => {
-  return;
-};
 
 // src/files/handle.ts
 function clone_req(url, request) {
@@ -194,13 +186,13 @@ async function first_resolve(request, resolvers) {
       return response;
   }
 }
-function override_origin(args, origin) {
+function override_origin(origin, args) {
   const url = get_url(args.request);
   const newUrl = new URL(url.pathname + url.search, origin);
   args.request = clone_req(newUrl, args.request);
   set_url(args.request, newUrl);
 }
-function override_origin_with_header(args, hostHeader, protocolHeader) {
+function override_origin_with_header(hostHeader, protocolHeader, args) {
   const url = get_url(args.request);
   let newUrl = new URL(url);
   if (hostHeader && args.request.headers.has(hostHeader)) {
@@ -220,14 +212,13 @@ function resolve_xff_ip(request, depth) {
   const ips = request.headers.get("x-forwarded-for").split(",");
   return ips.at(-depth) || undefined;
 }
-function create_fetch({
+async function create_fetch({
   overrideOrigin,
   hostHeader,
   protocolHeader,
   ipHeader,
   xffDepth
 }) {
-  const basePath2 = get_basepath();
   let getIp = undefined;
   if (ipHeader === "x-forwarded-for") {
     getIp = (req, fallback) => resolve_xff_ip(req, xffDepth) ?? fallback;
@@ -241,11 +232,13 @@ function create_fetch({
     return response;
   }
   if (overrideOrigin) {
-    resolvers.push((args) => override_origin(args, new URL(overrideOrigin)));
+    resolvers.push(override_origin.bind(null, new URL(overrideOrigin)));
   } else if (hostHeader || protocolHeader) {
-    resolvers.push((args) => override_origin_with_header(args, hostHeader, protocolHeader));
+    resolvers.push(override_origin_with_header.bind(null, hostHeader, protocolHeader));
+  }
+  if (SERVE_STATIC) {
+    resolvers.push(serve_static);
   }
-  resolvers.push(({ request }) => serve_static(request, basePath2));
   return (request, srv) => {
     const request_ip = srv.requestIP(request)?.address;
     const try_get_ip = getIp ? () => getIp(request, request_ip) : () => request_ip;
@@ -385,8 +378,18 @@ function bool_env(fn, name, fallback = false) {
 }
 
 // src/files/index.ts
-set_basepath(import.meta.dir);
-async function serve2() {
+import { resolve } from "path";
+Bun.plugin({
+  name: "asset-module",
+  target: "bun",
+  setup(build) {
+    build.module("sveltekit-adapter-bun:assets", async () => ({
+      loader: "object",
+      exports: await import(resolve(import.meta.dir, "./assets"))
+    }));
+  }
+});
+async function serve() {
   const socket = http_env("SOCKET");
   const serverOptions = socket ? {
     unix: socket
@@ -398,7 +401,7 @@ async function serve2() {
     ...serverOptions,
     idleTimeout: duration_env(http_env, "IDLE_TIMEOUT", 30),
     maxRequestBodySize: bytes_env(http_env, "MAX_BODY", 128 * 1024 * 1024),
-    fetch: create_fetch({
+    fetch: await create_fetch({
       overrideOrigin: http_env("OVERRIDE_ORIGIN"),
       hostHeader: http_env("HOST_HEADER"),
       protocolHeader: http_env("PROTOCOL_HEADER"),
@@ -432,7 +435,7 @@ async function serve2() {
   console.log(`Serving on ${server2.url}`);
 }
 if (Bun.main === Bun.fileURLToPath(import.meta.url)) {
-  serve2();
+  serve();
 }
 export {
   create_fetch as createBunFetch

package/dist/index.js

@@ -407,15 +407,21 @@ var T;
   }
   T.collect = collect;
 })(T ||= {});
+function to_base36(n) {
+  return n.toString(36);
+}
 function get_imports_n(imports, declared, import_path) {
   let n = declared.get(import_path);
   if (n === undefined) {
-    n = imports.length;
-    imports.push(T.concat(`import file${n} from `, T.stringify(import_path), ' with { type: "file" };'));
+    n = to_base36(imports.length);
+    imports.push(T.concat(`import f_${n} from `, T.stringify(import_path), ' with { type: "file" };'));
     declared.set(import_path, n);
   }
   return n;
 }
+function normalize_path(path) {
+  return path.replace(/\\/g, "/");
+}
 async function build_assets_js(base_path, client_files, prerendered_pages, immutable_prefix, ignores) {
   const imports = [];
   const records = [];
@@ -423,7 +429,8 @@ async function build_assets_js(base_path, client_files, prerendered_pages, immut
   for await (const path of client_files) {
     if (ignores.some((ignore) => ignore.match(path)))
       continue;
-    records.push(await build_asset_record(declared, imports, path.replace(/^(?:\.?\/)?/, "/"), join(base_path, "client", path), "./" + join("client", path), immutable_prefix));
+    const normalized = normalize_path(path);
+    records.push(await build_asset_record(declared, imports, normalized.replace(/^(?:\.?\/)?/, "/"), join(base_path, "client", normalized), "./" + join("client", normalized), immutable_prefix));
   }
   for await (const [pathname, target] of prerendered_pages) {
     records.push(await build_asset_record(declared, imports, pathname, join(base_path, "prerendered", target.file), "./" + join("prerendered", target.file), immutable_prefix));
@@ -453,7 +460,7 @@ async function build_asset_record(declared, imports, pathname, filepath, import_
   `, T.indent(T.join([
     T.stringify(pathname),
     T.obj([
-      ["file", T.fn("file", `file${file_n}`)],
+      ["file", T.fn("file", `f_${file_n}`)],
       ["immutable", pathname.startsWith(immutable_prefix) ? "true" : "false"],
       [
         "headers",
@@ -461,7 +468,7 @@ async function build_asset_record(declared, imports, pathname, filepath, import_
       ],
       [
         "compression",
-        T.concat("[", br_n ? T.fn("file", `file${br_n}`) : "undefined", ", ", gz_n ? T.fn("file", `file${gz_n}`) : "undefined", "]")
+        T.concat("[", br_n ? T.fn("file", `f_${br_n}`) : "undefined", ", ", gz_n ? T.fn("file", `f_${gz_n}`) : "undefined", "]")
       ]
     ])
   ], `,
@@ -686,25 +693,18 @@ function adapter(userOpts = {}) {
         ]);
       }
       builder.log.minor("Building server");
-      builder.writeServer(`${tmp}/server`);
-      writeFileSync(`${tmp}/server/manifest.js`, `export const manifest = ${builder.generateManifest({ relativePath: "./" })};
+      builder.writeServer(tmp);
+      writeFileSync(`${tmp}/manifest.js`, `export const manifest = ${builder.generateManifest({ relativePath: "./" })};
 
 ` + `export const prerendered = new Set(${JSON.stringify(builder.prerendered.paths)});
 `);
       const pkg = JSON.parse(readFileSync("package.json", "utf8"));
-      builder.copy(files, tmp, {
-        replace: {
-          SERVER: "./server/index.js",
-          MANIFEST: "./server/manifest.js",
-          SERVE_STATIC: opts.serveStatic ? "true" : "false"
-        }
-      });
       builder.log.minor("Bundling...");
       if (opts.bundler === "rollup") {
         const bundle = await rollup({
           input: {
             index: `${tmp}/index.js`,
-            manifest: `${tmp}/server/manifest.js`
+            manifest: `${tmp}/manifest.js`
           },
           external: [
             assets_module,
@@ -723,20 +723,20 @@ function adapter(userOpts = {}) {
           }
         });
         await bundle.write({
-          dir: out,
+          dir: `${out}/server`,
           format: "esm",
           sourcemap: opts.sourceMap,
-          chunkFileNames: "server/[name]-[hash].js"
+          chunkFileNames: "chunks/[name]-[hash].js"
         });
       } else {
         const res = await Bun.build({
           target: "bun",
-          entrypoints: [`${tmp}/index.js`, `${tmp}/server/manifest.js`],
-          outdir: out,
+          entrypoints: [`${tmp}/index.js`, `${tmp}/manifest.js`],
+          outdir: `${out}/server`,
           sourcemap: opts.sourceMap === true ? "linked" : opts.sourceMap ? "inline" : "none",
           naming: {
             entry: "[name].[ext]",
-            chunk: "server/[name]-[hash].[ext]"
+            chunk: "chunks/[name]-[hash].[ext]"
           },
           external: [assets_module, ...Object.keys(pkg.dependencies || {})],
           splitting: true,
@@ -760,8 +760,14 @@ function adapter(userOpts = {}) {
           process.exit(1);
         }
       }
-      const index = await Bun.file(`${out}/index.js`).text();
-      await Bun.write(`${out}/index.js`, index.replace(` from "${assets_module}"`, ' from "./assets.js"'));
+      builder.copy(files, out, {
+        replace: {
+          SERVER: "./server/index.js",
+          MANIFEST: "./server/manifest.js",
+          ASSETS: "./assets.js",
+          SERVE_STATIC: opts.serveStatic ? "true" : "false"
+        }
+      });
       const immutable = `${builder.config.kit.appDir}/immutable/`.replace(/^\/?/, "/");
       const staticIgnores = opts.staticIgnores.map((p) => new Bun.Glob(p));
       const clientFiles = new Bun.Glob("**/*");
@@ -771,7 +777,8 @@ function adapter(userOpts = {}) {
         dot: true,
         absolute: false,
         onlyFiles: true
-      }), builder.prerendered.pages, immutable, staticIgnores) : "export const assets = new Map();";
+      }), builder.prerendered.pages, immutable, staticIgnores) : `// @bun
+export const assets = new Map();`;
       await Bun.write(`${out}/assets.js`, assets_js);
       if ("patchedDependencies" in pkg) {
         const deps = Object.keys(pkg.devDependencies || {});
@@ -829,11 +836,12 @@ function adapter(userOpts = {}) {
     }
   };
 }
+var default_minimum_size = 1024;
 async function compress(directory, options) {
   if (!existsSync(directory)) {
     return;
   }
-  const files_ext = options === true || !options.files ? ["html", "js", "json", "css", "svg", "xml", "wasm"] : options.files;
+  const files_ext = options === true || typeof options === "number" || !options.files ? ["html", "js", "json", "css", "svg", "xml", "wasm"] : options.files;
   const glob = new Bun.Glob(`**/*.{${files_ext.join()}}`);
   const files2 = [
     ...glob.scanSync({
@@ -845,12 +853,20 @@ async function compress(directory, options) {
   ];
   let doBr = false, doGz = false;
   if (options === true) {
-    doBr = doGz = true;
+    doBr = doGz = default_minimum_size;
+  } else if (typeof options == "number") {
+    doBr = doGz = options;
   } else if (typeof options == "object") {
-    doBr = options.brotli ?? false;
-    doGz = options.gzip ?? false;
+    doBr = typeof options.brotli === "number" ? options.brotli : options.brotli ? default_minimum_size : false;
+    doGz = typeof options.gzip === "number" ? options.gzip : options.gzip ? default_minimum_size : false;
   }
-  await Promise.all(files2.map((file) => Promise.all([doGz && compress_file(file, "gz"), doBr && compress_file(file, "br")])));
+  await Promise.all(files2.map((file) => {
+    const size = Bun.file(file).size;
+    return Promise.all([
+      doGz !== false && size >= doGz && compress_file(file, "gz"),
+      doBr !== false && size >= doBr && compress_file(file, "br")
+    ]);
+  }));
 }
 async function compress_file(file, format = "gz") {
   if (format === "br" && typeof zlib.createBrotliCompress !== "function") {

package/dist/types.d.ts

@@ -88,15 +88,6 @@ export interface AdapterPlatform {
      */
     markForUpgrade(response: Response, ws: WebSocketHandler): Response;
 }
-export type PreCompressOptions = {
-    [k in 'gzip' | 'brotli']?: boolean;
-} & {
-    /**
-     * Extensions to pre-compress
-     * @default ['html','js','json','css','svg','xml','wasm']
-     */
-    files?: string[];
-};
 export type AdapterOptions = {
     /**
      * Output path
@@ -109,10 +100,12 @@ export type AdapterOptions = {
      */
     bundler?: 'rollup' | 'bun';
     /**
-     * Enable pre-compress
+     * Enable pre-compress, use number to specify a minimum file size which will be compressed.
+     * When it is true, the minimum size is 1KiB.
+     *
      * @default false
      */
-    precompress?: boolean | PreCompressOptions;
+    precompress?: boolean | PreCompressOptions | number;
     /**
      * Serve static assets, set if to false if you want to handle static assets yourself
      * like using nginx or caddy. When it is true, an index of assets will build with
@@ -149,4 +142,13 @@ export type AdapterOptions = {
         identifiers?: boolean;
     };
 };
+export type PreCompressOptions = {
+    [k in 'gzip' | 'brotli']?: boolean | number;
+} & {
+    /**
+     * Extensions to pre-compress
+     * @default ['html','js','json','css','svg','xml','wasm']
+     */
+    files?: string[];
+};
 export {};

package/package.json

@@ -34,5 +34,5 @@
     "@rollup/plugin-node-resolve": "^15.3.1",
     "rollup": "^4.34.8"
   },
-  "version": "2.0.0"
+  "version": "2.0.3"
 }