@magmamath/students-features 1.3.23-rc.46 → 1.3.23-rc.47
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/commonjs/features/voice/playing/hooks/useVoicePlayerLifecycle.js +7 -7
- package/dist/commonjs/features/voice/playing/hooks/useVoicePlayerLifecycle.js.map +1 -1
- package/dist/commonjs/features/voice/playing/model/PlaybackController.js +10 -1
- package/dist/commonjs/features/voice/playing/model/PlaybackController.js.map +1 -1
- package/dist/commonjs/features/voice/playing/model/Player.model.js +21 -6
- package/dist/commonjs/features/voice/playing/model/Player.model.js.map +1 -1
- package/dist/module/features/voice/playing/hooks/useVoicePlayerLifecycle.js +7 -7
- package/dist/module/features/voice/playing/hooks/useVoicePlayerLifecycle.js.map +1 -1
- package/dist/module/features/voice/playing/model/PlaybackController.js +10 -1
- package/dist/module/features/voice/playing/model/PlaybackController.js.map +1 -1
- package/dist/module/features/voice/playing/model/Player.model.js +21 -6
- package/dist/module/features/voice/playing/model/Player.model.js.map +1 -1
- package/dist/typescript/commonjs/features/voice/playing/model/PlaybackController.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/voice/playing/model/Player.model.d.ts +1 -0
- package/dist/typescript/commonjs/features/voice/playing/model/Player.model.d.ts.map +1 -1
- package/dist/typescript/module/features/voice/playing/model/PlaybackController.d.ts.map +1 -1
- package/dist/typescript/module/features/voice/playing/model/Player.model.d.ts +1 -0
- package/dist/typescript/module/features/voice/playing/model/Player.model.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/voice/playing/hooks/useVoicePlayerLifecycle.ts +7 -7
- package/src/features/voice/playing/model/PlaybackController.ts +9 -1
- package/src/features/voice/playing/model/Player.model.ts +21 -6
|
@@ -22,9 +22,10 @@ const useVoicePlayerLifecycle = ({
|
|
|
22
22
|
answersRef.current = answers;
|
|
23
23
|
(0, _react.useEffect)(() => {
|
|
24
24
|
model.reinitializePlayer();
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
// No stopAudio cleanup: this hook re-runs across normal renders in some
|
|
26
|
+
// host components, and tearing down audio in the cleanup races with
|
|
27
|
+
// play() requests from other consumers (e.g. TimelineManager). The page
|
|
28
|
+
// unmount path (resetPlayer / cleanup) still releases audio properly.
|
|
28
29
|
}, [model]);
|
|
29
30
|
(0, _react.useEffect)(() => {
|
|
30
31
|
model.resetPlayer();
|
|
@@ -35,10 +36,9 @@ const useVoicePlayerLifecycle = ({
|
|
|
35
36
|
}
|
|
36
37
|
}, [model, answersKey]);
|
|
37
38
|
(0, _react.useEffect)(() => {
|
|
38
|
-
//
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
39
|
+
// No stopAudio: VoiceSource (timeline) and VoiceTranscription (manual play
|
|
40
|
+
// button) drive playback transitions themselves. Calling stopAudio here
|
|
41
|
+
// races with concurrent play() requests and aborts in-flight audio.play().
|
|
42
42
|
model.setCurrentAttempt(activeAttempt);
|
|
43
43
|
if (activeAttempt !== null) {
|
|
44
44
|
model.loader.loadTranscriptForAttempt(activeAttempt);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_helpers","useVoicePlayerLifecycle","model","answers","attemptOffset","attemptsCount","problemId","activeAttempt","getActiveAttempt","answersKey","useMemo","map","a","_id","audioFileId","join","hasAnyAudio","some","answersRef","useRef","current","useEffect","reinitializePlayer","
|
|
1
|
+
{"version":3,"names":["_react","require","_helpers","useVoicePlayerLifecycle","model","answers","attemptOffset","attemptsCount","problemId","activeAttempt","getActiveAttempt","answersKey","useMemo","map","a","_id","audioFileId","join","hasAnyAudio","some","answersRef","useRef","current","useEffect","reinitializePlayer","resetPlayer","initializeWithAudios","setCurrentAttempt","loader","loadTranscriptForAttempt","exports"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/hooks/useVoicePlayerLifecycle.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAYA;AACA;AACO,MAAME,uBAAuB,GAAGA,CAAC;EACtCC,KAAK;EACLC,OAAO;EACPC,aAAa;EACbC,aAAa;EACbC;AACM,CAAC,KAAK;EACZ,MAAMC,aAAa,GAAG,IAAAC,yBAAgB,EAACJ,aAAa,EAAEC,aAAa,CAAC;EAEpE,MAAMI,UAAU,GAAG,IAAAC,cAAO,EACxB,MAAMP,OAAO,CAACQ,GAAG,CAAEC,CAAC,IAAK,GAAGA,CAAC,CAACC,GAAG,IAAID,CAAC,CAACE,WAAW,IAAI,EAAE,EAAE,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC,EACrE,CAACZ,OAAO,CACV,CAAC;EAED,MAAMa,WAAW,GAAG,IAAAN,cAAO,EAAC,MAAMP,OAAO,CAACc,IAAI,CAAEL,CAAC,IAAK,CAAC,CAACA,CAAC,CAACE,WAAW,CAAC,EAAE,CAACX,OAAO,CAAC,CAAC;EAElF,MAAMe,UAAU,GAAG,IAAAC,aAAM,EAAChB,OAAO,CAAC;EAClCe,UAAU,CAACE,OAAO,GAAGjB,OAAO;EAE5B,IAAAkB,gBAAS,EAAC,MAAM;IACdnB,KAAK,CAACoB,kBAAkB,CAAC,CAAC;IAC1B;IACA;IACA;IACA;EACF,CAAC,EAAE,CAACpB,KAAK,CAAC,CAAC;EAEX,IAAAmB,gBAAS,EAAC,MAAM;IACdnB,KAAK,CAACqB,WAAW,CAAC,CAAC;EACrB,CAAC,EAAE,CAACjB,SAAS,CAAC,CAAC;EAEf,IAAAe,gBAAS,EAAC,MAAM;IACd,IAAIH,UAAU,CAACE,OAAO,CAACH,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACE,WAAW,CAAC,EAAE;MACjDZ,KAAK,CAACsB,oBAAoB,CAACN,UAAU,CAACE,OAAO,CAAC;IAChD;EACF,CAAC,EAAE,CAAClB,KAAK,EAAEO,UAAU,CAAC,CAAC;EAEvB,IAAAY,gBAAS,EAAC,MAAM;IACd;IACA;IACA;IACAnB,KAAK,CAACuB,iBAAiB,CAAClB,aAAa,CAAC;IACtC,IAAIA,aAAa,KAAK,IAAI,EAAE;MAC1BL,KAAK,CAACwB,MAAM,CAACC,wBAAwB,CAACpB,aAAa,CAAC;IACtD;EACF,CAAC,EAAE,CAACL,KAAK,EAAEK,aAAa,EAAEE,UAAU,CAAC,CAAC;EAEtC,OAAO;IAAEF,aAAa;IAAES;EAAY,CAAC;AACvC,CAAC;AAAAY,OAAA,CAAA3B,uBAAA,GAAAA,uBAAA","ignoreList":[]}
|
|
@@ -52,10 +52,19 @@ class PlaybackController {
|
|
|
52
52
|
if (!audioUri) return;
|
|
53
53
|
this.player.prime(audioUri);
|
|
54
54
|
}
|
|
55
|
+
|
|
56
|
+
// Non-destructive halt: pause + IDLE, keep audio loaded so a subsequent
|
|
57
|
+
// play() can resume the same uri without re-fetch. Previously this called
|
|
58
|
+
// player.stop() which did replace('') and set stopped=true — that corrupted
|
|
59
|
+
// the AudioPlayer (isLoaded stuck false) and aborted any in-flight play()'s
|
|
60
|
+
// waitForLoad, when the lifecycle hook re-fired stopAudio mid-play.
|
|
55
61
|
halt() {
|
|
56
62
|
this.shouldPreventPlayback = true;
|
|
57
63
|
this.abortAllDownloads();
|
|
58
|
-
this.player.
|
|
64
|
+
if (this.player.player && this.player.$playerState.getState() !== _PlayerModel.PlayerState.IDLE) {
|
|
65
|
+
this.player.player.pause();
|
|
66
|
+
this.player.setPlayerState(_PlayerModel.PlayerState.IDLE);
|
|
67
|
+
}
|
|
59
68
|
this.clearCurrentAttempt();
|
|
60
69
|
}
|
|
61
70
|
releaseResources() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_effector","require","_PlayerModel","PlaybackController","currentPlayingAttempt","shouldPreventPlayback","constructor","deps","collection","player","downloader","playbackFinished","watch","clearCurrentAttempt","togglePlayPause","attemptNumber","playerState","$playerState","getState","PlayerState","PLAYING","pause","handlePlayAttempt","preloadAudio","createEffect","item","get","hasAudio","primePlayerIfIdle","audioDownloadPromise","downloadAudio","error","Error","name","console","IDLE","audioUri","prime","halt","abortAllDownloads","
|
|
1
|
+
{"version":3,"names":["_effector","require","_PlayerModel","PlaybackController","currentPlayingAttempt","shouldPreventPlayback","constructor","deps","collection","player","downloader","playbackFinished","watch","clearCurrentAttempt","togglePlayPause","attemptNumber","playerState","$playerState","getState","PlayerState","PLAYING","pause","handlePlayAttempt","preloadAudio","createEffect","item","get","hasAudio","primePlayerIfIdle","audioDownloadPromise","downloadAudio","error","Error","name","console","IDLE","audioUri","prime","halt","abortAllDownloads","setPlayerState","releaseResources","getAll","forEach","controller","abortDownload","startsWith","URL","revokeObjectURL","e","audioLoading","update","undefined","collectionItem","downloadPromise","download","audioFileId","result","uri","audioError","isAbort","message","playAudioFx","LOADING","warn","remove","playing","resume","play","exports"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/model/PlaybackController.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -28,6 +28,7 @@ class PlayerModel {
|
|
|
28
28
|
player = (0, _expoAudio.createAudioPlayer)();
|
|
29
29
|
stopped = false;
|
|
30
30
|
primedUri = null;
|
|
31
|
+
pendingSeek = null;
|
|
31
32
|
reset = (0, _effector.createEvent)();
|
|
32
33
|
setPlayerState = (0, _effector.createEvent)();
|
|
33
34
|
playbackFinished = (0, _effector.createEvent)();
|
|
@@ -52,6 +53,7 @@ class PlayerModel {
|
|
|
52
53
|
if (this.player) {
|
|
53
54
|
this.player.replace('');
|
|
54
55
|
this.primedUri = null;
|
|
56
|
+
this.pendingSeek = null;
|
|
55
57
|
this.setPlayerState(PlayerState.IDLE);
|
|
56
58
|
} else {
|
|
57
59
|
console.warn('Cannot stop: audio player not initialized');
|
|
@@ -64,10 +66,14 @@ class PlayerModel {
|
|
|
64
66
|
this.player.replace(uri);
|
|
65
67
|
});
|
|
66
68
|
seek = (0, _effector.createEffect)(async seconds => {
|
|
67
|
-
//
|
|
68
|
-
//
|
|
69
|
-
//
|
|
70
|
-
if (!this.player?.isLoaded)
|
|
69
|
+
// When not loaded, defer the seek so play()'s waitForLoad can apply it
|
|
70
|
+
// before starting playback — otherwise the requested offset is lost and
|
|
71
|
+
// audio starts from 0 after a scrub-across-attempt that halted the player.
|
|
72
|
+
if (!this.player?.isLoaded) {
|
|
73
|
+
this.pendingSeek = seconds;
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
this.pendingSeek = null;
|
|
71
77
|
await this.player.seekTo(seconds);
|
|
72
78
|
});
|
|
73
79
|
resume = (0, _effector.createEffect)(() => {
|
|
@@ -84,13 +90,21 @@ class PlayerModel {
|
|
|
84
90
|
return;
|
|
85
91
|
}
|
|
86
92
|
this.stopped = false;
|
|
87
|
-
if (this.primedUri !== uri) {
|
|
93
|
+
if (this.primedUri !== uri || !this.player.isLoaded) {
|
|
88
94
|
this.player.replace(uri);
|
|
89
95
|
this.primedUri = uri;
|
|
90
96
|
}
|
|
91
|
-
const waitForLoad = () => {
|
|
97
|
+
const waitForLoad = async () => {
|
|
92
98
|
if (this.stopped) return;
|
|
93
99
|
if (this.player && this.player.isLoaded) {
|
|
100
|
+
if (this.pendingSeek !== null) {
|
|
101
|
+
const target = this.pendingSeek;
|
|
102
|
+
this.pendingSeek = null;
|
|
103
|
+
try {
|
|
104
|
+
await this.player.seekTo(target);
|
|
105
|
+
} catch {}
|
|
106
|
+
if (this.stopped) return;
|
|
107
|
+
}
|
|
94
108
|
const unsubscribe = this.player.addListener('playbackStatusUpdate', status => {
|
|
95
109
|
if (status.didJustFinish) {
|
|
96
110
|
this.playbackFinished();
|
|
@@ -121,6 +135,7 @@ class PlayerModel {
|
|
|
121
135
|
this.player = null;
|
|
122
136
|
}
|
|
123
137
|
this.primedUri = null;
|
|
138
|
+
this.pendingSeek = null;
|
|
124
139
|
this.reset();
|
|
125
140
|
}
|
|
126
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_effector","require","_expoAudio","PlayerState","exports","safePlay","audio","result","play","catch","err","name","PlayerModel","player","createAudioPlayer","stopped","primedUri","reset","createEvent","setPlayerState","playbackFinished","$playerState","restore","IDLE","setupAudioMode","createEffect","setAudioModeAsync","playsInSilentMode","shouldPlayInBackground","interruptionMode","pause","PAUSED","console","warn","stop","replace","prime","uri","seek","seconds","isLoaded","seekTo","resume","PLAYING","waitForLoad","unsubscribe","addListener","status","didJustFinish","remove","setTimeout","reinitialize","release","error"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/model/Player.model.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAA8E,IAE5DE,WAAW,GAAAC,OAAA,CAAAD,WAAA,0BAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA,OAO7B;AACA;AACA,MAAME,QAAQ,GAAIC,KAAkB,IAAK;EACvC,MAAMC,MAAM,GAAGD,KAAK,CAACE,IAAI,CAAC,CAAY;EACtC,IAAID,MAAM,IAAI,OAAQA,MAAM,CAAsBE,KAAK,KAAK,UAAU,EAAE;IACtE;IAAEF,MAAM,CAAsBE,KAAK,CAAEC,GAAY,IAAK;MACpD,IAAKA,GAAG,EAAwBC,IAAI,KAAK,YAAY,EAAE;MACvD,MAAMD,GAAG;IACX,CAAC,CAAC;EACJ;AACF,CAAC;AAEM,MAAME,WAAW,CAAC;EAChBC,MAAM,GAAuB,IAAAC,4BAAiB,EAAC,CAAC;EAC/CC,OAAO,GAAG,KAAK;EACfC,SAAS,GAAkB,IAAI;
|
|
1
|
+
{"version":3,"names":["_effector","require","_expoAudio","PlayerState","exports","safePlay","audio","result","play","catch","err","name","PlayerModel","player","createAudioPlayer","stopped","primedUri","pendingSeek","reset","createEvent","setPlayerState","playbackFinished","$playerState","restore","IDLE","setupAudioMode","createEffect","setAudioModeAsync","playsInSilentMode","shouldPlayInBackground","interruptionMode","pause","PAUSED","console","warn","stop","replace","prime","uri","seek","seconds","isLoaded","seekTo","resume","PLAYING","waitForLoad","target","unsubscribe","addListener","status","didJustFinish","remove","setTimeout","reinitialize","release","error"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/model/Player.model.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -18,9 +18,10 @@ export const useVoicePlayerLifecycle = ({
|
|
|
18
18
|
answersRef.current = answers;
|
|
19
19
|
useEffect(() => {
|
|
20
20
|
model.reinitializePlayer();
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
// No stopAudio cleanup: this hook re-runs across normal renders in some
|
|
22
|
+
// host components, and tearing down audio in the cleanup races with
|
|
23
|
+
// play() requests from other consumers (e.g. TimelineManager). The page
|
|
24
|
+
// unmount path (resetPlayer / cleanup) still releases audio properly.
|
|
24
25
|
}, [model]);
|
|
25
26
|
useEffect(() => {
|
|
26
27
|
model.resetPlayer();
|
|
@@ -31,10 +32,9 @@ export const useVoicePlayerLifecycle = ({
|
|
|
31
32
|
}
|
|
32
33
|
}, [model, answersKey]);
|
|
33
34
|
useEffect(() => {
|
|
34
|
-
//
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
35
|
+
// No stopAudio: VoiceSource (timeline) and VoiceTranscription (manual play
|
|
36
|
+
// button) drive playback transitions themselves. Calling stopAudio here
|
|
37
|
+
// races with concurrent play() requests and aborts in-flight audio.play().
|
|
38
38
|
model.setCurrentAttempt(activeAttempt);
|
|
39
39
|
if (activeAttempt !== null) {
|
|
40
40
|
model.loader.loadTranscriptForAttempt(activeAttempt);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useEffect","useMemo","useRef","getActiveAttempt","useVoicePlayerLifecycle","model","answers","attemptOffset","attemptsCount","problemId","activeAttempt","answersKey","map","a","_id","audioFileId","join","hasAnyAudio","some","answersRef","current","reinitializePlayer","
|
|
1
|
+
{"version":3,"names":["useEffect","useMemo","useRef","getActiveAttempt","useVoicePlayerLifecycle","model","answers","attemptOffset","attemptsCount","problemId","activeAttempt","answersKey","map","a","_id","audioFileId","join","hasAnyAudio","some","answersRef","current","reinitializePlayer","resetPlayer","initializeWithAudios","setCurrentAttempt","loader","loadTranscriptForAttempt"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/hooks/useVoicePlayerLifecycle.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,OAAO,EAAEC,MAAM,QAAQ,OAAO;AAClD,SAASC,gBAAgB,QAAQ,kBAAe;AAYhD;AACA;AACA,OAAO,MAAMC,uBAAuB,GAAGA,CAAC;EACtCC,KAAK;EACLC,OAAO;EACPC,aAAa;EACbC,aAAa;EACbC;AACM,CAAC,KAAK;EACZ,MAAMC,aAAa,GAAGP,gBAAgB,CAACI,aAAa,EAAEC,aAAa,CAAC;EAEpE,MAAMG,UAAU,GAAGV,OAAO,CACxB,MAAMK,OAAO,CAACM,GAAG,CAAEC,CAAC,IAAK,GAAGA,CAAC,CAACC,GAAG,IAAID,CAAC,CAACE,WAAW,IAAI,EAAE,EAAE,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC,EACrE,CAACV,OAAO,CACV,CAAC;EAED,MAAMW,WAAW,GAAGhB,OAAO,CAAC,MAAMK,OAAO,CAACY,IAAI,CAAEL,CAAC,IAAK,CAAC,CAACA,CAAC,CAACE,WAAW,CAAC,EAAE,CAACT,OAAO,CAAC,CAAC;EAElF,MAAMa,UAAU,GAAGjB,MAAM,CAACI,OAAO,CAAC;EAClCa,UAAU,CAACC,OAAO,GAAGd,OAAO;EAE5BN,SAAS,CAAC,MAAM;IACdK,KAAK,CAACgB,kBAAkB,CAAC,CAAC;IAC1B;IACA;IACA;IACA;EACF,CAAC,EAAE,CAAChB,KAAK,CAAC,CAAC;EAEXL,SAAS,CAAC,MAAM;IACdK,KAAK,CAACiB,WAAW,CAAC,CAAC;EACrB,CAAC,EAAE,CAACb,SAAS,CAAC,CAAC;EAEfT,SAAS,CAAC,MAAM;IACd,IAAImB,UAAU,CAACC,OAAO,CAACF,IAAI,CAAEL,CAAC,IAAKA,CAAC,CAACE,WAAW,CAAC,EAAE;MACjDV,KAAK,CAACkB,oBAAoB,CAACJ,UAAU,CAACC,OAAO,CAAC;IAChD;EACF,CAAC,EAAE,CAACf,KAAK,EAAEM,UAAU,CAAC,CAAC;EAEvBX,SAAS,CAAC,MAAM;IACd;IACA;IACA;IACAK,KAAK,CAACmB,iBAAiB,CAACd,aAAa,CAAC;IACtC,IAAIA,aAAa,KAAK,IAAI,EAAE;MAC1BL,KAAK,CAACoB,MAAM,CAACC,wBAAwB,CAAChB,aAAa,CAAC;IACtD;EACF,CAAC,EAAE,CAACL,KAAK,EAAEK,aAAa,EAAEC,UAAU,CAAC,CAAC;EAEtC,OAAO;IAAED,aAAa;IAAEO;EAAY,CAAC;AACvC,CAAC","ignoreList":[]}
|
|
@@ -48,10 +48,19 @@ export class PlaybackController {
|
|
|
48
48
|
if (!audioUri) return;
|
|
49
49
|
this.player.prime(audioUri);
|
|
50
50
|
}
|
|
51
|
+
|
|
52
|
+
// Non-destructive halt: pause + IDLE, keep audio loaded so a subsequent
|
|
53
|
+
// play() can resume the same uri without re-fetch. Previously this called
|
|
54
|
+
// player.stop() which did replace('') and set stopped=true — that corrupted
|
|
55
|
+
// the AudioPlayer (isLoaded stuck false) and aborted any in-flight play()'s
|
|
56
|
+
// waitForLoad, when the lifecycle hook re-fired stopAudio mid-play.
|
|
51
57
|
halt() {
|
|
52
58
|
this.shouldPreventPlayback = true;
|
|
53
59
|
this.abortAllDownloads();
|
|
54
|
-
this.player.
|
|
60
|
+
if (this.player.player && this.player.$playerState.getState() !== PlayerState.IDLE) {
|
|
61
|
+
this.player.player.pause();
|
|
62
|
+
this.player.setPlayerState(PlayerState.IDLE);
|
|
63
|
+
}
|
|
55
64
|
this.clearCurrentAttempt();
|
|
56
65
|
}
|
|
57
66
|
releaseResources() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createEffect","PlayerState","PlaybackController","currentPlayingAttempt","shouldPreventPlayback","constructor","deps","collection","player","downloader","playbackFinished","watch","clearCurrentAttempt","togglePlayPause","attemptNumber","playerState","$playerState","getState","PLAYING","pause","handlePlayAttempt","preloadAudio","item","get","hasAudio","primePlayerIfIdle","audioDownloadPromise","downloadAudio","error","Error","name","console","IDLE","audioUri","prime","halt","abortAllDownloads","
|
|
1
|
+
{"version":3,"names":["createEffect","PlayerState","PlaybackController","currentPlayingAttempt","shouldPreventPlayback","constructor","deps","collection","player","downloader","playbackFinished","watch","clearCurrentAttempt","togglePlayPause","attemptNumber","playerState","$playerState","getState","PLAYING","pause","handlePlayAttempt","preloadAudio","item","get","hasAudio","primePlayerIfIdle","audioDownloadPromise","downloadAudio","error","Error","name","console","IDLE","audioUri","prime","halt","abortAllDownloads","setPlayerState","releaseResources","getAll","forEach","controller","abortDownload","startsWith","URL","revokeObjectURL","e","audioLoading","update","undefined","collectionItem","downloadPromise","download","audioFileId","result","uri","audioError","isAbort","message","playAudioFx","LOADING","warn","remove","playing","resume","play"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/model/PlaybackController.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -26,6 +26,7 @@ export class PlayerModel {
|
|
|
26
26
|
player = createAudioPlayer();
|
|
27
27
|
stopped = false;
|
|
28
28
|
primedUri = null;
|
|
29
|
+
pendingSeek = null;
|
|
29
30
|
reset = createEvent();
|
|
30
31
|
setPlayerState = createEvent();
|
|
31
32
|
playbackFinished = createEvent();
|
|
@@ -50,6 +51,7 @@ export class PlayerModel {
|
|
|
50
51
|
if (this.player) {
|
|
51
52
|
this.player.replace('');
|
|
52
53
|
this.primedUri = null;
|
|
54
|
+
this.pendingSeek = null;
|
|
53
55
|
this.setPlayerState(PlayerState.IDLE);
|
|
54
56
|
} else {
|
|
55
57
|
console.warn('Cannot stop: audio player not initialized');
|
|
@@ -62,10 +64,14 @@ export class PlayerModel {
|
|
|
62
64
|
this.player.replace(uri);
|
|
63
65
|
});
|
|
64
66
|
seek = createEffect(async seconds => {
|
|
65
|
-
//
|
|
66
|
-
//
|
|
67
|
-
//
|
|
68
|
-
if (!this.player?.isLoaded)
|
|
67
|
+
// When not loaded, defer the seek so play()'s waitForLoad can apply it
|
|
68
|
+
// before starting playback — otherwise the requested offset is lost and
|
|
69
|
+
// audio starts from 0 after a scrub-across-attempt that halted the player.
|
|
70
|
+
if (!this.player?.isLoaded) {
|
|
71
|
+
this.pendingSeek = seconds;
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
this.pendingSeek = null;
|
|
69
75
|
await this.player.seekTo(seconds);
|
|
70
76
|
});
|
|
71
77
|
resume = createEffect(() => {
|
|
@@ -82,13 +88,21 @@ export class PlayerModel {
|
|
|
82
88
|
return;
|
|
83
89
|
}
|
|
84
90
|
this.stopped = false;
|
|
85
|
-
if (this.primedUri !== uri) {
|
|
91
|
+
if (this.primedUri !== uri || !this.player.isLoaded) {
|
|
86
92
|
this.player.replace(uri);
|
|
87
93
|
this.primedUri = uri;
|
|
88
94
|
}
|
|
89
|
-
const waitForLoad = () => {
|
|
95
|
+
const waitForLoad = async () => {
|
|
90
96
|
if (this.stopped) return;
|
|
91
97
|
if (this.player && this.player.isLoaded) {
|
|
98
|
+
if (this.pendingSeek !== null) {
|
|
99
|
+
const target = this.pendingSeek;
|
|
100
|
+
this.pendingSeek = null;
|
|
101
|
+
try {
|
|
102
|
+
await this.player.seekTo(target);
|
|
103
|
+
} catch {}
|
|
104
|
+
if (this.stopped) return;
|
|
105
|
+
}
|
|
92
106
|
const unsubscribe = this.player.addListener('playbackStatusUpdate', status => {
|
|
93
107
|
if (status.didJustFinish) {
|
|
94
108
|
this.playbackFinished();
|
|
@@ -119,6 +133,7 @@ export class PlayerModel {
|
|
|
119
133
|
this.player = null;
|
|
120
134
|
}
|
|
121
135
|
this.primedUri = null;
|
|
136
|
+
this.pendingSeek = null;
|
|
122
137
|
this.reset();
|
|
123
138
|
}
|
|
124
139
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createEffect","createEvent","restore","createAudioPlayer","setAudioModeAsync","PlayerState","safePlay","audio","result","play","catch","err","name","PlayerModel","player","stopped","primedUri","reset","setPlayerState","playbackFinished","$playerState","IDLE","setupAudioMode","playsInSilentMode","shouldPlayInBackground","interruptionMode","pause","PAUSED","console","warn","stop","replace","prime","uri","seek","seconds","isLoaded","seekTo","resume","PLAYING","waitForLoad","unsubscribe","addListener","status","didJustFinish","remove","setTimeout","reinitialize","release","error"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/model/Player.model.ts"],"mappings":";;AAAA,SAASA,YAAY,EAAEC,WAAW,EAAEC,OAAO,QAAQ,UAAU;AAC7D,SAAsBC,iBAAiB,EAAEC,iBAAiB,QAAQ,YAAY;AAE9E,WAAkBC,WAAW,0BAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAXA,WAAW;EAAA,OAAXA,WAAW;AAAA;;AAO7B;AACA;AACA,MAAMC,QAAQ,GAAIC,KAAkB,IAAK;EACvC,MAAMC,MAAM,GAAGD,KAAK,CAACE,IAAI,CAAC,CAAY;EACtC,IAAID,MAAM,IAAI,OAAQA,MAAM,CAAsBE,KAAK,KAAK,UAAU,EAAE;IACtE;IAAEF,MAAM,CAAsBE,KAAK,CAAEC,GAAY,IAAK;MACpD,IAAKA,GAAG,EAAwBC,IAAI,KAAK,YAAY,EAAE;MACvD,MAAMD,GAAG;IACX,CAAC,CAAC;EACJ;AACF,CAAC;AAED,OAAO,MAAME,WAAW,CAAC;EAChBC,MAAM,GAAuBX,iBAAiB,CAAC,CAAC;EAC/CY,OAAO,GAAG,KAAK;EACfC,SAAS,GAAkB,IAAI;
|
|
1
|
+
{"version":3,"names":["createEffect","createEvent","restore","createAudioPlayer","setAudioModeAsync","PlayerState","safePlay","audio","result","play","catch","err","name","PlayerModel","player","stopped","primedUri","pendingSeek","reset","setPlayerState","playbackFinished","$playerState","IDLE","setupAudioMode","playsInSilentMode","shouldPlayInBackground","interruptionMode","pause","PAUSED","console","warn","stop","replace","prime","uri","seek","seconds","isLoaded","seekTo","resume","PLAYING","waitForLoad","target","unsubscribe","addListener","status","didJustFinish","remove","setTimeout","reinitialize","release","error"],"sourceRoot":"../../../../../../src","sources":["features/voice/playing/model/Player.model.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlaybackController.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/PlaybackController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAA;AAEtE,KAAK,sBAAsB,GAAG;IAC5B,UAAU,EAAE,wBAAwB,CAAA;IACpC,MAAM,EAAE,WAAW,CAAA;IACnB,UAAU,EAAE,wBAAwB,CAAA;CACrC,CAAA;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,qBAAqB,CAAQ;gBAEzB,IAAI,EAAE,sBAAsB;IAOxC,SAAgB,eAAe,kBAAmB,MAAM,UAOvD;IAED,SAAgB,YAAY,iDAqB1B;IAEF,OAAO,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"PlaybackController.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/PlaybackController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAA;AAEtE,KAAK,sBAAsB,GAAG;IAC5B,UAAU,EAAE,wBAAwB,CAAA;IACpC,MAAM,EAAE,WAAW,CAAA;IACnB,UAAU,EAAE,wBAAwB,CAAA;CACrC,CAAA;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,qBAAqB,CAAQ;gBAEzB,IAAI,EAAE,sBAAsB;IAOxC,SAAgB,eAAe,kBAAmB,MAAM,UAOvD;IAED,SAAgB,YAAY,iDAqB1B;IAEF,OAAO,CAAC,iBAAiB;IAalB,IAAI;IAUJ,gBAAgB;IAavB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;YAaX,aAAa;IAmC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAsChC;IAEF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAkC1B;CACH"}
|
|
@@ -9,6 +9,7 @@ export declare class PlayerModel {
|
|
|
9
9
|
player: AudioPlayer | null;
|
|
10
10
|
private stopped;
|
|
11
11
|
private primedUri;
|
|
12
|
+
private pendingSeek;
|
|
12
13
|
readonly reset: import("effector").EventCallable<void>;
|
|
13
14
|
readonly setPlayerState: import("effector").EventCallable<PlayerState>;
|
|
14
15
|
readonly playbackFinished: import("effector").EventCallable<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.model.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/Player.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAwC,MAAM,YAAY,CAAA;AAE9E,0BAAkB,WAAW;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAcD,qBAAa,WAAW;IACf,MAAM,EAAE,WAAW,GAAG,IAAI,CAAsB;IACvD,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,SAAS,CAAsB;
|
|
1
|
+
{"version":3,"file":"Player.model.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/Player.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAwC,MAAM,YAAY,CAAA;AAE9E,0BAAkB,WAAW;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAcD,qBAAa,WAAW;IACf,MAAM,EAAE,WAAW,GAAG,IAAI,CAAsB;IACvD,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,WAAW,CAAsB;IAEzC,SAAgB,KAAK,yCAAgB;IACrC,SAAgB,cAAc,gDAA6B;IAC3D,SAAgB,gBAAgB,yCAAgB;IAEhD,SAAgB,YAAY,gDAAmE;IAE/F,SAAgB,cAAc,+CAM5B;IAEF,SAAgB,KAAK,+CAOnB;IAEF,SAAgB,IAAI,+CAUlB;IAEF,SAAgB,KAAK,iDAKnB;IAEF,SAAgB,IAAI,iDAUlB;IAEF,SAAgB,MAAM,+CAOpB;IAEF,SAAgB,IAAI,iDAuClB;IAEK,YAAY;IAMZ,OAAO;CAaf"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlaybackController.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/PlaybackController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAA;AAEtE,KAAK,sBAAsB,GAAG;IAC5B,UAAU,EAAE,wBAAwB,CAAA;IACpC,MAAM,EAAE,WAAW,CAAA;IACnB,UAAU,EAAE,wBAAwB,CAAA;CACrC,CAAA;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,qBAAqB,CAAQ;gBAEzB,IAAI,EAAE,sBAAsB;IAOxC,SAAgB,eAAe,kBAAmB,MAAM,UAOvD;IAED,SAAgB,YAAY,iDAqB1B;IAEF,OAAO,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"PlaybackController.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/PlaybackController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAe,MAAM,gBAAgB,CAAA;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAA;AAEtE,KAAK,sBAAsB,GAAG;IAC5B,UAAU,EAAE,wBAAwB,CAAA;IACpC,MAAM,EAAE,WAAW,CAAA;IACnB,UAAU,EAAE,wBAAwB,CAAA;CACrC,CAAA;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,qBAAqB,CAAQ;gBAEzB,IAAI,EAAE,sBAAsB;IAOxC,SAAgB,eAAe,kBAAmB,MAAM,UAOvD;IAED,SAAgB,YAAY,iDAqB1B;IAEF,OAAO,CAAC,iBAAiB;IAalB,IAAI;IAUJ,gBAAgB;IAavB,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,iBAAiB;YAaX,aAAa;IAmC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAsChC;IAEF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAkC1B;CACH"}
|
|
@@ -9,6 +9,7 @@ export declare class PlayerModel {
|
|
|
9
9
|
player: AudioPlayer | null;
|
|
10
10
|
private stopped;
|
|
11
11
|
private primedUri;
|
|
12
|
+
private pendingSeek;
|
|
12
13
|
readonly reset: import("effector").EventCallable<void>;
|
|
13
14
|
readonly setPlayerState: import("effector").EventCallable<PlayerState>;
|
|
14
15
|
readonly playbackFinished: import("effector").EventCallable<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.model.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/Player.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAwC,MAAM,YAAY,CAAA;AAE9E,0BAAkB,WAAW;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAcD,qBAAa,WAAW;IACf,MAAM,EAAE,WAAW,GAAG,IAAI,CAAsB;IACvD,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,SAAS,CAAsB;
|
|
1
|
+
{"version":3,"file":"Player.model.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/voice/playing/model/Player.model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAwC,MAAM,YAAY,CAAA;AAE9E,0BAAkB,WAAW;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAcD,qBAAa,WAAW;IACf,MAAM,EAAE,WAAW,GAAG,IAAI,CAAsB;IACvD,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,WAAW,CAAsB;IAEzC,SAAgB,KAAK,yCAAgB;IACrC,SAAgB,cAAc,gDAA6B;IAC3D,SAAgB,gBAAgB,yCAAgB;IAEhD,SAAgB,YAAY,gDAAmE;IAE/F,SAAgB,cAAc,+CAM5B;IAEF,SAAgB,KAAK,+CAOnB;IAEF,SAAgB,IAAI,+CAUlB;IAEF,SAAgB,KAAK,iDAKnB;IAEF,SAAgB,IAAI,iDAUlB;IAEF,SAAgB,MAAM,+CAOpB;IAEF,SAAgB,IAAI,iDAuClB;IAEK,YAAY;IAMZ,OAAO;CAaf"}
|
package/package.json
CHANGED
|
@@ -34,9 +34,10 @@ export const useVoicePlayerLifecycle = ({
|
|
|
34
34
|
|
|
35
35
|
useEffect(() => {
|
|
36
36
|
model.reinitializePlayer()
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
// No stopAudio cleanup: this hook re-runs across normal renders in some
|
|
38
|
+
// host components, and tearing down audio in the cleanup races with
|
|
39
|
+
// play() requests from other consumers (e.g. TimelineManager). The page
|
|
40
|
+
// unmount path (resetPlayer / cleanup) still releases audio properly.
|
|
40
41
|
}, [model])
|
|
41
42
|
|
|
42
43
|
useEffect(() => {
|
|
@@ -50,10 +51,9 @@ export const useVoicePlayerLifecycle = ({
|
|
|
50
51
|
}, [model, answersKey])
|
|
51
52
|
|
|
52
53
|
useEffect(() => {
|
|
53
|
-
//
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
54
|
+
// No stopAudio: VoiceSource (timeline) and VoiceTranscription (manual play
|
|
55
|
+
// button) drive playback transitions themselves. Calling stopAudio here
|
|
56
|
+
// races with concurrent play() requests and aborts in-flight audio.play().
|
|
57
57
|
model.setCurrentAttempt(activeAttempt)
|
|
58
58
|
if (activeAttempt !== null) {
|
|
59
59
|
model.loader.loadTranscriptForAttempt(activeAttempt)
|
|
@@ -63,10 +63,18 @@ export class PlaybackController {
|
|
|
63
63
|
this.player.prime(audioUri)
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
+
// Non-destructive halt: pause + IDLE, keep audio loaded so a subsequent
|
|
67
|
+
// play() can resume the same uri without re-fetch. Previously this called
|
|
68
|
+
// player.stop() which did replace('') and set stopped=true — that corrupted
|
|
69
|
+
// the AudioPlayer (isLoaded stuck false) and aborted any in-flight play()'s
|
|
70
|
+
// waitForLoad, when the lifecycle hook re-fired stopAudio mid-play.
|
|
66
71
|
public halt() {
|
|
67
72
|
this.shouldPreventPlayback = true
|
|
68
73
|
this.abortAllDownloads()
|
|
69
|
-
this.player.
|
|
74
|
+
if (this.player.player && this.player.$playerState.getState() !== PlayerState.IDLE) {
|
|
75
|
+
this.player.player.pause()
|
|
76
|
+
this.player.setPlayerState(PlayerState.IDLE)
|
|
77
|
+
}
|
|
70
78
|
this.clearCurrentAttempt()
|
|
71
79
|
}
|
|
72
80
|
|
|
@@ -24,6 +24,7 @@ export class PlayerModel {
|
|
|
24
24
|
public player: AudioPlayer | null = createAudioPlayer()
|
|
25
25
|
private stopped = false
|
|
26
26
|
private primedUri: string | null = null
|
|
27
|
+
private pendingSeek: number | null = null
|
|
27
28
|
|
|
28
29
|
public readonly reset = createEvent()
|
|
29
30
|
public readonly setPlayerState = createEvent<PlayerState>()
|
|
@@ -53,6 +54,7 @@ export class PlayerModel {
|
|
|
53
54
|
if (this.player) {
|
|
54
55
|
this.player.replace('')
|
|
55
56
|
this.primedUri = null
|
|
57
|
+
this.pendingSeek = null
|
|
56
58
|
this.setPlayerState(PlayerState.IDLE)
|
|
57
59
|
} else {
|
|
58
60
|
console.warn('Cannot stop: audio player not initialized')
|
|
@@ -67,10 +69,14 @@ export class PlayerModel {
|
|
|
67
69
|
})
|
|
68
70
|
|
|
69
71
|
public readonly seek = createEffect(async (seconds: number) => {
|
|
70
|
-
//
|
|
71
|
-
//
|
|
72
|
-
//
|
|
73
|
-
if (!this.player?.isLoaded)
|
|
72
|
+
// When not loaded, defer the seek so play()'s waitForLoad can apply it
|
|
73
|
+
// before starting playback — otherwise the requested offset is lost and
|
|
74
|
+
// audio starts from 0 after a scrub-across-attempt that halted the player.
|
|
75
|
+
if (!this.player?.isLoaded) {
|
|
76
|
+
this.pendingSeek = seconds
|
|
77
|
+
return
|
|
78
|
+
}
|
|
79
|
+
this.pendingSeek = null
|
|
74
80
|
await this.player.seekTo(seconds)
|
|
75
81
|
})
|
|
76
82
|
|
|
@@ -90,14 +96,22 @@ export class PlayerModel {
|
|
|
90
96
|
}
|
|
91
97
|
|
|
92
98
|
this.stopped = false
|
|
93
|
-
if (this.primedUri !== uri) {
|
|
99
|
+
if (this.primedUri !== uri || !this.player.isLoaded) {
|
|
94
100
|
this.player.replace(uri)
|
|
95
101
|
this.primedUri = uri
|
|
96
102
|
}
|
|
97
103
|
|
|
98
|
-
const waitForLoad = () => {
|
|
104
|
+
const waitForLoad = async () => {
|
|
99
105
|
if (this.stopped) return
|
|
100
106
|
if (this.player && this.player.isLoaded) {
|
|
107
|
+
if (this.pendingSeek !== null) {
|
|
108
|
+
const target = this.pendingSeek
|
|
109
|
+
this.pendingSeek = null
|
|
110
|
+
try {
|
|
111
|
+
await this.player.seekTo(target)
|
|
112
|
+
} catch {}
|
|
113
|
+
if (this.stopped) return
|
|
114
|
+
}
|
|
101
115
|
const unsubscribe = this.player.addListener('playbackStatusUpdate', (status) => {
|
|
102
116
|
if (status.didJustFinish) {
|
|
103
117
|
this.playbackFinished()
|
|
@@ -132,6 +146,7 @@ export class PlayerModel {
|
|
|
132
146
|
this.player = null
|
|
133
147
|
}
|
|
134
148
|
this.primedUri = null
|
|
149
|
+
this.pendingSeek = null
|
|
135
150
|
this.reset()
|
|
136
151
|
}
|
|
137
152
|
}
|