@lde/distribution-downloader 0.5.2 → 0.6.0

package/dist/download.d.ts

@@ -10,13 +10,17 @@ export interface Logger {
 export interface DownloadOptions {
     logger?: Logger;
 }
+export interface DownloadResult {
+    path: string;
+    headers: Headers;
+}
 export interface Downloader {
-    download(distribution: Distribution, target?: string, options?: DownloadOptions): Promise<string>;
+    download(distribution: Distribution, target?: string, options?: DownloadOptions): Promise<DownloadResult>;
 }
 export declare class LastModifiedDownloader implements Downloader {
     private readonly path;
     constructor(path?: string);
-    download(distribution: Distribution, target?: string, options?: DownloadOptions): Promise<string>;
+    download(distribution: Distribution, target?: string, options?: DownloadOptions): Promise<DownloadResult>;
     private localFileIsUpToDate;
 }
 //# sourceMappingURL=download.d.ts.map

package/dist/download.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../src/download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAM5C,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAC9C;AAaD,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CACN,YAAY,EAAE,YAAY,EAC1B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,qBAAa,sBAAuB,YAAW,UAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,SAAY;IAEhC,QAAQ,CACnB,YAAY,EAAE,YAAY,EAC1B,MAAM,SAAyD,EAC/D,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,MAAM,CAAC;YAmCJ,mBAAmB;CAyBlC"}
+{"version":3,"file":"download.d.ts","sourceRoot":"","sources":["../src/download.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAM5C,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAC9C;AAaD,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CACN,YAAY,EAAE,YAAY,EAC1B,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,cAAc,CAAC,CAAC;CAC5B;AAED,qBAAa,sBAAuB,YAAW,UAAU;IAC3C,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,SAAY;IAEhC,QAAQ,CACnB,YAAY,EAAE,YAAY,EAC1B,MAAM,SAAyD,EAC/D,OAAO,CAAC,EAAE,eAAe,GACxB,OAAO,CAAC,cAAc,CAAC;YAyCZ,mBAAmB;CAyBlC"}

package/dist/download.js

@@ -1,5 +1,5 @@
 import filenamifyUrl from 'filenamify-url';
-import { join, resolve } from 'node:path';
+import { join, resolve, sep } from 'node:path';
 import { pipeline } from 'node:stream/promises';
 import { createWriteStream } from 'node:fs';
 import { access, rm, stat } from 'node:fs/promises';
@@ -22,9 +22,13 @@ export class LastModifiedDownloader {
         const logger = options?.logger ?? noopLogger;
         const downloadUrl = distribution.accessUrl;
         const filePath = resolve(target);
+        const baseDir = resolve(this.path);
+        if (!filePath.startsWith(baseDir + sep)) {
+            throw new Error(`Download target escapes the base directory: ${filePath}`);
+        }
         if (await this.localFileIsUpToDate(filePath, distribution)) {
             logger.debug(`File ${filePath} is up to date, skipping download.`);
-            return filePath;
+            return { path: filePath, headers: new Headers() };
         }
         const downloadResponse = await fetch(downloadUrl, {
             signal: AbortSignal.timeout(300_000),
@@ -44,7 +48,7 @@ export class LastModifiedDownloader {
             logger.debug(`Distribution download ${downloadUrl} is empty`);
             throw new Error('Distribution download is empty');
         }
-        return filePath;
+        return { path: filePath, headers: downloadResponse.headers };
     }
     async localFileIsUpToDate(filePath, distribution) {
         if (undefined === distribution.lastModified) {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@lde/distribution-downloader",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
     "directory": "packages/distribution-downloader"
   },
+  "license": "MIT",
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
@@ -23,7 +24,7 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@lde/dataset": "0.7.1",
+    "@lde/dataset": "0.7.2",
     "filenamify-url": "4.0.0",
     "tslib": "^2.3.0"
   }