sfml.js 1.0.0 → 1.2.1
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/README.ja.md +10 -9
- package/README.ko.md +10 -9
- package/README.md +10 -9
- package/README.zh-CN.md +10 -9
- package/binding.gyp +23 -16
- package/dist/audio/effect-processor.js +9 -3
- package/dist/audio/input-sound-file.js +41 -15
- package/dist/audio/listener.js +33 -11
- package/dist/audio/music.js +41 -18
- package/dist/audio/output-sound-file.js +4 -2
- package/dist/audio/playback-device.js +11 -3
- package/dist/audio/sound-buffer-recorder.js +8 -5
- package/dist/audio/sound-buffer.js +40 -17
- package/dist/audio/sound-file-factory.js +21 -9
- package/dist/audio/sound-file-reader.js +21 -7
- package/dist/audio/sound-recorder.js +36 -15
- package/dist/audio/sound-source.js +117 -40
- package/dist/audio/sound-stream.js +14 -5
- package/dist/audio/sound.js +9 -4
- package/dist/audio/value.js +42 -16
- package/dist/graphics/blend-mode.js +2 -1
- package/dist/graphics/boolean-vector.d.ts +1 -2
- package/dist/graphics/boolean-vector.js +19 -9
- package/dist/graphics/color.js +2 -1
- package/dist/graphics/convex-shape.js +7 -3
- package/dist/graphics/font.js +52 -23
- package/dist/graphics/glsl-matrix.js +8 -3
- package/dist/graphics/glsl.js +47 -16
- package/dist/graphics/glyph.js +27 -10
- package/dist/graphics/image.js +30 -14
- package/dist/graphics/rect.js +15 -8
- package/dist/graphics/render-states.js +18 -9
- package/dist/graphics/render-target.js +49 -23
- package/dist/graphics/render-texture.js +24 -12
- package/dist/graphics/render-window.js +6 -3
- package/dist/graphics/shader.js +67 -32
- package/dist/graphics/shape.js +25 -13
- package/dist/graphics/sprite.js +19 -9
- package/dist/graphics/stencil-mode.js +10 -6
- package/dist/graphics/swap.js +2 -1
- package/dist/graphics/text.js +123 -48
- package/dist/graphics/texture.js +48 -24
- package/dist/graphics/transform.js +29 -13
- package/dist/graphics/transformable.js +2 -1
- package/dist/graphics/vertex-array.js +40 -18
- package/dist/graphics/vertex-buffer.js +39 -19
- package/dist/graphics/vertex.js +6 -3
- package/dist/graphics/view.js +30 -14
- package/dist/index.d.ts +4 -4
- package/dist/internal/audio-codec-registry.js +12 -6
- package/dist/internal/audio-input-stream.js +2 -1
- package/dist/internal/audio-music-pump.js +58 -24
- package/dist/internal/audio-recorder-session.js +17 -7
- package/dist/internal/audio-worker-session.js +28 -10
- package/dist/internal/audio-worker.js +40 -21
- package/dist/internal/glsl-value.d.ts +3 -1
- package/dist/internal/glsl-value.js +18 -8
- package/dist/internal/graphics-state.js +29 -15
- package/dist/internal/input-stream.d.ts +3 -1
- package/dist/internal/input-stream.js +16 -7
- package/dist/internal/numeric-properties.js +2 -1
- package/dist/internal/render-states.js +2 -1
- package/dist/internal/scalar.js +22 -13
- package/dist/internal/shaped-glyph.d.ts +3 -1
- package/dist/internal/shaped-glyph.js +12 -4
- package/dist/internal/struct-view.d.ts +3 -1
- package/dist/internal/struct-view.js +3 -1
- package/dist/internal/transformable.js +2 -1
- package/dist/network/common.js +23 -11
- package/dist/network/dns.js +25 -17
- package/dist/network/ftp.js +43 -18
- package/dist/network/http.js +126 -56
- package/dist/network/ip-address.js +50 -25
- package/dist/network/packet.js +63 -25
- package/dist/network/sftp.js +175 -74
- package/dist/network/socket-selector.js +28 -14
- package/dist/network/socket.js +71 -30
- package/dist/network/tcp-listener.js +42 -19
- package/dist/network/tcp-socket.js +111 -53
- package/dist/network/tls-material.js +2 -1
- package/dist/network/udp-socket.js +68 -33
- package/dist/system/angle.js +2 -1
- package/dist/system/clock.js +4 -2
- package/dist/system/err.js +5 -2
- package/dist/system/file-input-stream.js +8 -4
- package/dist/system/input-stream.js +6 -3
- package/dist/system/operators.d.ts +1 -1
- package/dist/system/operators.js +90 -50
- package/dist/system/sleep.js +4 -2
- package/dist/system/time.js +12 -6
- package/dist/system/vector2.js +6 -7
- package/dist/system/vector3.js +11 -6
- package/dist/window/clipboard.js +2 -1
- package/dist/window/context.js +10 -5
- package/dist/window/cursor.js +2 -1
- package/dist/window/event.js +9 -5
- package/dist/window/mouse.js +4 -2
- package/dist/window/video-mode.js +2 -1
- package/dist/window/window.js +19 -12
- package/native/addon.cc +25 -12
- package/native/audio-binding.cc +266 -126
- package/native/audio-codec-binding.cc +147 -77
- package/native/audio-device-binding.cc +76 -49
- package/native/audio-file-binding.cc +116 -67
- package/native/audio-recorder-binding.cc +147 -98
- package/native/audio-recorder.h +1 -1
- package/native/audio-state.h +53 -30
- package/native/audio-stream-binding.cc +148 -94
- package/native/audio-stream.h +5 -4
- package/native/audio-worker-binding.cc +163 -81
- package/native/audio-worker.h +35 -19
- package/native/batch-drawable.cc +29 -16
- package/native/batch-drawable.h +11 -8
- package/native/context-binding.cc +40 -27
- package/native/context-settings.h +15 -8
- package/native/deferred-delete.cc +9 -6
- package/native/deferred-delete.h +7 -8
- package/native/error-stream-binding.cc +42 -28
- package/native/font-binding.cc +89 -48
- package/native/graphics-binding.cc +122 -72
- package/native/graphics-state.h +50 -36
- package/native/image-binding.cc +38 -24
- package/native/image-state.h +26 -18
- package/native/input-binding.cc +42 -27
- package/native/render-window-binding.cc +38 -23
- package/native/shader-binding.cc +115 -50
- package/native/shape-binding.cc +94 -49
- package/native/shape-state.h +18 -9
- package/native/shaped-glyph-storage.h +9 -5
- package/native/stream-binding.cc +143 -117
- package/native/system-binding.cc +17 -12
- package/native/text-binding.cc +68 -35
- package/native/text-state.h +25 -18
- package/native/texture-binding.cc +42 -33
- package/native/texture-resource.h +20 -12
- package/native/time-value.h +3 -1
- package/native/transformable-binding.cc +12 -6
- package/native/transformable-state.h +6 -6
- package/native/value-binding.h +46 -28
- package/native/value-layout.h +10 -10
- package/native/values-binding.cc +29 -23
- package/native/vertex-binding.cc +18 -12
- package/native/vertex-buffer-binding.cc +38 -24
- package/native/vertex-storage.h +2 -2
- package/native/view-data.h +4 -3
- package/native/window-binding.cc +75 -45
- package/native/window-event.h +20 -11
- package/native/window-owner.h +15 -12
- package/package.json +44 -51
- package/src/audio/effect-processor.ts +9 -3
- package/src/audio/input-sound-file.ts +108 -36
- package/src/audio/listener.ts +39 -13
- package/src/audio/music.ts +112 -47
- package/src/audio/output-sound-file.ts +40 -11
- package/src/audio/playback-device.ts +23 -8
- package/src/audio/sound-buffer-recorder.ts +35 -13
- package/src/audio/sound-buffer.ts +166 -58
- package/src/audio/sound-file-factory.ts +127 -49
- package/src/audio/sound-file-reader.ts +49 -15
- package/src/audio/sound-recorder.ts +100 -34
- package/src/audio/sound-source.ts +142 -45
- package/src/audio/sound-stream.ts +15 -5
- package/src/audio/sound.ts +12 -4
- package/src/audio/value.ts +89 -26
- package/src/graphics/blend-mode.ts +3 -1
- package/src/graphics/boolean-vector.ts +56 -26
- package/src/graphics/color.ts +3 -1
- package/src/graphics/convex-shape.ts +10 -3
- package/src/graphics/font.ts +171 -50
- package/src/graphics/glsl-matrix.ts +9 -3
- package/src/graphics/glsl.ts +81 -35
- package/src/graphics/glyph.ts +67 -26
- package/src/graphics/image.ts +119 -45
- package/src/graphics/rect.ts +56 -24
- package/src/graphics/render-states.ts +31 -14
- package/src/graphics/render-target.ts +197 -81
- package/src/graphics/render-texture.ts +36 -12
- package/src/graphics/render-window.ts +9 -3
- package/src/graphics/shader.ts +186 -61
- package/src/graphics/shape.ts +93 -35
- package/src/graphics/sprite.ts +64 -25
- package/src/graphics/stencil-mode.ts +12 -6
- package/src/graphics/swap.ts +3 -2
- package/src/graphics/text.ts +229 -74
- package/src/graphics/texture.ts +180 -61
- package/src/graphics/transform.ts +132 -47
- package/src/graphics/transformable.ts +3 -1
- package/src/graphics/vertex-array.ts +87 -35
- package/src/graphics/vertex-buffer.ts +97 -33
- package/src/graphics/vertex.ts +9 -3
- package/src/graphics/view.ts +59 -21
- package/src/index.ts +101 -23
- package/src/internal/audio-codec-registry.ts +18 -6
- package/src/internal/audio-input-stream.ts +6 -2
- package/src/internal/audio-music-pump.ts +116 -41
- package/src/internal/audio-native.ts +249 -96
- package/src/internal/audio-recorder-session.ts +68 -24
- package/src/internal/audio-worker-session.ts +65 -21
- package/src/internal/audio-worker.ts +85 -41
- package/src/internal/glsl-value.ts +26 -11
- package/src/internal/graphics-state.ts +57 -20
- package/src/internal/input-stream.ts +23 -10
- package/src/internal/native.ts +252 -99
- package/src/internal/numeric-properties.ts +2 -1
- package/src/internal/render-states.ts +3 -1
- package/src/internal/scalar.ts +33 -14
- package/src/internal/shaped-glyph.ts +25 -12
- package/src/internal/struct-view.ts +40 -13
- package/src/internal/transformable.ts +3 -1
- package/src/network/common.ts +35 -11
- package/src/network/dns.ts +95 -38
- package/src/network/ftp.ts +129 -47
- package/src/network/http.ts +232 -77
- package/src/network/ip-address.ts +118 -48
- package/src/network/packet.ts +161 -54
- package/src/network/sftp.ts +498 -168
- package/src/network/socket-selector.ts +66 -26
- package/src/network/socket.ts +133 -46
- package/src/network/tcp-listener.ts +78 -29
- package/src/network/tcp-socket.ts +240 -95
- package/src/network/tls-material.ts +6 -2
- package/src/network/udp-socket.ts +147 -53
- package/src/system/angle.ts +3 -1
- package/src/system/clock.ts +12 -4
- package/src/system/err.ts +5 -2
- package/src/system/file-input-stream.ts +12 -4
- package/src/system/input-stream.ts +9 -3
- package/src/system/operators.ts +290 -115
- package/src/system/sleep.ts +6 -2
- package/src/system/time.ts +18 -6
- package/src/system/timeout-with-predicate.ts +19 -8
- package/src/system/vector2.ts +101 -49
- package/src/system/vector3.ts +85 -36
- package/src/window/clipboard.ts +3 -1
- package/src/window/context.ts +15 -5
- package/src/window/cursor.ts +3 -1
- package/src/window/event.ts +26 -12
- package/src/window/mouse.ts +6 -2
- package/src/window/video-mode.ts +3 -1
- package/src/window/window.ts +119 -37
- package/test/native/audio-probes.cc +74 -36
- package/test/native/deferred-delete-probes.cc +17 -11
- package/test/native/drawable-probes.cc +70 -36
- package/test/native/exception-probes.cc +14 -9
- package/test/native/image-probes.cc +20 -10
- package/test/native/matrix-probes.cc +8 -4
- package/test/native/network-oracle.cc +17 -11
- package/test/native/render-texture-probes.cc +33 -24
- package/test/native/shader-probes.cc +9 -9
- package/test/native/shape-probes.cc +37 -23
- package/test/native/sprite-probes.cc +41 -25
- package/test/native/system-probes.cc +58 -35
- package/test/native/text-probes.cc +77 -44
- package/test/native/texture-probes.cc +43 -26
- package/test/native/time-probes.cc +18 -12
- package/test/native/transform-probes.cc +15 -10
- package/test/native/transformable-probes.cc +23 -17
- package/test/native/value-oracle.h +9 -4
- package/test/native/value-probes.cc +31 -23
- package/test/native/vertex-array-probes.cc +22 -14
- package/test/native/vertex-buffer-probes.cc +28 -17
- package/test/native/view-probes.cc +29 -17
- package/test/native/window-probes.cc +66 -33
- package/tools/ensure-sfml.cjs +9 -0
- package/tools/generate-network-constants.cjs +11 -6
- package/tools/generate-window-constants.cjs +31 -12
- package/docs/README.ja.md +0 -30
- package/docs/README.ko.md +0 -30
- package/docs/README.md +0 -30
- package/docs/README.zh-CN.md +0 -30
- package/docs/api.ja.md +0 -84
- package/docs/api.ko.md +0 -84
- package/docs/api.md +0 -81
- package/docs/api.zh-CN.md +0 -81
- package/docs/audio.ja.md +0 -249
- package/docs/audio.ko.md +0 -251
- package/docs/audio.md +0 -252
- package/docs/audio.zh-CN.md +0 -252
- package/docs/concepts.ja.md +0 -130
- package/docs/concepts.ko.md +0 -130
- package/docs/concepts.md +0 -131
- package/docs/concepts.zh-CN.md +0 -131
- package/docs/development.ja.md +0 -144
- package/docs/development.ko.md +0 -144
- package/docs/development.md +0 -146
- package/docs/development.zh-CN.md +0 -146
- package/docs/getting-started.ja.md +0 -154
- package/docs/getting-started.ko.md +0 -154
- package/docs/getting-started.md +0 -156
- package/docs/getting-started.zh-CN.md +0 -156
- package/docs/graphics.ja.md +0 -256
- package/docs/graphics.ko.md +0 -254
- package/docs/graphics.md +0 -255
- package/docs/graphics.zh-CN.md +0 -257
- package/docs/network.ja.md +0 -214
- package/docs/network.ko.md +0 -216
- package/docs/network.md +0 -218
- package/docs/network.zh-CN.md +0 -218
- package/docs/system.ja.md +0 -169
- package/docs/system.ko.md +0 -171
- package/docs/system.md +0 -173
- package/docs/system.zh-CN.md +0 -173
- package/docs/window.ja.md +0 -138
- package/docs/window.ko.md +0 -140
- package/docs/window.md +0 -141
- package/docs/window.zh-CN.md +0 -141
- package/native/exception-boundary.h +0 -97
- package/native/numeric-fields.h +0 -96
- package/native/shared-handle.h +0 -107
- package/test/tsconfig.json +0 -8
- package/tools/configure-lsp.cjs +0 -23
- package/tools/lib_downloader.cjs +0 -92
- package/tools/lib_downloader_urls.cjs +0 -23
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { audioNative, type AudioHandle } from './audio-native';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
InputSoundFile,
|
|
4
|
+
cancelAudioInput,
|
|
5
|
+
} from '../audio/input-sound-file';
|
|
3
6
|
import type { AudioWorkerStats, SoundStreamChunk } from '../audio/worker';
|
|
4
7
|
import { Time } from '../system/time';
|
|
5
8
|
import { isAudioInputCancellation } from './audio-input-stream';
|
|
@@ -7,13 +10,16 @@ import { isAudioInputCancellation } from './audio-input-stream';
|
|
|
7
10
|
/** 对象所属 JS 线程的音乐回调;实现只能弱引用包装对象。 */
|
|
8
11
|
export interface AudioMusicCallbacks {
|
|
9
12
|
/** 填充本次原生槽;完成前槽不会复用。 */
|
|
10
|
-
onGetData(
|
|
11
|
-
|
|
13
|
+
onGetData(
|
|
14
|
+
chunk: SoundStreamChunk,
|
|
15
|
+
pump: AudioMusicPump,
|
|
16
|
+
): boolean | Promise<boolean>;
|
|
12
17
|
/** 响应本次队列代数的定位请求。 */
|
|
13
18
|
onSeek(offset: Time, pump: AudioMusicPump): void | Promise<void>;
|
|
14
19
|
/** 准备末块时返回下一轮交错样本偏移。 */
|
|
15
|
-
onLoop(
|
|
16
|
-
|
|
20
|
+
onLoop(
|
|
21
|
+
pump: AudioMusicPump,
|
|
22
|
+
): bigint | undefined | Promise<bigint | undefined>;
|
|
17
23
|
}
|
|
18
24
|
|
|
19
25
|
/** Decode ahead into native slots; SFML's device callback only consumes PCM. */
|
|
@@ -44,18 +50,23 @@ export class AudioMusicPump {
|
|
|
44
50
|
private seekTarget?: { time: bigint; sample: bigint };
|
|
45
51
|
|
|
46
52
|
/** 创建解码会话;下一微任务才开始调用用户代码。 */
|
|
47
|
-
constructor(
|
|
53
|
+
constructor(
|
|
54
|
+
private readonly handle: AudioHandle<'worker'>,
|
|
55
|
+
token: bigint,
|
|
48
56
|
private readonly file: InputSoundFile,
|
|
49
|
-
private readonly callbacks?: AudioMusicCallbacks
|
|
57
|
+
private readonly callbacks?: AudioMusicCallbacks,
|
|
58
|
+
) {
|
|
50
59
|
this.ready = new Promise((resolve, reject) => {
|
|
51
60
|
this.resolveReady = resolve;
|
|
52
61
|
this.rejectReady = reject;
|
|
53
62
|
});
|
|
54
63
|
void this.ready.catch(() => {});
|
|
55
|
-
this.done = Promise.resolve()
|
|
64
|
+
this.done = Promise.resolve()
|
|
65
|
+
.then(() => this.run(token))
|
|
56
66
|
.catch((error: unknown) => {
|
|
57
67
|
if (!this.closed || !isAudioInputCancellation(error)) {
|
|
58
|
-
this.failure ??=
|
|
68
|
+
this.failure ??=
|
|
69
|
+
error instanceof Error ? error : new Error(String(error));
|
|
59
70
|
this.rejectReady(this.failure);
|
|
60
71
|
}
|
|
61
72
|
})
|
|
@@ -63,11 +74,19 @@ export class AudioMusicPump {
|
|
|
63
74
|
}
|
|
64
75
|
|
|
65
76
|
/** 最近的解码或用户回调错误。 */
|
|
66
|
-
get error(): Error | undefined {
|
|
77
|
+
get error(): Error | undefined {
|
|
78
|
+
return this.failure;
|
|
79
|
+
}
|
|
67
80
|
/** 读取 Native 队列的累计统计。 */
|
|
68
81
|
getStats(): AudioWorkerStats {
|
|
69
|
-
const fields = new BigUint64Array(
|
|
70
|
-
|
|
82
|
+
const fields = new BigUint64Array(
|
|
83
|
+
audioNative.audioWorkerStats(this.handle),
|
|
84
|
+
);
|
|
85
|
+
return {
|
|
86
|
+
underruns: fields[0],
|
|
87
|
+
overruns: fields[1],
|
|
88
|
+
processed: fields[2],
|
|
89
|
+
};
|
|
71
90
|
}
|
|
72
91
|
/** 请求关闭但不等待当前用户回调,允许在回调内安全调用。 */
|
|
73
92
|
requestClose(): void {
|
|
@@ -80,47 +99,77 @@ export class AudioMusicPump {
|
|
|
80
99
|
async close(): Promise<void> {
|
|
81
100
|
this.requestClose();
|
|
82
101
|
await this.done;
|
|
83
|
-
if (this.failure)
|
|
102
|
+
if (this.failure) {
|
|
103
|
+
throw this.failure;
|
|
104
|
+
}
|
|
84
105
|
}
|
|
85
106
|
/** 默认解码实现;只能由当前会话的 onGetData 调用。 */
|
|
86
107
|
async onGetData(chunk: SoundStreamChunk): Promise<boolean> {
|
|
87
|
-
if (this.closed) {
|
|
108
|
+
if (this.closed) {
|
|
109
|
+
chunk.sampleCount = 0;
|
|
110
|
+
return false;
|
|
111
|
+
}
|
|
88
112
|
const fields = this.fields!;
|
|
89
113
|
const counts = this.counts!;
|
|
90
114
|
const position = this.file.getSampleOffset();
|
|
91
115
|
const end = counts[3] + counts[4];
|
|
92
116
|
let size = chunk.samples.length;
|
|
93
|
-
if (
|
|
94
|
-
|
|
117
|
+
if (
|
|
118
|
+
fields[4] &&
|
|
119
|
+
counts[4] &&
|
|
120
|
+
position <= end &&
|
|
121
|
+
position + BigInt(size) > end
|
|
122
|
+
) {
|
|
123
|
+
size = Number(end - position);
|
|
124
|
+
}
|
|
95
125
|
let count: bigint;
|
|
96
126
|
try {
|
|
97
127
|
count = await this.file.read(chunk.samples.subarray(0, size));
|
|
98
128
|
} catch (error) {
|
|
99
|
-
if (!this.closed || !isAudioInputCancellation(error))
|
|
129
|
+
if (!this.closed || !isAudioInputCancellation(error)) {
|
|
130
|
+
throw error;
|
|
131
|
+
}
|
|
100
132
|
chunk.sampleCount = 0;
|
|
101
133
|
return false;
|
|
102
134
|
}
|
|
103
135
|
const next = position + count;
|
|
104
136
|
const loopEnd = fields[4] !== 0 && counts[4] !== 0n && next === end;
|
|
105
137
|
chunk.sampleCount = Number(count);
|
|
106
|
-
this.loopOffset = loopEnd
|
|
138
|
+
this.loopOffset = loopEnd
|
|
139
|
+
? counts[3]
|
|
140
|
+
: next >= counts[2]
|
|
141
|
+
? 0n
|
|
142
|
+
: undefined;
|
|
107
143
|
return count !== 0n && next < counts[2] && !loopEnd;
|
|
108
144
|
}
|
|
109
145
|
/** 默认定位文件;时间以微秒表示。 */
|
|
110
146
|
async onSeek(offset: Time): Promise<void> {
|
|
111
|
-
if (this.closed)
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
147
|
+
if (this.closed) {
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
const target =
|
|
151
|
+
this.seekTarget?.time === offset.asMicroseconds()
|
|
152
|
+
? this.seekTarget.sample
|
|
153
|
+
: offset;
|
|
154
|
+
try {
|
|
155
|
+
await this.file.seek(target);
|
|
156
|
+
} catch (error) {
|
|
157
|
+
if (!this.closed || !isAudioInputCancellation(error)) {
|
|
158
|
+
throw error;
|
|
159
|
+
}
|
|
116
160
|
}
|
|
117
161
|
}
|
|
118
162
|
/** 返回默认文件解码的下一轮交错样本位置。 */
|
|
119
|
-
onLoop(): bigint | undefined {
|
|
163
|
+
onLoop(): bigint | undefined {
|
|
164
|
+
return this.loopOffset;
|
|
165
|
+
}
|
|
120
166
|
/** 用户回调错误独立于取消状态保留,并进入 ready/close 错误通道。 */
|
|
121
167
|
private async dispatch<T>(callback: () => T | Promise<T>): Promise<T> {
|
|
122
|
-
try {
|
|
123
|
-
|
|
168
|
+
try {
|
|
169
|
+
return await callback();
|
|
170
|
+
} catch (error) {
|
|
171
|
+
this.failure ??=
|
|
172
|
+
error instanceof Error ? error : new Error(String(error));
|
|
124
173
|
this.rejectReady(this.failure);
|
|
125
174
|
throw error;
|
|
126
175
|
}
|
|
@@ -138,22 +187,34 @@ export class AudioMusicPump {
|
|
|
138
187
|
try {
|
|
139
188
|
for (;;) {
|
|
140
189
|
const operation = audioNative.pollAudioWorker(mapping.handle);
|
|
141
|
-
if (operation === -3)
|
|
190
|
+
if (operation === -3) {
|
|
191
|
+
break;
|
|
192
|
+
}
|
|
142
193
|
if (operation === -2) {
|
|
143
194
|
const offset = new Time(times[0]);
|
|
144
|
-
this.seekTarget =
|
|
145
|
-
|
|
195
|
+
this.seekTarget =
|
|
196
|
+
times[5] >= 0n
|
|
197
|
+
? { time: times[0], sample: times[5] }
|
|
198
|
+
: undefined;
|
|
146
199
|
try {
|
|
147
200
|
if (this.callbacks) {
|
|
148
|
-
await this.dispatch(() =>
|
|
149
|
-
|
|
150
|
-
|
|
201
|
+
await this.dispatch(() =>
|
|
202
|
+
this.callbacks!.onSeek(offset, this),
|
|
203
|
+
);
|
|
204
|
+
} else {
|
|
205
|
+
await this.onSeek(offset);
|
|
206
|
+
}
|
|
207
|
+
} finally {
|
|
208
|
+
this.seekTarget = undefined;
|
|
209
|
+
}
|
|
151
210
|
continue;
|
|
152
211
|
}
|
|
153
212
|
if (operation === -1) {
|
|
154
213
|
await new Promise<void>(resolve => {
|
|
155
214
|
this.timer = setTimeout(resolve, 2);
|
|
156
|
-
if (this.primed && !this.closed)
|
|
215
|
+
if (this.primed && !this.closed) {
|
|
216
|
+
this.timer.unref();
|
|
217
|
+
}
|
|
157
218
|
});
|
|
158
219
|
this.timer = undefined;
|
|
159
220
|
continue;
|
|
@@ -164,24 +225,38 @@ export class AudioMusicPump {
|
|
|
164
225
|
const more = await (this.callbacks
|
|
165
226
|
? this.dispatch(() => this.callbacks!.onGetData(chunk, this))
|
|
166
227
|
: this.onGetData(chunk));
|
|
167
|
-
if (this.closed)
|
|
228
|
+
if (this.closed) {
|
|
229
|
+
break;
|
|
230
|
+
}
|
|
168
231
|
if (typeof more !== 'boolean') {
|
|
169
232
|
throw new TypeError('onGetData must return a boolean');
|
|
170
233
|
}
|
|
171
234
|
if (chunk.samples !== samples) {
|
|
172
235
|
throw new TypeError('Fill the provided native sample buffer');
|
|
173
236
|
}
|
|
174
|
-
if (
|
|
175
|
-
|
|
237
|
+
if (
|
|
238
|
+
!Number.isInteger(chunk.sampleCount) ||
|
|
239
|
+
chunk.sampleCount < 0 ||
|
|
240
|
+
chunk.sampleCount > samples.length
|
|
241
|
+
) {
|
|
176
242
|
throw new RangeError('Invalid stream sample count');
|
|
177
243
|
}
|
|
178
244
|
fields[2] = chunk.sampleCount;
|
|
179
245
|
fields[3] = +more;
|
|
180
|
-
const loop = more
|
|
181
|
-
?
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
246
|
+
const loop = more
|
|
247
|
+
? undefined
|
|
248
|
+
: await (this.callbacks
|
|
249
|
+
? this.dispatch(() => this.callbacks!.onLoop(this))
|
|
250
|
+
: this.onLoop());
|
|
251
|
+
if (this.closed) {
|
|
252
|
+
break;
|
|
253
|
+
}
|
|
254
|
+
if (
|
|
255
|
+
loop !== undefined &&
|
|
256
|
+
(typeof loop !== 'bigint' ||
|
|
257
|
+
loop < 0n ||
|
|
258
|
+
loop > 0x7fffffffffffffffn)
|
|
259
|
+
) {
|
|
185
260
|
throw new RangeError('Invalid loop sample offset');
|
|
186
261
|
}
|
|
187
262
|
times[1] = loop ?? -1n;
|
|
@@ -3,7 +3,9 @@ import type { NativeStruct } from './struct-view';
|
|
|
3
3
|
import type { NativeStreamDispatch } from './native';
|
|
4
4
|
|
|
5
5
|
declare const audioBrand: unique symbol;
|
|
6
|
-
export interface AudioHandle<T extends string> {
|
|
6
|
+
export interface AudioHandle<T extends string> {
|
|
7
|
+
readonly [audioBrand]: T;
|
|
8
|
+
}
|
|
7
9
|
type Callback<T> = (error: Error | null, result: T) => void;
|
|
8
10
|
export interface AudioBufferMapping {
|
|
9
11
|
info: NativeStruct;
|
|
@@ -33,133 +35,281 @@ export interface AudioReaderInfoMapping {
|
|
|
33
35
|
}
|
|
34
36
|
export interface AudioBinding {
|
|
35
37
|
createAudioReaderInfo(): AudioReaderInfoMapping;
|
|
36
|
-
setAudioReaderChannels(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
38
|
+
setAudioReaderChannels(
|
|
39
|
+
handle: AudioHandle<'readerInfo'>,
|
|
40
|
+
map: Int32Array,
|
|
41
|
+
): ArrayBuffer;
|
|
42
|
+
createAudioReader(
|
|
43
|
+
input: string | Uint8Array | AudioHandle<'stream'>,
|
|
44
|
+
callback: Callback<AudioHandle<'reader'> | undefined>,
|
|
45
|
+
): void;
|
|
46
|
+
openAudioReader(
|
|
47
|
+
handle: AudioHandle<'reader'>,
|
|
48
|
+
stream: AudioHandle<'stream'>,
|
|
49
|
+
callback: Callback<AudioReaderInfoMapping | undefined>,
|
|
50
|
+
): void;
|
|
51
|
+
readAudioReader(
|
|
52
|
+
handle: AudioHandle<'reader'>,
|
|
53
|
+
samples: Int16Array,
|
|
54
|
+
callback: Callback<bigint>,
|
|
55
|
+
): void;
|
|
56
|
+
seekAudioReader(
|
|
57
|
+
handle: AudioHandle<'reader'>,
|
|
58
|
+
offset: bigint,
|
|
59
|
+
callback: Callback<void>,
|
|
60
|
+
): void;
|
|
61
|
+
closeAudioReader(
|
|
62
|
+
handle: AudioHandle<'reader'>,
|
|
63
|
+
callback: Callback<void>,
|
|
64
|
+
): void;
|
|
47
65
|
createAudioWriter(filename: string): AudioHandle<'writer'> | undefined;
|
|
48
|
-
openAudioWriter(
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
66
|
+
openAudioWriter(
|
|
67
|
+
handle: AudioHandle<'writer'>,
|
|
68
|
+
filename: string,
|
|
69
|
+
rate: number,
|
|
70
|
+
count: number,
|
|
71
|
+
map: Int32Array,
|
|
72
|
+
callback: Callback<boolean>,
|
|
73
|
+
): void;
|
|
74
|
+
writeAudioWriter(
|
|
75
|
+
handle: AudioHandle<'writer'>,
|
|
76
|
+
samples: Int16Array,
|
|
77
|
+
callback: Callback<void>,
|
|
78
|
+
): void;
|
|
79
|
+
closeAudioWriter(
|
|
80
|
+
handle: AudioHandle<'writer'>,
|
|
81
|
+
callback: Callback<void>,
|
|
82
|
+
): void;
|
|
83
|
+
createAudioFileMetadata(
|
|
84
|
+
info: AudioHandle<'readerInfo'>,
|
|
85
|
+
): AudioFileMapping & {
|
|
55
86
|
handle: AudioHandle<'fileMetadata'>;
|
|
56
87
|
};
|
|
57
|
-
updateAudioFileMetadata(
|
|
58
|
-
|
|
88
|
+
updateAudioFileMetadata(
|
|
89
|
+
handle: AudioHandle<'fileMetadata'>,
|
|
90
|
+
operation: number,
|
|
91
|
+
count?: bigint,
|
|
92
|
+
): void;
|
|
59
93
|
allocateAudioSamples(count: number): ArrayBuffer;
|
|
60
|
-
createAudioInputStream(
|
|
94
|
+
createAudioInputStream(
|
|
95
|
+
dispatch: NativeStreamDispatch,
|
|
96
|
+
): AudioHandle<'stream'>;
|
|
61
97
|
closeAudioInputStream(handle: AudioHandle<'stream'>): void;
|
|
62
98
|
createAudioRecorder(buffer: boolean): {
|
|
63
|
-
handle: AudioHandle<'recorder'>;
|
|
99
|
+
handle: AudioHandle<'recorder'>;
|
|
100
|
+
values: ArrayBuffer;
|
|
101
|
+
channelMap: ArrayBuffer;
|
|
64
102
|
};
|
|
65
|
-
prepareAudioRecorder(
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
callback: Callback<
|
|
71
|
-
|
|
72
|
-
|
|
103
|
+
prepareAudioRecorder(
|
|
104
|
+
handle: AudioHandle<'recorder'>,
|
|
105
|
+
rate: number,
|
|
106
|
+
frames: number,
|
|
107
|
+
slots: number,
|
|
108
|
+
callback: Callback<{
|
|
109
|
+
handle?: AudioHandle<'worker'>;
|
|
110
|
+
token?: bigint;
|
|
111
|
+
}>,
|
|
112
|
+
callbacks?: boolean,
|
|
113
|
+
): void;
|
|
114
|
+
startAudioRecorder(
|
|
115
|
+
handle: AudioHandle<'recorder'>,
|
|
116
|
+
callback: Callback<boolean>,
|
|
117
|
+
): void;
|
|
118
|
+
stopAudioRecorder(
|
|
119
|
+
handle: AudioHandle<'recorder'>,
|
|
120
|
+
callback: Callback<AudioHandle<'bufferData'> | undefined>,
|
|
121
|
+
): void;
|
|
73
122
|
/** 创建独立录音会话的 Native PCM 聚合器,快照当前采样率和声道映射。 */
|
|
74
|
-
createAudioRecorderBuffer(
|
|
75
|
-
|
|
123
|
+
createAudioRecorderBuffer(
|
|
124
|
+
handle: AudioHandle<'recorder'>,
|
|
125
|
+
): AudioHandle<'recorderBuffer'>;
|
|
76
126
|
/** 重置或完成 Native PCM 聚合,返回独立的 SoundBuffer 数据句柄。 */
|
|
77
|
-
audioRecorderBuffer(
|
|
78
|
-
|
|
127
|
+
audioRecorderBuffer(
|
|
128
|
+
handle: AudioHandle<'recorderBuffer'>,
|
|
129
|
+
command: 0 | 2,
|
|
130
|
+
): AudioHandle<'bufferData'>;
|
|
79
131
|
/** 追加交错 16 位 PCM 样本;只接受完整声道帧,数据由 Native 持有。 */
|
|
80
|
-
audioRecorderBuffer(
|
|
81
|
-
|
|
132
|
+
audioRecorderBuffer(
|
|
133
|
+
handle: AudioHandle<'recorderBuffer'>,
|
|
134
|
+
command: 1,
|
|
135
|
+
samples: Int16Array,
|
|
136
|
+
): void;
|
|
82
137
|
audioRecorderDevice(handle: AudioHandle<'recorder'>): string;
|
|
83
|
-
audioRecorderDevice(
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
138
|
+
audioRecorderDevice(
|
|
139
|
+
handle: AudioHandle<'recorder'>,
|
|
140
|
+
name: string,
|
|
141
|
+
callback: Callback<boolean>,
|
|
142
|
+
): void;
|
|
143
|
+
audioRecorderChannels(
|
|
144
|
+
handle: AudioHandle<'recorder'>,
|
|
145
|
+
count: number,
|
|
146
|
+
): ArrayBuffer;
|
|
87
147
|
audioCaptureDevices(command: 0): string[];
|
|
88
148
|
audioCaptureDevices(command: 1): string;
|
|
89
149
|
audioCaptureDevices(command: 2): boolean;
|
|
90
|
-
createAudioStream(
|
|
91
|
-
|
|
92
|
-
|
|
150
|
+
createAudioStream(
|
|
151
|
+
frames: number,
|
|
152
|
+
channels: number,
|
|
153
|
+
rate: number,
|
|
154
|
+
slots: number,
|
|
155
|
+
map: Int32Array,
|
|
156
|
+
): AudioSourceMapping & {
|
|
157
|
+
token: bigint;
|
|
158
|
+
worker: AudioHandle<'worker'>;
|
|
93
159
|
};
|
|
94
|
-
openAudioMusicStream(
|
|
95
|
-
|
|
96
|
-
|
|
160
|
+
openAudioMusicStream(
|
|
161
|
+
source: AudioHandle<'source'>,
|
|
162
|
+
frames: number,
|
|
163
|
+
channels: number,
|
|
164
|
+
rate: number,
|
|
165
|
+
slots: number,
|
|
166
|
+
map: Int32Array,
|
|
167
|
+
sampleCount: bigint,
|
|
168
|
+
): { handle: AudioHandle<'worker'>; token: bigint };
|
|
97
169
|
attachAudioWorker(token: bigint): AudioWorkerMapping;
|
|
98
170
|
pollAudioWorker(handle: AudioHandle<'worker'>): number;
|
|
99
171
|
commitAudioWorker(handle: AudioHandle<'worker'>, more?: boolean): void;
|
|
100
172
|
closeAudioWorker(handle: AudioHandle<'worker'>): void;
|
|
101
173
|
audioWorkerStats(handle: AudioHandle<'worker'>): ArrayBuffer;
|
|
102
|
-
createAudioEffect(
|
|
103
|
-
|
|
174
|
+
createAudioEffect(
|
|
175
|
+
frames: number,
|
|
176
|
+
channels: number,
|
|
177
|
+
slots: number,
|
|
178
|
+
): {
|
|
179
|
+
handle: AudioHandle<'worker'>;
|
|
180
|
+
token: bigint;
|
|
181
|
+
};
|
|
182
|
+
setAudioEffect(
|
|
183
|
+
source: AudioHandle<'source'>,
|
|
184
|
+
effect?: AudioHandle<'worker'>,
|
|
185
|
+
): void;
|
|
186
|
+
createAudioDeviceState(): {
|
|
187
|
+
handle: AudioHandle<'device'>;
|
|
188
|
+
buffer: ArrayBuffer;
|
|
104
189
|
};
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
audioDeviceNotifications(
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
createAudioBuffer(
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
map: Int32Array
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
190
|
+
audioDevice(
|
|
191
|
+
handle: AudioHandle<'device'>,
|
|
192
|
+
command: number,
|
|
193
|
+
name?: string,
|
|
194
|
+
): string | string[] | undefined;
|
|
195
|
+
audioDeviceNotifications(
|
|
196
|
+
callback?: ((event: number) => void) | null,
|
|
197
|
+
): void;
|
|
198
|
+
createAudioBuffer(
|
|
199
|
+
source?: AudioHandle<'buffer'>,
|
|
200
|
+
): AudioBufferMapping & { handle: AudioHandle<'buffer'> };
|
|
201
|
+
createAudioBuffer(
|
|
202
|
+
samples: Int16Array,
|
|
203
|
+
rate: number,
|
|
204
|
+
channels: number,
|
|
205
|
+
map: Int32Array,
|
|
206
|
+
): AudioBufferMapping & { handle: AudioHandle<'buffer'> };
|
|
207
|
+
assignAudioBuffer(
|
|
208
|
+
target: AudioHandle<'buffer'>,
|
|
209
|
+
source: AudioHandle<'buffer'>,
|
|
210
|
+
): AudioBufferMapping;
|
|
211
|
+
loadAudioBuffer(
|
|
212
|
+
input: string | Uint8Array | AudioHandle<'stream'>,
|
|
213
|
+
callback: Callback<AudioHandle<'bufferData'> | undefined>,
|
|
214
|
+
): void;
|
|
215
|
+
audioBufferSamples(
|
|
216
|
+
samples: Int16Array,
|
|
217
|
+
rate: number,
|
|
218
|
+
channels: number,
|
|
219
|
+
map: Int32Array,
|
|
220
|
+
): AudioHandle<'bufferData'> | undefined;
|
|
221
|
+
commitAudioBuffer(
|
|
222
|
+
handle: AudioHandle<'buffer'>,
|
|
223
|
+
data: AudioHandle<'bufferData'>,
|
|
224
|
+
): AudioBufferMapping;
|
|
225
|
+
saveAudioBuffer(
|
|
226
|
+
handle: AudioHandle<'buffer'>,
|
|
227
|
+
path: string,
|
|
228
|
+
callback: Callback<boolean>,
|
|
229
|
+
): void;
|
|
230
|
+
createAudioSource(
|
|
231
|
+
buffer?: AudioHandle<'buffer'>,
|
|
232
|
+
source?: AudioHandle<'source'>,
|
|
233
|
+
): AudioSourceMapping;
|
|
234
|
+
setAudioBuffer(
|
|
235
|
+
source: AudioHandle<'source'>,
|
|
236
|
+
buffer: AudioHandle<'buffer'>,
|
|
237
|
+
): void;
|
|
238
|
+
assignAudioSource(
|
|
239
|
+
target: AudioHandle<'source'>,
|
|
240
|
+
source: AudioHandle<'source'>,
|
|
241
|
+
fullSound: boolean,
|
|
242
|
+
): void;
|
|
243
|
+
audioSourceField(
|
|
244
|
+
source: AudioHandle<'source'>,
|
|
245
|
+
field: number,
|
|
246
|
+
write: boolean,
|
|
247
|
+
): void;
|
|
132
248
|
audioSourceCommand(source: AudioHandle<'source'>, command: number): void;
|
|
133
|
-
openAudioMusic(
|
|
134
|
-
|
|
249
|
+
openAudioMusic(
|
|
250
|
+
source: AudioHandle<'source'>,
|
|
251
|
+
input: string | Uint8Array,
|
|
252
|
+
callback: Callback<boolean>,
|
|
253
|
+
): void;
|
|
135
254
|
closeAudioMusic(source: AudioHandle<'source'>): void;
|
|
136
255
|
audioSourceChannels(source: AudioHandle<'source'>): ArrayBuffer;
|
|
137
|
-
createAudioListener(): {
|
|
138
|
-
|
|
139
|
-
|
|
256
|
+
createAudioListener(): {
|
|
257
|
+
handle: AudioHandle<'listener'>;
|
|
258
|
+
buffer: ArrayBuffer;
|
|
259
|
+
};
|
|
260
|
+
audioListenerField(
|
|
261
|
+
handle: AudioHandle<'listener'>,
|
|
262
|
+
field: number,
|
|
263
|
+
write: boolean,
|
|
264
|
+
): void;
|
|
140
265
|
createAudioValue(kind: number): ArrayBuffer;
|
|
141
266
|
createAudioInput(): AudioFileMapping & { handle: AudioHandle<'input'> };
|
|
142
|
-
openAudioInput(
|
|
267
|
+
openAudioInput(
|
|
268
|
+
handle: AudioHandle<'input'>,
|
|
143
269
|
input: string | Uint8Array | AudioHandle<'stream'>,
|
|
144
|
-
callback: Callback<AudioFileMapping | undefined
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
270
|
+
callback: Callback<AudioFileMapping | undefined>,
|
|
271
|
+
): void;
|
|
272
|
+
readAudioInput(
|
|
273
|
+
handle: AudioHandle<'input'>,
|
|
274
|
+
samples: Int16Array,
|
|
275
|
+
callback: Callback<void>,
|
|
276
|
+
): void;
|
|
277
|
+
seekAudioInput(
|
|
278
|
+
handle: AudioHandle<'input'>,
|
|
279
|
+
offset: bigint,
|
|
280
|
+
time: boolean,
|
|
281
|
+
callback: Callback<void>,
|
|
282
|
+
): void;
|
|
283
|
+
closeAudioInput(
|
|
284
|
+
handle: AudioHandle<'input'>,
|
|
285
|
+
callback: Callback<AudioFileMapping>,
|
|
286
|
+
): void;
|
|
151
287
|
createAudioOutput(): AudioHandle<'output'>;
|
|
152
|
-
openAudioOutput(
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
288
|
+
openAudioOutput(
|
|
289
|
+
handle: AudioHandle<'output'>,
|
|
290
|
+
path: string,
|
|
291
|
+
rate: number,
|
|
292
|
+
channels: number,
|
|
293
|
+
map: Int32Array,
|
|
294
|
+
callback: Callback<boolean>,
|
|
295
|
+
): void;
|
|
296
|
+
writeAudioOutput(
|
|
297
|
+
handle: AudioHandle<'output'>,
|
|
298
|
+
samples: Int16Array,
|
|
299
|
+
callback: Callback<void>,
|
|
300
|
+
): void;
|
|
301
|
+
closeAudioOutput(
|
|
302
|
+
handle: AudioHandle<'output'>,
|
|
303
|
+
callback: Callback<void>,
|
|
304
|
+
): void;
|
|
157
305
|
}
|
|
158
306
|
|
|
159
307
|
export const audioNative: AudioBinding = native as unknown as AudioBinding;
|
|
160
308
|
export const audioHandle: unique symbol = Symbol('Audio.native');
|
|
161
309
|
|
|
162
|
-
export function audioAsync<T>(
|
|
310
|
+
export function audioAsync<T>(
|
|
311
|
+
start: (callback: Callback<T>) => void,
|
|
312
|
+
): Promise<T> {
|
|
163
313
|
return new Promise((resolve, reject) => {
|
|
164
314
|
start((error, result) => (error ? reject(error) : resolve(result)));
|
|
165
315
|
});
|
|
@@ -170,7 +320,10 @@ export class AudioQueue {
|
|
|
170
320
|
private pending = Promise.resolve();
|
|
171
321
|
run<T>(action: () => Promise<T>): Promise<T> {
|
|
172
322
|
const next = this.pending.then(action);
|
|
173
|
-
this.pending = next.then(
|
|
323
|
+
this.pending = next.then(
|
|
324
|
+
() => undefined,
|
|
325
|
+
() => undefined,
|
|
326
|
+
);
|
|
174
327
|
return next;
|
|
175
328
|
}
|
|
176
329
|
}
|