@pioug/get-pixels - npm Package Compare versions

Comparing version 3.3.3 to 4.0.0

dom-pixels.js

@@ -1,26 +0,34 @@
-'use strict'
+"use strict";
 
-var path          = require('path')
-var ndarray       = require('ndarray')
-var GifReader     = require('omggif').GifReader
-var pack          = require('ndarray-pack')
-var through       = require('through')
-var parseDataURI  = require('data-uri-to-buffer')
+var path = require("path");
+var ndarray = require("ndarray");
+var GifReader = require("omggif").GifReader;
+var pack = require("ndarray-pack");
+var through = require("through");
+var parseDataURI = require("data-uri-to-buffer");
 
 function defaultImage(url, cb) {
-  var img = new Image()
-  img.crossOrigin = "Anonymous"
-  img.onload = function() {
-    var canvas = document.createElement('canvas')
-    canvas.width = img.width
-    canvas.height = img.height
-    var context = canvas.getContext('2d')
-    context.drawImage(img, 0, 0)
-    var pixels = context.getImageData(0, 0, img.width, img.height)
-    cb(null, ndarray(new Uint8Array(pixels.data), [img.width, img.height, 4], [4, 4*img.width, 1], 0))
-  }
-  img.onerror = function(err) {
-    cb(err)
-  }
-  img.src = url
+  var img = new Image();
+  img.crossOrigin = "Anonymous";
+  img.onload = function () {
+    var canvas = document.createElement("canvas");
+    canvas.width = img.width;
+    canvas.height = img.height;
+    var context = canvas.getContext("2d");
+    context.drawImage(img, 0, 0);
+    var pixels = context.getImageData(0, 0, img.width, img.height);
+    cb(
+      null,
+      ndarray(
+        new Uint8Array(pixels.data),
+        [img.width, img.height, 4],
+        [4, 4 * img.width, 1],
+        0
+      )
+    );
+  };
+  img.onerror = function (err) {
+    cb(err);
+  };
+  img.src = url;
 }
@@ -30,35 +38,36 @@
 function handleGif(data, cb) {
-  var reader
+  var reader;
   try {
-    reader = new GifReader(data)
-  } catch(err) {
-    cb(err)
-    return
+    reader = new GifReader(data);
+  } catch (err) {
+    cb(err);
+    return;
   }
-  if(reader.numFrames() > 0) {
-    var nshape = [reader.numFrames(), reader.height, reader.width, 4]
-    var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2] * nshape[3])
-    var result = ndarray(ndata, nshape)
+  if (reader.numFrames() > 0) {
+    var nshape = [reader.numFrames(), reader.height, reader.width, 4];
+    var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2] * nshape[3]);
+    var result = ndarray(ndata, nshape);
     try {
-      for(var i=0; i<reader.numFrames(); ++i) {
-        reader.decodeAndBlitFrameRGBA(i, ndata.subarray(
-          result.index(i, 0, 0, 0),
-          result.index(i+1, 0, 0, 0)))
+      for (var i = 0; i < reader.numFrames(); ++i) {
+        reader.decodeAndBlitFrameRGBA(
+          i,
+          ndata.subarray(result.index(i, 0, 0, 0), result.index(i + 1, 0, 0, 0))
+        );
       }
-    } catch(err) {
-      cb(err)
-      return
+    } catch (err) {
+      cb(err);
+      return;
     }
-    cb(null, result.transpose(0,2,1))
+    cb(null, result.transpose(0, 2, 1));
   } else {
-    var nshape = [reader.height, reader.width, 4]
-    var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2])
-    var result = ndarray(ndata, nshape)
+    var nshape = [reader.height, reader.width, 4];
+    var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2]);
+    var result = ndarray(ndata, nshape);
     try {
-      reader.decodeAndBlitFrameRGBA(0, ndata)
-    } catch(err) {
-      cb(err)
-      return
+      reader.decodeAndBlitFrameRGBA(0, ndata);
+    } catch (err) {
+      cb(err);
+      return;
     }
-    cb(null, result.transpose(1,0))
+    cb(null, result.transpose(1, 0));
   }
@@ -68,32 +77,32 @@ }
 function httpGif(url, cb) {
-  var xhr          = new XMLHttpRequest()
-  xhr.open('GET', url, true)
-  xhr.responseType = 'arraybuffer'
-  if(xhr.overrideMimeType){
-    xhr.overrideMimeType('application/binary')
+  var xhr = new XMLHttpRequest();
+  xhr.open("GET", url, true);
+  xhr.responseType = "arraybuffer";
+  if (xhr.overrideMimeType) {
+    xhr.overrideMimeType("application/binary");
   }
-  xhr.onerror = function(err) {
-    cb(err)
-  }
-  xhr.onload = function() {
-    if(xhr.readyState !== 4) {
-      return
+  xhr.onerror = function (err) {
+    cb(err);
+  };
+  xhr.onload = function () {
+    if (xhr.readyState !== 4) {
+      return;
     }
-    var data = new Uint8Array(xhr.response)
-    handleGif(data, cb)
-    return
-  }
-  xhr.send()
+    var data = new Uint8Array(xhr.response);
+    handleGif(data, cb);
+    return;
+  };
+  xhr.send();
 }
 
 function copyBuffer(buffer) {
-  if(buffer[0] === undefined) {
-    var n = buffer.length
-    var result = new Uint8Array(n)
-    for(var i=0; i<n; ++i) {
-      result[i] = buffer.get(i)
+  if (buffer[0] === undefined) {
+    var n = buffer.length;
+    var result = new Uint8Array(n);
+    for (var i = 0; i < n; ++i) {
+      result[i] = buffer.get(i);
     }
-    return result
+    return result;
   } else {
-    return new Uint8Array(buffer)
+    return new Uint8Array(buffer);
   }
@@ -103,36 +112,36 @@ }
 function dataGif(url, cb) {
-  process.nextTick(function() {
+  process.nextTick(function () {
     try {
-      var buffer = parseDataURI(url)
-      if(buffer) {
-        handleGif(copyBuffer(buffer), cb)
+      var buffer = parseDataURI(url);
+      if (buffer) {
+        handleGif(copyBuffer(buffer), cb);
       } else {
-        cb(new Error('Error parsing data URI'))
+        cb(new Error("Error parsing data URI"));
       }
-    } catch(err) {
-      cb(err)
+    } catch (err) {
+      cb(err);
     }
-  })
+  });
 }
 
 module.exports = function getPixels(url, type, cb) {
-  if(!cb) {
-    cb = type
-    type = ''
+  if (!cb) {
+    cb = type;
+    type = "";
   }
-  var ext = path.extname(url)
-  switch(type || ext.toUpperCase()) {
-    case '.GIF':
-      httpGif(url, cb)
-    break
+  var ext = path.extname(url);
+  switch (type || ext.toUpperCase()) {
+    case ".GIF":
+      httpGif(url, cb);
+      break;
     default:
-      if(Buffer.isBuffer(url)) {
-        url = 'data:' + type + ';base64,' + url.toString('base64')
+      if (Buffer.isBuffer(url)) {
+        url = "data:" + type + ";base64," + url.toString("base64");
       }
-      if(url.indexOf('data:image/gif;') === 0) {
-        dataGif(url, cb)
+      if (url.indexOf("data:image/gif;") === 0) {
+        dataGif(url, cb);
       } else {
-        defaultImage(url, cb)
+        defaultImage(url, cb);
       }
   }
-}
+};

node-pixels.js

@@ -1,86 +0,88 @@
-'use strict'
+"use strict";
 
-var ndarray       = require('ndarray')
-var path          = require('path')
-var PNG           = require('pngjs').PNG
-var jpeg          = require('jpeg-js')
-var pack          = require('ndarray-pack')
-var GifReader     = require('omggif').GifReader
-var Bitmap        = require('node-bitmap')
-var fs            = require('fs')
-var request       = require('request')
-var mime          = require('mime-types')
-var parseDataURI  = require('parse-data-uri')
+var ndarray = require("ndarray");
+var PNG = require("pngjs").PNG;
+var jpeg = require("jpeg-js");
+var pack = require("ndarray-pack");
+var GifReader = require("omggif").GifReader;
+var Bitmap = require("node-bitmap");
+var fs = require("fs");
+var mime = require("mime-types");
 
 function handlePNG(data, cb) {
   var png = new PNG();
-  png.parse(data, function(err, img_data) {
-    if(err) {
-      cb(err)
-      return
+  png.parse(data, function (err, img_data) {
+    if (err) {
+      cb(err);
+      return;
     }
-    cb(null, ndarray(new Uint8Array(img_data.data),
-      [img_data.width|0, img_data.height|0, 4],
-      [4, 4*img_data.width|0, 1],
-      0))
-  })
+    cb(
+      null,
+      ndarray(
+        new Uint8Array(img_data.data),
+        [img_data.width | 0, img_data.height | 0, 4],
+        [4, (4 * img_data.width) | 0, 1],
+        0
+      )
+    );
+  });
 }
 
 function handleJPEG(data, cb) {
-  var jpegData
+  var jpegData;
   try {
-    jpegData = jpeg.decode(data)
+    jpegData = jpeg.decode(data);
+  } catch (e) {
+    cb(e);
+    return;
   }
-  catch(e) {
-    cb(e)
-    return
+  if (!jpegData) {
+    cb(new Error("Error decoding jpeg"));
+    return;
   }
-  if(!jpegData) {
-    cb(new Error("Error decoding jpeg"))
-    return
-  }
-  var nshape = [ jpegData.height, jpegData.width, 4 ]
-  var result = ndarray(jpegData.data, nshape)
-  cb(null, result.transpose(1,0))
+  var nshape = [jpegData.height, jpegData.width, 4];
+  var result = ndarray(jpegData.data, nshape);
+  cb(null, result.transpose(1, 0));
 }
 
 function handleGIF(data, cb) {
-  var reader
+  var reader;
   try {
-    reader = new GifReader(data)
-  } catch(err) {
-    cb(err)
-    return
+    reader = new GifReader(data);
+  } catch (err) {
+    cb(err);
+    return;
   }
-  if(reader.numFrames() > 0) {
-    var nshape = [reader.numFrames(), reader.height, reader.width, 4]
-    try  {
-      var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2] * nshape[3])
-    } catch(err) {
-      cb(err)
-      return
+  if (reader.numFrames() > 0) {
+    var nshape = [reader.numFrames(), reader.height, reader.width, 4];
+    try {
+      var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2] * nshape[3]);
+    } catch (err) {
+      cb(err);
+      return;
     }
-    var result = ndarray(ndata, nshape)
+    var result = ndarray(ndata, nshape);
     try {
-      for(var i=0; i<reader.numFrames(); ++i) {
-        reader.decodeAndBlitFrameRGBA(i, ndata.subarray(
-          result.index(i, 0, 0, 0),
-          result.index(i+1, 0, 0, 0)))
+      for (var i = 0; i < reader.numFrames(); ++i) {
+        reader.decodeAndBlitFrameRGBA(
+          i,
+          ndata.subarray(result.index(i, 0, 0, 0), result.index(i + 1, 0, 0, 0))
+        );
       }
-    } catch(err) {
-      cb(err)
-      return
+    } catch (err) {
+      cb(err);
+      return;
     }
-    cb(null, result.transpose(0,2,1))
+    cb(null, result.transpose(0, 2, 1));
   } else {
-    var nshape = [reader.height, reader.width, 4]
-    var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2])
-    var result = ndarray(ndata, nshape)
+    var nshape = [reader.height, reader.width, 4];
+    var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2]);
+    var result = ndarray(ndata, nshape);
     try {
-      reader.decodeAndBlitFrameRGBA(0, ndata)
-    } catch(err) {
-      cb(err)
-      return
+      reader.decodeAndBlitFrameRGBA(0, ndata);
+    } catch (err) {
+      cb(err);
+      return;
     }
-    cb(null, result.transpose(1,0))
+    cb(null, result.transpose(1, 0));
   }
@@ -90,39 +92,38 @@ }
 function handleBMP(data, cb) {
-  var bmp = new Bitmap(data)
+  var bmp = new Bitmap(data);
   try {
-    bmp.init()
-  } catch(e) {
-    cb(e)
-    return
+    bmp.init();
+  } catch (e) {
+    cb(e);
+    return;
   }
-  var bmpData = bmp.getData()
-  var nshape = [ bmpData.getHeight(), bmpData.getWidth(), 4 ]
-  var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2])
-  var result = ndarray(ndata, nshape)
-  pack(bmpData, result)
-  cb(null, result.transpose(1,0))
+  var bmpData = bmp.getData();
+  var nshape = [bmpData.getHeight(), bmpData.getWidth(), 4];
+  var ndata = new Uint8Array(nshape[0] * nshape[1] * nshape[2]);
+  var result = ndarray(ndata, nshape);
+  pack(bmpData, result);
+  cb(null, result.transpose(1, 0));
 }
 
-
 function doParse(mimeType, data, cb) {
-  switch(mimeType) {
-    case 'image/png':
-      handlePNG(data, cb)
-    break
+  switch (mimeType) {
+    case "image/png":
+      handlePNG(data, cb);
+      break;
 
-    case 'image/jpg':
-    case 'image/jpeg':
-      handleJPEG(data, cb)
-    break
+    case "image/jpg":
+    case "image/jpeg":
+      handleJPEG(data, cb);
+      break;
 
-    case 'image/gif':
-      handleGIF(data, cb)
-    break
+    case "image/gif":
+      handleGIF(data, cb);
+      break;
 
-    case 'image/bmp':
-      handleBMP(data, cb)
-    break
+    case "image/bmp":
+      handleBMP(data, cb);
+      break;
 
     default:
-      cb(new Error("Unsupported file type: " + mimeType))
+      cb(new Error("Unsupported file type: " + mimeType));
   }
@@ -132,64 +133,47 @@ }
 module.exports = function getPixels(url, type, cb) {
-  if(!cb) {
-    cb = type
-    type = ''
+  if (!cb) {
+    cb = type;
+    type = "";
   }
-  if(Buffer.isBuffer(url)) {
-    if(!type) {
-      cb(new Error('Invalid file type'))
-      return
+  if (Buffer.isBuffer(url)) {
+    if (!type) {
+      cb(new Error("Invalid file type"));
+      return;
     }
-    doParse(type, url, cb)
-  } else if(url.indexOf('data:') === 0) {
-    try {
-      var buffer = parseDataURI(url)
-      if(buffer) {
-        process.nextTick(function() {
-          doParse(type || buffer.mimeType, buffer.data, cb)
-        })
-      } else {
-        process.nextTick(function() {
-          cb(new Error('Error parsing data URI'))
-        })
-      }
-    } catch(err) {
-      process.nextTick(function() {
-        cb(err)
+    doParse(type, url, cb);
+  } else if (
+    url.indexOf("data:") === 0 ||
+    url.indexOf("http://") === 0 ||
+    url.indexOf("https://") === 0
+  ) {
+    fetch(url)
+      .then(function (response) {
+        if (!type) {
+          type = response.headers.get("content-type");
+        }
+        if (!type) {
+          return Promise.reject(new Error("Invalid content-type"));
+        }
+        return response.arrayBuffer();
       })
-    }
-  } else if(url.indexOf('http://') === 0 || url.indexOf('https://') === 0) {
-    request({url:url, encoding:null}, function(err, response, body) {
-      if(err) {
-        cb(err)
-        return
-      }
-
-      type = type;
-      if(!type){
-        if(response.getHeader !== undefined){
-	  type = response.getHeader('content-type');
-	}else if(response.headers !== undefined){
-	  type = response.headers['content-type'];
-	}
-      }
-      if(!type) {
-        cb(new Error('Invalid content-type'))
-        return
-      }
-      doParse(type, body, cb)
-    })
+      .then(function (data) {
+        doParse(type, Buffer.from(data), cb);
+      })
+      .catch(function (err) {
+        cb(err);
+      });
   } else {
-    fs.readFile(url, function(err, data) {
-      if(err) {
-        cb(err)
-        return
+    fs.readFile(url, function (err, data) {
+      if (err) {
+        cb(err);
+        return;
       }
-      type = type || mime.lookup(url)
-      if(!type) {
-        cb(new Error('Invalid file type'))
-        return
+      type = type || mime.lookup(url);
+      if (!type) {
+        cb(new Error("Invalid file type"));
+        return;
       }
-      doParse(type, data, cb)
-    })
+      doParse(type, data, cb);
+    });
   }
-}
+};

package.json

 {
   "name": "@pioug/get-pixels",
-  "version": "3.3.3",
+  "version": "4.0.0",
   "description": "Reads the pixels of an image as an ndarray",
@@ -17,5 +17,3 @@ "main": "node-pixels.js",
     "omggif": "^1.0.5",
-    "parse-data-uri": "^0.2.0",
     "pngjs": "^3.3.3",
-    "request": "^2.44.0",
     "through": "^2.3.4"
@@ -30,2 +28,6 @@ },
   },
+  "scripts": {
+    "test": "tap test/*.js",
+    "test-browser": "beefy test/test.js --open  -- -t brfs"
+  },
   "repository": {
@@ -59,7 +61,3 @@ "type": "git",
   "readmeFilename": "README.md",
-  "gitHead": "380bbda330666e4a4066c48ef5a42770d13bcd5c",
-  "scripts": {
-    "test": "tap test/*.js",
-    "test-browser": "beefy test/test.js --open  -- -t brfs"
-  }
-}
+  "gitHead": "380bbda330666e4a4066c48ef5a42770d13bcd5c"
+}

README.md

@@ -1,28 +0,26 @@
-get-pixels
-==========
-Given a URL/path, grab all the pixels in an image and return the result as an [ndarray](https://github.com/mikolalysenko/ndarray).  Written in 100% JavaScript, works both in browserify and in node.js and has no external native dependencies.
+# get-pixels
 
+Given a URL/path, grab all the pixels in an image and return the result as an [ndarray](https://github.com/mikolalysenko/ndarray). Written in 100% JavaScript, works both in browserify and in node.js and has no external native dependencies.
+
 Currently the following file formats are supported:
 
-* `PNG`
-* `JPEG`
-* `GIF`
+- `PNG`
+- `JPEG`
+- `GIF`
 
-Example
-=======
+# Example
 
 ```javascript
-var getPixels = require("get-pixels")
+var getPixels = require("get-pixels");
 
-getPixels("lena.png", function(err, pixels) {
-  if(err) {
-    console.log("Bad image path")
-    return
+getPixels("lena.png", function (err, pixels) {
+  if (err) {
+    console.log("Bad image path");
+    return;
   }
-  console.log("got pixels", pixels.shape.slice())
-})
+  console.log("got pixels", pixels.shape.slice());
+});
 ```
 
-Install
-=======
+# Install
 
@@ -32,7 +30,8 @@ npm install get-pixels
 ### `require("get-pixels")(url[, type], cb(err, pixels))`
+
 Reads all the pixels from url into an ndarray.
 
-* `url` is the path to the file.  It can be a relative path, an http url, a data url, or an [in-memory Buffer](http://nodejs.org/api/buffer.html).
-* `type` is an optional mime type for the image (required when using a Buffer)
-* `cb(err, pixels)` is a callback which gets triggered once the image is loaded.
+- `url` is the path to the file. It can be a relative path, an http url, a data url, or an [in-memory Buffer](http://nodejs.org/api/buffer.html).
+- `type` is an optional mime type for the image (required when using a Buffer)
+- `cb(err, pixels)` is a callback which gets triggered once the image is loaded.
 
@@ -43,4 +42,4 @@ **Returns** An ndarray of pixels in raster order having shape equal to `[width, height, channels]`.
 
-Credits
-=======
+# Credits
+
 (c) 2013-2014 Mikola Lysenko. MIT License

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Dependency count

9

decreased by-18.18%

Number of package files

6

increased by20%

Worsened metrics

Total package byte prevSize

11136

decreased by-1.68%

Lines of code

303

decreased by-1.3%

Number of lines in readme file

44

decreased by-2.22%

Number of medium supply chain risk alerts

2

increased byInfinity%

Dependency changes

• - Removedparse-data-uri@^0.2.0

• - Removedrequest@^2.44.0

• - Removedajv@6.12.6(transitive)

• - Removedasn1@0.2.6(transitive)

• - Removedassert-plus@1.0.0(transitive)

• - Removedasynckit@0.4.0(transitive)

• - Removedaws-sign2@0.7.0(transitive)

• - Removedaws4@1.13.2(transitive)

• - Removedbcrypt-pbkdf@1.0.2(transitive)

• - Removedcaseless@0.12.0(transitive)

• - Removedcombined-stream@1.0.8(transitive)

• - Removedcore-util-is@1.0.2(transitive)

• - Removeddashdash@1.14.1(transitive)

• - Removeddelayed-stream@1.0.0(transitive)

• - Removedecc-jsbn@0.1.2(transitive)

• - Removedextend@3.0.2(transitive)

• - Removedextsprintf@1.3.0(transitive)

• - Removedfast-deep-equal@3.1.3(transitive)

• - Removedfast-json-stable-stringify@2.1.0(transitive)

• - Removedforever-agent@0.6.1(transitive)

• - Removedform-data@2.3.3(transitive)

• - Removedgetpass@0.1.7(transitive)

• - Removedhar-schema@2.0.0(transitive)

• - Removedhar-validator@5.1.5(transitive)

• - Removedhttp-signature@1.2.0(transitive)

• - Removedis-typedarray@1.0.0(transitive)

• - Removedisstream@0.1.2(transitive)

• - Removedjsbn@0.1.1(transitive)

• - Removedjson-schema@0.4.0(transitive)

• - Removedjson-schema-traverse@0.4.1(transitive)

• - Removedjson-stringify-safe@5.0.1(transitive)

• - Removedjsprim@1.4.2(transitive)

• - Removedoauth-sign@0.9.0(transitive)

• - Removedparse-data-uri@0.2.0(transitive)

• - Removedperformance-now@2.1.0(transitive)

• - Removedpsl@1.15.0(transitive)

• - Removedpunycode@2.3.1(transitive)

• - Removedqs@6.5.3(transitive)

• - Removedrequest@2.88.2(transitive)

• - Removedsafe-buffer@5.2.1(transitive)

• - Removedsafer-buffer@2.1.2(transitive)

• - Removedsshpk@1.18.0(transitive)

• - Removedtough-cookie@2.5.0(transitive)

• - Removedtunnel-agent@0.6.0(transitive)

• - Removedtweetnacl@0.14.5(transitive)

• - Removeduri-js@4.4.1(transitive)

• - Removeduuid@3.4.0(transitive)

• - Removedverror@1.10.0(transitive)