@scrabble-solver/word-lists 2.8.3 → 2.8.5

package/build/getPlPlWordList.js

@@ -11,15 +11,14 @@ const lib_1 = require("./lib");
 const PAGE_URL = 'https://sjp.pl/sl/growy/';
 const FILE_TO_EXTRACT_FROM_ZIP = 'slowa.txt';
 const getPlPlWordList = async () => {
-    const zipTempFilename = (0, lib_1.getTempFilename)();
     const tempFilename = (0, lib_1.getTempFilename)();
     const zipUrl = await fetchZipUrl(PAGE_URL);
-    await (0, lib_1.downloadFile)(zipUrl, memfs_1.fs.createWriteStream(zipTempFilename));
+    const zipTempFilename = await (0, lib_1.downloadFile)(zipUrl);
     await unzip(zipTempFilename, tempFilename);
     memfs_1.fs.unlinkSync(zipTempFilename);
     const file = memfs_1.fs.readFileSync(tempFilename, 'utf-8');
     memfs_1.fs.unlinkSync(tempFilename);
-    const words = (0, lib_1.extractWords)(file.toString());
+    const words = (0, lib_1.extractWords)(file.toLocaleString());
     return words;
 };
 const fetchZipUrl = async (url) => {

package/build/lib/downloadFile.d.ts

@@ -1,3 +1,2 @@
-import { Writable } from 'stream';
-declare const downloadFile: (url: string, outputStream: Writable) => Promise<void>;
+declare const downloadFile: (url: string) => Promise<string>;
 export default downloadFile;

package/build/lib/downloadFile.js

@@ -1,19 +1,37 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const follow_redirects_1 = require("follow-redirects");
-const downloadFile = (url, outputStream) => {
+const memfs_1 = require("memfs");
+const getTempFilename_1 = __importDefault(require("./getTempFilename"));
+const downloadFile = (url) => {
     return new Promise((resolve, reject) => {
+        const tempFilename = (0, getTempFilename_1.default)();
         const protocol = url.startsWith('https') ? follow_redirects_1.https : follow_redirects_1.http;
+        const writeStream = memfs_1.fs.createWriteStream(tempFilename);
         const request = protocol.get(url, (response) => {
             if (typeof response.statusCode === 'undefined' || response.statusCode >= 400) {
-                reject();
+                reject(new Error(`Cannot download file: ${url}`));
                 return;
             }
-            response.pipe(outputStream);
-            response.on('error', reject);
-            response.on('end', resolve);
+            response.on('error', (error) => {
+                writeStream.close();
+                reject(error);
+            });
+            response.on('end', () => {
+                writeStream.on('finish', () => {
+                    writeStream.close();
+                    resolve(tempFilename);
+                });
+            });
+            response.pipe(writeStream);
+        });
+        request.on('error', (error) => {
+            writeStream.close();
+            reject(error);
         });
-        request.on('error', reject);
     });
 };
 exports.default = downloadFile;

package/build/lib/getTxtWordList.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const memfs_1 = require("memfs");
 const downloadFile_1 = __importDefault(require("./downloadFile"));
 const extractWords_1 = __importDefault(require("./extractWords"));
-const getTempFilename_1 = __importDefault(require("./getTempFilename"));
 const getTxtWordList = async (url) => {
-    const tempFilename = (0, getTempFilename_1.default)();
-    await (0, downloadFile_1.default)(url, memfs_1.fs.createWriteStream(tempFilename));
+    const tempFilename = await (0, downloadFile_1.default)(url);
     const file = memfs_1.fs.readFileSync(tempFilename, 'utf-8');
-    const words = (0, extractWords_1.default)(file.toString());
+    const words = (0, extractWords_1.default)(file.toLocaleString());
     memfs_1.fs.unlinkSync(tempFilename);
     return words;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-lists",
-  "version": "2.8.3",
+  "version": "2.8.5",
   "description": "Scrabble Solver 2 - Word lists",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,7 +24,7 @@
     "clean:force": "npm run clean && rimraf package-lock.json"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.8.3",
+    "@scrabble-solver/types": "^2.8.5",
     "cheerio": "^1.0.0-rc.12",
     "follow-redirects": "^1.15.2",
     "memfs": "^3.4.7",
@@ -34,5 +34,5 @@
     "@types/follow-redirects": "^1.14.1",
     "@types/unzipper": "^0.10.5"
   },
-  "gitHead": "116f214733e7ad071044f556bcf67e867da3d9ca"
+  "gitHead": "79ba3664458e7dc8d805599a3cf3cd1faba86309"
 }

package/src/getPlPlWordList.ts

@@ -9,15 +9,14 @@ const PAGE_URL = 'https://sjp.pl/sl/growy/';
 const FILE_TO_EXTRACT_FROM_ZIP = 'slowa.txt';
 
 const getPlPlWordList = async (): Promise<string[]> => {
-  const zipTempFilename = getTempFilename();
   const tempFilename = getTempFilename();
   const zipUrl = await fetchZipUrl(PAGE_URL);
-  await downloadFile(zipUrl, fs.createWriteStream(zipTempFilename));
+  const zipTempFilename = await downloadFile(zipUrl);
   await unzip(zipTempFilename, tempFilename);
   fs.unlinkSync(zipTempFilename);
   const file = fs.readFileSync(tempFilename, 'utf-8');
   fs.unlinkSync(tempFilename);
-  const words = extractWords(file.toString());
+  const words = extractWords(file.toLocaleString());
   return words;
 };
 

package/src/lib/downloadFile.ts

@@ -1,20 +1,38 @@
 import { http, https } from 'follow-redirects';
-import { Writable } from 'stream';
+import { fs } from 'memfs';
 
-const downloadFile = (url: string, outputStream: Writable): Promise<void> => {
+import getTempFilename from './getTempFilename';
+
+const downloadFile = (url: string): Promise<string> => {
   return new Promise((resolve, reject) => {
+    const tempFilename = getTempFilename();
     const protocol = url.startsWith('https') ? https : http;
+    const writeStream = fs.createWriteStream(tempFilename);
     const request = protocol.get(url, (response) => {
       if (typeof response.statusCode === 'undefined' || response.statusCode >= 400) {
-        reject();
+        reject(new Error(`Cannot download file: ${url}`));
         return;
       }
 
-      response.pipe(outputStream);
-      response.on('error', reject);
-      response.on('end', resolve);
+      response.on('error', (error) => {
+        writeStream.close();
+        reject(error);
+      });
+
+      response.on('end', () => {
+        writeStream.on('finish', () => {
+          writeStream.close();
+          resolve(tempFilename);
+        });
+      });
+
+      response.pipe(writeStream);
+    });
+
+    request.on('error', (error) => {
+      writeStream.close();
+      reject(error);
     });
-    request.on('error', reject);
   });
 };
 

package/src/lib/getTxtWordList.ts

@@ -2,13 +2,11 @@ import { fs } from 'memfs';
 
 import downloadFile from './downloadFile';
 import extractWords from './extractWords';
-import getTempFilename from './getTempFilename';
 
 const getTxtWordList = async (url: string): Promise<string[]> => {
-  const tempFilename = getTempFilename();
-  await downloadFile(url, fs.createWriteStream(tempFilename));
+  const tempFilename = await downloadFile(url);
   const file = fs.readFileSync(tempFilename, 'utf-8');
-  const words = extractWords(file.toString());
+  const words = extractWords(file.toLocaleString());
   fs.unlinkSync(tempFilename);
   return words;
 };