addons-scanner-utils 7.1.0 → 8.0.0

package/dist/functions.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import fs from 'fs';
 import { Request, RequestHandler } from 'express';
-import download from 'download';
+import fetch from 'node-fetch';
 declare type ApiError = Error & {
     extraInfo?: string;
     status?: number;
@@ -17,7 +18,7 @@ export declare type RequestWithFiles = Request & {
 };
 export declare type FunctionConfig = {
     _console?: typeof console;
-    _download?: typeof download;
+    _fetch?: typeof fetch;
     _process?: typeof process;
     _unlinkFile?: typeof fs.promises.unlink;
     apiKeyEnvVarName?: string;
@@ -26,5 +27,5 @@ export declare type FunctionConfig = {
     tmpDir?: string;
     xpiFilename?: string;
 };
-export declare const createExpressApp: ({ _console, _download, _process, _unlinkFile, apiKeyEnvVarName, requiredApiKeyParam, requiredDownloadUrlParam, tmpDir, xpiFilename, }?: FunctionConfig) => (handler: RequestHandler) => import("express-serve-static-core").Express;
+export declare const createExpressApp: ({ _console, _fetch, _process, _unlinkFile, apiKeyEnvVarName, requiredApiKeyParam, requiredDownloadUrlParam, tmpDir, xpiFilename, }?: FunctionConfig) => (handler: RequestHandler) => import("express-serve-static-core").Express;
 export {};

package/dist/functions.js

@@ -16,9 +16,12 @@ exports.createExpressApp = exports.createApiError = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const node_fs_1 = require("node:fs");
+const node_stream_1 = require("node:stream");
+const node_util_1 = require("node:util");
 const express_1 = __importDefault(require("express"));
 const body_parser_1 = __importDefault(require("body-parser"));
-const download_1 = __importDefault(require("download"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const safe_compare_1 = __importDefault(require("safe-compare"));
 const createApiError = ({ message, extraInfo, status = 500, }) => {
     const error = new Error(message);
@@ -27,7 +30,7 @@ const createApiError = ({ message, extraInfo, status = 500, }) => {
     return error;
 };
 exports.createApiError = createApiError;
-const createExpressApp = ({ _console = console, _download = download_1.default, _process = process, _unlinkFile = fs_1.default.promises.unlink, apiKeyEnvVarName = 'LAMBDA_API_KEY', requiredApiKeyParam = 'api_key', requiredDownloadUrlParam = 'download_url', tmpDir = os_1.default.tmpdir(), xpiFilename = 'input.xpi', } = {}) => (handler) => {
+const createExpressApp = ({ _console = console, _fetch = node_fetch_1.default, _process = process, _unlinkFile = fs_1.default.promises.unlink, apiKeyEnvVarName = 'LAMBDA_API_KEY', requiredApiKeyParam = 'api_key', requiredDownloadUrlParam = 'download_url', tmpDir = os_1.default.tmpdir(), xpiFilename = 'input.xpi', } = {}) => (handler) => {
     const app = (0, express_1.default)();
     const allowedOrigin = _process.env.ALLOWED_ORIGIN || null;
     if (!allowedOrigin) {
@@ -90,8 +93,13 @@ const createExpressApp = ({ _console = console, _download = download_1.default,
             return;
         }
         try {
-            yield _download(downloadURL, tmpDir, { filename: xpiFilename });
             const xpiFilepath = path_1.default.join(tmpDir, xpiFilename);
+            const streamPipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
+            const response = yield _fetch(downloadURL);
+            if (!response.ok) {
+                throw new Error(`unexpected response ${response.statusText}`);
+            }
+            yield streamPipeline(response.body, (0, node_fs_1.createWriteStream)(xpiFilepath));
             req.xpiFilepath = xpiFilepath;
             // Add a listener that will run code after the response is sent.
             res.on('finish', () => {

package/dist/io/base.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable } from 'stream';
 import { Stderr } from '../stdio';
 declare type ScanFileFunction = (_path: string, isDirectory: boolean) => boolean;

package/dist/io/crx.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import defaultFs from 'fs';
 import yauzl, { ZipFile } from 'yauzl';
 import { IOBaseConstructorParams } from './base';

package/dist/io/directory.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable } from 'stream';
 import { IOBase, IOBaseConstructorParams } from './base';
 import { walkPromise } from './utils';

package/dist/io/xpi.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Readable } from 'stream';
 import yauzl, { Entry, ZipFile } from 'yauzl';
 import { IOBaseConstructorParams, IOBase } from './base';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "addons-scanner-utils",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "description": "Various addons related helpers to build CLIs.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,20 +18,16 @@
     "yauzl": "2.10.0"
   },
   "peerDependencies": {
-    "@types/download": "8.0.1",
-    "body-parser": "1.20.0",
-    "download": "8.0.0",
-    "express": "4.18.1",
+    "body-parser": "1.20.1",
+    "express": "4.18.2",
+    "node-fetch": "2.6.7",
     "safe-compare": "1.1.4"
   },
   "peerDependenciesMeta": {
-    "@types/download": {
-      "optional": true
-    },
     "body-parser": {
       "optional": true
     },
-    "download": {
+    "node-fetch": {
       "optional": true
     },
     "express": {
@@ -43,29 +39,29 @@
   },
   "devDependencies": {
     "@types/common-tags": "^1.8.0",
-    "@types/download": "8.0.1",
-    "@types/express": "4.17.13",
-    "@types/jest": "^28.0.0",
+    "@types/express": "4.17.14",
+    "@types/jest": "^29.0.0",
     "@types/node": "^14.0.0",
+    "@types/node-fetch": "^2.6.2",
     "@types/safe-compare": "^1.1.0",
     "@types/sinon": "^10.0.0",
     "@types/supertest": "^2.0.8",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
-    "body-parser": "1.20.0",
-    "download": "8.0.0",
+    "body-parser": "1.20.1",
     "eslint": "^8.1.0",
     "eslint-config-amo": "^5.0.0",
     "eslint-plugin-amo": "^1.10.2",
-    "express": "4.18.1",
-    "jest": "^28.0.0",
+    "express": "4.18.2",
+    "jest": "^29.0.0",
+    "node-fetch": "2.6.7",
     "prettier": "2.7.1",
     "pretty-quick": "^3.0.0",
     "rimraf": "^3.0.0",
     "safe-compare": "1.1.4",
     "sinon": "^14.0.0",
     "supertest": "^6.0.0",
-    "ts-jest": "^28.0.0",
+    "ts-jest": "^29.0.0",
     "type-coverage": "^2.3.0",
     "typescript": "^4.0.0"
   },