Ver Fonte

Uses request to follow redirects

craigsdennis há 9 anos atrás
pai
commit
6afb115a5c
2 ficheiros alterados com 5 adições e 6 exclusões
  1. 4 6
      back-end/prepare_binaries.js
  2. 1 0
      package.json

+ 4 - 6
back-end/prepare_binaries.js

@@ -1,5 +1,5 @@
 "use strict";
-const http = require("http");
+const request = require("request");
 const unzip = require("unzip");
 const fs = require("fs");
 const EventEmitter = require("events");
@@ -19,8 +19,9 @@ function addBufferToBinary(flashSpecification, fileName, buffer) {
 function prepareBinaries(manifest, callback) {
     const eventEmitter = new EventEmitter();
     const flashContents = manifest.flash;
-    const downloadRequest = http.get(manifest.download, (response) => {
-        response.pipe(unzip.Parse()).on('entry', (entry) => {
+    const downloadRequest = request(manifest.download)
+        .pipe(unzip.Parse())
+        .on('entry', (entry) => {
             const fileName = entry.path;
             if (isBinaryFileRequired(flashContents, fileName)) {
                 eventEmitter.emit("entry", {
@@ -42,15 +43,12 @@ function prepareBinaries(manifest, callback) {
                     });
                     addBufferToBinary(flashContents, fileName, body);
                 }).on("error", callback);
-
             } else {
                 entry.autodrain();
             }
         }).on("close", () => {
             callback(null, flashContents);
         });
-        response.on("error", callback);
-    });
     return eventEmitter;
 }
 

+ 1 - 0
package.json

@@ -26,6 +26,7 @@
   "dependencies": {
     "bunyan": "^1.8.0",
     "node-binary": "^1.1.0",
+    "request": "^2.72.0",
     "serialport": "^2.0.7-beta1",
     "tar.gz": "^1.0.3",
     "unzip": "^0.1.11"