Merge 142e366 into 578b391

ng-web-apis · May 10, 2020 · c8734e7 · c8734e7
2 parents 578b391 + 142e366
commit c8734e7
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/projects/midi/src/tokens/midi-messages.ts b/projects/midi/src/tokens/midi-messages.ts
@@ -1,10 +1,11 @@
 import {inject, InjectionToken} from '@angular/core';
 import {from, fromEvent, merge, Observable, throwError} from 'rxjs';
 import {FromEventTarget} from 'rxjs/internal/observable/fromEvent';
-import {share, switchMap} from 'rxjs/operators';
+import {share, startWith, switchMap} from 'rxjs/operators';
 import {MIDI_ACCESS} from './midi-access';
 
 import MIDIMessageEvent = WebMidi.MIDIMessageEvent;
+import MIDIConnectionEvent = WebMidi.MIDIConnectionEvent;
 
 export const MIDI_MESSAGES = new InjectionToken<Observable<MIDIMessageEvent>>(
     'All incoming MIDI messages stream',
@@ -15,11 +16,19 @@ export const MIDI_MESSAGES = new InjectionToken<Observable<MIDIMessageEvent>>(
                 switchMap(access =>
                     access instanceof Error
                         ? throwError(access)
-                        : merge(
-                              ...Array.from(access.inputs).map(([_, input]) =>
-                                  fromEvent(
-                                      input as FromEventTarget<MIDIMessageEvent>,
-                                      'midimessage',
+                        : fromEvent(
+                              access as FromEventTarget<MIDIConnectionEvent>,
+                              'statechange',
+                          ).pipe(
+                              startWith(null),
+                              switchMap(() =>
+                                  merge(
+                                      ...Array.from(access.inputs).map(([_, input]) =>
+                                          fromEvent(
+                                              input as FromEventTarget<MIDIMessageEvent>,
+                                              'midimessage',
+                                          ),
+                                      ),
                                   ),
                               ),
                           ),