@micdrop/client 1.8.1 → 1.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.d.mts CHANGED
@@ -18,10 +18,10 @@ declare class AudioAnalyser extends EventEmitter<AudioAnalyserEvents> {
18
18
 
19
19
  declare let mic: Mic;
20
20
  declare class Mic {
21
+ analyser: AudioAnalyser;
21
22
  private currentDeviceId;
22
23
  private audioStream;
23
24
  private sourceNode;
24
- analyser: AudioAnalyser;
25
25
  constructor();
26
26
  private getMicConstraints;
27
27
  /**
@@ -128,14 +128,20 @@ declare class MicRecorder extends EventEmitter<MicRecorderEvents> {
128
128
  }
129
129
 
130
130
  declare let speaker: Speaker;
131
- declare class Speaker {
131
+ interface SpeakerEvents {
132
+ StartPlaying: void;
133
+ StopPlaying: void;
134
+ }
135
+ declare class Speaker extends EventEmitter<SpeakerEvents> {
136
+ isPlaying: boolean;
137
+ analyser: AudioAnalyser;
132
138
  private audioElement?;
133
139
  private player?;
134
140
  private streamingEnabled;
135
- analyser: AudioAnalyser;
136
141
  constructor();
137
142
  private setupSpeakerPlayer;
138
143
  get isStreamingEnabled(): boolean;
144
+ protected changeIsPlaying(isPlaying: boolean): void;
139
145
  enableStreaming(): Promise<void>;
140
146
  disableStreaming(): Promise<void>;
141
147
  canChangeDevice(): boolean;
@@ -236,6 +242,7 @@ interface CallClientEvents {
236
242
  }
237
243
  interface CallClientOptions {
238
244
  vad?: VADConfig;
245
+ disableInterruption?: boolean;
239
246
  }
240
247
  declare global {
241
248
  interface Window {
@@ -254,25 +261,31 @@ declare class CallClient<Params extends {}, Options extends CallClientOptions =
254
261
  private ws?;
255
262
  private micStream?;
256
263
  private startTime;
257
- private lastAudioBlob?;
258
264
  private _isProcessing;
265
+ private _isPaused;
259
266
  private constructor();
260
267
  get isStarted(): boolean;
261
268
  get isStarting(): boolean;
269
+ get isPaused(): boolean;
270
+ get isProcessing(): boolean;
271
+ get isListening(): boolean;
262
272
  get isWSStarted(): boolean;
263
273
  get isWSStarting(): boolean;
264
274
  get isMicStarted(): boolean;
265
275
  get isMicMuted(): boolean;
266
- get isMicSpeaking(): boolean;
267
- get isProcessing(): boolean;
276
+ get isUserSpeaking(): boolean;
277
+ get isAssistantSpeaking(): boolean;
268
278
  start(): Promise<void>;
269
279
  stop(): Promise<void>;
270
280
  pause(): void;
271
281
  resume(): void;
282
+ destroy(): Promise<void>;
272
283
  startMic(deviceId?: string, record?: boolean): Promise<void>;
273
284
  private stopMic;
274
285
  private startWS;
275
286
  private stopWS;
287
+ private onSpeakerStartPlaying;
288
+ private onSpeakerStopPlaying;
276
289
  private addMessage;
277
290
  private notifyStateChange;
278
291
  private log;
package/dist/index.d.ts CHANGED
@@ -18,10 +18,10 @@ declare class AudioAnalyser extends EventEmitter<AudioAnalyserEvents> {
18
18
 
19
19
  declare let mic: Mic;
20
20
  declare class Mic {
21
+ analyser: AudioAnalyser;
21
22
  private currentDeviceId;
22
23
  private audioStream;
23
24
  private sourceNode;
24
- analyser: AudioAnalyser;
25
25
  constructor();
26
26
  private getMicConstraints;
27
27
  /**
@@ -128,14 +128,20 @@ declare class MicRecorder extends EventEmitter<MicRecorderEvents> {
128
128
  }
129
129
 
130
130
  declare let speaker: Speaker;
131
- declare class Speaker {
131
+ interface SpeakerEvents {
132
+ StartPlaying: void;
133
+ StopPlaying: void;
134
+ }
135
+ declare class Speaker extends EventEmitter<SpeakerEvents> {
136
+ isPlaying: boolean;
137
+ analyser: AudioAnalyser;
132
138
  private audioElement?;
133
139
  private player?;
134
140
  private streamingEnabled;
135
- analyser: AudioAnalyser;
136
141
  constructor();
137
142
  private setupSpeakerPlayer;
138
143
  get isStreamingEnabled(): boolean;
144
+ protected changeIsPlaying(isPlaying: boolean): void;
139
145
  enableStreaming(): Promise<void>;
140
146
  disableStreaming(): Promise<void>;
141
147
  canChangeDevice(): boolean;
@@ -236,6 +242,7 @@ interface CallClientEvents {
236
242
  }
237
243
  interface CallClientOptions {
238
244
  vad?: VADConfig;
245
+ disableInterruption?: boolean;
239
246
  }
240
247
  declare global {
241
248
  interface Window {
@@ -254,25 +261,31 @@ declare class CallClient<Params extends {}, Options extends CallClientOptions =
254
261
  private ws?;
255
262
  private micStream?;
256
263
  private startTime;
257
- private lastAudioBlob?;
258
264
  private _isProcessing;
265
+ private _isPaused;
259
266
  private constructor();
260
267
  get isStarted(): boolean;
261
268
  get isStarting(): boolean;
269
+ get isPaused(): boolean;
270
+ get isProcessing(): boolean;
271
+ get isListening(): boolean;
262
272
  get isWSStarted(): boolean;
263
273
  get isWSStarting(): boolean;
264
274
  get isMicStarted(): boolean;
265
275
  get isMicMuted(): boolean;
266
- get isMicSpeaking(): boolean;
267
- get isProcessing(): boolean;
276
+ get isUserSpeaking(): boolean;
277
+ get isAssistantSpeaking(): boolean;
268
278
  start(): Promise<void>;
269
279
  stop(): Promise<void>;
270
280
  pause(): void;
271
281
  resume(): void;
282
+ destroy(): Promise<void>;
272
283
  startMic(deviceId?: string, record?: boolean): Promise<void>;
273
284
  private stopMic;
274
285
  private startWS;
275
286
  private stopWS;
287
+ private onSpeakerStartPlaying;
288
+ private onSpeakerStopPlaying;
276
289
  private addMessage;
277
290
  private notifyStateChange;
278
291
  private log;
package/dist/index.js CHANGED
@@ -685,16 +685,30 @@ var MicRecorder = class extends import_eventemitter33.default {
685
685
  }
686
686
  };
687
687
 
688
+ // src/audio/speaker.ts
689
+ var import_eventemitter35 = __toESM(require("eventemitter3"));
690
+
688
691
  // src/audio/player/SpeakerPlayer.ts
689
- var SpeakerPlayer = class {
692
+ var import_eventemitter34 = require("eventemitter3");
693
+ var SpeakerPlayer = class extends import_eventemitter34.EventEmitter {
690
694
  constructor(outputNode) {
695
+ super();
691
696
  this.outputNode = outputNode;
697
+ this.isPlaying = false;
692
698
  const ctx = outputNode.context;
693
699
  if (!(ctx instanceof AudioContext)) {
694
700
  throw new Error("OutputNode must be connected to an AudioContext");
695
701
  }
696
702
  this.audioContext = ctx;
697
703
  }
704
+ destroy() {
705
+ this.removeAllListeners();
706
+ }
707
+ changeIsPlaying(isPlaying) {
708
+ if (this.isPlaying == isPlaying) return;
709
+ this.isPlaying = isPlaying;
710
+ this.emit(isPlaying ? "StartPlaying" : "StopPlaying");
711
+ }
698
712
  };
699
713
 
700
714
  // src/audio/player/SpeakerConcatPlayer.ts
@@ -718,7 +732,11 @@ var SpeakerConcatPlayer = class extends SpeakerPlayer {
718
732
  this.sourceStartTime = void 0;
719
733
  this.currentSource = void 0;
720
734
  source.disconnect();
721
- this.replaceSource();
735
+ if (this.nextSource) {
736
+ this.replaceSource();
737
+ } else {
738
+ this.changeIsPlaying(false);
739
+ }
722
740
  };
723
741
  const offset = this.prevSourceDuration + (this.sourceStartTime ? time - this.sourceStartTime : 0);
724
742
  source.start(0, offset);
@@ -764,10 +782,12 @@ var SpeakerConcatPlayer = class extends SpeakerPlayer {
764
782
  return destination;
765
783
  }
766
784
  addBlob(blob) {
785
+ this.changeIsPlaying(true);
767
786
  this.pendingBlobs.push(blob);
768
787
  this.convertNextBlob();
769
788
  }
770
789
  stop() {
790
+ this.changeIsPlaying(false);
771
791
  this.pendingBlobs.length = 0;
772
792
  this.sourceStartTime = void 0;
773
793
  this.prevSourceDuration = 0;
@@ -779,6 +799,7 @@ var SpeakerConcatPlayer = class extends SpeakerPlayer {
779
799
  this.isConvertingBlob = false;
780
800
  }
781
801
  destroy() {
802
+ super.destroy();
782
803
  this.stop();
783
804
  }
784
805
  };
@@ -855,6 +876,7 @@ var SpeakerMediaSourcePlayer = class extends SpeakerPlayer {
855
876
  this.setup();
856
877
  }
857
878
  destroy() {
879
+ super.destroy();
858
880
  if (this.sourceNode) {
859
881
  this.sourceNode.disconnect();
860
882
  this.sourceNode = void 0;
@@ -902,7 +924,11 @@ var SpeakerSequencePlayer = class extends SpeakerPlayer {
902
924
  source.onended = () => {
903
925
  source.disconnect();
904
926
  this.currentSource = void 0;
905
- this.processQueue();
927
+ if (this.pendingSources.length === 0) {
928
+ this.changeIsPlaying(false);
929
+ } else {
930
+ this.processQueue();
931
+ }
906
932
  };
907
933
  source.start(0);
908
934
  }
@@ -925,6 +951,7 @@ var SpeakerSequencePlayer = class extends SpeakerPlayer {
925
951
  this.convertNextBlob();
926
952
  }
927
953
  addBlob(blob) {
954
+ this.changeIsPlaying(true);
928
955
  this.pendingBlobs.push(blob);
929
956
  this.convertNextBlob();
930
957
  }
@@ -936,14 +963,17 @@ var SpeakerSequencePlayer = class extends SpeakerPlayer {
936
963
  this.currentSource = void 0;
937
964
  }
938
965
  destroy() {
966
+ super.destroy();
939
967
  this.stop();
940
968
  }
941
969
  };
942
970
 
943
971
  // src/audio/speaker.ts
944
972
  var speaker;
945
- var Speaker = class {
973
+ var Speaker = class extends import_eventemitter35.default {
946
974
  constructor() {
975
+ super();
976
+ this.isPlaying = false;
947
977
  this.streamingEnabled = false;
948
978
  this.analyser = new AudioAnalyser(audioContext);
949
979
  this.audioElement = new Audio();
@@ -964,6 +994,8 @@ var Speaker = class {
964
994
  this.player?.destroy();
965
995
  this.player = this.streamingEnabled ? SpeakerMediaSourcePlayer.isCompatible ? new SpeakerMediaSourcePlayer(this.analyser.node) : new SpeakerConcatPlayer(this.analyser.node) : new SpeakerSequencePlayer(this.analyser.node);
966
996
  await this.player?.setup();
997
+ this.player.on("StartPlaying", () => this.changeIsPlaying(true));
998
+ this.player.on("StopPlaying", () => this.changeIsPlaying(false));
967
999
  } catch (error) {
968
1000
  console.error("Error setting up speaker player", error);
969
1001
  }
@@ -971,6 +1003,11 @@ var Speaker = class {
971
1003
  get isStreamingEnabled() {
972
1004
  return this.streamingEnabled;
973
1005
  }
1006
+ changeIsPlaying(isPlaying) {
1007
+ if (this.isPlaying == isPlaying) return;
1008
+ this.isPlaying = isPlaying;
1009
+ this.emit(isPlaying ? "StartPlaying" : "StopPlaying");
1010
+ }
974
1011
  async enableStreaming() {
975
1012
  if (this.streamingEnabled) return;
976
1013
  this.streamingEnabled = true;
@@ -1030,7 +1067,7 @@ if (!window.micdropSpeaker) {
1030
1067
  speaker = window.micdropSpeaker;
1031
1068
 
1032
1069
  // src/call/CallClient.ts
1033
- var import_eventemitter34 = __toESM(require("eventemitter3"));
1070
+ var import_eventemitter36 = __toESM(require("eventemitter3"));
1034
1071
 
1035
1072
  // src/call/CallClientError.ts
1036
1073
  var CallClientErrorCode = /* @__PURE__ */ ((CallClientErrorCode2) => {
@@ -1047,7 +1084,7 @@ var CallClientError = class extends Error {
1047
1084
  };
1048
1085
 
1049
1086
  // src/call/CallClient.ts
1050
- var CallClient = class _CallClient extends import_eventemitter34.default {
1087
+ var CallClient = class _CallClient extends import_eventemitter36.default {
1051
1088
  constructor(options) {
1052
1089
  super();
1053
1090
  this.options = options;
@@ -1055,7 +1092,12 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1055
1092
  this.debug = false;
1056
1093
  this.startTime = 0;
1057
1094
  this._isProcessing = false;
1095
+ this._isPaused = false;
1058
1096
  this.vad = getVAD(this.options?.vad);
1097
+ this.onSpeakerStartPlaying = this.onSpeakerStartPlaying.bind(this);
1098
+ this.onSpeakerStopPlaying = this.onSpeakerStopPlaying.bind(this);
1099
+ speaker.on("StartPlaying", this.onSpeakerStartPlaying);
1100
+ speaker.on("StopPlaying", this.onSpeakerStopPlaying);
1059
1101
  }
1060
1102
  static getInstance(options) {
1061
1103
  if (!window.micdropCallClient) {
@@ -1069,6 +1111,15 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1069
1111
  get isStarting() {
1070
1112
  return this.isWSStarting || this.micRecorder?.state.isStarting || false;
1071
1113
  }
1114
+ get isPaused() {
1115
+ return this._isPaused;
1116
+ }
1117
+ get isProcessing() {
1118
+ return this._isProcessing && !this.isPaused;
1119
+ }
1120
+ get isListening() {
1121
+ return this.isMicStarted && !this.isPaused && !this.isProcessing && !this.isMicMuted && !this.isUserSpeaking && !this.isAssistantSpeaking;
1122
+ }
1072
1123
  get isWSStarted() {
1073
1124
  return this.ws?.readyState === WebSocket.OPEN;
1074
1125
  }
@@ -1081,11 +1132,11 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1081
1132
  get isMicMuted() {
1082
1133
  return this.micRecorder?.state.isMuted ?? false;
1083
1134
  }
1084
- get isMicSpeaking() {
1135
+ get isUserSpeaking() {
1085
1136
  return this.micRecorder?.state.isSpeaking ?? false;
1086
1137
  }
1087
- get isProcessing() {
1088
- return this._isProcessing;
1138
+ get isAssistantSpeaking() {
1139
+ return speaker.isPlaying;
1089
1140
  }
1090
1141
  async start() {
1091
1142
  this.startTime = Date.now();
@@ -1108,20 +1159,25 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1108
1159
  }
1109
1160
  }
1110
1161
  pause() {
1162
+ if (this.isPaused) return;
1111
1163
  this.micRecorder?.mute();
1164
+ this._isPaused = true;
1112
1165
  this._isProcessing = false;
1113
1166
  this.notifyStateChange();
1114
1167
  speaker.pauseAudio();
1115
1168
  this.ws?.send("Mute" /* Mute */);
1116
1169
  }
1117
1170
  resume() {
1118
- if (this.lastAudioBlob) {
1119
- speaker.playAudio(this.lastAudioBlob);
1120
- }
1121
- speaker.resumeAudio();
1171
+ if (!this.isPaused) return;
1122
1172
  this.micRecorder?.unmute();
1173
+ this._isPaused = false;
1123
1174
  this.notifyStateChange();
1124
1175
  }
1176
+ async destroy() {
1177
+ this.stop();
1178
+ speaker.off("StartPlaying", this.onSpeakerStartPlaying);
1179
+ speaker.off("StopPlaying", this.onSpeakerStopPlaying);
1180
+ }
1125
1181
  async startMic(deviceId, record = true) {
1126
1182
  try {
1127
1183
  if (!this.micRecorder) {
@@ -1130,7 +1186,7 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1130
1186
  this.notifyStateChange();
1131
1187
  });
1132
1188
  this.micRecorder.on("Chunk", (blob) => {
1133
- this.log(`[Mic] Received chunk`, blob);
1189
+ this.log(`[Mic] Chunk`, blob);
1134
1190
  this.ws?.send(blob);
1135
1191
  });
1136
1192
  this.micRecorder.on("StartSpeaking", () => {
@@ -1143,7 +1199,9 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1143
1199
  this.micRecorder.on("StopSpeaking", () => {
1144
1200
  this.log("[Mic] Stop speaking");
1145
1201
  this.ws?.send("StopSpeaking" /* StopSpeaking */);
1146
- this._isProcessing = true;
1202
+ if (this.isWSStarted) {
1203
+ this._isProcessing = true;
1204
+ }
1147
1205
  this.notifyStateChange();
1148
1206
  });
1149
1207
  }
@@ -1193,7 +1251,6 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1193
1251
  this.log("[WS]", event.data);
1194
1252
  if (event.data instanceof Blob) {
1195
1253
  speaker.playAudio(event.data);
1196
- this.lastAudioBlob = event.data;
1197
1254
  this._isProcessing = false;
1198
1255
  this.notifyStateChange();
1199
1256
  } else if (typeof event.data !== "string") {
@@ -1252,6 +1309,20 @@ var CallClient = class _CallClient extends import_eventemitter34.default {
1252
1309
  this.ws = void 0;
1253
1310
  this.notifyStateChange();
1254
1311
  }
1312
+ onSpeakerStartPlaying() {
1313
+ this.log("[Speaker] Start speaking");
1314
+ if (this.options?.disableInterruption && !this.isPaused) {
1315
+ this.micRecorder?.mute();
1316
+ }
1317
+ this.notifyStateChange();
1318
+ }
1319
+ onSpeakerStopPlaying() {
1320
+ this.log("[Speaker] Stop speaking");
1321
+ if (this.options?.disableInterruption && !this.isPaused) {
1322
+ this.micRecorder?.unmute();
1323
+ }
1324
+ this.notifyStateChange();
1325
+ }
1255
1326
  addMessage(message) {
1256
1327
  this.conversation.push(message);
1257
1328
  this.notifyStateChange();