use json files in dough-samples via bunny cdn

packages/sampler/sample-server.mjs

@@ -9,7 +9,6 @@ import readline from 'readline';
 import os from 'os';
 
 const LOG = !!process.env.LOG || false;
-const PORT = process.env.PORT || 5432;
 const VALID_AUDIO_EXTENSIONS = ['wav', 'mp3', 'ogg'];
 
 const isAudioFile = (f) => {
@@ -55,6 +54,7 @@ async function getBanks(directory, flat = false) {
     banks[bank].push(subDir);
     return subDir;
   });
+  banks._base = `http://localhost:5432`;
   return { banks, files };
 }
 
@@ -134,6 +134,8 @@ const server = http.createServer(async (req, res) => {
   readStream.pipe(res);
 });
 
+// eslint-disable-next-line
+const PORT = process.env.PORT || 5432;
 const IP_ADDRESS = '0.0.0.0';
 let IP;
 const networkInterfaces = os.networkInterfaces();

packages/superdough/sampler.mjs

@@ -1,4 +1,4 @@
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import { registerSound, registerWaveTable } from './index.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
@@ -211,7 +211,7 @@ export async function fetchSampleMap(url) {
     // not a browser
     return;
   }
-  const base = getBaseURL(url);
+  const base = url.split('/').slice(0, -1).join('/');
   if (typeof fetch === 'undefined') {
     // skip fetch when in node / testing
     return;

packages/superdough/util.mjs

@@ -105,13 +105,3 @@ export function getCommonSampleInfo(hapValue, bank) {
   const label = `${s}:${index}`;
   return { transpose, url, index, midi, label };
 }
-
-export const getBaseURL = (url) => {
-  try {
-    // For real URLs
-    return new URL('.', new URL(url)).href.replace(/\/$/, ''); // removes trailing slash
-  } catch {
-    // For pseudo URLS
-    return url.split('/').slice(0, -1).join('/');
-  }
-};

packages/superdough/wavetable.mjs

@@ -1,5 +1,5 @@
 import { getAudioContext, registerSound } from './index.mjs';
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import {
   applyFM,
   applyParameterModulators,
@@ -190,7 +190,6 @@ export const tables = async (url, frameLen, json, options = {}) => {
   if (url.startsWith('local:')) {
     url = `http://localhost:5432`;
   }
-  const base = getBaseURL(url);
   if (typeof fetch !== 'function') {
     // not a browser
     return;
@@ -201,7 +200,7 @@ export const tables = async (url, frameLen, json, options = {}) => {
   }
   return fetch(url)
     .then((res) => res.json())
-    .then((json) => _processTables(json, base, frameLen, options))
+    .then((json) => _processTables(json, url, frameLen, options))
     .catch((error) => {
       console.error(error);
       throw new Error(`error loading "${url}"`);

website/src/repl/prebake.mjs

@@ -6,6 +6,7 @@ import './files.mjs';
 
 const { BASE_URL } = import.meta.env;
 const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;
+const baseCDN = 'https://strudel.b-cdn.net';
 
 export async function prebake() {
   // https://archive.org/details/SalamanderGrandPianoV3
@@ -19,23 +20,23 @@ export async function prebake() {
     // => getting "window is not defined", as soon as "@strudel/soundfonts" is imported statically
     // seems to be a problem with soundfont2
     import('@strudel/soundfonts').then(({ registerSoundfonts }) => registerSoundfonts()),
-    samples(`${baseNoTrailing}/piano.json`, undefined, { prebake: true }),
+    samples(`${baseCDN}/piano.json`, `${baseCDN}/piano/`, { prebake: true }),
     // https://github.com/sgossner/VCSL/
     // https://api.github.com/repositories/126427031/contents/
     // LICENSE: CC0 general-purpose
-    samples(`${baseNoTrailing}/vcsl.json`, 'github:sgossner/VCSL/master/', { prebake: true }),
-    samples(`${baseNoTrailing}/tidal-drum-machines.json`, 'github:ritchse/tidal-drum-machines/main/machines/', {
+    samples(`${baseCDN}/vcsl.json`, `${baseCDN}/VCSL/`, { prebake: true }),
+    samples(`${baseCDN}/tidal-drum-machines.json`, `${baseCDN}/tidal-drum-machines/machines/`, {
       prebake: true,
       tag: 'drum-machines',
     }),
-    samples(`${baseNoTrailing}/uzu-drumkit.json`, undefined, {
+    samples(`${baseCDN}/uzu-drumkit.json`, `${baseCDN}/uzu-drumkit/`, {
       prebake: true,
       tag: 'drum-machines',
     }),
-    samples(`${baseNoTrailing}/uzu-wavetables.json`, undefined, {
+    samples(`${baseCDN}/uzu-wavetables.json`, `${baseCDN}/uzu-wavetables/`, {
       prebake: true,
     }),
-    samples(`${baseNoTrailing}/mridangam.json`, undefined, { prebake: true, tag: 'drum-machines' }),
+    samples(`${baseCDN}/mridangam.json`, `${baseCDN}/mrid/`, { prebake: true, tag: 'drum-machines' }),
     samples(
       {
         casio: ['casio/high.wav', 'casio/low.wav', 'casio/noise.wav'],
@@ -145,14 +146,14 @@ export async function prebake() {
           'num/20.wav',
         ],
       },
-      'github:tidalcycles/dirt-samples',
+      `${baseCDN}/Dirt-Samples/`,
       {
         prebake: true,
       },
     ),
   ]);
 
-  aliasBank(`${baseNoTrailing}/tidal-drum-machines-alias.json`);
+  aliasBank(`${baseCDN}/tidal-drum-machines-alias.json`);
 }
 
 const maxPan = noteToMidi('C8');