yetangitu/ya-webadb
1
0
Fork 0
mirror of https://github.com/yume-chan/ya-webadb.git synced 2025-10-05 02:39:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: remove AdbLogger

Browse source
This commit is contained in:
Simon Chan 2022-03-05 04:55:39 +08:00
parent 3322e643d6
commit b287340ac9
No known key found for this signature in database
GPG key ID: A8B69F750B9BCEDD
11 changed files with 54 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libraries/adb/src/adb.ts
View file

@ -3,7 +3,7 @@ import { AdbAuthenticationHandler, AdbCredentialStore, AdbDefaultAuthenticators
import { AdbFrameBuffer, AdbPower, AdbReverseCommand, AdbSubprocess, AdbSync, AdbTcpIpCommand, escapeArg, framebuffer, install } from './commands';
import { AdbFeatures } from './features';
import { AdbCommand, AdbPacket, AdbPacketCore, AdbPacketInit, AdbPacketSerializeStream, calculateChecksum } from './packet';
import { AdbLogger, AdbPacketDispatcher, AdbSocket } from './socket';
import { AdbPacketDispatcher, AdbSocket } from './socket';
import { AbortController, DecodeUtf8Stream, GatherStringStream, pipeFrom, ReadableWritablePair, StructDeserializeStream, WritableStream } from "./stream";
import { decodeUtf8, encodeUtf8 } from "./utils";
@ -40,7 +40,6 @@ export class Adb {
connection: ReadableWritablePair<AdbPacket, AdbPacketCore>,
credentialStore: AdbCredentialStore,
authenticators = AdbDefaultAuthenticators,
logger?: AdbLogger
) {
let version = 0x01000001;
let maxPayloadSize = 0x100000;
@ -71,8 +70,6 @@ export class Adb {
const pipe = connection.readable
.pipeTo(new WritableStream({
async write(packet: AdbPacket) {
logger?.onIncomingPacket?.(packet);
switch (packet.command) {
case AdbCommand.Connect:
version = Math.min(version, packet.arg0);
@ -99,8 +96,6 @@ export class Adb {
const writer = connection.writable.getWriter();
async function sendPacket(init: AdbPacketCore) {
logger?.onOutgoingPacket?.(init);
// Always send checksum in auth steps
// Because we don't know if the device will ignore it yet.
await writer.write(calculateChecksum(init));
@ -130,7 +125,6 @@ export class Adb {
version,
maxPayloadSize,
banner,
logger
);
} finally {
abortController.abort();
@ -165,10 +159,9 @@ export class Adb {
version: number,
maxPayloadSize: number,
banner: string,
logger?: AdbLogger
) {
this.parseBanner(banner);
this.packetDispatcher = new AdbPacketDispatcher(connection, logger);
this.packetDispatcher = new AdbPacketDispatcher(connection);
this._protocolVersion = version;
if (version >= VERSION_OMIT_CHECKSUM) {