@lineageos-infra/libmjolnir 0.6.1 → 0.6.2

package/dist/index.d.ts

@@ -100,6 +100,12 @@ declare class InboundPacket extends BasePacket {
 }
 //#endregion
 //#region src/packets/outbound/OutboundPacket.d.ts
+declare enum EmptySendKind {
+  None = 0,
+  Before = 1,
+  After = 2,
+  BeforeAndAfter = 3
+}
 declare class OutboundPacket extends BasePacket {
   constructor(size: number);
   packInteger(offset: number, value: number): void;
@@ -231,7 +237,7 @@ declare class OdinDevice {
    */
   sendLz4File(fileData: Uint8Array, binaryType: EntryBinaryType, deviceType: number, fileIdentifier: number): Promise<void>;
   _sendFileSequence(sequenceData: Uint8Array, endByteCount: number, binaryType: EntryBinaryType, deviceType: number, fileIdentifier: number, isLastSequence: boolean, lz4: boolean): Promise<void>;
-  sendPacket(packet: OutboundPacket, timeout?: number): Promise<void>;
+  sendPacket(packet: OutboundPacket, emptySendKind?: EmptySendKind, timeout?: number): Promise<void>;
   receivePacket<T extends InboundPacket>(Packet: {
     new (): T;
   }, timeout?: number, size?: number): Promise<T>;

package/dist/index.js

@@ -901,7 +901,7 @@ function* lz4Sequences(data, header, maxSequenceDecompressedSize) {
 //#endregion
 //#region src/OdinDevice.ts
 const BEGIN_SESSION_DELAY = 3e3;
-const EMPTY_RECEIVE_TIMEOUT = 100;
+const EMPTY_TRANSFER_TIMEOUT = 100;
 const DEFAULT_DEVICE_OPTIONS = {
 	logging: false,
 	timeout: 5e3,
@@ -1157,25 +1157,28 @@ var OdinDevice = class {
 		}
 	}
 	async _sendFileSequence(sequenceData, endByteCount, binaryType, deviceType, fileIdentifier, isLastSequence, lz4) {
-		await this.sendPacket(new FlashPartFileTransferPacket(sequenceData.length, lz4), this._flashTimeout);
+		await this.sendPacket(new FlashPartFileTransferPacket(sequenceData.length, lz4), void 0, this._flashTimeout);
 		await this.receivePacket(FileTransferResponse, this._flashTimeout);
 		const partCount = Math.ceil(sequenceData.length / this._flashPacketSize);
 		for (let filePartIndex = 0; filePartIndex < partCount; filePartIndex++) {
 			this._log("info", `sending part ${filePartIndex + 1} of ${partCount}`);
 			const startOffset = filePartIndex * this._flashPacketSize;
 			const partData = sequenceData.slice(startOffset, startOffset + this._flashPacketSize);
-			await this.sendPacket(new SendFilePartPacket(partData, this._flashPacketSize), this._flashTimeout);
+			await this.sendPacket(new SendFilePartPacket(partData, this._flashPacketSize), filePartIndex === 0 ? 0 : 1, this._flashTimeout);
 			const receivedPartIndex = (await this.receivePacket(SendFilePartResponse, this._flashTimeout)).partIndex;
 			if (receivedPartIndex !== filePartIndex) throw new Error(`Expected file part index: ${filePartIndex} Received: ${receivedPartIndex}`);
 		}
 		const endPacket = binaryType === 1 ? new EndModemFileTransferPacket(endByteCount, binaryType, deviceType, isLastSequence, lz4) : new EndPhoneFileTransferPacket(endByteCount, binaryType, deviceType, fileIdentifier, isLastSequence, lz4);
-		await this.sendPacket(endPacket, this._flashTimeout);
+		await this.sendPacket(endPacket, 3, this._flashTimeout);
 		await this.receivePacket(FileTransferResponse, this._flashTimeout);
 	}
-	async sendPacket(packet, timeout) {
+	async sendPacket(packet, emptySendKind, timeout) {
 		packet.pack();
 		this._log("debug", "sending", packet);
+		if (emptySendKind === void 0) emptySendKind = 2;
+		if ((emptySendKind & 1) !== 0) await this.transport.send(new Uint8Array(), EMPTY_TRANSFER_TIMEOUT).catch(() => {});
 		await this.transport.send(packet.data, timeout ?? this.deviceOptions.timeout);
+		if ((emptySendKind & 2) !== 0) await this.transport.send(new Uint8Array(), EMPTY_TRANSFER_TIMEOUT).catch(() => {});
 		this._log("debug", "sendPacket sent", packet);
 	}
 	async receivePacket(Packet, timeout, size) {
@@ -1189,7 +1192,7 @@ var OdinDevice = class {
 		return packet;
 	}
 	async _emptyReceive(timeout) {
-		await this.transport.emptyReceive(1024, timeout ?? EMPTY_RECEIVE_TIMEOUT);
+		await this.transport.emptyReceive(1024, timeout ?? EMPTY_TRANSFER_TIMEOUT);
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lineageos-infra/libmjolnir",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "WebUSB library for communicating with Samsung devices in Download Mode",
   "type": "module",
   "main": "dist/index.js",