@withbuddi/buddi 0.1.0-pre.20 → 0.1.0-pre.22

package/node_modules/imapflow/dist/esm/jp-decoder.js

@@ -31,7 +31,7 @@ export class JPDecoder extends Transform {
             chunk = Buffer.from(chunk, encoding);
         }
         if (this.chunklen + chunk.length > this.maxBytes) {
-            chunk = chunk.slice(0, Math.max(0, this.maxBytes - this.chunklen));
+            chunk = chunk.subarray(0, Math.max(0, this.maxBytes - this.chunklen));
         }
         if (chunk.length) {
             this.chunks.push(chunk);

package/node_modules/imapflow/dist/esm/logger.d.ts

@@ -1,3 +1,21 @@
-import pino from 'pino';
-declare const logger: pino.Logger<never, boolean>;
-export default logger;
+import { type Logger as PinoLogger } from 'pino';
+/**
+ * Returns the shared default logger, used when a connection is given no logger of its own.
+ * Created on first use, so importing the library does not set up a stdout logger nobody asked
+ * for. Level info: a caller that asks for raw socket data (logRaw) lowers its own child logger
+ * to trace.
+ *
+ * @returns The default pino logger
+ */
+export declare function getDefaultLogger(): PinoLogger;
+/**
+ * Returns the child of the default logger a connection logs through when it was given no
+ * logger of its own.
+ *
+ * @param options - cid is the connection id to stamp on entries, logRaw asks for raw socket data
+ * @returns A child logger of the default logger
+ */
+export declare function createConnectionLogger(options: {
+    cid?: string | undefined;
+    logRaw?: boolean | undefined;
+}): PinoLogger;

package/node_modules/imapflow/dist/esm/logger.js

@@ -1,4 +1,34 @@
 import pino from 'pino';
-const logger = pino();
-logger.level = 'trace';
-export default logger;
+let logger = null;
+/**
+ * Returns the shared default logger, used when a connection is given no logger of its own.
+ * Created on first use, so importing the library does not set up a stdout logger nobody asked
+ * for. Level info: a caller that asks for raw socket data (logRaw) lowers its own child logger
+ * to trace.
+ *
+ * @returns The default pino logger
+ */
+export function getDefaultLogger() {
+    if (!logger) {
+        logger = pino({ level: 'info' });
+    }
+    return logger;
+}
+/**
+ * Returns the child of the default logger a connection logs through when it was given no
+ * logger of its own.
+ *
+ * @param options - cid is the connection id to stamp on entries, logRaw asks for raw socket data
+ * @returns A child logger of the default logger
+ */
+export function createConnectionLogger(options) {
+    let child = getDefaultLogger().child({
+        component: 'imap-connection',
+        cid: options.cid
+    });
+    // Raw socket data is logged at trace level, so asking for it lowers the threshold
+    if (options.logRaw) {
+        child.level = 'trace';
+    }
+    return child;
+}

package/node_modules/imapflow/dist/esm/package-info.d.ts

@@ -1,3 +1,3 @@
 export declare const name = "imapflow";
-export declare const version = "2.0.7";
+export declare const version = "2.1.2";
 export declare const homepage = "https://imapflow.com/";

package/node_modules/imapflow/dist/esm/package-info.js

@@ -1,4 +1,4 @@
 // Generated by scripts/build.js from package.json. Do not edit by hand.
-export const name = 'imapflow';
-export const version = '2.0.7';
-export const homepage = 'https://imapflow.com/';
+export const name = "imapflow";
+export const version = "2.1.2";
+export const homepage = "https://imapflow.com/";

package/node_modules/imapflow/dist/esm/search-compiler.d.ts

@@ -9,7 +9,7 @@ export type SearchAttribute = ImapAttributeNode | SearchAttribute[];
  * Compiles a JavaScript object query into IMAP search command attributes.
  * Supports standard IMAP search criteria and extensions like OBJECTID and Gmail extensions.
  *
- * @param connection - IMAP connection object (capabilities, enabled extensions and the current mailbox are read)
+ * @param connection - IMAP connection object (capabilities and enabled extensions are read)
  * @param query - Search query object
  * @returns Array of IMAP search attributes
  * @throws {Error} When required server extensions are not available

package/node_modules/imapflow/dist/esm/search-compiler.js

@@ -1,5 +1,5 @@
 /* eslint no-control-regex:0 */
-import { formatDate, formatFlag, canUseFlag, toValidDate, isRev2Active } from './tools.js';
+import { formatDate, formatFlag, toValidDate, isRev2Active } from './tools.js';
 /**
  * Sets a boolean flag in the IMAP search attributes.
  * Automatically handles UN- prefixing for falsy values.
@@ -88,6 +88,17 @@ let processDateField = (attributes, term, value) => {
 };
 // Pre-compiled regex for better performance
 const UNICODE_PATTERN = /[^\x00-\x7F]/;
+/**
+ * Throws a coded search compilation error.
+ *
+ * @param code - Error code, one of the ImapFlowErrorCode values
+ * @param message - Error message
+ */
+let fail = (code, message) => {
+    let error = new Error(message);
+    error.code = code;
+    throw error;
+};
 /**
  * Checks if a string contains Unicode characters.
  * Used to determine if CHARSET UTF-8 needs to be specified.
@@ -107,7 +118,7 @@ let isUnicodeString = (str) => {
  * Compiles a JavaScript object query into IMAP search command attributes.
  * Supports standard IMAP search criteria and extensions like OBJECTID and Gmail extensions.
  *
- * @param connection - IMAP connection object (capabilities, enabled extensions and the current mailbox are read)
+ * @param connection - IMAP connection object (capabilities and enabled extensions are read)
  * @param query - Search query object
  * @returns Array of IMAP search attributes
  * @throws {Error} When required server extensions are not available
@@ -133,21 +144,29 @@ export const searchCompiler = (connection, query) => {
     const attributes = [];
     // Track if we need to specify UTF-8 charset
     let hasUnicode = false;
-    const mailbox = connection.mailbox;
     /**
      * Recursively walks through the query object and builds IMAP attributes.
      * @param params - Query parameters to process
      */
     const walk = (params) => {
-        // Walks a query object and wraps the resulting attributes in a
-        // sub-array so the IMAP compiler emits parentheses around them.
-        // Used when a single search-key is required (NOT, OR operands)
-        // but the condition has multiple keys (RFC 3501 Section 6.4.4).
-        let walkGrouped = (obj) => {
+        // Compiles one NOT or OR operand, which the caller has already put its operator in
+        // front of. An operand with several keys is wrapped in a sub-array so the IMAP compiler
+        // emits parentheses around it, as the operator takes a single search-key
+        // (RFC 3501 Section 6.4.4). An operand that compiles to nothing (an invalid date, an
+        // empty object, ...) is refused: the operator would otherwise bind to whatever
+        // criterion follows it and invert or widen the search.
+        let walkOperand = (operator, obj) => {
             let startIdx = attributes.length;
-            walk(obj);
-            let subAttrs = attributes.splice(startIdx);
-            attributes.push(subAttrs);
+            if (obj && typeof obj === 'object') {
+                walk(obj);
+            }
+            if (attributes.length === startIdx) {
+                fail('InvalidSearchQuery', `Search operand for ${operator} does not include any usable search criteria`);
+            }
+            if (Object.keys(obj).length > 1) {
+                let subAttrs = attributes.splice(startIdx);
+                attributes.push(subAttrs);
+            }
         };
         Object.keys(params || {}).forEach(term => {
             switch (term.toUpperCase()) {
@@ -193,9 +212,7 @@ export const searchCompiler = (connection, query) => {
                         // reject the whole search with a tagged BAD, so fail with a
                         // descriptive error instead
                         if (isRev2Active(connection)) {
-                            let error = new Error(`The "${term.toLowerCase()}" search key does not exist in IMAP4rev2`);
-                            error.code = 'MissingServerExtension';
-                            throw error;
+                            fail('MissingServerExtension', `The "${term.toLowerCase()}" search key does not exist in IMAP4rev2`);
                         }
                         setBoolOpt(attributes, term, true);
                     }
@@ -241,6 +258,11 @@ export const searchCompiler = (connection, query) => {
                         // Fallback to Gmail message ID
                         setOpt(attributes, 'X-GM-MSGID', params[term]);
                     }
+                    else if (params[term]) {
+                        // Dropping the criterion would widen the search to every message
+                        // matching the rest of the query, which a delete or move acts on
+                        fail('MissingServerExtension', 'Server does not support OBJECTID or X-GM-EXT-1 extension required for EMAILID');
+                    }
                     break;
                 // Thread ID support (OBJECTID or Gmail extension)
                 case 'THREADID':
@@ -251,6 +273,11 @@ export const searchCompiler = (connection, query) => {
                         // Fallback to Gmail thread ID
                         setOpt(attributes, 'X-GM-THRID', params[term]);
                     }
+                    else if (params[term]) {
+                        // Dropping the criterion would widen the search to every message
+                        // matching the rest of the query, which a delete or move acts on
+                        fail('MissingServerExtension', 'Server does not support OBJECTID or X-GM-EXT-1 extension required for THREADID');
+                    }
                     break;
                 // Gmail raw search
                 case 'GMRAW':
@@ -262,9 +289,7 @@ export const searchCompiler = (connection, query) => {
                         setOpt(attributes, 'X-GM-RAW', params[term]);
                     }
                     else {
-                        let error = new Error('Server does not support X-GM-EXT-1 extension required for X-GM-RAW');
-                        error.code = 'MissingServerExtension';
-                        throw error;
+                        fail('MissingServerExtension', 'Server does not support X-GM-EXT-1 extension required for X-GM-RAW');
                     }
                     break;
                 // Gmail label search. Compiles { has, not } into an X-GM-RAW "label:"/"-label:" query
@@ -298,9 +323,7 @@ export const searchCompiler = (connection, query) => {
                         break;
                     }
                     if (!connection.capabilities.has('X-GM-EXT-1')) {
-                        let error = new Error('Server does not support X-GM-EXT-1 extension required for label search');
-                        error.code = 'MissingServerExtension';
-                        throw error;
+                        fail('MissingServerExtension', 'Server does not support X-GM-EXT-1 extension required for label search');
                     }
                     let rawQuery = rawParts.join(' ');
                     if (isUnicodeString(rawQuery)) {
@@ -344,8 +367,10 @@ export const searchCompiler = (connection, query) => {
                 case 'UNKEYWORD':
                     {
                         let flag = formatFlag(params[term]);
-                        // Only add if flag is supported or already exists in mailbox
-                        if (canUseFlag(mailbox, flag) || mailbox.flags.has(flag)) {
+                        // Compiled even when the mailbox does not allow the keyword: the
+                        // correct answer is then the empty set, which dropping the
+                        // criterion would turn into every message matching the rest
+                        if (flag) {
                             setOpt(attributes, term, flag);
                         }
                     }
@@ -374,12 +399,7 @@ export const searchCompiler = (connection, query) => {
                 case 'NOT':
                     if (params[term] && typeof params[term] === 'object') {
                         attributes.push({ type: 'ATOM', value: 'NOT' });
-                        if (Object.keys(params[term]).length > 1) {
-                            walkGrouped(params[term]);
-                        }
-                        else {
-                            walk(params[term]);
-                        }
+                        walkOperand('NOT', params[term]);
                     }
                     break;
                 // OR operator - complex logic for building OR trees
@@ -403,21 +423,14 @@ export const searchCompiler = (connection, query) => {
                          * @returns Binary tree structure
                          */
                         let genOrTree = (list) => {
-                            let group = false;
                             let groups = [];
                             // Group items in pairs
-                            list.forEach((entry, i) => {
-                                if (i % 2 === 0) {
-                                    group = [entry];
-                                }
-                                else {
-                                    group.push(entry);
-                                    groups.push(group);
-                                    group = false;
-                                }
-                            });
+                            for (let i = 0; i + 1 < list.length; i += 2) {
+                                groups.push([list[i], list[i + 1]]);
+                            }
                             // Handle odd number of items
-                            if (group && group.length) {
+                            if (list.length % 2) {
+                                let group = [list[list.length - 1]];
                                 while (group.length === 1 && Array.isArray(group[0])) {
                                     group = group[0];
                                 }
@@ -445,14 +458,7 @@ export const searchCompiler = (connection, query) => {
                                 entry.forEach(walkOrTree);
                                 return;
                             }
-                            if (entry && typeof entry === 'object') {
-                                if (Object.keys(entry).length > 1) {
-                                    walkGrouped(entry);
-                                }
-                                else {
-                                    walk(entry);
-                                }
-                            }
+                            walkOperand('OR', entry);
                         };
                         walkOrTree(genOrTree(params[term]));
                     }

package/node_modules/imapflow/dist/esm/tools.d.ts

@@ -1,8 +1,8 @@
 import type { Transform } from 'node:stream';
 import type { ImapFlow } from './imap-flow.js';
-import type { ConnectionErrorSite, ImapFlowError } from './errors.js';
+import { type ConnectionErrorSite, type ImapFlowError } from './errors.js';
 import type { ImapAttributeList, ImapAttributeNode, ImapResponse } from './handler/types.js';
-import type { FetchMessageObject, ListResponse, ListTreeResponse, MailboxObject, MessageEnvelopeObject, MessageStructureObject, StatusQuery } from './types.js';
+import type { FetchMessageObject, ListResponse, ListTreeResponse, MailboxObject, MessageEnvelopeObject, MessageStructureObject, ImapFlowEvents, StatusQuery } from './types.js';
 export { AuthenticationFailure } from './errors.js';
 export declare const EXPANDED_RANGE_LIMIT = 16777216;
 export declare const MAX_UINT32_DIGITS = 10;
@@ -80,6 +80,13 @@ export declare function guardedPromise<T>(executor: (resolve: (value: T | Promis
  * @returns Rejected promise, with its rejection already observed
  */
 export declare function guardedReject(error: Error): Promise<never>;
+/**
+ * Clears a timer that may already have been dropped. `clearTimeout()` accepts undefined but not
+ * null, and the connection nulls its timer fields once cleared, so every site clears through here.
+ *
+ * @param timer - Timer handle returned by setTimeout, or null/undefined when none is armed
+ */
+export declare function clearTimer(timer: NodeJS.Timeout | null | undefined): void;
 /**
  * Detaches a background timer from the event loop, so it cannot keep the process alive on its
  * own. Applied to every background timer (auto-IDLE, IDLE restart, fallback polling, throttle
@@ -89,13 +96,6 @@ export declare function guardedReject(error: Error): Promise<never>;
  * @param timer - Timer handle returned by setTimeout
  * @returns The same timer handle
  */
-/**
- * Clears a timer that may already have been dropped. `clearTimeout()` accepts undefined but not
- * null, and the connection nulls its timer fields once cleared, so every site clears through here.
- *
- * @param timer - Timer handle returned by setTimeout, or null/undefined when none is armed
- */
-export declare function clearTimer(timer: NodeJS.Timeout | null | undefined): void;
 export declare function unrefTimer<T extends NodeJS.Timeout | null | undefined>(timer: T): T;
 /**
  * Logs a failure from background connection work at the level its cause deserves.
@@ -200,6 +200,25 @@ export declare function updateCapabilities(list: ImapAttributeList | null | unde
  * @returns Uppercase status code string, or false if not found
  */
 export declare function getStatusCode(response: ImapResponse | string | false | undefined): string | false;
+/**
+ * Emits a state-change event from inside the command pipeline. A listener that throws must not
+ * abort the code that emitted it: select() emits before it releases the response, so the throw
+ * would leave the reader loop waiting forever, and close() would never get to emit 'close'. The
+ * error is logged instead, the same contract untagged handlers and the 'response' event get.
+ *
+ * @param connection - IMAP connection instance
+ * @param event - Event name
+ * @param args - Event arguments
+ */
+export declare function emitSafe<K extends keyof ImapFlowEvents>(connection: ImapFlow, event: K, ...args: ImapFlowEvents[K]): void;
+/**
+ * Collects the values of the TEXT tokens of a parsed response (the human-readable
+ * part of a status response, a greeting or a BYE).
+ *
+ * @param attributes - Attributes of a parsed IMAP response
+ * @returns Values of the TEXT tokens, in order
+ */
+export declare function getTextValues(attributes: ImapAttributeList | undefined): string[];
 /**
  * Compiles an IMAP response object back into a human-readable string.
  *
@@ -214,6 +233,28 @@ export declare function getErrorText(response: ImapResponse | string | false | u
  * @returns The enhanced error with `serverResponseCode` and string `response`
  */
 export declare function enhanceCommandError(err: ImapFlowError): Promise<ImapFlowError>;
+/**
+ * Enhances a failed command's error (see enhanceCommandError()) and logs it, the shared first
+ * step of every command's failure path. The caller decides whether to throw or return.
+ *
+ * @param connection - IMAP connection instance
+ * @param err - The command error
+ */
+export declare function reportCommandError(connection: ImapFlow, err: ImapFlowError): Promise<void>;
+/**
+ * Whether the session is authenticated, that is in the AUTHENTICATED or SELECTED state, which
+ * every mailbox-level command requires.
+ *
+ * @param connection - IMAP connection instance
+ */
+export declare function isAuthenticatedState(connection: ImapFlow): boolean;
+/**
+ * Returns the selected mailbox, or false when the connection is not in the SELECTED state.
+ * Message-level commands use it as their precondition, which also narrows the mailbox type.
+ *
+ * @param connection - IMAP connection instance
+ */
+export declare function getSelectedMailbox(connection: ImapFlow): MailboxObject | false;
 /**
  * Converts a flat list of mailbox folders into a tree structure.
  *
@@ -305,14 +346,14 @@ export declare function toValidDate(value: unknown): Date | null;
  * @param value - Date to format
  * @returns Formatted date string, or undefined if invalid
  */
-export declare function formatDate(value: Date | string | null | undefined): string | undefined;
+export declare function formatDate(value: unknown): string | undefined;
 /**
  * Formats a date value into IMAP date-time format (DD-Mon-YYYY HH:MM:SS +0000).
  *
  * @param value - Date to format
  * @returns Formatted date-time string, or undefined if invalid
  */
-export declare function formatDateTime(value: Date | string | null | undefined): string | undefined;
+export declare function formatDateTime(value: unknown): string | undefined;
 /**
  * Normalizes a flag string. Returns false for non-settable flags (e.g. \Recent),
  * and capitalizes system flags properly.

package/node_modules/imapflow/dist/esm/tools.js

@@ -5,10 +5,11 @@ import { compiler } from './handler/imap-handler.js';
 import { createHash } from 'node:crypto';
 import { JPDecoder } from './jp-decoder.js';
 import iconv from 'iconv-lite';
+import { ImapFlowErrorCode } from './errors.js';
 export { AuthenticationFailure } from './errors.js';
 const FLAG_COLORS = ['red', 'orange', 'yellow', 'green', 'blue', 'purple', 'grey'];
 // Error codes that only mean the connection is no longer usable. See logConnectionError().
-const CONNECTION_GONE_CODES = new Set(['NoConnection', 'EConnectionClosed', 'StateLogout']);
+const CONNECTION_GONE_CODES = new Set([ImapFlowErrorCode.NoConnection, ImapFlowErrorCode.EConnectionClosed, ImapFlowErrorCode.StateLogout]);
 // Upper bound for expanding server-supplied sequence ranges (see expandRange). 2^24
 // entries in total is far beyond any legitimate mailbox while keeping the worst-case
 // expansion of a hostile range set bounded.
@@ -158,15 +159,6 @@ export function guardedReject(error) {
     promise.catch(noop);
     return promise;
 }
-/**
- * Detaches a background timer from the event loop, so it cannot keep the process alive on its
- * own. Applied to every background timer (auto-IDLE, IDLE restart, fallback polling, throttle
- * back-off, held-lock diagnostics); connection and greeting deadlines are deliberately left
- * attached, because a caller is waiting for connect() to settle.
- *
- * @param timer - Timer handle returned by setTimeout
- * @returns The same timer handle
- */
 /**
  * Clears a timer that may already have been dropped. `clearTimeout()` accepts undefined but not
  * null, and the connection nulls its timer fields once cleared, so every site clears through here.
@@ -178,6 +170,15 @@ export function clearTimer(timer) {
         clearTimeout(timer);
     }
 }
+/**
+ * Detaches a background timer from the event loop, so it cannot keep the process alive on its
+ * own. Applied to every background timer (auto-IDLE, IDLE restart, fallback polling, throttle
+ * back-off, held-lock diagnostics); connection and greeting deadlines are deliberately left
+ * attached, because a caller is waiting for connect() to settle.
+ *
+ * @param timer - Timer handle returned by setTimeout
+ * @returns The same timer handle
+ */
 export function unrefTimer(timer) {
     /* c8 ignore next 3 */ // node timers always expose unref(); the guard covers replaced globals in tests
     if (timer && typeof timer.unref === 'function') {
@@ -393,7 +394,7 @@ export function updateCapabilities(list) {
             }
             if (capability.startsWith('APPENDLIMIT=')) {
                 let splitPos = capability.indexOf('=');
-                map.set('APPENDLIMIT', parseUintValue(capability.substr(splitPos + 1)) || 0);
+                map.set('APPENDLIMIT', parseUintValue(capability.slice(splitPos + 1)) || 0);
                 return;
             }
             map.set(capability, true);
@@ -419,6 +420,34 @@ export function getStatusCode(response) {
         ? response.attributes[0].section[0].value.toUpperCase().trim()
         : false;
 }
+/**
+ * Emits a state-change event from inside the command pipeline. A listener that throws must not
+ * abort the code that emitted it: select() emits before it releases the response, so the throw
+ * would leave the reader loop waiting forever, and close() would never get to emit 'close'. The
+ * error is logged instead, the same contract untagged handlers and the 'response' event get.
+ *
+ * @param connection - IMAP connection instance
+ * @param event - Event name
+ * @param args - Event arguments
+ */
+export function emitSafe(connection, event, ...args) {
+    try {
+        connection.emit(event, ...args);
+    }
+    catch (err) {
+        connection.log.warn({ msg: 'Event listener failed', event, err, cid: connection.id });
+    }
+}
+/**
+ * Collects the values of the TEXT tokens of a parsed response (the human-readable
+ * part of a status response, a greeting or a BYE).
+ *
+ * @param attributes - Attributes of a parsed IMAP response
+ * @returns Values of the TEXT tokens, in order
+ */
+export function getTextValues(attributes) {
+    return (attributes || []).filter(attr => attr?.type === 'TEXT').map(attr => String(attr?.value ?? ''));
+}
 /**
  * Compiles an IMAP response object back into a human-readable string.
  *
@@ -456,6 +485,35 @@ export async function enhanceCommandError(err) {
     err.response = await getErrorText(err.response);
     return err;
 }
+/**
+ * Enhances a failed command's error (see enhanceCommandError()) and logs it, the shared first
+ * step of every command's failure path. The caller decides whether to throw or return.
+ *
+ * @param connection - IMAP connection instance
+ * @param err - The command error
+ */
+export async function reportCommandError(connection, err) {
+    await enhanceCommandError(err);
+    connection.log.warn({ err, cid: connection.id });
+}
+/**
+ * Whether the session is authenticated, that is in the AUTHENTICATED or SELECTED state, which
+ * every mailbox-level command requires.
+ *
+ * @param connection - IMAP connection instance
+ */
+export function isAuthenticatedState(connection) {
+    return connection.state === connection.states.AUTHENTICATED || connection.state === connection.states.SELECTED;
+}
+/**
+ * Returns the selected mailbox, or false when the connection is not in the SELECTED state.
+ * Message-level commands use it as their precondition, which also narrows the mailbox type.
+ *
+ * @param connection - IMAP connection instance
+ */
+export function getSelectedMailbox(connection) {
+    return connection.state === connection.states.SELECTED && connection.mailbox ? connection.mailbox : false;
+}
 /**
  * Converts a flat list of mailbox folders into a tree structure.
  *
@@ -703,11 +761,18 @@ export async function formatMessageResponse(untagged, mailbox) {
             case 'flags':
                 map.flags = new Set(getArray(attribute));
                 break;
+            // A server with nothing to report can answer ENVELOPE NIL or BODYSTRUCTURE NIL.
+            // The field is left unset then: parsing NIL threw, and the whole message
+            // disappeared from the FETCH result.
             case 'envelope':
-                map.envelope = parseEnvelope(attribute);
+                if (Array.isArray(attribute)) {
+                    map.envelope = parseEnvelope(attribute);
+                }
                 break;
             case 'bodystructure':
-                map.bodyStructure = parseBodystructure(attribute);
+                if (Array.isArray(attribute)) {
+                    map.bodyStructure = parseBodystructure(attribute);
+                }
                 break;
             case 'internaldate': {
                 let value = getString(attribute);
@@ -943,7 +1008,7 @@ export function getStructuredParams(arr) {
             // nothing to do here, does not seem like a continuation param
             return;
         }
-        actualKey = key.substr(0, match.index).toLowerCase();
+        actualKey = key.substring(0, match.index).toLowerCase();
         nr = Number(match[2]) || 0;
         if (isUnsafeKey(actualKey)) {
             // A continuation key like "__proto__*0*" would group under "__proto__":
@@ -1035,7 +1100,7 @@ export function parseBodystructure(entry) {
             curNode.type = 'multipart/' + ((node[i++] || {}).value || '').toString().toLowerCase();
             // extension data (not available for BODY requests)
             // body parameter parenthesized list
-            if (i < node.length - 1) {
+            if (i < node.length) {
                 if (node[i]) {
                     curNode.parameters = getStructuredParams(node[i]);
                 }
@@ -1117,7 +1182,7 @@ export function parseBodystructure(entry) {
             }
             // extension data (not available for BODY requests)
             // md5
-            if (i < node.length - 1) {
+            if (i < node.length) {
                 if (node[i]) {
                     curNode.md5 = (node[i].value || '').toString().toLowerCase();
                 }
@@ -1127,7 +1192,7 @@ export function parseBodystructure(entry) {
         // the following are shared extension values (for both multipart and non-multipart parts)
         // not available for BODY requests
         // body disposition
-        if (i < node.length - 1) {
+        if (i < node.length) {
             let disposition = node[i];
             if (Array.isArray(disposition) && disposition.length) {
                 curNode.disposition = ((disposition[0] && disposition[0].value) || '').toString().toLowerCase();
@@ -1138,7 +1203,7 @@ export function parseBodystructure(entry) {
             i++;
         }
         // body language
-        if (i < node.length - 1) {
+        if (i < node.length) {
             if (node[i]) {
                 /* c8 ignore next */ // node[i] is truthy inside this guard, so the [] fallback is unreachable
                 curNode.language = [].concat(node[i] || []).map(val => ((val && val.value) || '').toString().toLowerCase());
@@ -1148,7 +1213,7 @@ export function parseBodystructure(entry) {
         // body location
         // NB! defined as a "string list" in RFC3501 but replaced in errata document with "string"
         // Errata: http://www.rfc-editor.org/errata_search.php?rfc=3501
-        if (i < node.length - 1) {
+        if (i < node.length) {
             if (node[i]) {
                 curNode.location = (node[i].value || '').toString();
             }
@@ -1195,7 +1260,7 @@ export function formatDate(value) {
     if (!date) {
         return;
     }
-    let dateParts = date.toISOString().substr(0, 10).split('-');
+    let dateParts = date.toISOString().substring(0, 10).split('-');
     dateParts.reverse();
     let months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
     dateParts[1] = months[Number(dateParts[1]) - 1];
@@ -1213,7 +1278,7 @@ export function formatDateTime(value) {
         return;
     }
     let dateStr = formatDate(date).replace(/^0/, ' '); //starts with date-day-fixed with leading 0 replaced by SP
-    let timeStr = date.toISOString().substr(11, 8);
+    let timeStr = date.toISOString().substring(11, 19);
     return `${dateStr} ${timeStr} +0000`;
 }
 /**
@@ -1367,8 +1432,8 @@ export function expandRange(range) {
             }
             continue;
         }
-        let first = Number(entry.substr(0, colon));
-        let second = Number(entry.substr(colon + 1));
+        let first = Number(entry.substring(0, colon));
+        let second = Number(entry.slice(colon + 1));
         if (!isValidSequenceValue(first) || !isValidSequenceValue(second)) {
             continue;
         }