@jsenv/server 17.4.0 → 17.5.0

package/dist/jsenv_server.js

@@ -2564,6 +2564,9 @@ const RESPONSE_KEYS_COMPOSITION = {
   headers: composeTwoHeaders,
   body: (prevBody, body) => body,
   bodyEncoding: (prevEncoding, encoding) => encoding,
+  // measures a response hands back, merged into the server-timing header when
+  // the server has serverTiming enabled (see finalizeResponseProperties)
+  timing: (prevTiming, timing) => ({ ...prevTiming, ...timing }),
 };
 
 /**
@@ -3373,8 +3376,9 @@ const createEventHistory = (limit) => {
 
   const add = (data) => {
     events.push(data);
-
-    if (events.length >= limit) {
+    // Strictly above, not "as many as": shifting at `>= limit` keeps one less
+    // than asked for.
+    if (events.length > limit) {
       events.shift();
     }
   };
@@ -6147,6 +6151,9 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
       let statusMessage;
       let headers;
       let body;
+      // measures the route hands back, merged into the server-timing header
+      // when serverTiming is enabled (see finalizeResponseProperties)
+      let timing;
 
       if (fetchReturnValue instanceof Response) {
         status = fetchReturnValue.status;
@@ -6162,6 +6169,7 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
         statusMessage = fetchReturnValue.statusMessage;
         headers = fetchReturnValue.headers || {};
         body = fetchReturnValue.body;
+        timing = fetchReturnValue.timing;
       } else {
         throw new TypeError(
           `response must be a Response, or an Object, received ${fetchReturnValue}`,
@@ -6194,7 +6202,7 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
 
       onRouteMatch(route);
       onResponseHeaders(request, route, headers);
-      return { status, statusText, statusMessage, headers, body };
+      return { status, statusText, statusMessage, headers, body, timing };
     };
 
     const matchRoutes = async (request) => {
@@ -6944,11 +6952,19 @@ The list of existing endpoints is available at ${routeInspectorUrl}.`,
 const timingToServerTimingResponseHeaders = (timing) => {
   const serverTimingHeader = {};
   Object.keys(timing).forEach((key, index) => {
-    const name = letters[index] || "zz";
-    serverTimingHeader[name] = {
-      desc: key,
-      dur: timing[key],
-    };
+    // "a".."z" then "aa", "ab", …: names must be unique — they are the keys of
+    // the header object, so a shared fallback would overwrite every entry past
+    // it with the last one.
+    const name =
+      index < letters.length
+        ? letters[index]
+        : letters[Math.floor(index / letters.length) - 1] +
+          letters[index % letters.length];
+    const dur = timing[key];
+    // a non-number duration is a marker ("served from memory cache"): it has
+    // something to say (desc) but nothing to measure
+    serverTimingHeader[name] =
+      typeof dur === "number" ? { desc: key, dur } : { desc: key };
   });
   const serverTimingHeaderString =
     stringifyServerTimingHeader(serverTimingHeader);
@@ -7235,6 +7251,10 @@ const startServer = async ({
   // This param should be enabled ONLY during development on your machine
   canExposeSensitiveData = false,
   nagle = true,
+  // false | true | { minDuration }: server-timing response headers.
+  // minDuration (ms) drops entries that took less — 0 keeps everything, which
+  // is what a test wants; a human reading devtools usually wants the noise
+  // gone (the jsenv dev server passes 0.5 for that).
   serverTiming = false,
   requestWaitingMs = 0,
   requestWaitingCallback = ({ request, requestWaitingMs }) => {
@@ -7588,6 +7608,10 @@ const startServer = async ({
     sendResponseOperation.addAbortSignal(receiveRequestOperation.signal);
     return [receiveRequestOperation, sendResponseOperation];
   };
+  const serverTimingMinDuration =
+    serverTiming && typeof serverTiming === "object"
+      ? serverTiming.minDuration || 0
+      : 0;
   const getResponseProperties = async (request, { pushResponse }) => {
     const timings = {};
     const timing = serverTiming
@@ -7629,9 +7653,32 @@ const startServer = async ({
     const finalizeResponseProperties = (responseProperties) => {
       if (serverTiming) {
         startRespondingTiming.end();
+        // A response can hand back measures of its own (a `timing` property —
+        // durations keyed by description, null for a plain marker): they join
+        // the server's own in the same server-timing header.
+        if (responseProperties.timing) {
+          Object.assign(timings, responseProperties.timing);
+          delete responseProperties.timing;
+        }
+        // serverTiming.minDuration drops what took less: a request crosses
+        // every registered route, and a wall of sub-millisecond ".routing"
+        // entries buries the measures worth reading. Markers (null) and the
+        // overall "time to start responding" — the summary the rest details —
+        // always stay.
+        const timingsWorthReading = {};
+        for (const name of Object.keys(timings)) {
+          const duration = timings[name];
+          if (
+            name === startRespondingTiming.name ||
+            typeof duration !== "number" ||
+            duration >= serverTimingMinDuration
+          ) {
+            timingsWorthReading[name] = duration;
+          }
+        }
         responseProperties.headers = composeTwoHeaders(
           responseProperties.headers,
-          timingToServerTimingResponseHeaders(timings),
+          timingToServerTimingResponseHeaders(timingsWorthReading),
         );
       }
       if (requestWaitingMs) {

package/dist/ws/ws.js

@@ -8,8 +8,7 @@ import require$$0$2 from "node:stream";
 import require$$7 from "node:url";
 import require$$0 from "node:zlib";
 import require$$0$1 from "node:buffer";
-
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+import require$$2 from "node:util";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -1693,664 +1692,6 @@ function requireReceiver () {
 	return receiver$1;
 }
 
-var util = {};
-
-var isBuffer;
-var hasRequiredIsBuffer;
-
-function requireIsBuffer () {
-	if (hasRequiredIsBuffer) return isBuffer;
-	hasRequiredIsBuffer = 1;
-	isBuffer = function isBuffer(arg) {
-	  return arg instanceof Buffer;
-	};
-	return isBuffer;
-}
-
-var inherits = {exports: {}};
-
-var inherits_browser = {exports: {}};
-
-var hasRequiredInherits_browser;
-
-function requireInherits_browser () {
-	if (hasRequiredInherits_browser) return inherits_browser.exports;
-	hasRequiredInherits_browser = 1;
-	if (typeof Object.create === 'function') {
-	  // implementation from standard node.js 'util' module
-	  inherits_browser.exports = function inherits(ctor, superCtor) {
-	    ctor.super_ = superCtor;
-	    ctor.prototype = Object.create(superCtor.prototype, {
-	      constructor: {
-	        value: ctor,
-	        enumerable: false,
-	        writable: true,
-	        configurable: true
-	      }
-	    });
-	  };
-	} else {
-	  // old school shim for old browsers
-	  inherits_browser.exports = function inherits(ctor, superCtor) {
-	    ctor.super_ = superCtor;
-	    var TempCtor = function () {};
-	    TempCtor.prototype = superCtor.prototype;
-	    ctor.prototype = new TempCtor();
-	    ctor.prototype.constructor = ctor;
-	  };
-	}
-	return inherits_browser.exports;
-}
-
-var hasRequiredInherits;
-
-function requireInherits () {
-	if (hasRequiredInherits) return inherits.exports;
-	hasRequiredInherits = 1;
-	try {
-	  var util = requireUtil();
-	  if (typeof util.inherits !== 'function') throw '';
-	  inherits.exports = util.inherits;
-	} catch (e) {
-	  inherits.exports = requireInherits_browser();
-	}
-	return inherits.exports;
-}
-
-var hasRequiredUtil;
-
-function requireUtil () {
-	if (hasRequiredUtil) return util;
-	hasRequiredUtil = 1;
-	(function (exports) {
-		// Copyright Joyent, Inc. and other Node contributors.
-		//
-		// Permission is hereby granted, free of charge, to any person obtaining a
-		// copy of this software and associated documentation files (the
-		// "Software"), to deal in the Software without restriction, including
-		// without limitation the rights to use, copy, modify, merge, publish,
-		// distribute, sublicense, and/or sell copies of the Software, and to permit
-		// persons to whom the Software is furnished to do so, subject to the
-		// following conditions:
-		//
-		// The above copyright notice and this permission notice shall be included
-		// in all copies or substantial portions of the Software.
-		//
-		// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-		// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-		// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-		// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-		// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-		// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-		// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-		var formatRegExp = /%[sdj%]/g;
-		exports.format = function(f) {
-		  if (!isString(f)) {
-		    var objects = [];
-		    for (var i = 0; i < arguments.length; i++) {
-		      objects.push(inspect(arguments[i]));
-		    }
-		    return objects.join(' ');
-		  }
-
-		  var i = 1;
-		  var args = arguments;
-		  var len = args.length;
-		  var str = String(f).replace(formatRegExp, function(x) {
-		    if (x === '%%') return '%';
-		    if (i >= len) return x;
-		    switch (x) {
-		      case '%s': return String(args[i++]);
-		      case '%d': return Number(args[i++]);
-		      case '%j':
-		        try {
-		          return JSON.stringify(args[i++]);
-		        } catch (_) {
-		          return '[Circular]';
-		        }
-		      default:
-		        return x;
-		    }
-		  });
-		  for (var x = args[i]; i < len; x = args[++i]) {
-		    if (isNull(x) || !isObject(x)) {
-		      str += ' ' + x;
-		    } else {
-		      str += ' ' + inspect(x);
-		    }
-		  }
-		  return str;
-		};
-
-
-		// Mark that a method should not be used.
-		// Returns a modified function which warns once by default.
-		// If --no-deprecation is set, then it is a no-op.
-		exports.deprecate = function(fn, msg) {
-		  // Allow for deprecating things in the process of starting up.
-		  if (isUndefined(commonjsGlobal.process)) {
-		    return function() {
-		      return exports.deprecate(fn, msg).apply(this, arguments);
-		    };
-		  }
-
-		  if (process.noDeprecation === true) {
-		    return fn;
-		  }
-
-		  var warned = false;
-		  function deprecated() {
-		    if (!warned) {
-		      if (process.throwDeprecation) {
-		        throw new Error(msg);
-		      } else if (process.traceDeprecation) {
-		        console.trace(msg);
-		      } else {
-		        console.error(msg);
-		      }
-		      warned = true;
-		    }
-		    return fn.apply(this, arguments);
-		  }
-
-		  return deprecated;
-		};
-
-
-		var debugs = {};
-		var debugEnviron;
-		exports.debuglog = function(set) {
-		  if (isUndefined(debugEnviron))
-		    debugEnviron = process.env.NODE_DEBUG || '';
-		  set = set.toUpperCase();
-		  if (!debugs[set]) {
-		    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
-		      var pid = process.pid;
-		      debugs[set] = function() {
-		        var msg = exports.format.apply(exports, arguments);
-		        console.error('%s %d: %s', set, pid, msg);
-		      };
-		    } else {
-		      debugs[set] = function() {};
-		    }
-		  }
-		  return debugs[set];
-		};
-
-
-		/**
-		 * Echos the value of a value. Trys to print the value out
-		 * in the best way possible given the different types.
-		 *
-		 * @param {Object} obj The object to print out.
-		 * @param {Object} opts Optional options object that alters the output.
-		 */
-		/* legacy: obj, showHidden, depth, colors*/
-		function inspect(obj, opts) {
-		  // default options
-		  var ctx = {
-		    seen: [],
-		    stylize: stylizeNoColor
-		  };
-		  // legacy...
-		  if (arguments.length >= 3) ctx.depth = arguments[2];
-		  if (arguments.length >= 4) ctx.colors = arguments[3];
-		  if (isBoolean(opts)) {
-		    // legacy...
-		    ctx.showHidden = opts;
-		  } else if (opts) {
-		    // got an "options" object
-		    exports._extend(ctx, opts);
-		  }
-		  // set default options
-		  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
-		  if (isUndefined(ctx.depth)) ctx.depth = 2;
-		  if (isUndefined(ctx.colors)) ctx.colors = false;
-		  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
-		  if (ctx.colors) ctx.stylize = stylizeWithColor;
-		  return formatValue(ctx, obj, ctx.depth);
-		}
-		exports.inspect = inspect;
-
-
-		// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
-		inspect.colors = {
-		  'bold' : [1, 22],
-		  'italic' : [3, 23],
-		  'underline' : [4, 24],
-		  'inverse' : [7, 27],
-		  'white' : [37, 39],
-		  'grey' : [90, 39],
-		  'black' : [30, 39],
-		  'blue' : [34, 39],
-		  'cyan' : [36, 39],
-		  'green' : [32, 39],
-		  'magenta' : [35, 39],
-		  'red' : [31, 39],
-		  'yellow' : [33, 39]
-		};
-
-		// Don't use 'blue' not visible on cmd.exe
-		inspect.styles = {
-		  'special': 'cyan',
-		  'number': 'yellow',
-		  'boolean': 'yellow',
-		  'undefined': 'grey',
-		  'null': 'bold',
-		  'string': 'green',
-		  'date': 'magenta',
-		  // "name": intentionally not styling
-		  'regexp': 'red'
-		};
-
-
-		function stylizeWithColor(str, styleType) {
-		  var style = inspect.styles[styleType];
-
-		  if (style) {
-		    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
-		           '\u001b[' + inspect.colors[style][1] + 'm';
-		  } else {
-		    return str;
-		  }
-		}
-
-
-		function stylizeNoColor(str, styleType) {
-		  return str;
-		}
-
-
-		function arrayToHash(array) {
-		  var hash = {};
-
-		  array.forEach(function(val, idx) {
-		    hash[val] = true;
-		  });
-
-		  return hash;
-		}
-
-
-		function formatValue(ctx, value, recurseTimes) {
-		  // Provide a hook for user-specified inspect functions.
-		  // Check that value is an object with an inspect function on it
-		  if (ctx.customInspect &&
-		      value &&
-		      isFunction(value.inspect) &&
-		      // Filter out the util module, it's inspect function is special
-		      value.inspect !== exports.inspect &&
-		      // Also filter out any prototype objects using the circular check.
-		      !(value.constructor && value.constructor.prototype === value)) {
-		    var ret = value.inspect(recurseTimes, ctx);
-		    if (!isString(ret)) {
-		      ret = formatValue(ctx, ret, recurseTimes);
-		    }
-		    return ret;
-		  }
-
-		  // Primitive types cannot have properties
-		  var primitive = formatPrimitive(ctx, value);
-		  if (primitive) {
-		    return primitive;
-		  }
-
-		  // Look up the keys of the object.
-		  var keys = Object.keys(value);
-		  var visibleKeys = arrayToHash(keys);
-
-		  if (ctx.showHidden) {
-		    keys = Object.getOwnPropertyNames(value);
-		  }
-
-		  // IE doesn't make error fields non-enumerable
-		  // http://msdn.microsoft.com/en-us/library/ie/dww52sbt(v=vs.94).aspx
-		  if (isError(value)
-		      && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
-		    return formatError(value);
-		  }
-
-		  // Some type of object without properties can be shortcutted.
-		  if (keys.length === 0) {
-		    if (isFunction(value)) {
-		      var name = value.name ? ': ' + value.name : '';
-		      return ctx.stylize('[Function' + name + ']', 'special');
-		    }
-		    if (isRegExp(value)) {
-		      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-		    }
-		    if (isDate(value)) {
-		      return ctx.stylize(Date.prototype.toString.call(value), 'date');
-		    }
-		    if (isError(value)) {
-		      return formatError(value);
-		    }
-		  }
-
-		  var base = '', array = false, braces = ['{', '}'];
-
-		  // Make Array say that they are Array
-		  if (isArray(value)) {
-		    array = true;
-		    braces = ['[', ']'];
-		  }
-
-		  // Make functions say that they are functions
-		  if (isFunction(value)) {
-		    var n = value.name ? ': ' + value.name : '';
-		    base = ' [Function' + n + ']';
-		  }
-
-		  // Make RegExps say that they are RegExps
-		  if (isRegExp(value)) {
-		    base = ' ' + RegExp.prototype.toString.call(value);
-		  }
-
-		  // Make dates with properties first say the date
-		  if (isDate(value)) {
-		    base = ' ' + Date.prototype.toUTCString.call(value);
-		  }
-
-		  // Make error with message first say the error
-		  if (isError(value)) {
-		    base = ' ' + formatError(value);
-		  }
-
-		  if (keys.length === 0 && (!array || value.length == 0)) {
-		    return braces[0] + base + braces[1];
-		  }
-
-		  if (recurseTimes < 0) {
-		    if (isRegExp(value)) {
-		      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
-		    } else {
-		      return ctx.stylize('[Object]', 'special');
-		    }
-		  }
-
-		  ctx.seen.push(value);
-
-		  var output;
-		  if (array) {
-		    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
-		  } else {
-		    output = keys.map(function(key) {
-		      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
-		    });
-		  }
-
-		  ctx.seen.pop();
-
-		  return reduceToSingleString(output, base, braces);
-		}
-
-
-		function formatPrimitive(ctx, value) {
-		  if (isUndefined(value))
-		    return ctx.stylize('undefined', 'undefined');
-		  if (isString(value)) {
-		    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
-		                                             .replace(/'/g, "\\'")
-		                                             .replace(/\\"/g, '"') + '\'';
-		    return ctx.stylize(simple, 'string');
-		  }
-		  if (isNumber(value))
-		    return ctx.stylize('' + value, 'number');
-		  if (isBoolean(value))
-		    return ctx.stylize('' + value, 'boolean');
-		  // For some reason typeof null is "object", so special case here.
-		  if (isNull(value))
-		    return ctx.stylize('null', 'null');
-		}
-
-
-		function formatError(value) {
-		  return '[' + Error.prototype.toString.call(value) + ']';
-		}
-
-
-		function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
-		  var output = [];
-		  for (var i = 0, l = value.length; i < l; ++i) {
-		    if (hasOwnProperty(value, String(i))) {
-		      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-		          String(i), true));
-		    } else {
-		      output.push('');
-		    }
-		  }
-		  keys.forEach(function(key) {
-		    if (!key.match(/^\d+$/)) {
-		      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
-		          key, true));
-		    }
-		  });
-		  return output;
-		}
-
-
-		function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
-		  var name, str, desc;
-		  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
-		  if (desc.get) {
-		    if (desc.set) {
-		      str = ctx.stylize('[Getter/Setter]', 'special');
-		    } else {
-		      str = ctx.stylize('[Getter]', 'special');
-		    }
-		  } else {
-		    if (desc.set) {
-		      str = ctx.stylize('[Setter]', 'special');
-		    }
-		  }
-		  if (!hasOwnProperty(visibleKeys, key)) {
-		    name = '[' + key + ']';
-		  }
-		  if (!str) {
-		    if (ctx.seen.indexOf(desc.value) < 0) {
-		      if (isNull(recurseTimes)) {
-		        str = formatValue(ctx, desc.value, null);
-		      } else {
-		        str = formatValue(ctx, desc.value, recurseTimes - 1);
-		      }
-		      if (str.indexOf('\n') > -1) {
-		        if (array) {
-		          str = str.split('\n').map(function(line) {
-		            return '  ' + line;
-		          }).join('\n').substr(2);
-		        } else {
-		          str = '\n' + str.split('\n').map(function(line) {
-		            return '   ' + line;
-		          }).join('\n');
-		        }
-		      }
-		    } else {
-		      str = ctx.stylize('[Circular]', 'special');
-		    }
-		  }
-		  if (isUndefined(name)) {
-		    if (array && key.match(/^\d+$/)) {
-		      return str;
-		    }
-		    name = JSON.stringify('' + key);
-		    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
-		      name = name.substr(1, name.length - 2);
-		      name = ctx.stylize(name, 'name');
-		    } else {
-		      name = name.replace(/'/g, "\\'")
-		                 .replace(/\\"/g, '"')
-		                 .replace(/(^"|"$)/g, "'");
-		      name = ctx.stylize(name, 'string');
-		    }
-		  }
-
-		  return name + ': ' + str;
-		}
-
-
-		function reduceToSingleString(output, base, braces) {
-		  var length = output.reduce(function(prev, cur) {
-		    if (cur.indexOf('\n') >= 0) ;
-		    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
-		  }, 0);
-
-		  if (length > 60) {
-		    return braces[0] +
-		           (base === '' ? '' : base + '\n ') +
-		           ' ' +
-		           output.join(',\n  ') +
-		           ' ' +
-		           braces[1];
-		  }
-
-		  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
-		}
-
-
-		// NOTE: These type checking functions intentionally don't use `instanceof`
-		// because it is fragile and can be easily faked with `Object.create()`.
-		function isArray(ar) {
-		  return Array.isArray(ar);
-		}
-		exports.isArray = isArray;
-
-		function isBoolean(arg) {
-		  return typeof arg === 'boolean';
-		}
-		exports.isBoolean = isBoolean;
-
-		function isNull(arg) {
-		  return arg === null;
-		}
-		exports.isNull = isNull;
-
-		function isNullOrUndefined(arg) {
-		  return arg == null;
-		}
-		exports.isNullOrUndefined = isNullOrUndefined;
-
-		function isNumber(arg) {
-		  return typeof arg === 'number';
-		}
-		exports.isNumber = isNumber;
-
-		function isString(arg) {
-		  return typeof arg === 'string';
-		}
-		exports.isString = isString;
-
-		function isSymbol(arg) {
-		  return typeof arg === 'symbol';
-		}
-		exports.isSymbol = isSymbol;
-
-		function isUndefined(arg) {
-		  return arg === void 0;
-		}
-		exports.isUndefined = isUndefined;
-
-		function isRegExp(re) {
-		  return isObject(re) && objectToString(re) === '[object RegExp]';
-		}
-		exports.isRegExp = isRegExp;
-
-		function isObject(arg) {
-		  return typeof arg === 'object' && arg !== null;
-		}
-		exports.isObject = isObject;
-
-		function isDate(d) {
-		  return isObject(d) && objectToString(d) === '[object Date]';
-		}
-		exports.isDate = isDate;
-
-		function isError(e) {
-		  return isObject(e) &&
-		      (objectToString(e) === '[object Error]' || e instanceof Error);
-		}
-		exports.isError = isError;
-
-		function isFunction(arg) {
-		  return typeof arg === 'function';
-		}
-		exports.isFunction = isFunction;
-
-		function isPrimitive(arg) {
-		  return arg === null ||
-		         typeof arg === 'boolean' ||
-		         typeof arg === 'number' ||
-		         typeof arg === 'string' ||
-		         typeof arg === 'symbol' ||  // ES6 symbol
-		         typeof arg === 'undefined';
-		}
-		exports.isPrimitive = isPrimitive;
-
-		exports.isBuffer = requireIsBuffer();
-
-		function objectToString(o) {
-		  return Object.prototype.toString.call(o);
-		}
-
-
-		function pad(n) {
-		  return n < 10 ? '0' + n.toString(10) : n.toString(10);
-		}
-
-
-		var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
-		              'Oct', 'Nov', 'Dec'];
-
-		// 26 Feb 16:19:34
-		function timestamp() {
-		  var d = new Date();
-		  var time = [pad(d.getHours()),
-		              pad(d.getMinutes()),
-		              pad(d.getSeconds())].join(':');
-		  return [d.getDate(), months[d.getMonth()], time].join(' ');
-		}
-
-
-		// log is just a thin wrapper to console.log that prepends a timestamp
-		exports.log = function() {
-		  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
-		};
-
-
-		/**
-		 * Inherit the prototype methods from one constructor into another.
-		 *
-		 * The Function.prototype.inherits from lang.js rewritten as a standalone
-		 * function (not on Function.prototype). NOTE: If this file is to be loaded
-		 * during bootstrapping this function needs to be rewritten using some native
-		 * functions as prototype setup using normal JavaScript does not work as
-		 * expected during bootstrapping (see mirror.js in r114903).
-		 *
-		 * @param {function} ctor Constructor function which needs to inherit the
-		 *     prototype.
-		 * @param {function} superCtor Constructor function to inherit prototype from.
-		 */
-		exports.inherits = requireInherits();
-
-		exports._extend = function(origin, add) {
-		  // Don't do anything if add isn't an object
-		  if (!add || !isObject(add)) return origin;
-
-		  var keys = Object.keys(add);
-		  var i = keys.length;
-		  while (i--) {
-		    origin[keys[i]] = add[keys[i]];
-		  }
-		  return origin;
-		};
-
-		function hasOwnProperty(obj, prop) {
-		  return Object.prototype.hasOwnProperty.call(obj, prop);
-		} 
-	} (util));
-	return util;
-}
-
 /* eslint no-unused-vars: ["error", { "varsIgnorePattern": "^Duplex" }] */
 
 var sender$1;
@@ -2364,7 +1705,7 @@ function requireSender () {
 	const { randomFillSync } = require$$1;
 	const {
 	  types: { isUint8Array }
-	} = requireUtil();
+	} = require$$2;
 
 	const PerMessageDeflate = requirePermessageDeflate();
 	const { EMPTY_BUFFER, kWebSocket, NOOP } = requireConstants();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/server",
-  "version": "17.4.0",
+  "version": "17.5.0",
   "type": "module",
   "description": "A modern Node.js HTTP server with declarative routing, content negotiation, and WebSocket support",
   "repository": {

package/src/internal/response_composition.js

@@ -31,4 +31,7 @@ const RESPONSE_KEYS_COMPOSITION = {
   headers: composeTwoHeaders,
   body: (prevBody, body) => body,
   bodyEncoding: (prevEncoding, encoding) => encoding,
+  // measures a response hands back, merged into the server-timing header when
+  // the server has serverTiming enabled (see finalizeResponseProperties)
+  timing: (prevTiming, timing) => ({ ...prevTiming, ...timing }),
 };

package/src/plugins/filesystem/fetch_file.js

@@ -4,11 +4,7 @@
  * It is meant to be used inside "requestToResponse"
  */
 
-import {
-  urlIsOrIsInsideOf,
-  urlToExtension,
-  urlToPathname,
-} from "@jsenv/urls";
+import { urlIsOrIsInsideOf, urlToExtension, urlToPathname } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 import { createReadStream, readFile, statSync } from "node:fs";
 

package/src/router/router.js

@@ -279,6 +279,9 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
       let statusMessage;
       let headers;
       let body;
+      // measures the route hands back, merged into the server-timing header
+      // when serverTiming is enabled (see finalizeResponseProperties)
+      let timing;
 
       if (fetchReturnValue instanceof Response) {
         status = fetchReturnValue.status;
@@ -294,6 +297,7 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
         statusMessage = fetchReturnValue.statusMessage;
         headers = fetchReturnValue.headers || {};
         body = fetchReturnValue.body;
+        timing = fetchReturnValue.timing;
       } else {
         throw new TypeError(
           `response must be a Response, or an Object, received ${fetchReturnValue}`,
@@ -326,7 +330,7 @@ It should be should be one of route.${routePropertyName}: ${availableValues.join
 
       onRouteMatch(route);
       onResponseHeaders(request, route, headers);
-      return { status, statusText, statusMessage, headers, body };
+      return { status, statusText, statusMessage, headers, body, timing };
     };
 
     const matchRoutes = async (request) => {

package/src/server_events.js

@@ -412,8 +412,9 @@ const createEventHistory = (limit) => {
 
   const add = (data) => {
     events.push(data);
-
-    if (events.length >= limit) {
+    // Strictly above, not "as many as": shifting at `>= limit` keeps one less
+    // than asked for.
+    if (events.length > limit) {
       events.shift();
     }
   };

package/src/server_timing/timing_header.js

@@ -12,11 +12,19 @@ import {
 export const timingToServerTimingResponseHeaders = (timing) => {
   const serverTimingHeader = {};
   Object.keys(timing).forEach((key, index) => {
-    const name = letters[index] || "zz";
-    serverTimingHeader[name] = {
-      desc: key,
-      dur: timing[key],
-    };
+    // "a".."z" then "aa", "ab", …: names must be unique — they are the keys of
+    // the header object, so a shared fallback would overwrite every entry past
+    // it with the last one.
+    const name =
+      index < letters.length
+        ? letters[index]
+        : letters[Math.floor(index / letters.length) - 1] +
+          letters[index % letters.length];
+    const dur = timing[key];
+    // a non-number duration is a marker ("served from memory cache"): it has
+    // something to say (desc) but nothing to measure
+    serverTimingHeader[name] =
+      typeof dur === "number" ? { desc: key, dur } : { desc: key };
   });
   const serverTimingHeaderString =
     stringifyServerTimingHeader(serverTimingHeader);

package/src/start_server.js

@@ -149,6 +149,10 @@ export const startServer = async ({
   // This param should be enabled ONLY during development on your machine
   canExposeSensitiveData = false,
   nagle = true,
+  // false | true | { minDuration }: server-timing response headers.
+  // minDuration (ms) drops entries that took less — 0 keeps everything, which
+  // is what a test wants; a human reading devtools usually wants the noise
+  // gone (the jsenv dev server passes 0.5 for that).
   serverTiming = false,
   requestWaitingMs = 0,
   requestWaitingCallback = ({ request, requestWaitingMs }) => {
@@ -502,6 +506,10 @@ export const startServer = async ({
     sendResponseOperation.addAbortSignal(receiveRequestOperation.signal);
     return [receiveRequestOperation, sendResponseOperation];
   };
+  const serverTimingMinDuration =
+    serverTiming && typeof serverTiming === "object"
+      ? serverTiming.minDuration || 0
+      : 0;
   const getResponseProperties = async (request, { pushResponse }) => {
     const timings = {};
     const timing = serverTiming
@@ -543,9 +551,32 @@ export const startServer = async ({
     const finalizeResponseProperties = (responseProperties) => {
       if (serverTiming) {
         startRespondingTiming.end();
+        // A response can hand back measures of its own (a `timing` property —
+        // durations keyed by description, null for a plain marker): they join
+        // the server's own in the same server-timing header.
+        if (responseProperties.timing) {
+          Object.assign(timings, responseProperties.timing);
+          delete responseProperties.timing;
+        }
+        // serverTiming.minDuration drops what took less: a request crosses
+        // every registered route, and a wall of sub-millisecond ".routing"
+        // entries buries the measures worth reading. Markers (null) and the
+        // overall "time to start responding" — the summary the rest details —
+        // always stay.
+        const timingsWorthReading = {};
+        for (const name of Object.keys(timings)) {
+          const duration = timings[name];
+          if (
+            name === startRespondingTiming.name ||
+            typeof duration !== "number" ||
+            duration >= serverTimingMinDuration
+          ) {
+            timingsWorthReading[name] = duration;
+          }
+        }
         responseProperties.headers = composeTwoHeaders(
           responseProperties.headers,
-          timingToServerTimingResponseHeaders(timings),
+          timingToServerTimingResponseHeaders(timingsWorthReading),
         );
       }
       if (requestWaitingMs) {