too many to list

Author: stagas

dynamic-cache.js

@@ -2,7 +2,7 @@ export default class DynamicCache {
   static async cleanup () {
     const cacheKeys = await window.caches.keys()
     await Promise.all(cacheKeys
-      .filter(key => key.startsWith('dynamic-cache:'))
+      // .filter(key => key.startsWith('dynamic-cache:')) //TODO: enable this in prod
       .map(key => window.caches.delete(key))
     )
   }

lib/impulse-convolve-stereo.js

@@ -0,0 +1,27 @@
+import convolve from './convolve.js'
+
+export default async (c, url, length) => {
+  const impulse = await c.sample(url)
+  if (length > -1) {
+    impulse[0] = impulse[0].subarray(0, length)
+    impulse[1] = impulse[1].subarray(0, length)
+  }
+  const id = 'impulse-convolve-stereo:kernel:' + url + ':' + c.buffer[0].length + ':' + length
+  let kernel = await c.get(id)
+  if (kernel === false) {
+    // console.log('processing kernel:', id)
+    kernel = [
+      convolve.fftProcessKernel(c.buffer[0].length, impulse[0]),
+      convolve.fftProcessKernel(c.buffer[0].length, impulse[1])
+    ]
+    await c.set(id, kernel)
+    // console.log('set kernel cache:', id)
+  } else {
+    // console.log('got cached kernel:', id)
+  }
+  const reverb = [
+    convolve.fftConvolution(c.buffer[0].length, kernel[0], impulse[0].length),
+    convolve.fftConvolution(c.buffer[0].length, kernel[1], impulse[0].length)
+  ]
+  return reverb
+}

lib/impulse-convolve.js

@@ -8,12 +8,12 @@ export default async (c, url, length) => {
   const id = 'kernel:' + url + ':' + c.buffer[0].length + ':' + length
   let kernel = await c.get(id)
   if (kernel === false) {
-    console.log('processing kernel:', id)
+    // console.log('processing kernel:', id)
     kernel = convolve.fftProcessKernel(c.buffer[0].length, impulse[0])
     await c.set(id, kernel)
-    console.log('set kernel cache:', id)
+    // console.log('set kernel cache:', id)
   } else {
-    console.log('got cached kernel:', id)
+    // console.log('got cached kernel:', id)
   }
   const reverb = convolve.fftConvolution(c.buffer[0].length, kernel, impulse[0].length)
   return reverb

lib/impulse-reverb-stereo.js

@@ -0,0 +1,31 @@
+import impulseConvolve from './impulse-convolve-stereo.js'
+
+export default async (c, { url, offset = 0, length = -1, id = '' }=c) => {
+  const reverb = await impulseConvolve(c, url, length)
+  let tail = 0
+  let prev = (await c.get('impulse-reverb-stereo:prev:'+id+url+(c.n-c.buffer[0].length)))
+    ||[new Float32Array(),new Float32Array()]
+  let curr
+  let len = 0
+  let i = 0
+  return c => {
+    len = c.buffer[0].length
+    curr = [
+      reverb[0](c.buffer[0]),
+      reverb[1](c.buffer[1])
+    ]
+    // add remaining tail from previous step
+    for (i = 0; i < prev[0].length; i++) {
+      curr[0][i] += prev[0][i]
+      curr[1][i] += prev[1][i]
+    }
+    tail = (curr[0].length - offset) - len
+    prev[0] = curr[0].subarray(-tail)
+    prev[1] = curr[1].subarray(-tail)
+    c.set('impulse-reverb-stereo:prev:'+id+url+c.n, prev, 5000)
+    return [
+      curr[0].subarray(offset, offset + len),
+      curr[1].subarray(offset, offset + len),
+    ]
+  }
+}

lib/impulse-reverb.js

@@ -1,9 +1,9 @@
 import impulseConvolve from './impulse-convolve.js'
 
-export default async (c, { url, offset = 0, length = -1 }=c) => {
+export default async (c, { url, offset = 0, length = -1, id = '' }=c) => {
   const reverb = await impulseConvolve(c, url, length)
   let tail = 0
-  let prev = (await c.get('prev:'+url+(c.n-c.buffer[0].length)))||new Float32Array()
+  let prev = (await c.get('prev:'+id+url+(c.n-c.buffer[0].length)))||new Float32Array()
   let curr
   let len = 0
   let i = 0
@@ -16,7 +16,7 @@ export default async (c, { url, offset = 0, length = -1 }=c) => {
     }
     tail = (curr.length - offset) - len
     prev = curr.subarray(-tail)
-    c.set('prev:'+url+c.n, prev, 5000)
+    c.set('prev:'+id+url+c.n, prev, 5000)
     return curr.subarray(offset, offset + len)
   }
 }

src/buffer-service.js

@@ -21,6 +21,7 @@ const garbageCollect = match => {
 }
 
 const BufferService = {
+  buffers,
   methods: {
     getBuffer: (checksum, size, channels = 2) => {
       const id = (checksum + size + channels).toString()

src/context.js

@@ -1,6 +1,7 @@
 import randomId from '../lib/random-id.js'
 import checksumOf from '../lib/checksum.js'
 import ImpulseReverb from '../lib/impulse-reverb.js'
+import ImpulseReverbStereo from '../lib/impulse-reverb-stereo.js'
 import mixWorker from './mix-worker-service.js'
 import mixBuffers from './mix-buffers.js'
 import rpc from './lazy-singleton-worker-rpc.js'
@@ -52,7 +53,7 @@ export default class Context {
   }
 
   constructor (data) {
-    this.id = randomId()
+    this.id = data.id ?? randomId()
 
     this.bpm = 60
     this.beatRate = 44100
@@ -108,7 +109,7 @@ export default class Context {
 
   // public api
 
-  buf ({ id = '', len = this.buffer[0].length, ch = this.buffer.length } = {}) {
+  buf ({ id = '', len = this.bufferSize, ch = this.buffer.length } = {}) {
     return rpc(BUFFER_SERVICE_URL, 'getBuffer', [
       id+checksumOf(this),
       len|0,
@@ -132,6 +133,10 @@ export default class Context {
     return ImpulseReverb(this, params)
   }
 
+  reverbStereo (params) {
+    return ImpulseReverbStereo(this, params)
+  }
+
   zero (buffer = this.buffer) {
     buffer.forEach(b => b.fill(0))
     return buffer
@@ -140,22 +145,64 @@ export default class Context {
   src (url, params = {}) {
     const targetUrl = new URL(url, this.url ?? location.href).href
     const context = Object.assign(this.toJSON(), params, { url: targetUrl })
-      // const checksum = c.checksum
-
-      // if (checksums[c.url + c.id] === checksum) return
-
-      // checksums[c.url + c.id] = checksum
-    // console.log('here!')
     return mixWorker(targetUrl, context).then(result => {
       result.update = c => { c.src(url, params) }
       return result
     })
   }
 
-  mix(...args) {
+  async render (name, params) {
+    const id = name + checksumOf(params)
+    const buffer  = await this.buf({ ...params, id })
+    if (buffer.createdNow) {
+      console.log('shall render', name, id, buffer, params)
+      await this.src('./' + name + '.js', { buffer, ...params, id })
+    }
+    return buffer
+  }
+
+  mix (...args) {
     return mixBuffers(...args)
   }
 
+  async import (sources) {
+    const entries = await Promise.all(
+      Object.entries(sources)
+        .map(async ([key, value]) => {
+          const params = { ...value }
+          delete params.src
+          const buffer = await this.render(value.src ?? key, {
+            id: key,
+            ...params,
+          })
+          return [key, buffer]
+        }))
+
+    return Object.fromEntries(entries)
+  }
+
+  // async import (sources) {
+  //   const entries = await Promise.all(
+  //     Object.entries(sources)
+  //       .map(async ([key, value]) => {
+  //         const buffer = value.buffer ?? await this.buf({
+  //           id: value.id ?? key,
+  //           len: value.len ?? this.br,
+  //           ch: value.ch ?? 1,
+  //         })
+  //         const params = { ...value }
+  //         delete params.src
+  //         const src = await this.src('./' + (value.src ?? key) + '.js', {
+  //           id: key,
+  //           ...params,
+  //           buffer
+  //         })
+  //         return [key, buffer]
+  //       }))
+
+  //   return Object.fromEntries(entries)
+  // }
+
   // internals
 
   prepare () {
@@ -195,35 +242,16 @@ export default class Context {
     this.k = this.p1 / this.br
   }
 
-  // get checksum () {
-  //   return checksumOf(this)
-  // }
-
-  // set checksum (value) {
-  //   /* ignore */
-  // }
-
-  get bufferSize () { return this.buffer[0].length }
-
-  // get c () { return this }
-  // get sr () { return this.sampleRate }
-  // get br () { return this.beatRate }
+  get bufferSize () { return this.buffer[0].length*4 }
 
   toJSON () {
     const json = {}
-    // this.prepare()
     for (const key in this) {
       if (key[0] === '_') continue
       if (typeof this[key] !== 'function') {
         json[key] = this[key]
       }
     }
-    // delete json.g
-    // delete json.worker
-    // delete json.parent
-    // json.n = this.n
-    // json.frame = this.frame
-    // json.checksum = this.checksum
     return json
   }
 

src/global-service.js

@@ -4,6 +4,8 @@ const values = new Map
 const ttlMap = new Map
 
 const GlobalService = {
+  values,
+  ttlMap,
   methods: {
     get: id => {
       const value = values.get(id)
@@ -32,10 +34,10 @@ setInterval(() => {
     if (now > time + ttl) {
       ttlMap.delete(id)
       values.delete(id)
-      console.warn('gs gc:', id, ttl, [values.size])
+      console.log('gs gc:', id, ttl, [values.size])
     }
   }
-  if (values.size > 10) {
+  if (values.size > 30) {
     console.warn('gs: too many values:', values.size)
   }
 }, 1000)

src/lazy-singleton-worker-rpc.js

@@ -10,7 +10,7 @@ export const rpcs = new Map
 
 const rpc = (url, method, args = []) => getRpc(url).rpc(method, args)
 rpc.get = url => getRpc(url)
-rpc.update = url => getRpc(url).worker.updateInstance()
+rpc.update = (url, noCreate = false) => getRpc(url, noCreate)?.worker?.updateInstance()
 rpc.markAsSafe = url => getRpc(url).worker.markAsSafe()
 rpc.clear = () => rpcs.clear()
 rpc.clearHanging = error => { [...callbacks.values()].forEach(fn => fn.reject(error)), callbacks.clear() }
@@ -37,6 +37,8 @@ class Rpc {
         this.worker = new SafeDynamicWorker(url)
         workers.set(url, this.worker)
         this.bindListeners()
+      } else if (this.worker.paused) {
+        this.worker.updateInstance()
       }
     }
   }
@@ -49,9 +51,10 @@ class Rpc {
       }
       this[data.call](data)
     }
-    this.worker.onmessageerror = error => rpc.onmessageerror?.(error, url)
-    this.worker.onerror = error => rpc.onerror?.(error, url)
-    this.worker.onfail = fail => rpc.onfail?.(fail, url)
+    this.worker.onmessageerror = error => rpc.onmessageerror?.(error, this.url)
+    this.worker.onerror = error => rpc.onerror?.(error, this.url)
+    this.worker.onfail = fail => rpc.onfail?.(fail, this.url)
+    this.worker.onpause = () => rpcs.delete(this.url)
   }
 
   async proxyRpc ({ url, callbackId, method, args }) {
@@ -133,10 +136,13 @@ class RpcProxy {
   }
 }
 
-const getRpc = url => {
+const getRpc = (url, noCreate = false) => {
   url = new URL(url, location.href).href
   if (isMain) {
-    if (!rpcs.has(url)) rpcs.set(url, new Rpc(url))
+    if (!rpcs.has(url)) {
+      if (noCreate) return
+      rpcs.set(url, new Rpc(url))
+    }
     return rpcs.get(url)
   } else {
     return new RpcProxy(url)

src/loop-node.js

@@ -46,7 +46,7 @@ export default class LoopNode {
   }
 
   get bufferSize () {
-    return this.beatRate * 4 /// 5 | 0
+    return this.beatRate * 4 //* 4 /// 5 | 0
   }
 
   resetTime (offset = 0) {
@@ -97,7 +97,6 @@ export default class LoopNode {
   }
 
   playBuffer (buffer) {
-    // console.log('should render buffer:', buffer[0].slice(0,3))
     const syncTime = this.syncTime
     const output = this.nextBuffer
     for (let i = 0; i < this.numberOfChannels; i++) {
@@ -110,7 +109,6 @@ export default class LoopNode {
     }
 
     if (!this.scheduledNode) {
-      // console.log('schedule for', syncTime)
       const node = this.scheduledNode = this.context.createBufferSource()
       node.buffer = this.nextBuffer
       node.connect(this.gain)