@@ -71,25 +71,34 @@ export class ExportService {
7171 ) : Promise < Buffer > {
7272 const exportData = messages . map ( message => {
7373 const base : any = {
74- id : message . id . id ,
75- guildId : message . guildId ,
76- topicName : message . topicName ,
77- timestamp : message . metadata . timestamp . toISOString ( ) ,
78- status : message . status . current ,
74+ id : message . id ,
75+ timestamp : new Date ( message . timestamp ) . toISOString ( ) ,
76+ format : message . format ,
77+ topics : message . topics ,
78+ sender : message . sender ,
7979 payload : message . payload ,
80+ is_error_message : message . is_error_message ,
81+ process_status : message . process_status ,
8082 } ;
81-
83+
8284 if ( options . includeMetadata ) {
83- base . metadata = message . metadata ;
85+ base . priority = message . priority ;
86+ base . recipient_list = message . recipient_list ;
87+ base . thread = message . thread ;
88+ base . in_response_to = message . in_response_to ;
89+ base . conversation_id = message . conversation_id ;
90+ base . ttl = message . ttl ;
8491 }
85-
92+
8693 if ( options . includeRouting ) {
87- base . routing = message . routing ;
94+ base . routing_slip = message . routing_slip ;
95+ base . forward_header = message . forward_header ;
96+ base . message_history = message . message_history ;
8897 }
89-
98+
9099 return base ;
91100 } ) ;
92-
101+
93102 return Buffer . from ( JSON . stringify ( exportData , null , 2 ) ) ;
94103 }
95104
@@ -120,31 +129,31 @@ export class ExportService {
120129 const rows = [ headers . join ( ',' ) ] ;
121130
122131 for ( const message of messages ) {
123- const payloadStr = JSON . stringify ( message . payload . content ) ;
132+ const payloadStr = JSON . stringify ( message . payload ) ;
124133 const row = [
125- message . id . id ,
126- message . guildId ,
127- message . topicName ,
128- message . metadata . timestamp . toISOString ( ) ,
129- message . status . current ,
130- message . metadata . sourceAgent ,
131- message . metadata . targetAgent || '' ,
132- message . payload . type ,
134+ message . id . toString ( ) ,
135+ typeof message . topics === 'string' ? message . topics : message . topics . join ( ';' ) ,
136+ message . topic_published_to || '' ,
137+ new Date ( message . timestamp ) . toISOString ( ) ,
138+ message . process_status || ( message . is_error_message ? 'error' : 'completed' ) ,
139+ message . sender . name || message . sender . id || 'unknown' ,
140+ message . recipient_list ?. map ( r => r . name || r . id ) . join ( ';' ) || '' ,
141+ message . format ,
133142 payloadStr . length . toString ( ) ,
134143 ] ;
135-
144+
136145 if ( options . includeMetadata ) {
137146 row . push (
138- message . metadata . priority . toString ( ) ,
139- message . metadata . retryCount . toString ( ) ,
140- message . metadata . ttl ?. toString ( ) || ''
147+ message . priority . toString ( ) ,
148+ message . thread ?. length . toString ( ) || '0' ,
149+ message . ttl ?. toString ( ) || ''
141150 ) ;
142151 }
143-
152+
144153 if ( options . includeRouting ) {
145154 row . push (
146- message . routing . hops . length . toString ( ) ,
147- message . routing . destination || ''
155+ message . message_history ?. length . toString ( ) || '0' ,
156+ message . forward_header ?. on_behalf_of ?. name || ''
148157 ) ;
149158 }
150159
0 commit comments