@kmamal/sdl 0.11.13 → 1.0.0-3

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.
Files changed (86) hide show
  1. package/CHANGELOG.md +113 -1
  2. package/README.md +26 -2685
  3. package/binding.gyp +82 -65
  4. package/package.json +17 -11
  5. package/scripts/build-sdl.mjs +15 -7
  6. package/scripts/build.mjs +30 -15
  7. package/scripts/download-release.mjs +9 -6
  8. package/scripts/download-sdl.mjs +9 -6
  9. package/scripts/install.mjs +13 -5
  10. package/scripts/util/common.js +9 -1
  11. package/src/javascript/audio/audio-playback-stream.js +50 -0
  12. package/src/javascript/audio/audio-recording-stream.js +32 -0
  13. package/src/javascript/audio/{audio-instance.js → audio-stream.js} +40 -34
  14. package/src/javascript/audio/device.js +34 -6
  15. package/src/javascript/audio/format-helpers.js +29 -34
  16. package/src/javascript/audio/index.js +37 -26
  17. package/src/javascript/audio/prevent-exit.js +19 -9
  18. package/src/javascript/cleanup.js +19 -10
  19. package/src/javascript/enums.js +5 -0
  20. package/src/javascript/events/events-via-poll.js +25 -7
  21. package/src/javascript/events/index.js +280 -174
  22. package/src/javascript/gamepad/device.js +23 -0
  23. package/src/javascript/gamepad/gamepad-instance.js +211 -0
  24. package/src/javascript/gamepad/index.js +51 -0
  25. package/src/javascript/globals.js +8 -5
  26. package/src/javascript/helpers.js +41 -7
  27. package/src/javascript/index.js +5 -3
  28. package/src/javascript/joystick/device.js +5 -10
  29. package/src/javascript/joystick/index.js +7 -7
  30. package/src/javascript/joystick/joystick-instance.js +81 -42
  31. package/src/javascript/joystick/shared.js +90 -0
  32. package/src/javascript/keyboard/index.js +6 -4
  33. package/src/javascript/keyboard/key-mapping.js +70 -28
  34. package/src/javascript/mouse/index.js +21 -10
  35. package/src/javascript/sensor/devices.js +17 -0
  36. package/src/javascript/sensor/index.js +2 -16
  37. package/src/javascript/sensor/sensor-instance.js +22 -6
  38. package/src/javascript/touch/devices.js +17 -0
  39. package/src/javascript/touch/index.js +3 -7
  40. package/src/javascript/video/format-helpers.js +117 -0
  41. package/src/javascript/video/index.js +44 -5
  42. package/src/javascript/video/window.js +289 -133
  43. package/src/native/audio.cpp +182 -58
  44. package/src/native/audio.h +10 -5
  45. package/src/native/clipboard.cpp +22 -5
  46. package/src/native/cocoa-window.h +1 -0
  47. package/src/native/cocoa-window.mm +1 -1
  48. package/src/native/enums.cpp +91 -58
  49. package/src/native/events.cpp +437 -284
  50. package/src/native/events.h +18 -12
  51. package/src/native/gamepad.cpp +185 -0
  52. package/src/native/gamepad.h +27 -0
  53. package/src/native/global.cpp +173 -167
  54. package/src/native/global.h +0 -2
  55. package/src/native/joystick.cpp +287 -225
  56. package/src/native/joystick.h +7 -6
  57. package/src/native/keyboard.cpp +28 -8
  58. package/src/native/keyboard.h +4 -2
  59. package/src/native/module.cpp +14 -8
  60. package/src/native/mouse.cpp +54 -34
  61. package/src/native/mouse.h +0 -1
  62. package/src/native/power.cpp +10 -4
  63. package/src/native/power.h +1 -1
  64. package/src/native/sensor.cpp +52 -52
  65. package/src/native/sensor.h +1 -1
  66. package/src/native/touch.cpp +45 -24
  67. package/src/native/touch.h +1 -1
  68. package/src/native/video.cpp +115 -75
  69. package/src/native/video.h +5 -2
  70. package/src/native/window.cpp +409 -321
  71. package/src/native/window.h +3 -1
  72. package/src/types/helpers.d.ts +45 -19
  73. package/src/types/index.d.ts +366 -273
  74. package/scripts/util/fetch.js +0 -85
  75. package/src/javascript/audio/audio-playback-instance.js +0 -23
  76. package/src/javascript/audio/audio-recording-instance.js +0 -17
  77. package/src/javascript/controller/controller-instance.js +0 -160
  78. package/src/javascript/controller/device.js +0 -26
  79. package/src/javascript/controller/index.js +0 -33
  80. package/src/javascript/events/reconcile-audio-devices.js +0 -16
  81. package/src/javascript/events/reconcile-displays.js +0 -17
  82. package/src/javascript/events/reconcile-joystick-and-controller-devices.js +0 -40
  83. package/src/javascript/events/reconcile.js +0 -61
  84. package/src/javascript/video/display.js +0 -4
  85. package/src/native/controller.cpp +0 -192
  86. package/src/native/controller.h +0 -26
@@ -3,14 +3,15 @@ const Bindings = require('../bindings')
3
3
  const Enums = require('../enums')
4
4
  const { EventsViaPoll } = require('../events/events-via-poll')
5
5
  const { AudioFormatHelpers } = require('./format-helpers')
6
+ const { update: updateDevice } = require('./device')
6
7
 
7
8
  const validEvents = [ 'close' ]
8
9
 
9
- class AudioInstance extends EventsViaPoll {
10
- constructor (device, options) {
10
+ class AudioStream extends EventsViaPoll {
11
+ constructor (recording, device, options) {
11
12
  super(validEvents)
12
13
 
13
- const { name, type } = device
14
+ if (typeof options !== 'object' || options === null) { throw Object.assign(new Error("options must be an object"), { options }) }
14
15
 
15
16
  const {
16
17
  channels = 1,
@@ -19,33 +20,33 @@ class AudioInstance extends EventsViaPoll {
19
20
  buffered = 4096,
20
21
  } = options
21
22
 
22
- if (name !== undefined && name !== null && typeof name !== 'string') { throw Object.assign(new Error("device.name must be a string"), { name }) }
23
- // We already tested device.type in sdl.audio.openDevice()
24
23
  if (!Number.isInteger(channels)) { throw Object.assign(new Error("channels must be an integer"), { channels }) }
25
- if (![ 1, 2, 4, 6 ].includes(channels)) { throw Object.assign(new Error("invalid channels"), { channels }) }
24
+ if (channels < 1 || channels > 8) { throw Object.assign(new Error("channels must be between 1 and 8"), { channels }) }
26
25
  if (!Number.isInteger(frequency)) { throw Object.assign(new Error("frequency must be an integer"), { frequency }) }
27
- if (frequency <= 0) { throw Object.assign(new Error("invalid frequency"), { frequency }) }
26
+ if (frequency <= 0 || frequency > 2 ** 31 - 1) { throw Object.assign(new Error("frequency must be a positive 32-bit integer"), { frequency }) }
28
27
  if (typeof format !== 'string') { throw Object.assign(new Error("format must be a string"), { format }) }
29
28
  if (!Number.isInteger(buffered)) { throw Object.assign(new Error("buffered must be an integer"), { buffered }) }
30
- if (buffered <= 0) { throw Object.assign(new Error("invalid buffered"), { buffered }) }
31
- if (buffered !== 2 ** (32 - Math.clz32(buffered) - 1)) { throw Object.assign(new Error("invalid buffered"), { buffered }) }
29
+ if (buffered <= 0) { throw Object.assign(new Error("buffered must be positive"), { buffered }) }
30
+ if (buffered > 2 ** 15) { throw Object.assign(new Error("buffered must be at most 32768"), { buffered }) }
31
+ if (buffered !== 2 ** (32 - Math.clz32(buffered) - 1)) { throw Object.assign(new Error("buffered must be a power of 2"), { buffered }) }
32
32
 
33
33
  const _format = Enums.audioFormat[format]
34
34
  if (_format === undefined) { throw Object.assign(new Error("invalid format"), { format }) }
35
35
 
36
- this._id = Bindings.audio_open(name ?? null, type === 'recording', frequency, _format, channels, buffered)
36
+ const id = Bindings.audio_open(device.id, recording, frequency, _format, channels, buffered)
37
+
38
+ this._id = id
39
+ this._recording = recording
40
+ const helper = AudioFormatHelpers[format]
37
41
 
38
42
  this._device = device
39
- this._name = name
40
- this._buffered = buffered
41
43
  this._channels = channels
42
- this._format = format
44
+ this._format = helper.name
43
45
  this._frequency = frequency
44
46
 
45
47
  this._playing = false
46
48
  this._closed = false
47
49
 
48
- const helper = AudioFormatHelpers[this._format]
49
50
  this._bytesPerSample = helper.bytesPerSample
50
51
  this._minSampleValue = helper.minSampleValue
51
52
  this._maxSampleValue = helper.maxSampleValue
@@ -53,12 +54,12 @@ class AudioInstance extends EventsViaPoll {
53
54
  this._reader = helper.reader
54
55
  this._writer = helper.writer
55
56
 
56
- Globals.audioInstances.set(this._id, this)
57
+ Globals.audioStreams.set(this._id, this)
58
+ updateDevice(this._device)
57
59
  }
58
60
 
59
61
  get id () { return this._id }
60
62
  get device () { return this._device }
61
- get name () { return this._name }
62
63
 
63
64
  get channels () { return this._channels }
64
65
  get frequency () { return this._frequency }
@@ -70,18 +71,18 @@ class AudioInstance extends EventsViaPoll {
70
71
  get zeroSampleValue () { return this._zeroSampleValue }
71
72
 
72
73
  readSample (buffer, offset) {
74
+ if (!(buffer instanceof Buffer)) { throw Object.assign(new Error("buffer must be a Buffer"), { buffer }) }
73
75
  return this._reader.call(buffer, offset)
74
76
  }
75
77
 
76
78
  writeSample (buffer, value, offset) {
79
+ if (!(buffer instanceof Buffer)) { throw Object.assign(new Error("buffer must be a Buffer"), { buffer }) }
77
80
  return this._writer.call(buffer, value, offset)
78
81
  }
79
82
 
80
- get buffered () { return this._buffered }
81
-
82
83
  get playing () { return this._playing }
83
84
  play (play = true) {
84
- if (this._closed) { throw Object.assign(new Error("instance is closed"), { id: this._id }) }
85
+ if (this._closed) { throw Object.assign(new Error("stream is closed"), { id: this._id }) }
85
86
 
86
87
  if (typeof play !== 'boolean') { throw Object.assign(new Error("play must be a boolean"), { play }) }
87
88
 
@@ -94,30 +95,35 @@ class AudioInstance extends EventsViaPoll {
94
95
  this.play(false)
95
96
  }
96
97
 
97
- get queued () {
98
- if (this._closed) { throw Object.assign(new Error("instance is closed"), { id: this._id }) }
99
-
100
- return Bindings.audio_getQueueSize(this._id)
101
- }
102
-
103
- clearQueue () {
104
- if (this._closed) { throw Object.assign(new Error("instance is closed"), { id: this._id }) }
98
+ clear () {
99
+ if (this._closed) { throw Object.assign(new Error("stream is closed"), { id: this._id }) }
105
100
 
106
- Bindings.audio_clearQueue(this._id)
101
+ Bindings.audio_clear(this._id)
107
102
  }
108
103
 
109
104
  get closed () { return this._closed }
110
105
  close () {
111
- if (this._closed) { throw Object.assign(new Error("instance is closed"), { id: this._id }) }
106
+ if (this._closed) { throw Object.assign(new Error("stream is closed"), { id: this._id }) }
112
107
 
113
- this.emit('close')
114
- this.removeAllListeners()
115
108
  this._closed = true
109
+ this._playing = false
110
+
111
+ Globals.audioStreams.delete(this._id)
112
+
113
+ // This call could throw if the device is gone
114
+ try { Bindings.audio_close(this._id) }
115
+ catch (_) { }
116
+
117
+ updateDevice(this._device)
116
118
 
117
- Bindings.audio_close(this._id)
119
+ // We might be inside an event listener
120
+ this._retire(() => Object.assign(new Error("stream is closed"), { id: this._id }))
118
121
 
119
- Globals.audioInstances.delete(this._id)
122
+ Globals.events.withoutPolling(() => {
123
+ try { this.emit('close', { type: 'close' }) }
124
+ catch (error) { this.emit('error', error) }
125
+ })
120
126
  }
121
127
  }
122
128
 
123
- module.exports = { AudioInstance }
129
+ module.exports = { AudioStream }
@@ -1,9 +1,37 @@
1
+ const Globals = require('../globals')
2
+ const Bindings = require('../bindings')
1
3
 
2
- const compare = (a, b) => {
3
- const { name: aName } = a
4
- const { name: bName } = b
5
- if (aName === bName) { return 0 }
6
- return a.name < b.name ? -1 : 1
4
+ const closedFormat = {
5
+ format: null,
6
+ channels: null,
7
+ frequency: null,
8
+ buffered: null,
7
9
  }
8
10
 
9
- module.exports = { compare }
11
+ const make = (device) => ({ ...device, ...closedFormat })
12
+
13
+ const makeDefault = () => make({ id: null, name: null })
14
+
15
+ const update = (device) => {
16
+ let stream = null
17
+ for (const candidate of Globals.audioStreams.values()) {
18
+ if (candidate._device === device) {
19
+ stream = candidate
20
+ break
21
+ }
22
+ }
23
+
24
+ if (!stream) {
25
+ Object.assign(device, closedFormat)
26
+ return
27
+ }
28
+
29
+ try { Object.assign(device, Bindings.audio_getDeviceFormat(stream._id)) }
30
+ catch (_) {}
31
+ }
32
+
33
+ module.exports = {
34
+ make,
35
+ makeDefault,
36
+ update,
37
+ }
@@ -1,4 +1,4 @@
1
- const Os = require('os')
1
+ const Os = require('node:os')
2
2
 
3
3
  const signedLimits = (bits) => ({
4
4
  bytesPerSample: bits / 8,
@@ -10,7 +10,7 @@ const signedLimits = (bits) => ({
10
10
  const unsignedLimits = (bits) => ({
11
11
  bytesPerSample: bits / 8,
12
12
  minSampleValue: 0,
13
- zeroSampleValue: (2 ** (bits - 1)) - 1,
13
+ zeroSampleValue: 2 ** (bits - 1),
14
14
  maxSampleValue: (2 ** bits) - 1,
15
15
  })
16
16
 
@@ -21,7 +21,7 @@ const floatLimits = {
21
21
  maxSampleValue: 1,
22
22
  }
23
23
 
24
- const AudioFormatHelpers = {
24
+ const AudioFormatHelpers = Object.assign(Object.create(null), {
25
25
  s8: {
26
26
  reader: Buffer.prototype.readInt8,
27
27
  writer: Buffer.prototype.writeInt8,
@@ -32,63 +32,58 @@ const AudioFormatHelpers = {
32
32
  writer: Buffer.prototype.writeUInt8,
33
33
  ...unsignedLimits(8),
34
34
  },
35
- s16lsb: {
35
+ s16le: {
36
36
  reader: Buffer.prototype.readInt16LE,
37
37
  writer: Buffer.prototype.writeInt16LE,
38
38
  ...signedLimits(16),
39
39
  },
40
- s16msb: {
40
+ s16be: {
41
41
  reader: Buffer.prototype.readInt16BE,
42
42
  writer: Buffer.prototype.writeInt16BE,
43
43
  ...signedLimits(16),
44
44
  },
45
- u16lsb: {
46
- reader: Buffer.prototype.readUInt16LE,
47
- writer: Buffer.prototype.writeUInt16LE,
48
- ...unsignedLimits(16),
49
- },
50
- u16msb: {
51
- reader: Buffer.prototype.readUInt16BE,
52
- writer: Buffer.prototype.writeUInt16BE,
53
- ...unsignedLimits(16),
54
- },
55
- s32lsb: {
45
+ s32le: {
56
46
  reader: Buffer.prototype.readInt32LE,
57
47
  writer: Buffer.prototype.writeInt32LE,
58
48
  ...signedLimits(32),
59
49
  },
60
- s32msb: {
50
+ s32be: {
61
51
  reader: Buffer.prototype.readInt32BE,
62
52
  writer: Buffer.prototype.writeInt32BE,
63
53
  ...signedLimits(32),
64
54
  },
65
- f32lsb: {
55
+ f32le: {
66
56
  reader: Buffer.prototype.readFloatLE,
67
57
  writer: Buffer.prototype.writeFloatLE,
68
58
  ...floatLimits,
69
59
  },
70
- f32msb: {
60
+ f32be: {
71
61
  reader: Buffer.prototype.readFloatBE,
72
62
  writer: Buffer.prototype.writeFloatBE,
73
63
  ...floatLimits,
74
64
  },
75
- }
65
+ })
76
66
 
77
- AudioFormatHelpers.s16 = AudioFormatHelpers.s16lsb
78
- AudioFormatHelpers.u16 = AudioFormatHelpers.u16lsb
79
- AudioFormatHelpers.s32 = AudioFormatHelpers.s32lsb
80
- AudioFormatHelpers.f32 = AudioFormatHelpers.f32lsb
67
+ for (const [ key, value ] of Object.entries(AudioFormatHelpers)) {
68
+ value.name = key
69
+ }
81
70
 
82
71
  if (Os.endianness() === 'LE') {
83
- AudioFormatHelpers.s16sys = AudioFormatHelpers.s16lsb
84
- AudioFormatHelpers.u16sys = AudioFormatHelpers.u16lsb
85
- AudioFormatHelpers.s32sys = AudioFormatHelpers.s32lsb
86
- AudioFormatHelpers.f32sys = AudioFormatHelpers.f32lsb
87
- } else {
88
- AudioFormatHelpers.s16sys = AudioFormatHelpers.s16msb
89
- AudioFormatHelpers.u16sys = AudioFormatHelpers.u16msb
90
- AudioFormatHelpers.s32sys = AudioFormatHelpers.s32msb
91
- AudioFormatHelpers.f32sys = AudioFormatHelpers.f32msb
72
+ AudioFormatHelpers.s16 = AudioFormatHelpers.s16le
73
+ AudioFormatHelpers.s32 = AudioFormatHelpers.s32le
74
+ AudioFormatHelpers.f32 = AudioFormatHelpers.f32le
75
+ }
76
+ else {
77
+ AudioFormatHelpers.s16 = AudioFormatHelpers.s16be
78
+ AudioFormatHelpers.s32 = AudioFormatHelpers.s32be
79
+ AudioFormatHelpers.f32 = AudioFormatHelpers.f32be
80
+ }
81
+
82
+ const getFormatHelpers = (format) => {
83
+ if (typeof format !== 'string') { throw Object.assign(new Error("format must be a string"), { format }) }
84
+ const helpers = AudioFormatHelpers[format]
85
+ if (helpers === undefined) { throw Object.assign(new Error("invalid format"), { format }) }
86
+ return helpers
92
87
  }
93
88
 
94
- module.exports = { AudioFormatHelpers }
89
+ module.exports = { AudioFormatHelpers, getFormatHelpers }
@@ -1,50 +1,61 @@
1
1
  const Globals = require('../globals')
2
2
  const Bindings = require('../bindings')
3
3
  const { EventsViaPoll } = require('../events/events-via-poll')
4
- const { AudioPlaybackInstance } = require('./audio-playback-instance')
5
- const { AudioRecordingInstance } = require('./audio-recording-instance')
6
- const { AudioFormatHelpers } = require('./format-helpers')
4
+ const { AudioPlaybackStream } = require('./audio-playback-stream')
5
+ const { AudioRecordingStream } = require('./audio-recording-stream')
6
+ const { getFormatHelpers } = require('./format-helpers')
7
+ const {
8
+ make: makeDevice,
9
+ makeDefault: makeDefaultDevice,
10
+ } = require('./device')
7
11
 
8
12
 
9
- Globals.audioDevices.playback = Bindings.audio_getDevices(false)
10
- Globals.audioDevices.recording = Bindings.audio_getDevices(true)
13
+ Globals.audioDevices.playback = [ makeDefaultDevice() ]
14
+ Globals.audioDevices.recording = [ makeDefaultDevice() ]
15
+ if (Globals.info.initialized.audio) {
16
+ Globals.audioDevices.playback.push(...Bindings.audio_getDevices(false).map(makeDevice))
17
+ Globals.audioDevices.recording.push(...Bindings.audio_getDevices(true).map(makeDevice))
18
+ }
11
19
 
12
20
 
13
21
  const validEvents = [ 'deviceAdd', 'deviceRemove' ]
14
22
 
15
- const audio = new class extends EventsViaPoll {
23
+ const makeModule = (type, Stream) => new class extends EventsViaPoll {
16
24
  constructor () { super(validEvents) }
17
25
 
18
26
  get devices () {
19
27
  Globals.events.poll()
20
- return [
21
- ...Globals.audioDevices.playback,
22
- ...Globals.audioDevices.recording,
23
- ]
28
+ return [ ...Globals.audioDevices[type] ]
24
29
  }
25
30
 
26
- openDevice (device, options = {}) {
27
- if (typeof device !== 'object') { throw Object.assign(new Error("device must be an object"), { device }) }
28
- if (typeof device.type !== 'string') { throw Object.assign(new Error("device.type must be a string"), { device }) }
29
- if (![ 'playback', 'recording' ].includes(device.type)) { throw Object.assign(new Error("invalid device.type"), { device }) }
31
+ openDevice (device = null, options = {}) {
32
+ Globals.events.poll()
33
+ const list = Globals.audioDevices[type]
34
+ if (device === null) { device = list[0] }
35
+ else if (!list.includes(device)) { throw Object.assign(new Error(`device must be from sdl.audio.${type}.devices`), { device }) }
30
36
 
31
- return device.type === 'recording'
32
- ? new AudioRecordingInstance(device, options)
33
- : new AudioPlaybackInstance(device, options)
37
+ return new Stream(device, options)
34
38
  }
39
+ }()
40
+
41
+ const audio = {
42
+ playback: makeModule('playback', AudioPlaybackStream),
43
+ recording: makeModule('recording', AudioRecordingStream),
35
44
 
36
- bytesPerSample (format) { return AudioFormatHelpers[format].bytesPerSample }
37
- minSampleValue (format) { return AudioFormatHelpers[format].minSampleValue }
38
- maxSampleValue (format) { return AudioFormatHelpers[format].maxSampleValue }
39
- zeroSampleValue (format) { return AudioFormatHelpers[format].zeroSampleValue }
45
+ bytesPerSample (format) { return getFormatHelpers(format).bytesPerSample },
46
+ minSampleValue (format) { return getFormatHelpers(format).minSampleValue },
47
+ maxSampleValue (format) { return getFormatHelpers(format).maxSampleValue },
48
+ zeroSampleValue (format) { return getFormatHelpers(format).zeroSampleValue },
40
49
 
41
50
  readSample (format, buffer, offset) {
42
- return AudioFormatHelpers[format].reader.call(buffer, offset)
43
- }
51
+ if (!(buffer instanceof Buffer)) { throw Object.assign(new Error("buffer must be a Buffer"), { buffer }) }
52
+ return getFormatHelpers(format).reader.call(buffer, offset)
53
+ },
44
54
 
45
55
  writeSample (format, buffer, value, offset) {
46
- return AudioFormatHelpers[format].writer.call(buffer, value, offset)
47
- }
48
- }()
56
+ if (!(buffer instanceof Buffer)) { throw Object.assign(new Error("buffer must be a Buffer"), { buffer }) }
57
+ return getFormatHelpers(format).writer.call(buffer, value, offset)
58
+ },
59
+ }
49
60
 
50
61
  module.exports = { audio }
@@ -1,4 +1,5 @@
1
1
  const Globals = require('../globals')
2
+ const Bindings = require('../bindings')
2
3
 
3
4
  let timeout
4
5
 
@@ -14,20 +15,29 @@ process.on('beforeExit', (code) => {
14
15
 
15
16
  let duration = 0
16
17
 
17
- for (const instance of Globals.audioInstances.values()) {
18
- if (instance.device.type === 'recording') { continue }
19
-
20
- const { queued, playing } = instance
21
- if (!queued || !playing) { continue }
22
-
23
- const { channels, frequency, buffered, bytesPerSample } = instance
18
+ Globals.events.poll()
19
+ for (const stream of Globals.audioStreams.values()) {
20
+ if (stream._recording) { continue }
21
+ if (!stream.playing) { continue }
22
+
23
+ let queued = null
24
+ let device = null
25
+ try {
26
+ queued = Bindings.audio_getQueued(stream.id)
27
+ device = Bindings.audio_getDeviceFormat(stream.id)
28
+ }
29
+ catch (_) { }
30
+ if (!queued || !device) { continue }
31
+
32
+ const { channels, frequency, bytesPerSample } = stream
24
33
  const bytesPerSecond = channels * frequency * bytesPerSample
25
- duration = Math.max(duration, (queued + buffered) / bytesPerSecond)
34
+ duration = Math.max(duration, queued / bytesPerSecond + device.buffered / device.frequency)
26
35
  }
27
36
 
28
37
  if (duration) {
38
+ // Keeps Node.js alive while audio is playing
29
39
  resetTimeout()
30
- timeout = setTimeout(() => { timeout = null }, duration * 1e3)
40
+ timeout = setTimeout(() => { timeout = null }, Math.min(duration * 1e3, 2 ** 31 - 1))
31
41
  }
32
42
  })
33
43
 
@@ -6,25 +6,34 @@ process.on('exit', (code) => {
6
6
 
7
7
  Globals.events.stopPolling()
8
8
 
9
- // Close all windows
9
+ const errors = []
10
+
10
11
  for (const window of Globals.windows.all.values()) {
11
- window.destroy()
12
+ try { window.destroy() }
13
+ catch (error) { errors.push(error) }
12
14
  }
13
15
 
14
- // Close all audio instances
15
- for (const instance of Globals.audioInstances.values()) {
16
- instance.close()
16
+ for (const stream of Globals.audioStreams.values()) {
17
+ try { stream.close() }
18
+ catch (error) { errors.push(error) }
17
19
  }
18
20
 
19
- // Close all joysticks
20
21
  for (const joystick of Globals.joystickInstances.all.values()) {
21
- joystick.close()
22
+ try { joystick.close() }
23
+ catch (error) { errors.push(error) }
24
+ }
25
+
26
+ for (const gamepad of Globals.gamepadInstances.all.values()) {
27
+ try { gamepad.close() }
28
+ catch (error) { errors.push(error) }
22
29
  }
23
30
 
24
- // Close all controllers
25
- for (const controller of Globals.controllerInstances.all.values()) {
26
- controller.close()
31
+ for (const sensor of Globals.sensorInstances.all.values()) {
32
+ try { sensor.close() }
33
+ catch (error) { errors.push(error) }
27
34
  }
28
35
 
29
36
  Bindings.global_cleanup()
37
+
38
+ if (errors.length) { throw new AggregateError(errors, "errors occurred during process exit cleanup") }
30
39
  })
@@ -2,4 +2,9 @@ const Bindings = require('./bindings')
2
2
 
3
3
  const enums = Bindings.enums_get()
4
4
 
5
+ Object.setPrototypeOf(enums, null)
6
+ for (const table of Object.values(enums)) {
7
+ Object.setPrototypeOf(table, null)
8
+ }
9
+
5
10
  module.exports = enums
@@ -1,10 +1,10 @@
1
1
  const Globals = require('../globals')
2
- const { EventEmitter } = require('events')
2
+ const { EventEmitter } = require('node:events')
3
3
 
4
4
  let _ID = 0
5
5
  const activeEmitters = new Set()
6
6
 
7
- const commonEvents = [ 'newListener', 'removeListener', '*' ]
7
+ const commonEvents = [ 'newListener', 'removeListener', 'error', '*' ]
8
8
 
9
9
  class EventsViaPoll extends EventEmitter {
10
10
  constructor (validEvents) {
@@ -17,9 +17,7 @@ class EventsViaPoll extends EventEmitter {
17
17
 
18
18
  // NOTE: this needs to be first, otherwise it will emit for 'newListener'
19
19
  this.on('removeListener', (type) => {
20
- if (!commonEvents.includes(type) && !validEvents.includes(type)) {
21
- throw Object.assign(new Error("invalid event"), { type })
22
- }
20
+ if (type === 'newListener' || type === 'removeListener') { return }
23
21
 
24
22
  count--
25
23
  if (count !== 0) { return }
@@ -31,10 +29,14 @@ class EventsViaPoll extends EventEmitter {
31
29
  })
32
30
 
33
31
  this.on('newListener', (type) => {
32
+ if (this._makeRetiredError) { throw this._makeRetiredError() }
33
+
34
34
  if (!commonEvents.includes(type) && !validEvents.includes(type)) {
35
35
  throw Object.assign(new Error("invalid event"), { type })
36
36
  }
37
37
 
38
+ if (type === 'newListener' || type === 'removeListener') { return }
39
+
38
40
  count++
39
41
  if (count !== 1) { return }
40
42
 
@@ -45,6 +47,20 @@ class EventsViaPoll extends EventEmitter {
45
47
  })
46
48
  }
47
49
 
50
+ _retire (makeError) {
51
+ this._makeRetiredError = makeError
52
+ process.nextTick(() => { this.removeAllListeners() })
53
+ }
54
+
55
+ removeAllListeners (type) {
56
+ const types = type !== undefined ? [ type ] : this.eventNames()
57
+ for (const eventType of types) {
58
+ if (eventType === 'newListener' || eventType === 'removeListener') { continue }
59
+ super.removeAllListeners(eventType)
60
+ }
61
+ return this
62
+ }
63
+
48
64
  emit (type, ...args) {
49
65
  const isCommon = commonEvents.includes(type)
50
66
  const isValid = this._validEvents.includes(type)
@@ -52,11 +68,13 @@ class EventsViaPoll extends EventEmitter {
52
68
  throw Object.assign(new Error("invalid event"), { type })
53
69
  }
54
70
 
55
- super.emit(type, ...args)
71
+ let hadListeners = super.emit(type, ...args)
56
72
 
57
73
  if (!isCommon) {
58
- super.emit("*", type, ...args)
74
+ hadListeners = super.emit("*", type, ...args) || hadListeners
59
75
  }
76
+
77
+ return hadListeners
60
78
  }
61
79
  }
62
80