structure cache, update libraries, add speaker to devdeps, etc.

Author: be195

lib/cache.ts

@@ -28,14 +28,24 @@ export default class CacheManager {
     } catch (err) {}
   }
 
-  private getCachedSourceFilename(identifier: string) {
+  private async getCachedSourceFilename(identifier: string) {
     const filename = createHash('sha256').update(identifier).digest('hex');
-    return join(this.directory, SOURCES_CACHE_DIRECTORY, filename + '.json');
+    const folder = join(this.directory, SOURCES_CACHE_DIRECTORY, filename.slice(0, 2), filename.slice(2, 4));
+
+    if (!existsSync(folder))
+      await promises.mkdir(folder, { recursive: true });
+
+    return join(folder, filename + '.json');
   }
 
-  private getCachedSoundFilename(url: string) {
+  private async getCachedSoundFilename(url: string) {
     const filename = createHash('sha256').update(url).digest('hex');
-    return join(this.directory, SOUNDS_CACHE_DIRECTORY, filename + '.ogg');
+    const folder = join(this.directory, SOUNDS_CACHE_DIRECTORY, filename.slice(0, 2), filename.slice(2, 4));
+
+    if (!existsSync(folder))
+      await promises.mkdir(folder, { recursive: true });
+
+    return join(folder, filename + '.ogg');
   }
 
   private get cachedDurationsFile() {
@@ -118,12 +128,10 @@ export default class CacheManager {
     });
   }
 
-  public async getSound(url: string) {
-    await this.createNeededDirectories();
-
-    const path = this.getCachedSoundFilename(url);
+  public async getSound(url: string, download = true) {
+    const path = await this.getCachedSoundFilename(url);
 
-    if (!existsSync(path)) {
+    if (!existsSync(path) && download) {
       const buffer = await this.convertToSuitableFormat(url);
       await promises.writeFile(path, buffer);
     }
@@ -134,7 +142,7 @@ export default class CacheManager {
   public async compareLocalList(hash: string, identifier: string) {
     await this.createNeededDirectories();
 
-    const path = this.getCachedSourceFilename(identifier);
+    const path = await this.getCachedSourceFilename(identifier);
 
     if (existsSync(path)) {
       try {
@@ -155,7 +163,7 @@ export default class CacheManager {
   ) {
     await this.createNeededDirectories();
 
-    const path = this.getCachedSourceFilename(identifier);
+    const path = await this.getCachedSourceFilename(identifier);
     await promises.writeFile(
       path,
       JSON.stringify({ sounds, hash } as CachedSource)

lib/context.ts

@@ -41,15 +41,18 @@ export default class Context {
     if (!this.flattened || this.flattened.length === 0) return;
     let last: Chatsound | undefined;
 
+    const downloading: string[] = [];
     let paths = await Promise.all(
       this.flattened.map(scope => {
         const sound = this.chatsounds.getRequiredSound(scope, last);
         last = sound;
 
         if (!sound) return;
 
-        // if parser found it, this should be able to too
-        return this.chatsounds.cache.getSound((sound as Chatsound).url);
+        const used = downloading.includes(sound.url);
+        if (!used) downloading.push(sound.url);
+
+        return this.chatsounds.cache.getSound(sound.url, !used);
       })
     );
 

package-lock.json

@@ -27,6 +27,7 @@
   },
   "devDependencies": {
     "@types/node": "^18.11.17",
+    "speaker": "^0.5.5",
     "typescript": "^4.9.4"
   }
 }

package.json

@@ -16,20 +16,20 @@ async function update() {
 async function run(data) {
   data = data.toString().trim();
 
-  const context = sh.new('stream', data);
+  const context = sh.new(data);
   const speaker = new Speaker({
     channels: 2, // 2 channels
     bitDepth: 16, // 16-bit samples
-    sampleRate: 44100, // 48,000 Hz sample rate
+    sampleRate: 44100, // 44,100 Hz sample rate
   });
   speaker.on("end", () => speaker.close());
-  console.log(context.scope.children[0].children)
 
-  const audio = await context.audio({
+  const audio = await context.stream({
     sampleRate: 44100,
     audioChannels: 2,
     format: 's16le'
   });
+  if (!audio) return console.log('no audio :(');
   audio.pipe(speaker);
 }
 

test.js

@@ -12,6 +12,57 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-18.11.17.tgz"
   integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==
 
+bindings@^1.3.0:
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz"
+  integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==
+
+debug@^4.0.0:
+  version "4.3.7"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  dependencies:
+    ms "^2.1.3"
+
+[email protected]:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
+ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+speaker@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.npmjs.org/speaker/-/speaker-0.5.5.tgz"
+  integrity sha512-IBeMZUITigYBO139h0+1MAgBHNZF55GFJN4U/Box35Sg49cfqYkbCO92TXoCUy22Ast08zfqKuXLvPxq9CWwLw==
+  dependencies:
+    bindings "^1.3.0"
+    buffer-alloc "^1.1.0"
+    debug "^4.0.0"
+
 typescript@^4.9.4:
   version "4.9.4"
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz"