scrabble-solver 2.8.2 → 2.8.4

package/packages/dictionaries/src/lib/DiskCache.ts

@@ -6,8 +6,6 @@ import { CACHE_STALE_THRESHOLD } from '../constants';
 import { Cache } from '../types';
 
 import getDictionaryFilepath from './getDictionaryFilepath';
-import readFile from './readFile';
-import writeFile from './writeFile';
 
 class DiskCache implements Cache<Locale, Trie> {
   public async get(locale: Locale): Promise<Trie | undefined> {
@@ -16,7 +14,7 @@ class DiskCache implements Cache<Locale, Trie> {
     }
 
     const filepath = getDictionaryFilepath(locale);
-    const serialized = await readFile(filepath);
+    const serialized = await fs.promises.readFile(filepath, 'utf-8');
     const trie = Trie.deserialize(serialized);
     return trie;
   }
@@ -54,7 +52,7 @@ class DiskCache implements Cache<Locale, Trie> {
 
   public async set(locale: Locale, trie: Trie): Promise<void> {
     const filepath = getDictionaryFilepath(locale);
-    await writeFile(filepath, trie.serialize());
+    await fs.promises.writeFile(filepath, trie.serialize());
   }
 }
 

package/packages/dictionaries/src/lib/LayeredCache.ts

@@ -10,24 +10,31 @@ import MemoryCache from './MemoryCache';
 class LayeredCache implements Cache<Locale, Trie> {
   private readonly layers = [new MemoryCache(), new DiskCache()];
 
-  public get(locale: Locale): Promise<Trie | undefined> {
-    const cached = this.getLastModifiedLayer(locale);
+  public async get(locale: Locale): Promise<Trie | undefined> {
+    const cache = this.getLastModifiedLayer(locale);
 
-    if (!cached) {
+    if (!cache) {
       return Promise.resolve(undefined);
     }
 
-    return cached.get(locale);
+    const [memoryCache, diskCache] = this.layers;
+    const value = await cache.get(locale);
+
+    if (cache === diskCache && typeof value !== 'undefined') {
+      await memoryCache.set(locale, value);
+    }
+
+    return value;
   }
 
   public getLastModifiedTimestamp(locale: Locale): number | undefined {
-    const cached = this.getLastModifiedLayer(locale);
+    const cache = this.getLastModifiedLayer(locale);
 
-    if (!cached) {
+    if (!cache) {
       return undefined;
     }
 
-    return cached.getLastModifiedTimestamp(locale);
+    return cache.getLastModifiedTimestamp(locale);
   }
 
   public has(locale: Locale): boolean {
@@ -47,7 +54,9 @@ class LayeredCache implements Cache<Locale, Trie> {
   }
 
   public async set(locale: Locale, trie: Trie): Promise<void> {
-    await Promise.all(this.layers.map((cache) => cache.set(locale, trie)));
+    const [memoryCache, diskCache] = this.layers;
+    await diskCache.set(locale, trie);
+    await memoryCache.set(locale, trie);
   }
 
   private getLastModifiedLayer(locale: Locale): Cache<Locale, Trie> | undefined {

package/packages/dictionaries/src/lib/index.ts

@@ -5,5 +5,3 @@ export { default as downloadDictionary } from './downloadDictionary';
 export { default as getDictionaryFilepath } from './getDictionaryFilepath';
 export { default as LayeredCache } from './LayeredCache';
 export { default as MemoryCache } from './MemoryCache';
-export { default as readFile } from './readFile';
-export { default as writeFile } from './writeFile';

package/packages/logger/build/constants.js

@@ -4,6 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OUTPUT_DIRECTORY = void 0;
-var os_1 = __importDefault(require("os"));
-var path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 exports.OUTPUT_DIRECTORY = path_1.default.resolve(os_1.default.homedir(), '.scrabble-solver', 'logs');

package/packages/logger/build/logger.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var path_1 = __importDefault(require("path"));
-var winston_1 = require("winston");
-var constants_1 = require("./constants");
-var logger = (0, winston_1.createLogger)({
+const path_1 = __importDefault(require("path"));
+const winston_1 = require("winston");
+const constants_1 = require("./constants");
+const logger = (0, winston_1.createLogger)({
     level: 'info',
     format: winston_1.format.combine(winston_1.format.timestamp({
         format: 'YYYY-MM-DD HH:mm:ss',

package/packages/logger/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/logger",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/logger",
-      "version": "2.8.2",
+      "version": "2.8.4",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "winston": "^3.8.2"

package/packages/logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/logger",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "Scrabble Solver 2 - Logger",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/packages/scrabble-solver/.next/BUILD_ID

@@ -1 +1 @@
-nXSSCVI5pGlS_NxEidxkS
+-UOLkxdxU0PlKbXa09-xO

package/packages/scrabble-solver/.next/build-manifest.json

@@ -5,8 +5,8 @@
   "devFiles": [],
   "ampDevFiles": [],
   "lowPriorityFiles": [
-    "static/nXSSCVI5pGlS_NxEidxkS/_buildManifest.js",
-    "static/nXSSCVI5pGlS_NxEidxkS/_ssgManifest.js"
+    "static/-UOLkxdxU0PlKbXa09-xO/_buildManifest.js",
+    "static/-UOLkxdxU0PlKbXa09-xO/_ssgManifest.js"
   ],
   "rootMainFiles": [],
   "pages": {
@@ -15,26 +15,26 @@
       "static/chunks/framework-4556c45dd113b893.js",
       "static/chunks/main-a75cf611e061d8f8.js",
       "static/chunks/758-f333b1dcdb941547.js",
-      "static/css/d676d43c6b9c9a57.css",
-      "static/chunks/195-fcadef5c6eed8338.js",
+      "static/css/551d09cac435debb.css",
+      "static/chunks/56-2d34867599a0ac66.js",
       "static/css/3159cfe62ff742a3.css",
-      "static/chunks/pages/index-75517525489ab316.js"
+      "static/chunks/pages/index-13ea7770a65c69ee.js"
     ],
     "/404": [
       "static/chunks/webpack-5752944655d749a0.js",
       "static/chunks/framework-4556c45dd113b893.js",
       "static/chunks/main-a75cf611e061d8f8.js",
       "static/chunks/758-f333b1dcdb941547.js",
-      "static/css/d676d43c6b9c9a57.css",
-      "static/chunks/195-fcadef5c6eed8338.js",
-      "static/chunks/pages/404-02d949d2fe59e960.js"
+      "static/css/551d09cac435debb.css",
+      "static/chunks/56-2d34867599a0ac66.js",
+      "static/chunks/pages/404-30c06e61d256c5b2.js"
     ],
     "/_app": [
       "static/chunks/webpack-5752944655d749a0.js",
       "static/chunks/framework-4556c45dd113b893.js",
       "static/chunks/main-a75cf611e061d8f8.js",
-      "static/css/6a9e5ba3f77c27f2.css",
-      "static/chunks/pages/_app-f4030148d742bcd2.js"
+      "static/css/cdbc9e0afcff5473.css",
+      "static/chunks/pages/_app-6ffa2ab900772b67.js"
     ],
     "/_error": [
       "static/chunks/webpack-5752944655d749a0.js",