adds caching

Author: a7ul

package.json

@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "7zip-min": "^1.1.1",
-    "mkdirp": "^1.0.3",
+    "env-paths": "^2.2.0",
+    "make-dir": "^3.0.0",
     "node-fetch": "^2.6.0",
-    "progress": "^2.0.3",
-    "tempy": "^0.3.0"
+    "progress": "^2.0.3"
   }
 }

src/downloader.ts

@@ -3,10 +3,11 @@ import util from 'util';
 import fs from 'fs';
 import path from 'path';
 import stream from 'stream';
-import mkdirp from 'mkdirp';
+import mkdirp from 'make-dir';
 import Progress from 'progress';
 
 const streamPipeline = util.promisify(stream.pipeline);
+const fsExist = util.promisify(fs.exists);
 
 function progressBar(tokens: string, total: number): stream.PassThrough {
   const pt = new stream.PassThrough();
@@ -21,6 +22,11 @@ export async function download(link: string, outPath: string, options: DownloadO
   if (!response.ok) {
     throw new Error(`Error while downloading ${name}:${link}. ${response.statusText}`);
   }
+  if (options.skipIfCached) {
+    if (await fsExist(outPath)) {
+      return console.warn(`Archive already exists at ${outPath}. Skipping download....`);
+    }
+  }
   await mkdirp(path.dirname(outPath));
   const total = parseInt(`${response.headers.get('content-length')}`, 10);
   const totalInMb = (total / 1024 / 1024).toFixed(2);
@@ -31,4 +37,4 @@ export async function download(link: string, outPath: string, options: DownloadO
   );
 }
 
-type DownloadOptions = { name?: string };
+type DownloadOptions = { name?: string; skipIfCached?: boolean };

src/index.ts

@@ -1,2 +1 @@
-import './types';
 export { setupQt } from './setup';

src/setup.ts

@@ -1,7 +1,10 @@
 import { download } from './downloader';
 import { extract } from './extractor';
+import path from 'path';
 import metadata from './metadata.json';
-import tempy from 'tempy';
+import envPaths from 'env-paths';
+
+const appPaths = envPaths('nodegui-qt');
 
 type SupportedOs = 'linux' | 'win32' | 'darwin';
 type SetupOptions = {
@@ -12,9 +15,9 @@ type SetupOptions = {
 
 export async function setupQt(options: SetupOptions): Promise<string> {
   const downloadLink = options.downloadLink || metadata[options.osType];
-  const archivePath = tempy.file({ extension: '7z' });
+  const archivePath = path.resolve(appPaths.cache, path.basename(downloadLink));
   const extractDir = options.qtDir;
-  await download(downloadLink, archivePath, { name: 'Qt for Mac' });
+  await download(downloadLink, archivePath, { name: 'Qt for Mac', skipIfCached: true });
   await extract(archivePath, extractDir);
   console.log(`Mini Qt was setup successfully.  QtDir: ${extractDir}`);
   return extractDir;

src/types.ts

@@ -992,11 +992,6 @@ cross-spawn@^7.0.0:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
-
 cssom@^0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@@ -1142,6 +1137,11 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+env-paths@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
+  integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+
 es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
   version "1.17.4"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
@@ -2651,11 +2651,6 @@ mkdirp@0.x, mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
-mkdirp@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
-  integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -3551,20 +3546,6 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-temp-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
-  integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
-
-tempy@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.3.0.tgz#6f6c5b295695a16130996ad5ab01a8bd726e8bf8"
-  integrity sha512-WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ==
-  dependencies:
-    temp-dir "^1.0.0"
-    type-fest "^0.3.1"
-    unique-string "^1.0.0"
-
 terminal-link@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -3730,11 +3711,6 @@ type-detect@4.0.8:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
-  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
-
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -3762,13 +3738,6 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
-  dependencies:
-    crypto-random-string "^1.0.0"
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"