File tree Expand file tree Collapse file tree 4 files changed +13
-11
lines changed Expand file tree Collapse file tree 4 files changed +13
-11
lines changed Original file line number Diff line number Diff line change @@ -55,9 +55,10 @@ export default {
5555 maxResults : this . maxResults ,
5656 } ) ;
5757 const messageIds = messages . map ( ( { id } ) => id ) ;
58- let messagesToEmit = await this . gmail . getMessages ( messageIds ) ;
58+ const messagesToEmit = [ ] ;
59+ for await ( const message of this . gmail . getAllMessages ( messageIds ) ) {
60+ messagesToEmit . push ( message ) ;
5961
60- for await ( const message of messagesToEmit ) {
6162 let newPayload = "" ;
6263
6364 const messageIdHeader = message . payload ?. headers ?. find (
Original file line number Diff line number Diff line change @@ -410,12 +410,6 @@ export default {
410410 const { value : subject } = message . payload . headers . find ( ( { name } ) => name === "Subject" ) ;
411411 return subject ;
412412 } ,
413- async getMessages ( ids = [ ] ) {
414- const promises = ids . map ( ( id ) => this . getMessage ( {
415- id,
416- } ) ) ;
417- return Promise . all ( promises ) ;
418- } ,
419413 async * getAllMessages ( ids = [ ] ) {
420414 for ( const id of ids ) {
421415 const message = await this . getMessage ( {
Original file line number Diff line number Diff line change @@ -60,9 +60,13 @@ export default {
6060 index === self . findIndex ( ( m ) => m . id === message . id ) ) ;
6161
6262 const messageIds = uniqueMessages . map ( ( { id } ) => id ) ;
63- const messagesWithHistoryId = await this . gmail . getMessages ( messageIds ) ;
63+ const messages = [ ] ;
64+ for await ( const message of this . gmail . getAllMessages ( messageIds ) ) {
65+ messages . push ( message ) ;
66+ }
67+
6468 const sortedMessages =
65- Array . from ( messagesWithHistoryId )
69+ Array . from ( messages )
6670 . sort ( ( a , b ) => ( Number ( b . historyId ) - Number ( a . historyId ) ) ) ;
6771
6872 const { historyId } = await this . gmail . getMessage ( {
Original file line number Diff line number Diff line change @@ -57,7 +57,10 @@ export default {
5757 }
5858 } ,
5959 async processHistoricalEvents ( messageIds ) {
60- let messages = await this . gmail . getMessages ( messageIds ) ;
60+ let messages = [ ] ;
61+ for await ( const message of this . gmail . getAllMessages ( messageIds ) ) {
62+ messages . push ( message ) ;
63+ }
6164 messages = messages . sort ( ( a , b ) => ( a . internalDate - b . internalDate ) ) ;
6265 this . setLastDate ( messages [ messages . length - 1 ] . internalDate ) ;
6366 messages . forEach ( ( message ) => this . emitEvent ( message ) ) ;
You can’t perform that action at this time.
0 commit comments