audio-decode 2.1.6 → 2.2.0

package/audio-decode.js

@@ -30,37 +30,54 @@ export default async function audioDecode(buf) {
 
 export const decoders = {
 	async oga(buf) {
-		let { OggVorbisDecoder } = await import('@wasm-audio-decoders/ogg-vorbis')
-		const decoder = new OggVorbisDecoder()
-		await decoder.ready;
-		return (decoders.oga = async buf => buf && createBuffer(await decoder.decodeFile(buf)))(buf)
+		let { decoder } = decoders.oga
+		if (!decoder) {
+			let { OggVorbisDecoder } = await import('@wasm-audio-decoders/ogg-vorbis')
+			await (decoders.oga.decoder = decoder = new OggVorbisDecoder()).ready;
+		} else await decoder.reset()
+		return buf && createBuffer(await decoder.decodeFile(buf))
 	},
 	async mp3(buf) {
-		const { MPEGDecoder } = await import('mpg123-decoder')
-		const decoder = new MPEGDecoder()
-		await decoder.ready;
-		return (decoders.mp3 = buf => buf && createBuffer(decoder.decode(buf)))(buf)
+		let { decoder } = decoders.mp3
+		if (!decoder) {
+			const { MPEGDecoder } = await import('mpg123-decoder')
+			await (decoders.mp3.decoder = decoder = new MPEGDecoder()).ready;
+		}
+		else await decoder.reset()
+		return buf && createBuffer(await decoder.decode(buf))
 	},
 	async flac(buf) {
-		const { FLACDecoder } = await import('@wasm-audio-decoders/flac')
-		const decoder = new FLACDecoder()
-		await decoder.ready;
-		return (decoders.mp3 = async buf => buf && createBuffer(await decoder.decode(buf)))(buf)
+		let { decoder } = decoders.flac
+		if (!decoder) {
+			const { FLACDecoder } = await import('@wasm-audio-decoders/flac')
+			await (decoders.flac.decoder = decoder = new FLACDecoder()).ready
+		}
+		else await decoder.reset()
+		return buf && createBuffer(await decoder.decode(buf))
 	},
 	async opus(buf) {
-		const { OggOpusDecoder } = await import('ogg-opus-decoder')
-		const decoder = new OggOpusDecoder()
-		await decoder.ready;
-		return (decoders.opus = async buf => buf && createBuffer(await decoder.decodeFile(buf)))(buf)
+		let { decoder } = decoders.opus
+		if (!decoder) {
+			const { OggOpusDecoder } = await import('ogg-opus-decoder')
+			await (decoders.opus.decoder = decoder = new OggOpusDecoder()).ready
+		}
+		else await decoder.reset()
+		return buf && createBuffer(await decoder.decodeFile(buf))
 	},
 	async wav(buf) {
-		let module = await import('node-wav')
-		let { decode } = module.default
-		return (decoders.wav = buf => buf && createBuffer(decode(buf)))(buf)
+		let { decode } = decoders.wav
+		if (!decode) {
+			let module = await import('node-wav')
+			decode = decoders.wav.decode = module.default.decode
+		}
+		return buf && createBuffer(await decode(buf))
 	},
 	async qoa(buf) {
-		let { decode } = await import('qoa-format')
-		return (decoders.qoa = buf => buf && createBuffer(decode(buf)))(buf)
+		let { decode } = decoders.qoa
+		if (!decode) {
+			decoders.qoa.decode = decode = (await import('qoa-format')).decode
+		}
+		return buf && createBuffer(await decode(buf))
 	}
 }
 

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "audio-decode",
-  "version": "2.1.6",
+  "version": "2.2.0",
   "description": "Decode audio data in node or browser",
   "main": "audio-decode.js",
   "module": "audio-decode.js",
   "browser": "audio-decode.js",
   "type": "module",
+  "types": "audio-decode.d.ts",
   "dependencies": {
     "@wasm-audio-decoders/flac": "^0.2.1",
     "@wasm-audio-decoders/ogg-vorbis": "^0.1.12",

package/test.js

@@ -1,5 +1,5 @@
 
-import decodeAudio, {decoders} from './audio-decode.js';
+import decodeAudio, { decoders } from './audio-decode.js';
 import wav from 'audio-lena/wav.js';
 import mp3 from 'audio-lena/mp3.js';
 import ogg from 'audio-lena/ogg.js';
@@ -85,15 +85,23 @@ t('malformed data', async t => {
 	let log = []
 	try {
 		let x = await decodeAudio(new Float32Array(10))
-	} catch (e) { log.push('arr')}
+	} catch (e) { log.push('arr') }
 
 	try {
 		let x = await decodeAudio(null)
-	} catch (e) { log.push('null')}
+	} catch (e) { log.push('null') }
 
 	try {
 		let x = await decodeAudio(Promise.resolve())
-	} catch (e) { log.push('nonbuf')}
+	} catch (e) { log.push('nonbuf') }
 
 	is(log, ['arr', 'null', 'nonbuf'])
 })
+
+t.skip('sequence #38', async t => {
+	let flacBuffer = await decoders.flac(new Uint8Array(flac))
+	is(flacBuffer.duration | 0, 12, 'flac duration')
+
+	let mp3Buffer = await decoders.mp3(new Uint8Array(mp3))
+	is(mp3Buffer.duration | 0, 12, 'mp3 duration')
+})