@voicethere/client 0.14.0 → 0.14.2
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/CHANGELOG.md +12 -0
- package/dist/browser/microphone.d.ts +2 -0
- package/dist/browser/microphone.d.ts.map +1 -1
- package/dist/browser/microphone.js +9 -3
- package/dist/browser/microphone.js.map +1 -1
- package/dist/browser/opus-stereo-sdp.d.ts +3 -0
- package/dist/browser/opus-stereo-sdp.d.ts.map +1 -1
- package/dist/browser/opus-stereo-sdp.js +19 -0
- package/dist/browser/opus-stereo-sdp.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,18 @@
|
|
|
2
2
|
|
|
3
3
|
## [Unreleased]
|
|
4
4
|
|
|
5
|
+
## [0.14.2] - 2026-10-27
|
|
6
|
+
|
|
7
|
+
### Fixed
|
|
8
|
+
|
|
9
|
+
- The microphone now explicitly requests echo cancellation, noise suppression and auto gain control, with or without a chosen input device.
|
|
10
|
+
|
|
11
|
+
## [0.14.1] - 2026-10-26
|
|
12
|
+
|
|
13
|
+
### Fixed
|
|
14
|
+
|
|
15
|
+
- Node sessions (`@voicethere/client/node`) failed to connect on 0.14.0 with `new sdp does not match previous answer`: the stereo rewrite changed answers that already asked for stereo, and the Node WebRTC runtime rejects a changed answer. Answers that already carry `stereo=1` are now left unchanged.
|
|
16
|
+
|
|
5
17
|
## [0.14.0] - 2026-10-26
|
|
6
18
|
|
|
7
19
|
### Fixed
|
|
@@ -22,6 +22,8 @@ export type AcquireAudioInputResult = {
|
|
|
22
22
|
/** Stops tracks and closes synthetic AudioContext resources when applicable. */
|
|
23
23
|
dispose: () => void;
|
|
24
24
|
};
|
|
25
|
+
/** Explicit AEC/NS/AGC so browsers use echo cancellation against element playout. */
|
|
26
|
+
export declare function buildAudioConstraints(deviceId?: string | null): MediaTrackConstraints;
|
|
25
27
|
/** Stop every track on a stream (no-op for null). */
|
|
26
28
|
export declare function stopMicStream(stream: MediaStream | null): void;
|
|
27
29
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"microphone.d.ts","sourceRoot":"","sources":["../../src/browser/microphone.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,aAAa,GAAG,WAAW,CAAC;AAE9E,mFAAmF;AACnF,eAAO,MAAM,wBAAwB,QAAQ,CAAC;AAK9C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,sBAAsB,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7E,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gFAAgF;IAChF,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;
|
|
1
|
+
{"version":3,"file":"microphone.d.ts","sourceRoot":"","sources":["../../src/browser/microphone.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,aAAa,GAAG,WAAW,CAAC;AAE9E,mFAAmF;AACnF,eAAO,MAAM,wBAAwB,QAAQ,CAAC;AAK9C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,YAAY,CAAC,EAAE,CAAC,WAAW,EAAE,sBAAsB,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7E,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gFAAgF;IAChF,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,qFAAqF;AACrF,wBAAgB,qBAAqB,CACnC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GACvB,qBAAqB,CAUvB;AAkCD,qDAAqD;AACrD,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAQ9D;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,IAAI;IAC1C,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAmEA;AAcD;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,uBAAuB,CAAC,CAsBlC;AAED,2EAA2E;AAC3E,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAczE;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAG3E"}
|
|
@@ -8,11 +8,17 @@
|
|
|
8
8
|
export const SYNTHETIC_MIC_NOISE_GAIN = 0.004;
|
|
9
9
|
/** Duration of one loop of synthetic white noise (seconds). */
|
|
10
10
|
const SYNTHETIC_MIC_NOISE_BUFFER_SECONDS = 0.25;
|
|
11
|
-
|
|
11
|
+
/** Explicit AEC/NS/AGC so browsers use echo cancellation against element playout. */
|
|
12
|
+
export function buildAudioConstraints(deviceId) {
|
|
13
|
+
const constraints = {
|
|
14
|
+
echoCancellation: true,
|
|
15
|
+
noiseSuppression: true,
|
|
16
|
+
autoGainControl: true,
|
|
17
|
+
};
|
|
12
18
|
if (deviceId) {
|
|
13
|
-
|
|
19
|
+
constraints.deviceId = { ideal: deviceId };
|
|
14
20
|
}
|
|
15
|
-
return
|
|
21
|
+
return constraints;
|
|
16
22
|
}
|
|
17
23
|
function classifyGumError(error) {
|
|
18
24
|
if (error instanceof DOMException) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"microphone.js","sourceRoot":"","sources":["../../src/browser/microphone.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,mFAAmF;AACnF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC;AAE9C,+DAA+D;AAC/D,MAAM,kCAAkC,GAAG,IAAI,CAAC;AAoBhD,
|
|
1
|
+
{"version":3,"file":"microphone.js","sourceRoot":"","sources":["../../src/browser/microphone.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,9 @@
|
|
|
8
8
|
* Other parameters keep their order and values. Existing `stereo` / `sprop-stereo`
|
|
9
9
|
* values (including `0`) are replaced, never duplicated. SDP without Opus is returned
|
|
10
10
|
* unchanged (the same string).
|
|
11
|
+
*
|
|
12
|
+
* Answers that already ask for stereo on every Opus payload type are returned unchanged.
|
|
13
|
+
* Some WebRTC stacks (webrtc-rs) reject a local answer that differs from createAnswer's output.
|
|
11
14
|
*/
|
|
12
15
|
export declare function preferOpusStereoInAnswer(sdp: string): string;
|
|
13
16
|
//# sourceMappingURL=opus-stereo-sdp.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opus-stereo-sdp.d.ts","sourceRoot":"","sources":["../../src/browser/opus-stereo-sdp.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"opus-stereo-sdp.d.ts","sourceRoot":"","sources":["../../src/browser/opus-stereo-sdp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAyC5D"}
|
|
@@ -8,6 +8,9 @@
|
|
|
8
8
|
* Other parameters keep their order and values. Existing `stereo` / `sprop-stereo`
|
|
9
9
|
* values (including `0`) are replaced, never duplicated. SDP without Opus is returned
|
|
10
10
|
* unchanged (the same string).
|
|
11
|
+
*
|
|
12
|
+
* Answers that already ask for stereo on every Opus payload type are returned unchanged.
|
|
13
|
+
* Some WebRTC stacks (webrtc-rs) reject a local answer that differs from createAnswer's output.
|
|
11
14
|
*/
|
|
12
15
|
export function preferOpusStereoInAnswer(sdp) {
|
|
13
16
|
const eol = sdp.includes("\r\n") ? "\r\n" : "\n";
|
|
@@ -23,6 +26,14 @@ export function preferOpusStereoInAnswer(sdp) {
|
|
|
23
26
|
}
|
|
24
27
|
if (opusPts.size === 0)
|
|
25
28
|
return sdp;
|
|
29
|
+
const stereoPts = new Set();
|
|
30
|
+
for (const line of lines) {
|
|
31
|
+
const m = /^a=fmtp:(\d+) (.*)$/.exec(line);
|
|
32
|
+
if (m && opusPts.has(m[1]) && hasStereoOne(m[2]))
|
|
33
|
+
stereoPts.add(m[1]);
|
|
34
|
+
}
|
|
35
|
+
if (stereoPts.size === opusPts.size)
|
|
36
|
+
return sdp;
|
|
26
37
|
const withFmtp = new Set();
|
|
27
38
|
const out = [];
|
|
28
39
|
for (const line of lines) {
|
|
@@ -62,4 +73,12 @@ function setStereoParams(params) {
|
|
|
62
73
|
}
|
|
63
74
|
return parts.join(";");
|
|
64
75
|
}
|
|
76
|
+
function hasStereoOne(params) {
|
|
77
|
+
return params.split(";").some((p) => {
|
|
78
|
+
const eq = p.indexOf("=");
|
|
79
|
+
if (eq === -1)
|
|
80
|
+
return false;
|
|
81
|
+
return p.slice(0, eq).trim().toLowerCase() === "stereo" && p.slice(eq + 1).trim() === "1";
|
|
82
|
+
});
|
|
83
|
+
}
|
|
65
84
|
//# sourceMappingURL=opus-stereo-sdp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opus-stereo-sdp.js","sourceRoot":"","sources":["../../src/browser/opus-stereo-sdp.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"opus-stereo-sdp.js","sourceRoot":"","sources":["../../src/browser/opus-stereo-sdp.ts"],"names":[],"mappings":"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"}
|