Reorganized files structure

Author: Vitaly Puzrin

http.js

@@ -0,0 +1,55 @@
+'use strict';
+
+
+var once        = require('./lib/common').once;
+var request     = require('request').defaults({
+  timeout: 30000,
+  maxRedirects: 2,
+  rejectUnauthorized: false
+});
+
+var probeStream = require('./stream');
+
+
+module.exports = function probeHttp(options, _callback) {
+  var callback = once(_callback);
+  var req;
+
+  try {
+    req = request(options);
+  } catch (err) {
+    callback(err);
+    return;
+  }
+
+  req.on('response', function (res) {
+    if (res.statusCode === 200) {
+      probeStream(res, function (err, result) {
+        req.abort();
+
+        if (result) {
+          var length = res.headers['content-length'];
+
+          if (length && length.match(/^\d+$/)) {
+            result.length = +length;
+          }
+        }
+
+        callback(err, result);
+      });
+    } else {
+      var err = new Error('bad status code: ' + res.statusCode);
+
+      err.status = res.statusCode;
+      req.abort();
+      callback(err);
+    }
+  });
+
+  req.on('error', function (err) {
+    callback(err);
+  });
+};
+
+
+module.exports.parsers = require('./lib/parsers_stream');

index.js

@@ -1,5 +1,39 @@
 'use strict';
 
 
-module.exports      = require('./lib');
-module.exports.sync = require('./lib/sync');
+var probeStream = require('./stream');
+var probeHttp   = require('./http');
+
+
+// Cache for promise implementation
+var P;
+
+
+/* eslint-disable consistent-return */
+
+module.exports = function get_image_size(src, callback) {
+  var prober;
+
+  if (typeof src.on === 'function' && typeof src.emit === 'function') {
+    // looks like an EventEmitter, treating it as a stream
+    prober = probeStream;
+  } else {
+    prober = probeHttp;
+  }
+
+  if (!callback) {
+    P = P || require('any-promise');
+
+    return new P(function (resolve, reject) {
+      prober(src, function (err, data) {
+        if (err) reject(err);
+        else resolve(data);
+      });
+    });
+  }
+
+  prober(src, callback);
+};
+
+module.exports.parsers = require('./lib/parsers_stream');
+module.exports.sync    = require('./sync');

lib/index.js

@@ -0,0 +1,12 @@
+'use strict';
+
+
+module.exports = {
+  bmp:  require('./parse_stream/bmp'),
+  gif:  require('./parse_stream/gif'),
+  jpeg: require('./parse_stream/jpeg'),
+  png:  require('./parse_stream/png'),
+  psd:  require('./parse_stream/psd'),
+  tiff: require('./parse_stream/tiff'),
+  webp: require('./parse_stream/webp')
+};

lib/parsers_stream.js

@@ -0,0 +1,12 @@
+'use strict';
+
+
+module.exports = {
+  bmp:  require('./parse_sync/bmp'),
+  gif:  require('./parse_sync/gif'),
+  //jpeg: require('./parse_sync/jpeg'),
+  png:  require('./parse_sync/png'),
+  psd:  require('./parse_sync/psd'),
+  tiff: require('./parse_sync/tiff'),
+  webp: require('./parse_sync/webp')
+};

lib/parsers_sync.js

@@ -18,6 +18,9 @@
   "license": "MIT",
   "files": [
     "index.js",
+    "http.js",
+    "stream.js",
+    "sync.js",
     "lib/"
   ],
   "scripts": {

lib/sync.js

@@ -0,0 +1,37 @@
+'use strict';
+
+
+var async   = require('async');
+var parsers = require('./lib/parsers_stream');
+
+
+module.exports = function probeStream(stream, callback) {
+  // prevent "possible EventEmitter memory leak" warnings
+  stream.setMaxListeners(0);
+
+  async.map(parsers, function (parser, next) {
+    parser(stream, next);
+  }, function (err, results) {
+    if (err) {
+      callback(err);
+      return;
+    }
+
+    var result = Object.keys(results).map(function (type) {
+      return results[type];
+    }).filter(Boolean)[0];
+
+    if (!result) {
+      var error = new Error('unrecognized file format');
+
+      error.code = 'ECONTENT';
+      callback(error);
+      return;
+    }
+
+    callback(null, result);
+  });
+};
+
+
+module.exports.parsers = parsers;

package.json

@@ -1,4 +1,28 @@
 'use strict';
 
 
-module.exports = require('./lib/sync');
+var parsers = require('./lib/parsers_sync');
+
+
+function probeBuffer(buffer) {
+  var parser_names = Object.keys(parsers);
+
+  for (var i = 0; i < parser_names.length; i++) {
+    var result = parsers[parser_names[i]](buffer);
+
+    if (result) return result;
+  }
+
+  return null;
+}
+
+
+///////////////////////////////////////////////////////////////////////
+// Exports
+//
+
+module.exports = function get_image_size(src) {
+  return probeBuffer(src);
+};
+
+module.exports.parsers = parsers;