buffer: add end parameter

To limit how far into the buffer we search without allocating an
unnecessary subarray.
Signed-off-by: Robert Nagy <ronay@icloud.com>
PR-URL: #62390
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

Author: ronag

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage:

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage:

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage:

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage:

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage:

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage:

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage:

doc/api/buffer.md

@@ -2085,19 +2085,24 @@ console.log(buf.fill('zz', 'hex'));
 // Throws an exception.
 ```
 
-### `buf.includes(value[, byteOffset][, encoding])`
+### `buf.includes(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v5.3.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v24.13.1
  pr-url: https://github.com/nodejs/node/pull/56578
  description: supports Uint8Array as `this` value.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is its encoding.
 **Default:**`'utf8'`.
 * Returns: {boolean} `true` if `value` was found in `buf`, `false` otherwise.
@@ -2146,11 +2151,14 @@ console.log(buf.includes('this', 4));
 // Prints: false
 ```
 
-### `buf.indexOf(value[, byteOffset][, encoding])`
+### `buf.indexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v1.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
@@ -2163,8 +2171,10 @@ changes:
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**`0`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.
@@ -2324,20 +2334,25 @@ for (const key of buf.keys()) {
 // 5
 ```
 
-### `buf.lastIndexOf(value[, byteOffset][, encoding])`
+### `buf.lastIndexOf(value[, start[, end]][, encoding])`
 
 <!-- YAML
 added: v6.0.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/62390
+ description: Added the `end` parameter.
  - version: v8.0.0
  pr-url: https://github.com/nodejs/node/pull/10236
  description: The `value` can now be a `Uint8Array`.
 -->
 
 *`value` {string|Buffer|Uint8Array|integer} What to search for.
-*`byteOffset` {integer} Where to begin searching in `buf`. If negative, then
+*`start` {integer} Where to begin searching in `buf`. If negative, then
  offset is calculated from the end of `buf`. **Default:**
 `buf.length - 1`.
+*`end` {integer} Where to stop searching in `buf` (exclusive). **Default:**
+`buf.length`.
 *`encoding` {string} If `value` is a string, this is the encoding used to
  determine the binary representation of the string that will be searched for in
 `buf`. **Default:**`'utf8'`.

lib/buffer.js

@@ -714,83 +714,91 @@ const encodingOps = {
 byteLength: byteLengthUtf8,
 write: utf8Write,
 slice: utf8Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf8,dir,end),
 },
 ucs2: {
 encoding: 'ucs2',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 utf16le: {
 encoding: 'utf16le',
 encodingVal: encodingsMap.utf16le,
 byteLength: (string)=>string.length*2,
 write: ucs2Write,
 slice: ucs2Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.utf16le,dir,end),
 },
 latin1: {
 encoding: 'latin1',
 encodingVal: encodingsMap.latin1,
 byteLength: (string)=>string.length,
 write: latin1Write,
 slice: latin1Slice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfString(buf,val,byteOffset,encodingsMap.latin1,dir,end),
 },
 ascii: {
 encoding: 'ascii',
 encodingVal: encodingsMap.ascii,
 byteLength: (string)=>string.length,
 write: asciiWrite,
 slice: asciiSlice,
-indexOf: (buf,val,byteOffset,dir)=>
-indexOfString(buf,val,byteOffset,encodingsMap.ascii,dir),
+indexOf: (buf,val,byteOffset,dir,end)=>
+indexOfBuffer(buf,
+fromStringFast(val,encodingOps.ascii),
+byteOffset,
+encodingsMap.ascii,
+dir,
+end),
 },
 base64: {
 encoding: 'base64',
 encodingVal: encodingsMap.base64,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64Write,
 slice: base64Slice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64),
 byteOffset,
 encodingsMap.base64,
-dir),
+dir,
+end),
 },
 base64url: {
 encoding: 'base64url',
 encodingVal: encodingsMap.base64url,
 byteLength: (string)=>base64ByteLength(string,string.length),
 write: base64urlWrite,
 slice: base64urlSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.base64url),
 byteOffset,
 encodingsMap.base64url,
-dir),
+dir,
+end),
 },
 hex: {
 encoding: 'hex',
 encodingVal: encodingsMap.hex,
 byteLength: (string)=>string.length>>>1,
 write: hexWrite,
 slice: hexSlice,
-indexOf: (buf,val,byteOffset,dir)=>
+indexOf: (buf,val,byteOffset,dir,end)=>
 indexOfBuffer(buf,
 fromStringFast(val,encodingOps.hex),
 byteOffset,
 encodingsMap.hex,
-dir),
+dir,
+end),
 },
 };
 functiongetEncodingOps(encoding){
@@ -1044,9 +1052,10 @@ Buffer.prototype.compare = function compare(target,
 // - buffer - a Buffer to search
 // - val - a string, Buffer, or number
 // - byteOffset - an index into `buffer`; will be clamped to an int32
+// - end - absolute exclusive end of the search range
 // - encoding - an optional encoding, relevant if val is a string
 // - dir - true for indexOf, false for lastIndexOf
-functionbidirectionalIndexOf(buffer,val,byteOffset,encoding,dir){
+functionbidirectionalIndexOf(buffer,val,byteOffset,end,encoding,dir){
 validateBuffer(buffer);
 
 if(typeofbyteOffset==='string'){
@@ -1066,7 +1075,7 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 dir=!!dir;// Cast to bool.
 
 if(typeofval==='number')
-returnindexOfNumber(buffer,val>>>0,byteOffset,dir);
+returnindexOfNumber(buffer,val>>>0,byteOffset,dir,end);
 
 letops;
 if(encoding===undefined)
@@ -1077,30 +1086,48 @@ function bidirectionalIndexOf(buffer, val, byteOffset, encoding, dir) {
 if(typeofval==='string'){
 if(ops===undefined)
 thrownewERR_UNKNOWN_ENCODING(encoding);
-returnops.indexOf(buffer,val,byteOffset,dir);
+returnops.indexOf(buffer,val,byteOffset,dir,end);
 }
 
 if(isUint8Array(val)){
 constencodingVal=
 (ops===undefined ? encodingsMap.utf8 : ops.encodingVal);
-returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir);
+returnindexOfBuffer(buffer,val,byteOffset,encodingVal,dir,end);
 }
 
 thrownewERR_INVALID_ARG_TYPE(
 'value',['number','string','Buffer','Uint8Array'],val,
 );
 }
 
-Buffer.prototype.indexOf=functionindexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true);
+Buffer.prototype.indexOf=functionindexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true);
 };
 
-Buffer.prototype.lastIndexOf=functionlastIndexOf(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,false);
+Buffer.prototype.lastIndexOf=functionlastIndexOf(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,false);
 };
 
-Buffer.prototype.includes=functionincludes(val,byteOffset,encoding){
-returnbidirectionalIndexOf(this,val,byteOffset,encoding,true)!==-1;
+Buffer.prototype.includes=functionincludes(val,offset,end,encoding){
+if(typeofend==='string'){
+encoding=end;
+end=this.length;
+}elseif(end===undefined){
+end=this.length;
+}
+returnbidirectionalIndexOf(this,val,offset,end,encoding,true)!==-1;
 };
 
 // Usage: