@homebridge-eufy-security/eufy-security-client 3.8.0-dev.7 → 3.8.0-dev.8

package/build/p2p/adts.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Normalize a buffer of ADTS audio data by scanning for ADTS frames and splitting
+ * any multi-RDB frames into individual single-RDB frames.
+ *
+ * The input buffer may contain one or more concatenated ADTS frames.  Non-ADTS
+ * data (or data without a valid sync word) is returned unchanged in a
+ * single-element array.
+ *
+ * For the common case of a single-RDB frame, no allocation occurs — the original
+ * buffer region is returned via subarray.
+ */
+export declare function normalizeAdtsFrames(data: Buffer): Buffer[];

package/build/p2p/adts.js

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeAdtsFrames = normalizeAdtsFrames;
+const logging_1 = require("../logging");
+// ADTS header: 7 bytes (protection_absent=1) or 9 bytes (protection_absent=0).
+// Byte 6 bits 0-1: number_of_raw_data_blocks_in_frame (0 = 1 RDB, 3 = 4 RDBs).
+// Multi-RDB frames pack several AAC raw data blocks into one ADTS frame.
+// Most decoders (including FFmpeg's native aac) only support single-RDB frames,
+// so we split multi-RDB frames into individual single-RDB ADTS frames.
+const ADTS_SYNC_WORD = 0xfff;
+const ADTS_MIN_HEADER_SIZE = 7;
+/**
+ * Returns true when the first two bytes contain an ADTS sync word (0xFFF).
+ */
+function hasAdtsSyncWord(buf, offset) {
+    if (offset + 1 >= buf.length)
+        return false;
+    return ((buf[offset] << 4) | (buf[offset + 1] >> 4)) === ADTS_SYNC_WORD;
+}
+/**
+ * Extract the 13-bit frame_length field from an ADTS header starting at `offset`.
+ * frame_length includes the header itself.
+ */
+function getFrameLength(buf, offset) {
+    return ((buf[offset + 3] & 0x03) << 11) | (buf[offset + 4] << 3) | ((buf[offset + 5] >> 5) & 0x07);
+}
+/**
+ * Extract the 2-bit number_of_raw_data_blocks_in_frame field (0-indexed, so actual
+ * count is value + 1).
+ */
+function getNumRawDataBlocks(buf, offset) {
+    return buf[offset + 6] & 0x03;
+}
+/**
+ * Returns true when `protection_absent` is 0 (CRC present).
+ */
+function hasCrc(buf, offset) {
+    return (buf[offset + 1] & 0x01) === 0;
+}
+/**
+ * Build a single-RDB ADTS frame by prepending a rewritten 7-byte header (without
+ * CRC) to a raw data block.  The template header is cloned from the original
+ * multi-RDB frame and patched:
+ *   - frame_length   → 7 + rdbData.length
+ *   - num_rdb        → 0 (meaning 1 block)
+ *   - protection_absent → 1 (no CRC, since we don't recompute it)
+ */
+function buildSingleRdbFrame(templateHeader, headerOffset, rdbData) {
+    const newLen = ADTS_MIN_HEADER_SIZE + rdbData.length;
+    const out = Buffer.allocUnsafe(newLen);
+    // Copy the 7-byte header template.
+    templateHeader.copy(out, 0, headerOffset, headerOffset + ADTS_MIN_HEADER_SIZE);
+    // Set protection_absent = 1 (bit 0 of byte 1).
+    out[1] |= 0x01;
+    // Rewrite frame_length (13 bits spanning bytes 3-5).
+    out[3] = (out[3] & 0xfc) | ((newLen >> 11) & 0x03);
+    out[4] = (newLen >> 3) & 0xff;
+    out[5] = ((newLen & 0x07) << 5) | (out[5] & 0x1f);
+    // Set number_of_raw_data_blocks_in_frame = 0 (bits 0-1 of byte 6).
+    out[6] &= 0xfc;
+    // Append the raw data block.
+    rdbData.copy(out, ADTS_MIN_HEADER_SIZE);
+    return out;
+}
+/**
+ * Split a single multi-RDB ADTS frame into individual single-RDB frames.
+ *
+ * For multi-RDB frames the spec (ISO 14496-3 §1.A.3) places a
+ * `raw_data_block_position` table after the header (and CRC when present) that
+ * gives the byte offset of each RDB relative to the start of the first RDB.
+ *
+ * Layout:
+ *   [7-byte header]
+ *   [2-byte CRC]            ← only if protection_absent=0
+ *   [2-byte position] × (N) ← N = number_of_raw_data_blocks_in_frame (i.e. num_rdb)
+ *   [RDB 0 data ...]
+ *   [RDB 1 data ...]
+ *   ...
+ *
+ * The position entries give byte offsets relative to the start of RDB 0.
+ * RDB 0 implicitly starts at offset 0.  Position[i] gives the start of RDB i+1.
+ */
+function splitMultiRdbFrame(buf, offset, frameLength) {
+    const numRdbMinusOne = getNumRawDataBlocks(buf, offset); // 1-3
+    const numRdb = numRdbMinusOne + 1;
+    const crcPresent = hasCrc(buf, offset);
+    // Calculate where the position table starts.
+    let posTableStart = offset + ADTS_MIN_HEADER_SIZE;
+    if (crcPresent) {
+        posTableStart += 2; // skip CRC-16
+    }
+    // We need (numRdb - 1) position entries, each 2 bytes.
+    const posTableSize = (numRdb - 1) * 2;
+    const rdbDataStart = posTableStart + posTableSize;
+    if (rdbDataStart > offset + frameLength) {
+        logging_1.rootP2PLogger.warn("ADTS multi-RDB frame too short for position table", {
+            frameLength,
+            numRdb,
+            rdbDataStart: rdbDataStart - offset,
+        });
+        return [buf.subarray(offset, offset + frameLength)];
+    }
+    // Read position table: offsets relative to the start of RDB 0.
+    const rdbOffsets = [0]; // RDB 0 always starts at relative offset 0
+    for (let i = 0; i < numRdb - 1; i++) {
+        rdbOffsets.push(buf.readUInt16BE(posTableStart + i * 2));
+    }
+    const rdbSectionEnd = offset + frameLength;
+    const result = [];
+    for (let i = 0; i < numRdb; i++) {
+        const start = rdbDataStart + rdbOffsets[i];
+        const end = i < numRdb - 1 ? rdbDataStart + rdbOffsets[i + 1] : rdbSectionEnd;
+        if (start >= end || end > rdbSectionEnd) {
+            logging_1.rootP2PLogger.warn("ADTS multi-RDB frame has invalid RDB boundaries", {
+                rdbIndex: i,
+                start: start - offset,
+                end: end - offset,
+                frameLength,
+            });
+            // Return remaining data as a single frame rather than losing it.
+            if (start < rdbSectionEnd) {
+                result.push(buildSingleRdbFrame(buf, offset, buf.subarray(start, rdbSectionEnd)));
+            }
+            break;
+        }
+        result.push(buildSingleRdbFrame(buf, offset, buf.subarray(start, end)));
+    }
+    return result;
+}
+/**
+ * Normalize a buffer of ADTS audio data by scanning for ADTS frames and splitting
+ * any multi-RDB frames into individual single-RDB frames.
+ *
+ * The input buffer may contain one or more concatenated ADTS frames.  Non-ADTS
+ * data (or data without a valid sync word) is returned unchanged in a
+ * single-element array.
+ *
+ * For the common case of a single-RDB frame, no allocation occurs — the original
+ * buffer region is returned via subarray.
+ */
+function normalizeAdtsFrames(data) {
+    if (data.length < ADTS_MIN_HEADER_SIZE || !hasAdtsSyncWord(data, 0)) {
+        // Not ADTS data — return as-is.
+        return [data];
+    }
+    const result = [];
+    let pos = 0;
+    while (pos + ADTS_MIN_HEADER_SIZE <= data.length) {
+        if (!hasAdtsSyncWord(data, pos)) {
+            // Lost sync — push remaining bytes and stop.
+            logging_1.rootP2PLogger.debug("ADTS sync lost, pushing remaining bytes as-is", {
+                offset: pos,
+                remaining: data.length - pos,
+            });
+            result.push(data.subarray(pos));
+            break;
+        }
+        const frameLength = getFrameLength(data, pos);
+        if (frameLength < ADTS_MIN_HEADER_SIZE || pos + frameLength > data.length) {
+            // Incomplete or invalid frame — push remaining bytes.
+            logging_1.rootP2PLogger.debug("ADTS frame length invalid or truncated", {
+                offset: pos,
+                frameLength,
+                available: data.length - pos,
+            });
+            result.push(data.subarray(pos));
+            break;
+        }
+        const numRdbMinusOne = getNumRawDataBlocks(data, pos);
+        if (numRdbMinusOne === 0) {
+            // Single RDB — zero-copy, return subarray of original buffer.
+            result.push(data.subarray(pos, pos + frameLength));
+        }
+        else {
+            // Multi-RDB — split into individual frames.
+            const splitFrames = splitMultiRdbFrame(data, pos, frameLength);
+            for (const frame of splitFrames) {
+                result.push(frame);
+            }
+        }
+        pos += frameLength;
+    }
+    return result.length > 0 ? result : [data];
+}
+//# sourceMappingURL=adts.js.map

package/build/p2p/adts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adts.js","sourceRoot":"","sources":["../../src/p2p/adts.ts"],"names":[],"mappings":"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"}

package/build/p2p/interfaces.d.ts

@@ -149,6 +149,15 @@ export interface StreamMetadata {
     videoHeight: number;
     audioCodec: AudioCodec;
 }
+/** Configurable timeout values for P2P streaming. All values in milliseconds. */
+export interface StreamTimeoutOptions {
+    /** Max time to wait for stream data before auto-stopping. Default: 5000ms. */
+    streamDataWait?: number;
+    /** Time to wait for first audio frame before declaring no audio. Default: 650ms. */
+    audioCodecAnalyze?: number;
+    /** Max time to wait for an expected sequence number. Default: 20000ms. */
+    expectedSeqNoWait?: number;
+}
 export interface DeviceSerial {
     [index: number]: {
         sn: string;

package/build/p2p/session.d.ts

@@ -2,7 +2,7 @@ import { TypedEmitter } from "tiny-typed-emitter";
 import * as NodeRSA from "node-rsa";
 import { Address, CustomData } from "./models";
 import { CommandType, P2PDataType, P2PConnectionType } from "./types";
-import { P2PClientProtocolEvents, P2PCommand } from "./interfaces";
+import { P2PClientProtocolEvents, P2PCommand, StreamTimeoutOptions } from "./interfaces";
 import { StationListResponse } from "../http/models";
 import { HTTPApi } from "../http/api";
 export declare class P2PClientProtocol extends TypedEmitter<P2PClientProtocolEvents> {
@@ -24,6 +24,7 @@ export declare class P2PClientProtocol extends TypedEmitter<P2PClientProtocolEve
     private readonly ESD_DISCONNECT_TIMEOUT;
     private readonly MAX_STREAM_DATA_WAIT;
     private readonly RESEND_NOT_ACKNOWLEDGED_COMMAND;
+    private streamTimeouts;
     private readonly UDP_RECVBUFFERSIZE_BYTES;
     private readonly MAX_PAYLOAD_BYTES;
     private readonly MAX_PACKET_BYTES;
@@ -162,6 +163,7 @@ export declare class P2PClientProtocol extends TypedEmitter<P2PClientProtocolEve
     private emitStreamStopEvent;
     isStreaming(channel: number, datatype: P2PDataType): boolean;
     isLiveStreaming(channel: number): boolean;
+    setStreamTimeouts(options: StreamTimeoutOptions): void;
     private isCurrentlyStreaming;
     isRTSPLiveStreaming(channel: number): boolean;
     isDownloading(channel: number): boolean;

package/build/p2p/session.js

@@ -18,6 +18,7 @@ const ble_1 = require("./ble");
 const http_1 = require("../http");
 const utils_3 = require("../utils");
 const logging_1 = require("../logging");
+const adts_1 = require("./adts");
 class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
     MAX_RETRIES = 10;
     MAX_COMMAND_RESULT_WAIT = 30 * 1000;
@@ -37,6 +38,11 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
     ESD_DISCONNECT_TIMEOUT = 30 * 1000;
     MAX_STREAM_DATA_WAIT = 5 * 1000;
     RESEND_NOT_ACKNOWLEDGED_COMMAND = 100;
+    streamTimeouts = {
+        streamDataWait: this.MAX_STREAM_DATA_WAIT,
+        audioCodecAnalyze: this.AUDIO_CODEC_ANALYZE_TIMEOUT,
+        expectedSeqNoWait: this.MAX_EXPECTED_SEQNO_WAIT,
+    };
     UDP_RECVBUFFERSIZE_BYTES = 1048576;
     MAX_PAYLOAD_BYTES = 1028;
     MAX_PACKET_BYTES = 1024;
@@ -1240,7 +1246,7 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
                         this.currentMessageState[dataType].waitForSeqNoTimeout = setTimeout(() => {
                             this.endStream(dataType, true);
                             this.currentMessageState[dataType].waitForSeqNoTimeout = undefined;
-                        }, this.MAX_EXPECTED_SEQNO_WAIT);
+                        }, this.streamTimeouts.expectedSeqNoWait);
                     if (!this.currentMessageState[dataType].queuedData.get(message.seqNo)) {
                         this.currentMessageState[dataType].queuedData.set(message.seqNo, message);
                         logging_1.rootP2PLogger.trace(`Received message - DATA ${types_1.P2PDataType[message.type]} - Received not expected sequence, added to the queue for future processing`, {
@@ -1514,24 +1520,36 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
                 let return_code = 0;
                 let resultData;
                 if (message.bytesToRead > 0) {
-                    if (message.signCode > 0) {
-                        try {
-                            message.data = (0, utils_1.decryptP2PData)(message.data, this.p2pKey);
+                    if (message.signCode > 0 && message.data.length > 0) {
+                        if (message.data.length % 16 === 0) {
+                            try {
+                                message.data = (0, utils_1.decryptP2PData)(message.data, this.p2pKey);
+                            }
+                            catch (err) {
+                                const error = (0, error_1.ensureError)(err);
+                                logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - Decrypt Error`, {
+                                    error: (0, utils_3.getError)(error),
+                                    stationSN: this.rawStation.station_sn,
+                                    message: {
+                                        seqNo: message.seqNo,
+                                        channel: message.channel,
+                                        commandType: types_1.CommandType[message.commandId],
+                                        signCode: message.signCode,
+                                        type: message.type,
+                                        dataType: types_1.P2PDataType[message.dataType],
+                                        data: message.data.toString("hex"),
+                                    },
+                                });
+                            }
                         }
-                        catch (err) {
-                            const error = (0, error_1.ensureError)(err);
-                            logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - Decrypt Error`, {
-                                error: (0, utils_3.getError)(error),
+                        else {
+                            logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - Skipping decryption, data not block-aligned`, {
                                 stationSN: this.rawStation.station_sn,
-                                message: {
-                                    seqNo: message.seqNo,
-                                    channel: message.channel,
-                                    commandType: types_1.CommandType[message.commandId],
-                                    signCode: message.signCode,
-                                    type: message.type,
-                                    dataType: types_1.P2PDataType[message.dataType],
-                                    data: message.data.toString("hex"),
-                                },
+                                seqNo: message.seqNo,
+                                commandType: types_1.CommandType[message.commandId],
+                                signCode: message.signCode,
+                                dataLength: message.data.length,
+                                mod16: message.data.length % 16,
                             });
                         }
                     }
@@ -1801,9 +1819,9 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
             clearTimeout(this.currentMessageState[dataType].p2pStreamingTimeout);
         }
         this.currentMessageState[dataType].p2pStreamingTimeout = setTimeout(() => {
-            logging_1.rootP2PLogger.info(`Stopping the station stream for the device ${this.deviceSNs[this.currentMessageState[dataType].p2pStreamChannel]?.sn}, because we haven't received any data for ${this.MAX_STREAM_DATA_WAIT / 1000} seconds`);
+            logging_1.rootP2PLogger.info(`Stopping the station stream for the device ${this.deviceSNs[this.currentMessageState[dataType].p2pStreamChannel]?.sn}, because we haven't received any data for ${this.streamTimeouts.streamDataWait / 1000} seconds`);
             this.endStream(dataType, sendStopCommand);
-        }, this.MAX_STREAM_DATA_WAIT);
+        }, this.streamTimeouts.streamDataWait);
     }
     handleDataBinaryAndVideo(message) {
         if (!this.currentMessageState[message.dataType].invalidStream) {
@@ -1972,7 +1990,7 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
                                     this.currentMessageState[message.dataType].p2pStreamNotStarted) {
                                     this.emitStreamStartEvent(message.dataType);
                                 }
-                            }, this.AUDIO_CODEC_ANALYZE_TIMEOUT);
+                            }, this.streamTimeouts.audioCodecAnalyze);
                         }
                     }
                     if (this.currentMessageState[message.dataType].p2pStreamNotStarted) {
@@ -2059,7 +2077,18 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
                             this.emitStreamStartEvent(message.dataType);
                         }
                     }
-                    this.currentMessageState[message.dataType].audioStream?.push(audio_data);
+                    {
+                        const codec = this.currentMessageState[message.dataType].p2pStreamMetadata.audioCodec;
+                        const stream = this.currentMessageState[message.dataType].audioStream;
+                        if (stream && (codec === types_1.AudioCodec.AAC || codec === types_1.AudioCodec.AAC_LC)) {
+                            for (const frame of (0, adts_1.normalizeAdtsFrames)(audio_data)) {
+                                stream.push(frame);
+                            }
+                        }
+                        else {
+                            stream?.push(audio_data);
+                        }
+                    }
                     break;
                 default:
                     logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - Not implemented message`, {
@@ -2433,7 +2462,7 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
                                             device_1.Device.isLockWifiT8502(this.rawStation.devices[0]?.device_type) ||
                                             device_1.Device.isLockWifiT8510P(this.rawStation.devices[0]?.device_type, this.rawStation.devices[0]?.device_sn) ||
                                             device_1.Device.isLockWifiT8520P(this.rawStation.devices[0]?.device_type, this.rawStation.devices[0]?.device_sn) ||
-                                            device_1.Device.isLockWifiT85V0(this.rawStation.devices[0]?.device_type, this.rawStation.devices[0]?.device_sn) ||
+                                            device_1.Device.isLockWifiT85V0(this.rawStation.devices[0]?.device_type) ||
                                             device_1.Device.isLockWifiT8531(this.rawStation.devices[0]?.device_type) ||
                                             device_1.Device.isLockWifiT85L0(this.rawStation.devices[0]?.device_type)) {
                                             this.emit("sequence error", message.channel, types_1.SmartLockCommand[payload.bus_type == types_1.SmartLockFunctionType.TYPE_2
@@ -3230,7 +3259,10 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
                         data: data.toString("hex"),
                         cipherID: cipherID,
                     });
-                    const encryptedKey = (0, utils_1.readNullTerminatedBuffer)(data.subarray(4));
+                    // Keep full raw buffer for ECDH — readNullTerminatedBuffer truncates binary ECIES envelopes at 0x00 bytes
+                    const rawEncryptedKey = data.subarray(4);
+                    const encryptedKey = (0, utils_1.readNullTerminatedBuffer)(rawEncryptedKey);
+                    const isECDHDevice = this.rawStation.station_sn.startsWith("T8214") || this.rawStation.station_sn.startsWith("T8425");
                     this.api
                         .getCipher(/*this.rawStation.station_sn, */ cipherID, this.rawStation.member.admin_user_id)
                         .then((cipher) => {
@@ -3242,10 +3274,49 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
                             cipher: JSON.stringify(cipher),
                         });
                         if (cipher !== undefined) {
-                            this.encryption = types_1.EncryptionType.LEVEL_2;
-                            const rsa = (0, utils_1.getRSAPrivateKey)(cipher.private_key, this.enableEmbeddedPKCS1Support);
-                            this.p2pKey = rsa.decrypt(encryptedKey);
-                            logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - CMD_GATEWAYINFO - set encryption level 2`, { stationSN: this.rawStation.station_sn, key: this.p2pKey.toString("hex") });
+                            // Try RSA first
+                            try {
+                                this.encryption = types_1.EncryptionType.LEVEL_2;
+                                const rsa = (0, utils_1.getRSAPrivateKey)(cipher.private_key, this.enableEmbeddedPKCS1Support);
+                                this.p2pKey = rsa.decrypt(encryptedKey);
+                                logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - CMD_GATEWAYINFO - RSA success - set encryption level 2`, { stationSN: this.rawStation.station_sn, key: this.p2pKey.toString("hex") });
+                            }
+                            catch (rsaErr) {
+                                const rsaError = (0, error_1.ensureError)(rsaErr);
+                                logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - CMD_GATEWAYINFO - RSA decrypt failed`, {
+                                    error: (0, utils_3.getError)(rsaError),
+                                    stationSN: this.rawStation.station_sn,
+                                    isECDHDevice: isECDHDevice,
+                                    hasEccKey: !!cipher.ecc_private_key,
+                                });
+                                // Try ECDH only for known ECDH devices (T8214/T8425)
+                                if (isECDHDevice && cipher.ecc_private_key) {
+                                    try {
+                                        this.encryption = types_1.EncryptionType.LEVEL_2;
+                                        this.p2pKey = (0, utils_1.decryptP2PKeyECDH)(rawEncryptedKey, cipher.ecc_private_key);
+                                        logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - CMD_GATEWAYINFO - ECDH success - set encryption level 2`, {
+                                            stationSN: this.rawStation.station_sn,
+                                            key: this.p2pKey.toString("hex"),
+                                            keyLength: this.p2pKey.length,
+                                        });
+                                    }
+                                    catch (ecdhErr) {
+                                        const ecdhError = (0, error_1.ensureError)(ecdhErr);
+                                        logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - CMD_GATEWAYINFO - ECDH also failed, falling back to Level 1`, {
+                                            error: (0, utils_3.getError)(ecdhError),
+                                            stationSN: this.rawStation.station_sn,
+                                        });
+                                        this.encryption = types_1.EncryptionType.LEVEL_1;
+                                        this.p2pKey = Buffer.from((0, utils_1.getP2PCommandEncryptionKey)(this.rawStation.station_sn, this.rawStation.p2p_did));
+                                    }
+                                }
+                                else {
+                                    // Non-ECDH device or no ECC key — fall back to Level 1
+                                    this.encryption = types_1.EncryptionType.LEVEL_1;
+                                    this.p2pKey = Buffer.from((0, utils_1.getP2PCommandEncryptionKey)(this.rawStation.station_sn, this.rawStation.p2p_did));
+                                    logging_1.rootP2PLogger.debug(`Handle DATA ${types_1.P2PDataType[message.dataType]} - CMD_GATEWAYINFO - RSA failed, set encryption level 1`, { stationSN: this.rawStation.station_sn, key: this.p2pKey.toString("hex") });
+                                }
+                            }
                         }
                         else {
                             this.encryption = types_1.EncryptionType.LEVEL_1;
@@ -3537,6 +3608,9 @@ class P2PClientProtocol extends tiny_typed_emitter_1.TypedEmitter {
     isLiveStreaming(channel) {
         return this.isStreaming(channel, types_1.P2PDataType.VIDEO);
     }
+    setStreamTimeouts(options) {
+        this.streamTimeouts = { ...this.streamTimeouts, ...options };
+    }
     isCurrentlyStreaming() {
         for (const element of Object.values(this.currentMessageState)) {
             if (element.p2pStreaming || element.p2pTalkback)