From 8f54117cf1c85c86804dbff8bb2a0e8fa5142499 Mon Sep 17 00:00:00 2001 From: auliasadil Date: Sat, 11 May 2024 06:24:49 +0700 Subject: [PATCH 1/7] Delete summary --- TypeScript/draft-01/QLog.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/TypeScript/draft-01/QLog.ts b/TypeScript/draft-01/QLog.ts index 75ca89d..fd7012a 100644 --- a/TypeScript/draft-01/QLog.ts +++ b/TypeScript/draft-01/QLog.ts @@ -6,8 +6,6 @@ export interface IQLog { qlog_version: string, title?:string, description?: string, - summary?:any, - traces: Array } From 647bde630a59c16092337f200f61bacf9bf1c30a Mon Sep 17 00:00:00 2001 From: auliasadil Date: Sat, 11 May 2024 06:25:21 +0700 Subject: [PATCH 2/7] Add qlog_format --- TypeScript/draft-01/QLog.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/TypeScript/draft-01/QLog.ts b/TypeScript/draft-01/QLog.ts index fd7012a..6692529 100644 --- a/TypeScript/draft-01/QLog.ts +++ b/TypeScript/draft-01/QLog.ts @@ -4,6 +4,7 @@ export interface IQLog { qlog_version: string, + qlog_format?: string, title?:string, description?: string, traces: Array From 59615aeabadec475f07144ff4e0866e2a32e6e9d Mon Sep 17 00:00:00 2001 From: auliasadil Date: Sat, 11 May 2024 06:28:54 +0700 Subject: [PATCH 3/7] Correct ITrace --- TypeScript/draft-01/QLog.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/TypeScript/draft-01/QLog.ts b/TypeScript/draft-01/QLog.ts index 6692529..9bf4f1c 100644 --- a/TypeScript/draft-01/QLog.ts +++ b/TypeScript/draft-01/QLog.ts @@ -18,15 +18,10 @@ export interface ITraceError { } export interface ITrace { - vantage_point: IVantagePoint, + vantage_point?: IVantagePoint, title?:string, description?: string, - - configuration?: IConfiguration, - common_fields?: ICommonFields, - event_fields: string[], - events: Array> } From b831278aa0bd29dc861803bef9245193354bddfc Mon Sep 17 00:00:00 2001 From: auliasadil Date: Sat, 11 May 2024 06:37:41 +0700 Subject: [PATCH 4/7] Disable trace.event_fields.indexOf("group_id") --- TypeScript/draft-01/util.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TypeScript/draft-01/util.ts b/TypeScript/draft-01/util.ts index 4511109..8648644 100644 --- a/TypeScript/draft-01/util.ts +++ b/TypeScript/draft-01/util.ts @@ -60,10 +60,10 @@ export class QUtil { // if there is just one, we expect there to be a "group_id" in the common_fields // if there are more, we expect "group_id" in the event_fields // if there isn't a group_id anywhere, we currently also assume there is just 1 connection - if( trace.event_fields.indexOf("group_id") >= 0 ){ - return false; - } - else - return true; + // if( trace.event_fields.indexOf("group_id") >= 0 ){ + // return false; + // } + // else + return true; } } From a7baf14cf51adab229d357edbfd7e3109644c94b Mon Sep 17 00:00:00 2001 From: auliasadil Date: Sat, 11 May 2024 06:42:32 +0700 Subject: [PATCH 5/7] Change ITraceError --- TypeScript/draft-01/QLog.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TypeScript/draft-01/QLog.ts b/TypeScript/draft-01/QLog.ts index 9bf4f1c..dd6fd1c 100644 --- a/TypeScript/draft-01/QLog.ts +++ b/TypeScript/draft-01/QLog.ts @@ -12,7 +12,7 @@ export interface IQLog { export interface ITraceError { error_description: string, - uri: string, + uri?: string, vantage_point?: IVantagePoint } From 351e4c4fb3aa6dcbe3b72559486c8aa30ec5b9c1 Mon Sep 17 00:00:00 2001 From: auliasadil Date: Sat, 11 May 2024 06:47:36 +0700 Subject: [PATCH 6/7] Delete IConfiguration --- TypeScript/draft-01/QLog.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/TypeScript/draft-01/QLog.ts b/TypeScript/draft-01/QLog.ts index dd6fd1c..274863e 100644 --- a/TypeScript/draft-01/QLog.ts +++ b/TypeScript/draft-01/QLog.ts @@ -38,15 +38,6 @@ export enum VantagePointType { unknown = "unknown", } -export interface IConfiguration{ - time_units?:"ms"|"us", - time_offset?:string, - - original_uris?: Array, - - // allow additional properties. This way, we can enforce proper types for the ones defined in the spec, see other properties - [additionalUserSpecifiedProperty: string]: any -} export interface ICommonFields{ group_id?: string | Array, From fd839a94d0dde1eaa6914ed38d289b234def608b Mon Sep 17 00:00:00 2001 From: auliasadil Date: Sun, 19 May 2024 20:13:32 +0700 Subject: [PATCH 7/7] Add IEvent --- TypeScript/draft-01/QLog.ts | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/TypeScript/draft-01/QLog.ts b/TypeScript/draft-01/QLog.ts index 274863e..7dc3ed3 100644 --- a/TypeScript/draft-01/QLog.ts +++ b/TypeScript/draft-01/QLog.ts @@ -22,7 +22,7 @@ export interface ITrace { title?:string, description?: string, common_fields?: ICommonFields, - events: Array> + events: Array } export interface IVantagePoint{ @@ -38,7 +38,6 @@ export enum VantagePointType { unknown = "unknown", } - export interface ICommonFields{ group_id?: string | Array, protocol_type?: string, @@ -63,13 +62,21 @@ export enum IDefaultEventFieldNames { export type EventType = ConnectivityEventType | TransportEventType | SecurityEventType | RecoveryEventType | HTTP3EventType | QPACKEventType | GenericEventType; // FIXME: TODO: add something for the DATA definitions! -export type EventField = EventCategory | EventType | EventData | number | string; // number = for the time values, string = for unknown, user-specified fields +export interface IEvent { + time: number, + name: EventCategoryAndType, + data: EventData, + text?: string +} +// export type EventField = EventCategory | EventType | EventData | number | string; // number = for the time values, string = for unknown, user-specified fields // ================================================================== // // Based on QUIC draft 23 // ================================================================== // +export type EventCategoryAndType = string; // e.g., "connectivity:connection_started" + export enum EventCategory { connectivity = "connectivity", security = "security", @@ -152,8 +159,8 @@ export type EventData = IEventServerListening | IEventConnectionStarted | IEvent IEventKeyUpdated | IEventKeyRetired | IEventTransportParametersSet | IEventDatagramsReceived | IEventDatagramsSent | IEventDatagramDropped | IEventPacketReceived | IEventPacketSent | IEventPacketDropped | IEventPacketBuffered | IEventStreamStateUpdated | IEventFramesProcessed | IEventRecoveryParametersSet | IEventMetricsUpdated | IEventCongestionStateUpdated | IEventLossTimerSet | IEventLossTimerExpired | IEventPacketLost | IEventMarkedForRetransmit | - HTTP3EventData | - QPACKEventData | + HTTP3EventData | + QPACKEventData | GenericEventData ; // ================================================================== // @@ -471,7 +478,9 @@ export enum HTTP3EventType { stream_type_set = "stream_type_set", frame_created = "frame_created", frame_parsed = "frame_parsed", - data_moved = "data_moved" + data_moved = "data_moved", + datagram_received = "data_received", + dependency_update = "dependency_update" } export interface IEventH3ParametersSet { @@ -873,7 +882,7 @@ export interface IConnectionCloseFrame{ error_space:ErrorSpace; error_code:TransportError | ApplicationError | CryptoError | string | number; raw_error_code:number; - reason:string; // hex + reason:string; trigger_frame_type?:number; // TODO: should be more defined, but we don't have a FrameType enum atm... }