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

feat(log): format log entry like native binary

Browse source
This commit is contained in:
Simon Chan 2022-07-14 13:53:25 +08:00
parent 2621f83ccb
commit db079b4292
No known key found for this signature in database
GPG key ID: A8B69F750B9BCEDD
6 changed files with 157 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

53
libraries/android-bin/src/logcat.ts
View file

@ -25,6 +25,7 @@ export enum AndroidLogPriority {
Unknown,
Default,
Verbose,
Debug,
Info,
Warn,
Error,
@ -32,6 +33,41 @@ export enum AndroidLogPriority {
Silent,
}
// https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/logprint.cpp;l=140;drc=8dbf3b2bb6b6d1652d9797e477b9abd03278bb79
export const AndroidLogPriorityToCharacter: Record<AndroidLogPriority, string> = {
[AndroidLogPriority.Unknown]: '?',
[AndroidLogPriority.Default]: '?',
[AndroidLogPriority.Verbose]: 'V',
[AndroidLogPriority.Debug]: 'D',
[AndroidLogPriority.Info]: 'I',
[AndroidLogPriority.Warn]: 'W',
[AndroidLogPriority.Error]: 'E',
[AndroidLogPriority.Fatal]: 'F',
[AndroidLogPriority.Silent]: 'S',
};
export enum LogcatFormat {
Brief,
Process,
Tag,
Thread,
Raw,
Time,
ThreadTime,
Long
}
export interface LogcatFormatModifiers {
usec?: boolean;
printable?: boolean;
year?: boolean;
zone?: boolean;
epoch?: boolean;
monotonic?: boolean;
uid?: boolean;
descriptive?: boolean;
}
export interface LogcatOptions {
pid?: number;
ids?: LogId[];
@ -65,6 +101,21 @@ export interface AndroidLogEntry extends LoggerEntry {
message: string;
}
// https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/logprint.cpp;l=1415;drc=8dbf3b2bb6b6d1652d9797e477b9abd03278bb79
export function formatAndroidLogEntry(
entry: AndroidLogEntry,
format: LogcatFormat = LogcatFormat.Brief,
modifier?: LogcatFormatModifiers
) {
const uid = modifier?.uid ? `${entry.uid.toString().padStart(5)}:` : '';
switch (format) {
// TODO: implement other formats
default:
return `${AndroidLogPriorityToCharacter[entry.priority]}/${entry.tag.padEnd(8)}(${uid}${entry.pid.toString().padStart(5)}): ${entry.message}`;
}
}
function findTagEnd(payload: Uint8Array) {
for (const separator of [0, ' '.charCodeAt(0), ':'.charCodeAt(0)]) {
const index = payload.indexOf(separator);
@ -200,6 +251,6 @@ export class Logcat extends AdbCommandBase {
return stdout;
}).pipeThrough(new BufferedTransformStream(stream => {
return deserializeAndroidLogEntry(stream);
}))
}));
}
}