@sveltejs/adapter-netlify 1.0.5 → 2.0.0

package/files/esm/serverless.js

@@ -1,5 +1,7 @@
 import './shims.js';
 import { Server } from '0SERVER';
+import 'node:stream/web';
+import 'node:crypto';
 import 'assert';
 import 'net';
 import 'http';

package/files/esm/shims.js

@@ -1,3 +1,5 @@
+import { ReadableStream as ReadableStream$1, TransformStream, WritableStream } from 'node:stream/web';
+import { webcrypto } from 'node:crypto';
 import require$$0$1 from 'assert';
 import require$$4 from 'net';
 import require$$2 from 'http';
@@ -5,7 +7,7 @@ import require$$0$2 from 'stream';
 import require$$7 from 'buffer';
 import require$$0 from 'util';
 import require$$8 from 'querystring';
-import require$$13, { ReadableStream as ReadableStream$1, TransformStream, WritableStream } from 'stream/web';
+import require$$13 from 'stream/web';
 import require$$0$3 from 'worker_threads';
 import require$$1 from 'perf_hooks';
 import require$$4$1 from 'util/types';
@@ -16,7 +18,7 @@ import require$$3 from 'async_hooks';
 import require$$1$1 from 'console';
 import require$$3$1 from 'zlib';
 import require$$6 from 'string_decoder';
-import require$$0$5, { webcrypto } from 'crypto';
+import require$$0$5 from 'crypto';
 import require$$1$2 from 'diagnostics_channel';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -700,6 +702,94 @@ var util$g = {
   buildURL: buildURL$2
 };
 
+let fastNow = Date.now();
+let fastNowTimeout;
+
+const fastTimers = [];
+
+function onTimeout () {
+  fastNow = Date.now();
+
+  let len = fastTimers.length;
+  let idx = 0;
+  while (idx < len) {
+    const timer = fastTimers[idx];
+
+    if (timer.expires && fastNow >= timer.expires) {
+      timer.expires = 0;
+      timer.callback(timer.opaque);
+    }
+
+    if (timer.expires === 0) {
+      timer.active = false;
+      if (idx !== len - 1) {
+        fastTimers[idx] = fastTimers.pop();
+      } else {
+        fastTimers.pop();
+      }
+      len -= 1;
+    } else {
+      idx += 1;
+    }
+  }
+
+  if (fastTimers.length > 0) {
+    refreshTimeout();
+  }
+}
+
+function refreshTimeout () {
+  if (fastNowTimeout && fastNowTimeout.refresh) {
+    fastNowTimeout.refresh();
+  } else {
+    clearTimeout(fastNowTimeout);
+    fastNowTimeout = setTimeout(onTimeout, 1e3);
+    if (fastNowTimeout.unref) {
+      fastNowTimeout.unref();
+    }
+  }
+}
+
+class Timeout {
+  constructor (callback, delay, opaque) {
+    this.callback = callback;
+    this.delay = delay;
+    this.opaque = opaque;
+    this.expires = 0;
+    this.active = false;
+
+    this.refresh();
+  }
+
+  refresh () {
+    if (!this.active) {
+      this.active = true;
+      fastTimers.push(this);
+      if (!fastNowTimeout || fastTimers.length === 1) {
+        refreshTimeout();
+        fastNow = Date.now();
+      }
+    }
+
+    this.expires = fastNow + this.delay;
+  }
+
+  clear () {
+    this.expires = 0;
+  }
+}
+
+var timers$1 = {
+  setTimeout (callback, delay, opaque) {
+    return new Timeout(callback, delay, opaque)
+  },
+  clearTimeout (timeout) {
+    if (timeout && timeout.clear) {
+      timeout.clear();
+    }
+  }
+};
+
 var utils$1;
 var hasRequiredUtils$1;
 
@@ -4502,8 +4592,8 @@ function requireDataURL () {
 	  // 5. Let mimeType be the result of collecting a
 	  // sequence of code points that are not equal
 	  // to U+002C (,), given position.
-	  let mimeType = collectASequenceOfCodePoints(
-	    (char) => char !== ',',
+	  let mimeType = collectASequenceOfCodePointsFast(
+	    ',',
 	    input,
 	    position
 	  );
@@ -4616,6 +4706,25 @@ function requireDataURL () {
 	  return result
 	}
 
+	/**
+	 * A faster collectASequenceOfCodePoints that only works when comparing a single character.
+	 * @param {string} char
+	 * @param {string} input
+	 * @param {{ position: number }} position
+	 */
+	function collectASequenceOfCodePointsFast (char, input, position) {
+	  const idx = input.indexOf(char, position.position);
+	  const start = position.position;
+
+	  if (idx === -1) {
+	    position.position = input.length;
+	    return input.slice(start)
+	  }
+
+	  position.position = idx;
+	  return input.slice(start, position.position)
+	}
+
 	// https://url.spec.whatwg.org/#string-percent-decode
 	/** @param {string} input */
 	function stringPercentDecode (input) {
@@ -4685,8 +4794,8 @@ function requireDataURL () {
 	  // 3. Let type be the result of collecting a sequence
 	  // of code points that are not U+002F (/) from
 	  // input, given position.
-	  const type = collectASequenceOfCodePoints(
-	    (char) => char !== '/',
+	  const type = collectASequenceOfCodePointsFast(
+	    '/',
 	    input,
 	    position
 	  );
@@ -4710,8 +4819,8 @@ function requireDataURL () {
 	  // 7. Let subtype be the result of collecting a sequence of
 	  // code points that are not U+003B (;) from input, given
 	  // position.
-	  let subtype = collectASequenceOfCodePoints(
-	    (char) => char !== ';',
+	  let subtype = collectASequenceOfCodePointsFast(
+	    ';',
 	    input,
 	    position
 	  );
@@ -4795,8 +4904,8 @@ function requireDataURL () {
 
 	      // 2. Collect a sequence of code points that are not
 	      // U+003B (;) from input, given position.
-	      collectASequenceOfCodePoints(
-	        (char) => char !== ';',
+	      collectASequenceOfCodePointsFast(
+	        ';',
 	        input,
 	        position
 	      );
@@ -4806,8 +4915,8 @@ function requireDataURL () {
 	      // 1. Set parameterValue to the result of collecting
 	      // a sequence of code points that are not U+003B (;)
 	      // from input, given position.
-	      parameterValue = collectASequenceOfCodePoints(
-	        (char) => char !== ';',
+	      parameterValue = collectASequenceOfCodePointsFast(
+	        ';',
 	        input,
 	        position
 	      );
@@ -6529,11 +6638,16 @@ let Request$1 = class Request {
 };
 
 function processHeaderValue (key, val) {
-  if (val && (typeof val === 'object' && !Array.isArray(val))) {
+  if (val && typeof val === 'object') {
     throw new InvalidArgumentError$i(`invalid ${key} header`)
-  } else if (headerCharRegex.exec(val) !== null) {
+  }
+
+  val = val != null ? `${val}` : '';
+
+  if (headerCharRegex.exec(val) !== null) {
     throw new InvalidArgumentError$i(`invalid ${key} header`)
   }
+
   return `${key}: ${val}\r\n`
 }
 
@@ -6563,11 +6677,10 @@ function processHeader (request, key, val) {
   } else if (
     request.contentType === null &&
     key.length === 12 &&
-    key.toLowerCase() === 'content-type' &&
-    headerCharRegex.exec(val) === null
+    key.toLowerCase() === 'content-type'
   ) {
     request.contentType = val;
-    request.headers += `${key}: ${val}\r\n`;
+    request.headers += processHeaderValue(key, val);
   } else if (
     key.length === 17 &&
     key.toLowerCase() === 'transfer-encoding'
@@ -6577,7 +6690,7 @@ function processHeader (request, key, val) {
     key.length === 10 &&
     key.toLowerCase() === 'connection'
   ) {
-    const value = val.toLowerCase();
+    const value = typeof val === 'string' ? val.toLowerCase() : null;
     if (value !== 'close' && value !== 'keep-alive') {
       throw new InvalidArgumentError$i('invalid connection header')
     } else if (value === 'close') {
@@ -6941,6 +7054,12 @@ function buildConnector$3 ({ maxCachedSessions, socketPath, timeout, ...opts })
       });
     }
 
+    // Set TCP keep alive options on the socket here instead of in connect() for the case of assigning the socket
+    if (options.keepAlive == null || options.keepAlive) {
+      const keepAliveInitialDelay = options.keepAliveInitialDelay === undefined ? 60e3 : options.keepAliveInitialDelay;
+      socket.setKeepAlive(true, keepAliveInitialDelay);
+    }
+
     const cancelTimeout = setupTimeout(() => onConnectTimeout(socket), timeout);
 
     socket
@@ -7548,6 +7667,7 @@ function requireLlhttp_simd_wasm () {
 const assert$3 = require$$0$1;
 const net = require$$4;
 const util$b = util$g;
+const timers = timers$1;
 const Request = request$2;
 const DispatcherBase$3 = dispatcherBase;
 const {
@@ -7608,6 +7728,7 @@ const {
   kLocalAddress,
   kMaxResponseSize
 } = symbols$3;
+const FastBuffer = Buffer[Symbol.species];
 
 const kClosedResolve$1 = Symbol('kClosedResolve');
 
@@ -7903,9 +8024,8 @@ async function lazyllhttp () {
       },
       wasm_on_status: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onStatus(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onStatus(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_message_begin: (p) => {
         assert$3.strictEqual(currentParser.ptr, p);
@@ -7913,15 +8033,13 @@ async function lazyllhttp () {
       },
       wasm_on_header_field: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onHeaderField(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onHeaderField(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_header_value: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onHeaderValue(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onHeaderValue(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_headers_complete: (p, statusCode, upgrade, shouldKeepAlive) => {
         assert$3.strictEqual(currentParser.ptr, p);
@@ -7929,9 +8047,8 @@ async function lazyllhttp () {
       },
       wasm_on_body: (p, at, len) => {
         assert$3.strictEqual(currentParser.ptr, p);
-        const start = at - currentBufferPtr;
-        const end = start + len;
-        return currentParser.onBody(currentBufferRef.slice(start, end)) || 0
+        const start = at - currentBufferPtr + currentBufferRef.byteOffset;
+        return currentParser.onBody(new FastBuffer(currentBufferRef.buffer, start, len)) || 0
       },
       wasm_on_message_complete: (p) => {
         assert$3.strictEqual(currentParser.ptr, p);
@@ -7988,9 +8105,9 @@ class Parser {
   setTimeout (value, type) {
     this.timeoutType = type;
     if (value !== this.timeoutValue) {
-      clearTimeout(this.timeout);
+      timers.clearTimeout(this.timeout);
       if (value) {
-        this.timeout = setTimeout(onParserTimeout, value, this);
+        this.timeout = timers.setTimeout(onParserTimeout, value, this);
         // istanbul ignore else: only for jest
         if (this.timeout.unref) {
           this.timeout.unref();
@@ -8106,7 +8223,7 @@ class Parser {
     this.llhttp.llhttp_free(this.ptr);
     this.ptr = null;
 
-    clearTimeout(this.timeout);
+    timers.clearTimeout(this.timeout);
     this.timeout = null;
     this.timeoutValue = null;
     this.timeoutType = null;
@@ -12585,7 +12702,11 @@ function requireHeaders () {
 
 	    // 2. Append (name, value) to list.
 	    if (exists) {
-	      this[kHeadersMap].set(lowercaseName, { name: exists.name, value: `${exists.value}, ${value}` });
+	      const delimiter = lowercaseName === 'cookie' ? '; ' : ', ';
+	      this[kHeadersMap].set(lowercaseName, {
+	        name: exists.name,
+	        value: `${exists.value}${delimiter}${value}`
+	      });
 	    } else {
 	      this[kHeadersMap].set(lowercaseName, { name, value });
 	    }
@@ -20595,6 +20716,11 @@ function requireUndici () {
 	  undici.getCookies = getCookies;
 	  undici.getSetCookies = getSetCookies;
 	  undici.setCookie = setCookie;
+
+	  const { parseMIMEType, serializeAMimeType } = requireDataURL();
+
+	  undici.parseMIMEType = parseMIMEType;
+	  undici.serializeAMimeType = serializeAMimeType;
 	}
 
 	if (nodeMajor >= 18 && hasCrypto) {

package/index.js

@@ -162,10 +162,17 @@ async function generate_lambda_functions({ builder, publish, split }) {
 	// Configuring the function to use ESM as the output format.
 	const fn_config = JSON.stringify({ config: { nodeModuleFormat: 'esm' }, version: 1 });
 
+	builder.log.minor('Generating serverless functions...');
+
 	if (split) {
-		builder.log.minor('Generating serverless functions...');
+		const seen = new Set();
+
+		for (let i = 0; i < builder.routes.length; i++) {
+			const route = builder.routes[i];
+			if (route.prerender === true) continue;
+
+			const routes = [route];
 
-		await builder.createEntries((route) => {
 			const parts = [];
 			// Netlify's syntax uses '*' and ':param' as "splats" and "placeholders"
 			// https://docs.netlify.com/routing/redirects/redirect-options/#splats
@@ -183,27 +190,33 @@ async function generate_lambda_functions({ builder, publish, split }) {
 			const pattern = `/${parts.join('/')}`;
 			const name = parts.join('-').replace(/[:.]/g, '_').replace('*', '__rest') || 'index';
 
-			return {
-				id: pattern,
-				filter: (other) => matches(route.segments, other.segments),
-				complete: (entry) => {
-					const manifest = entry.generateManifest({
-						relativePath: '../server'
-					});
+			// skip routes with identical patterns, they were already folded into another function
+			if (seen.has(pattern)) continue;
+			seen.add(pattern);
 
-					const fn = `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`;
+			// figure out which lower priority routes should be considered fallbacks
+			for (let j = i + 1; j < builder.routes.length; j += 1) {
+				if (routes[j].prerender === true) continue;
 
-					writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
-					writeFileSync(`.netlify/functions-internal/${name}.json`, fn_config);
-
-					redirects.push(`${pattern} /.netlify/functions/${name} 200`);
-					redirects.push(`${pattern}/__data.json /.netlify/functions/${name} 200`);
+				if (matches(route.segments, routes[j].segments)) {
+					routes.push(builder.routes[j]);
 				}
-			};
-		});
-	} else {
-		builder.log.minor('Generating serverless functions...');
+			}
+
+			const manifest = builder.generateManifest({
+				relativePath: '../server',
+				routes
+			});
+
+			const fn = `import { init } from '../serverless.js';\n\nexport const handler = init(${manifest});\n`;
 
+			writeFileSync(`.netlify/functions-internal/${name}.mjs`, fn);
+			writeFileSync(`.netlify/functions-internal/${name}.json`, fn_config);
+
+			redirects.push(`${pattern} /.netlify/functions/${name} 200`);
+			redirects.push(`${pattern}/__data.json /.netlify/functions/${name} 200`);
+		}
+	} else {
 		const manifest = builder.generateManifest({
 			relativePath: '../server'
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/adapter-netlify",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -38,10 +38,10 @@
     "rollup": "^3.7.0",
     "typescript": "^4.9.4",
     "uvu": "^0.5.6",
-    "@sveltejs/kit": "^1.2.4"
+    "@sveltejs/kit": "^1.5.0"
   },
   "peerDependencies": {
-    "@sveltejs/kit": "^1.0.0"
+    "@sveltejs/kit": "^1.5.0"
   },
   "scripts": {
     "dev": "rimraf files && rollup -cw",