@florianpat/lando-core 3.23.22 → 3.23.27-2florianPat.0

package/CHANGELOG.md

@@ -1,6 +1,28 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v3.23.22 - [January 6, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.22)
+## v3.23.27-2florianPat.0 - [February 19, 2025](https://github.com/florianPat/lando-core/releases/tag/v3.23.27-2florianPat.0)
+
+## v3.23.26 - [January 24, 2025](https://github.com/lando/core/releases/tag/v3.23.26)
+
+* Fixed bug where an app’s services were inadvertently reaped if the app’s path included a comma [#322](https://github.com/lando/core/issues/322)
+
+## v3.23.25 - [January 18, 2025](https://github.com/lando/core/releases/tag/v3.23.25)
+
+* Fixed bug causing `--accept-license` flag to not work when installing Docker Desktop on macOS
+* Updated default Docker Desktop version to `4.37.1|2`
+* Updated default Docker Engine version to `27.5.0`
+* Updated default Docker Compose version to `2.31.0`
+* Updated recommended Docker Desktop range to `>=4.37.0`
+* Updated tested Docker Desktop range to `<=4.37`
+* Updated tested Docker Compose range to `<=2.32`
+
+## v3.23.24 - [January 14, 2025](https://github.com/lando/core/releases/tag/v3.23.24)
+
+* Fixed bug causing service script moving to fail when receiving non-stringy inputs
+
+## v3.23.23 - [January 14, 2025](https://github.com/lando/core/releases/tag/v3.23.23)
+
+* Fixed bug causing service script loading collisions
 
 ## v3.23.22 - [December 17, 2024](https://github.com/lando/core/releases/tag/v3.23.22)
 

package/app.js

@@ -113,6 +113,9 @@ module.exports = async (app, lando) => {
   // Add tooling if applicable
   app.events.on('post-init', async () => await require('./hooks/app-add-tooling')(app, lando));
 
+  // Add _init tooling for bootstrap reference
+  app.events.on('pre-bootstrap', async () => await require('./hooks/app-add-init-tooling')(app, lando));
+
   // Collect info so we can inject LANDO_INFO
   // @NOTE: this is not currently the full lando info because a lot of it requires the app to be on
   app.events.on('post-init', 10, async () => await require('./hooks/app-set-lando-info')(app, lando));
@@ -240,6 +243,8 @@ module.exports = async (app, lando) => {
       BITNAMI_DEBUG: 'true',
     },
     labels: {
+      'io.lando.landofiles': app.configFiles.map(file => path.basename(file)).join(','),
+      'io.lando.root': app.root,
       'io.lando.src': app.configFiles.join(','),
       'io.lando.http-ports': '80,443',
     },

package/builders/_lando.js

@@ -41,6 +41,7 @@ module.exports = {
         refreshCerts = false,
         remoteFiles = {},
         scripts = [],
+        scriptsDir = false,
         sport = '443',
         ssl = false,
         sslExpose = true,
@@ -68,16 +69,25 @@ module.exports = {
         console.error(color.yellow(`${type} version ${version} is a legacy version! We recommend upgrading.`));
       }
 
+      // normalize scripts dir if needed
+      if (typeof scriptsDir === 'string' && !path.isAbsolute(scriptsDir)) scriptsDir = path.resolve(root, scriptsDir);
+
+      // Get some basic locations
+      const globalScriptsDir = path.join(userConfRoot, 'scripts');
+      const serviceScriptsDir = path.join(userConfRoot, 'helpers', project, type, name);
+      const entrypointScript = path.join(globalScriptsDir, 'lando-entrypoint.sh');
+      const addCertsScript = path.join(globalScriptsDir, 'add-cert.sh');
+      const refreshCertsScript = path.join(globalScriptsDir, 'refresh-certs.sh');
+
       // Move our config into the userconfroot if we have some
       // NOTE: we need to do this because on macOS and Windows not all host files
       // are shared into the docker vm
       if (fs.existsSync(confSrc)) require('../utils/move-config')(confSrc, confDest);
 
-      // Get some basic locations
-      const scriptsDir = path.join(userConfRoot, 'scripts');
-      const entrypointScript = path.join(scriptsDir, 'lando-entrypoint.sh');
-      const addCertsScript = path.join(scriptsDir, 'add-cert.sh');
-      const refreshCertsScript = path.join(scriptsDir, 'refresh-certs.sh');
+      // ditto for service helpers
+      if (!require('../utils/is-disabled')(scriptsDir) && typeof scriptsDir === 'string' && fs.existsSync(scriptsDir)) {
+        require('../utils/move-config')(scriptsDir, serviceScriptsDir);
+      }
 
       // Handle Environment
       const environment = {
@@ -100,10 +110,13 @@ module.exports = {
       // Handle volumes
       const volumes = [
         `${userConfRoot}:/lando:cached`,
-        `${scriptsDir}:/helpers`,
+        `${globalScriptsDir}:/helpers`,
         `${entrypointScript}:/lando-entrypoint.sh`,
       ];
 
+      // add in service helpers if we have them
+      if (fs.existsSync(serviceScriptsDir)) volumes.push(`${serviceScriptsDir}:/etc/lando/service/helpers`);
+
       // Handle ssl
       if (ssl) {
         // also expose the sport

package/builders/lando-v4.js

@@ -443,7 +443,10 @@ module.exports = {
       const labels = merge({}, app.labels, {
         'dev.lando.container': 'TRUE',
         'dev.lando.id': lando.config.id,
+        'dev.lando.landofiles': app.configFiles.map(file => path.basename(file)).join(','),
+        'dev.lando.root': app.root,
         'dev.lando.src': app.root,
+        'io.lando.http-ports': '80,443',
       }, config.labels);
 
       // add it all 2getha

package/config.yml

@@ -13,21 +13,21 @@ dockerSupportedVersions:
   compose:
     satisfies: "1.x.x || 2.x.x"
     recommendUpdate: "<=2.24.6"
-    tested: "<=2.30.99"
+    tested: "<=2.32.99"
     link:
       linux: https://docs.docker.com/compose/install/#install-compose-on-linux-systems
       darwin: https://docs.docker.com/desktop/install/mac-install/
       win32: https://docs.docker.com/desktop/install/windows-install/
   desktop:
     satisfies: ">=4.0.0 <5"
-    tested: "<=4.36.99"
-    recommendUpdate: "<=4.34.0"
+    tested: "<=4.37.99"
+    recommendUpdate: "<=4.36"
     link:
       darwin: https://docs.docker.com/desktop/install/mac-install/
       win32: https://docs.docker.com/desktop/install/windows-install/
       wsl: https://docs.docker.com/desktop/install/windows-install/
   engine:
     satisfies: ">=18 <28"
-    tested: "<=27.3.1"
+    tested: "<=27.5.99"
     link:
       linux: https://docs.docker.com/engine/install/debian/#install-using-the-convenience-script

package/hooks/app-add-init-tooling.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const _ = require('lodash');
+
+module.exports = async (app, lando) => {
+  if (!_.isEmpty(_.get(app, 'config.tooling', {}))) {
+    app.log.verbose('additional tooling detected');
+
+    // Add the _init tasks for the bootstrap event!
+    // TODO(flo): They are duplicated through "app-add-tooling" but I do not care for now!
+    _.forEach(require('../utils/get-tooling-tasks')(app.config.tooling, app), task => {
+      if (task.service !== '_init') {
+        return;
+      }
+
+      app.log.debug('adding app cli task %s', task.name);
+      const injectable = _.has(app, 'engine') ? app : lando;
+      app.tasks.push(require('../utils/build-tooling-task')(task, injectable));
+    });
+  }
+};

package/hooks/app-run-events.js

@@ -7,6 +7,28 @@ const formatters = require('../lib/formatters');
 
 module.exports = async (app, lando, cmds, data, event) => {
   const eventCommands = require('./../utils/parse-events-config')(cmds, app, data, lando);
+  // add perm sweeping to all v3 services
+  if (!_.isEmpty(eventCommands)) {
+    const permsweepers = _(eventCommands)
+      .filter(command => command.api === 3)
+      .map(command => ({id: command.id, services: _.get(command, 'opts.services', [])}))
+      .uniqBy('id')
+      .value();
+    lando.log.debug('added preemptive perm sweeping to evented v3 services %j', permsweepers.map(s => s.id));
+    _.forEach(permsweepers, ({id, services}) => {
+      eventCommands.unshift({
+        id,
+        cmd: '/helpers/user-perms.sh --silent',
+        compose: app.compose,
+        project: app.project,
+        opts: {
+          mode: 'attach',
+          user: 'root',
+          services,
+        },
+      });
+    });
+  }
   const injectable = _.has(app, 'engine') ? app : lando;
 
   const splitEventCommands = [];

package/hooks/lando-setup-build-engine-darwin.js

@@ -10,6 +10,9 @@ const semver = require('semver');
 const {color} = require('listr2');
 
 const buildIds = {
+  '4.37.2': '179585',
+  '4.37.1': '178610',
+  '4.37.0': '178034',
   '4.36.0': '175267',
   '4.35.1': '173168',
   '4.35.0': '172550',

package/hooks/lando-setup-build-engine-win32.js

@@ -10,6 +10,8 @@ const {color} = require('listr2');
 const {nanoid} = require('nanoid');
 
 const buildIds = {
+  '4.37.1': '178610',
+  '4.37.0': '178034',
   '4.36.0': '175267',
   '4.35.1': '173168',
   '4.35.0': '172550',

package/hooks/lando-setup-build-engine-wsl.js

@@ -12,6 +12,8 @@ const {color} = require('listr2');
 const {nanoid} = require('nanoid');
 
 const buildIds = {
+  '4.37.1': '178610',
+  '4.37.0': '178034',
   '4.36.0': '175267',
   '4.35.1': '173168',
   '4.35.0': '172550',

package/hooks/lando-setup-orchestrator.js

@@ -7,7 +7,7 @@ const path = require('path');
 /*
  * Helper to get docker compose v2 download url
  */
-const getComposeDownloadUrl = (version = '2.30.3') => {
+const getComposeDownloadUrl = (version = '2.31.0') => {
   const mv = version.split('.')[0] > 1 ? '2' : '1';
   const arch = process.arch === 'arm64' ? 'aarch64' : 'x86_64';
   const toggle = `${process.platform}-${mv}`;
@@ -31,7 +31,7 @@ const getComposeDownloadUrl = (version = '2.30.3') => {
 /*
  * Helper to get docker compose v2 download destination
  */
-const getComposeDownloadDest = (base, version = '2.30.3') => {
+const getComposeDownloadDest = (base, version = '2.31.0') => {
   switch (process.platform) {
     case 'linux':
     case 'darwin':

package/lib/app.js

@@ -11,8 +11,8 @@ const fs = require('node:fs');
 /*
  * Helper to init and then report
  */
-const initAndReport = (app, method = 'start') => {
-  return app.init().then(() => {
+const initAndReport = (app, method, shouldBootstrap = false) => {
+  return app.init({shouldBootstrap}).then(() => {
     app.metrics.report(method, utils.metricsParse(app));
     return Promise.resolve(true);
   });
@@ -257,6 +257,8 @@ module.exports = class App {
     .then(() => this.log.info('destroyed app.'));
   };
 
+  static isBootstrapCommand = undefined;
+
   /**
    * Initializes the app
    *
@@ -270,21 +272,37 @@ module.exports = class App {
    * @fires ready
    * @return {Promise} A Promise.
    */
-  init({noEngine = false} = {}) {
+  init({noEngine = false, shouldBootstrap = false} = {}) {
     // We should only need to initialize once, if we have just go right to app ready
     if (this.initialized) return this.events.emit('ready', this);
+    if (undefined === App.isBootstrapCommand) {
+      App.isBootstrapCommand = !fs.existsSync(this._dir);
+    }
+    const bootstrapping = App.isBootstrapCommand && shouldBootstrap && !noEngine;
+    if (bootstrapping) {
+      console.log(require('yargonaut').chalk().cyan('Looks like this is the first time to start the app. Lets bootstrap it...'));
+    }
+
+    return loadPlugins(this, this._lando)
+    /**
+     * Event that only gets triggered if the app never started before (or was destroyed)
+     *
+     * @since 3.23.25
+     * @alias app.events:pre-bootstrap
+     * @event pre-bootstrap
+     * @property {App} app The app instance.
+     */
+    .then(() => bootstrapping ? this.events.emit('pre-bootstrap', this) : undefined)
     // Get compose data if we have any, otherwise set to []
-    return require('../utils/load-compose-files')(
+    .then(() => noEngine === true ? [] : require('../utils/load-compose-files')(
       _.get(this, 'config.compose', []),
       this.root,
       this._dir,
       (composeFiles, outputFilePath) =>
         this.engine.getComposeConfig({compose: composeFiles, project: this.project, outputFilePath}),
-    )
+    ))
     .then(composeFileData => {
-      if (undefined !== composeFileData) {
-        this.composeData = [new this.ComposeService('compose', {}, composeFileData)];
-      }
+      this.composeData = [new this.ComposeService('compose', {}, ...composeFileData)];
       // Validate and set env files
       this.envFiles = require('../utils/normalize-files')(_.get(this, 'config.env_file', []), this.root);
       // Log some things
@@ -303,8 +321,6 @@ module.exports = class App {
      * @event pre_init
      * @property {App} app The app instance.
      */
-    .then(() => loadPlugins(this, this._lando))
-
     .then(() => this.events.emit('pre-init', this))
     // Actually assemble this thing so its ready for that engine
     .then(() => {
@@ -501,25 +517,15 @@ module.exports = class App {
    * @alias app.start
    * @fires pre_start
    * @fires post_start
+   * @fires post_bootstrap
    * @return {Promise} A Promise.
    *
    */
   start() {
     // Log
     this.log.info('starting app...');
-    const shouldBootstrap = fs.existsSync(this._dir);
-
-    return initAndReport(this)
 
-    /**
-     * Event that only gets triggered if the app never started before (or was destroyed)
-     *
-     * @since 3.22.3
-     * @alias app.events:pre-bootstrap
-     * @event pre-bootstrap
-     * @property {App} app The app instance.
-     */
-    .then(() => shouldBootstrap ? this.events.emit('pre-bootstrap', this) : undefined)
+    return initAndReport(this, 'start', true)
 
     /**
      * Event that runs before an app starts up.
@@ -551,12 +557,12 @@ module.exports = class App {
     /**
      * Event that only gets triggered if the app never started before (or was destroyed)
      *
-     * @since 3.22.3
+     * @since 3.23.25
      * @alias app.events:post-bootstrap
      * @event post-bootstrap
      * @property {App} app The app instance.
      */
-    .then(() => shouldBootstrap ? this.events.emit('post-bootstrap', this) : undefined)
+    .then(() => App.isBootstrapCommand ? this.events.emit('post-bootstrap', this) : undefined)
 
     .then(() => this.log.info('started app.'));
   };

package/lib/daemon.js

@@ -53,7 +53,7 @@ module.exports = class LandoDaemon {
       log = new Log(),
       context = 'node',
       compose = require('../utils/get-compose-x')(),
-      orchestratorVersion = '2.30.3',
+      orchestratorVersion = '2.31.0',
       userConfRoot = path.join(os.homedir(), '.lando'),
   ) {
     this.cache = cache;

package/lib/engine.js

@@ -172,7 +172,7 @@ module.exports = class Engine {
    * return lando.engine.exists(compose);
    */
   exists(data) {
-    return this.engineCmd('exists', data);
+    return this.engineCmd('exists', _.merge({}, {separator: this.separator}, data));
   };
 
   /*

package/lib/formatters.js

@@ -135,7 +135,7 @@ exports.handleInteractive = (inquiry, argv, command, lando) => lando.Promise.try
       // NOTE: We need to clone deep here otherwise any apps with interactive options get 2x all their events
       // NOTE: Not exactly clear on why app here gets conflated with the app returned from lando.getApp
       const app = _.cloneDeep(lando.getApp(argv._app.root));
-      return app.init().then(() => {
+      return app.init({noEngine: true}).then(() => {
         inquiry = exports.getInteractive(_.find(app.tasks.concat(lando.tasks), {command: command}).options, argv);
         return inquirer.prompt(_.sortBy(inquiry, 'weight'));
       });

package/lib/router.js

@@ -55,7 +55,7 @@ exports.destroy = (data, compose, docker) => retryEach(data, datum => {
 exports.exists = (data, compose, docker, ids = []) => {
   if (data.compose) return compose('getId', data).then(id => !_.isEmpty(id));
   else {
-    return docker.list()
+    return docker.list({}, data.separator)
     .each(container => {
       ids.push(container.id);
       ids.push(container.name);

package/lib/updates.js

@@ -127,7 +127,15 @@ module.exports = class UpdateManager {
           const {data, status, url} = await octokit.rest.repos.listReleases({owner: 'lando', repo: 'core'});
           this.debug('retrieved cli information from %o [%o]', url, status);
 
-          const newestCoreVersion = semver.clean((await this.plugins.find(plugin => plugin.core)?.check4Update())?.update?.version ?? '');
+          const corePlugin = await this.plugins.find(plugin => plugin.core);
+          if (undefined === corePlugin) {
+            throw new Error('We should find a core!');
+          }
+          let newestCoreVersion = corePlugin.check4Update()?.update?.version ?? corePlugin.version;
+          if (undefined === newestCoreVersion) {
+            throw new Error('Could not obtain the next lando core version!');
+          }
+          newestCoreVersion = semver.clean(newestCoreVersion);
 
           const versions = data
             .map(release => ({...release, version: semver.clean(release.tag_name)}))

package/netlify.toml

@@ -20,6 +20,7 @@
       "https://docs.google.com/document",
       "https://docs.google.com/forms",
       "https://github.com",
+      "https://www.drupal.org/community/events",
       "/v/"
     ]
     skipPatterns = [

package/node_modules/undici/docs/docs/api/Dispatcher.md

@@ -986,6 +986,57 @@ client.dispatch(
 );
 ```
 
+##### `dns`
+
+The `dns` interceptor enables you to cache DNS lookups for a given duration, per origin.
+
+>It is well suited for scenarios where you want to cache DNS lookups to avoid the overhead of resolving the same domain multiple times
+
+**Options**
+- `maxTTL` - The maximum time-to-live (in milliseconds) of the DNS cache. It should be a positive integer. Default: `10000`.
+  - Set `0` to disable TTL.
+- `maxItems` - The maximum number of items to cache. It should be a positive integer. Default: `Infinity`.
+- `dualStack` - Whether to resolve both IPv4 and IPv6 addresses. Default: `true`.
+  - It will also attempt a happy-eyeballs-like approach to connect to the available addresses in case of a connection failure.
+- `affinity` - Whether to use IPv4 or IPv6 addresses. Default: `4`.
+  - It can be either `'4` or `6`.
+  - It will only take effect if `dualStack` is `false`.
+- `lookup: (hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException | null, addresses: DNSInterceptorRecord[]) => void) => void` - Custom lookup function. Default: `dns.lookup`.
+  - For more info see [dns.lookup](https://nodejs.org/api/dns.html#dns_dns_lookup_hostname_options_callback).
+- `pick: (origin: URL, records: DNSInterceptorRecords, affinity: 4 | 6) => DNSInterceptorRecord` - Custom pick function. Default: `RoundRobin`.
+  - The function should return a single record from the records array.
+  - By default a simplified version of Round Robin is used.
+  - The `records` property can be mutated to store the state of the balancing algorithm.
+
+> The `Dispatcher#options` also gets extended with the options `dns.affinity`, `dns.dualStack`, `dns.lookup` and `dns.pick` which can be used to configure the interceptor at a request-per-request basis.
+
+
+**DNSInterceptorRecord**
+It represents a DNS record.
+- `family` - (`number`) The IP family of the address. It can be either `4` or `6`.
+- `address` - (`string`) The IP address.
+
+**DNSInterceptorOriginRecords**
+It represents a map of DNS IP addresses records for a single origin.
+- `4.ips` - (`DNSInterceptorRecord[] | null`) The IPv4 addresses.
+- `6.ips` - (`DNSInterceptorRecord[] | null`) The IPv6 addresses.
+
+**Example - Basic DNS Interceptor**
+
+```js
+const { Client, interceptors } = require("undici");
+const { dns } = interceptors;
+
+const client = new Agent().compose([
+  dns({ ...opts })
+])
+
+const response = await client.request({
+  origin: `http://localhost:3030`,
+  ...requestOpts
+})
+```
+
 ##### `Response Error Interceptor`
 
 **Introduction**

package/node_modules/undici/index.js

@@ -41,7 +41,8 @@ module.exports.createRedirectInterceptor = createRedirectInterceptor
 module.exports.interceptors = {
   redirect: require('./lib/interceptor/redirect'),
   retry: require('./lib/interceptor/retry'),
-  dump: require('./lib/interceptor/dump')
+  dump: require('./lib/interceptor/dump'),
+  dns: require('./lib/interceptor/dns')
 }
 
 module.exports.buildConnector = buildConnector

package/node_modules/undici/lib/api/api-request.js

@@ -73,7 +73,7 @@ class RequestHandler extends AsyncResource {
         this.removeAbortListener = util.addAbortListener(this.signal, () => {
           this.reason = this.signal.reason ?? new RequestAbortedError()
           if (this.res) {
-            util.destroy(this.res, this.reason)
+            util.destroy(this.res.on('error', util.nop), this.reason)
           } else if (this.abort) {
             this.abort(this.reason)
           }

package/node_modules/undici/lib/core/connect.js

@@ -220,6 +220,11 @@ const setupConnectTimeout = process.platform === 'win32'
  * @param {number} opts.port
  */
 function onConnectTimeout (socket, opts) {
+  // The socket could be already garbage collected
+  if (socket == null) {
+    return
+  }
+
   let message = 'Connect Timeout Error'
   if (Array.isArray(socket.autoSelectFamilyAttemptedAddresses)) {
     message += ` (attempted addresses: ${socket.autoSelectFamilyAttemptedAddresses.join(', ')},`

package/node_modules/undici/lib/dispatcher/client-h2.js

@@ -31,6 +31,8 @@ const {
 
 const kOpenStreams = Symbol('open streams')
 
+let extractBody
+
 // Experimental
 let h2ExperimentalWarned = false
 
@@ -240,11 +242,12 @@ function onHTTP2GoAway (code) {
   util.destroy(this[kSocket], err)
 
   // Fail head of pipeline.
-  const request = client[kQueue][client[kRunningIdx]]
-  client[kQueue][client[kRunningIdx]++] = null
-  util.errorRequest(client, request, err)
-
-  client[kPendingIdx] = client[kRunningIdx]
+  if (client[kRunningIdx] < client[kQueue].length) {
+    const request = client[kQueue][client[kRunningIdx]]
+    client[kQueue][client[kRunningIdx]++] = null
+    util.errorRequest(client, request, err)
+    client[kPendingIdx] = client[kRunningIdx]
+  }
 
   assert(client[kRunning] === 0)
 
@@ -260,7 +263,8 @@ function shouldSendContentLength (method) {
 
 function writeH2 (client, request) {
   const session = client[kHTTP2Session]
-  const { body, method, path, host, upgrade, expectContinue, signal, headers: reqHeaders } = request
+  const { method, path, host, upgrade, expectContinue, signal, headers: reqHeaders } = request
+  let { body } = request
 
   if (upgrade) {
     util.errorRequest(client, request, new Error('Upgrade not supported for H2'))
@@ -381,6 +385,16 @@ function writeH2 (client, request) {
 
   let contentLength = util.bodyLength(body)
 
+  if (util.isFormDataLike(body)) {
+    extractBody ??= require('../web/fetch/body.js').extractBody
+
+    const [bodyStream, contentType] = extractBody(body)
+    headers['content-type'] = contentType
+
+    body = bodyStream.stream
+    contentLength = bodyStream.length
+  }
+
   if (contentLength == null) {
     contentLength = request.contentLength
   }

package/node_modules/undici/lib/handler/retry-handler.js

@@ -229,7 +229,7 @@ class RetryHandler {
         return false
       }
 
-      const { start, size, end = size } = contentRange
+      const { start, size, end = size - 1 } = contentRange
 
       assert(this.start === start, 'content-range mismatch')
       assert(this.end == null || this.end === end, 'content-range mismatch')
@@ -252,7 +252,7 @@ class RetryHandler {
           )
         }
 
-        const { start, size, end = size } = range
+        const { start, size, end = size - 1 } = range
         assert(
           start != null && Number.isFinite(start),
           'content-range mismatch'
@@ -266,7 +266,7 @@ class RetryHandler {
       // We make our best to checkpoint the body for further range headers
       if (this.end == null) {
         const contentLength = headers['content-length']
-        this.end = contentLength != null ? Number(contentLength) : null
+        this.end = contentLength != null ? Number(contentLength) - 1 : null
       }
 
       assert(Number.isFinite(this.start))