alchemymvc 1.2.5 → 1.2.7

package/lib/init/functions.js

@@ -1015,7 +1015,7 @@ Alchemy.setMethod(function request(url, options, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.1.0
- * @version  0.4.1
+ * @version  1.2.6
  *
  * @param    {String}   url       The url
  * @param    {Object}   options
@@ -1098,12 +1098,16 @@ Alchemy.setMethod(function downloadFile(url, options, callback) {
 			}
 		}
 
+		if (output) {
+			// Pipe the response stream into the file
+			output.pipe(file);
+		} else {
+			file.end('');
+		}
+
 		// @todo: maybe implement content-type for downloaded file, too?
 		// Because webservers can lie about filetypes
 
-		// Pipe the response stream into the file
-		output.pipe(file);
-
 		// Close the file when finished and callback
 		file.on('finish', function writeFinished() {
 			callback(null, filepath, name);

package/lib/init/requirements.js

@@ -1,102 +1,102 @@
-'use strict';
-
-/**
- * The basic http module, used to create the server.
- *
- * @link   http://nodejs.org/api/http.html
- */
-alchemy.use('http', 'http');
-
-/**
- * This module contains utilities for handling and transforming file paths.
- * Almost all these methods perform only string transformations.
- * The file system is not consulted to check whether paths are valid.
- *
- * @link   http://nodejs.org/api/path.html
- */
-alchemy.use('path', 'path');
-
-/**
- * File I/O is provided by simple wrappers around standard POSIX functions.
- *
- * @link   http://nodejs.org/api/fs.html
- */
-alchemy.use('graceful-fs', 'fs');
-
-/**
- * Usefull utilities.
- *
- * @link   http://nodejs.org/api/util.html
- */
-alchemy.use('util', 'util');
-
-/**
- * The native mongodb library
- *
- * @link   https://npmjs.org/package/mongodb
- */
-alchemy.use('mongodb', 'mongodb');
-
-/**
- * The LESS interpreter.
- *
- * @link   https://npmjs.org/package/less
- */
-alchemy.use('less', 'less');
-
-/**
- * Hawkejs view engine
- *
- * @link   https://npmjs.org/package/hawkejs
- */
-alchemy.use('hawkejs', 'hawkejs');
-alchemy.hawkejs = Classes.Hawkejs.Hawkejs.getInstance();
-
-/**
- * The function to detect when everything is too busy
- */
-alchemy.toobusy = alchemy.use('toobusy-js', 'toobusy');
-
-// If the config is a number, use that as the lag threshold
-if (typeof alchemy.settings.toobusy === 'number') {
-	alchemy.toobusy.maxLag(alchemy.settings.toobusy);
-}
-
-/**
- * Load Sputnik, the stage-based launcher
- */
-alchemy.sputnik = new (alchemy.use('sputnik', 'sputnik'))();
-
-/**
- * Real-time apps made cross-browser & easy with a WebSocket-like API.
- *
- * @link   https://npmjs.org/package/socket.io
- */
-alchemy.use('socket.io', 'io');
-
-/**
- * Allow streams over a socket.io connection
- */
-alchemy.use('@11ways/socket.io-stream', 'socket.io-stream');
-
-/**
- * Recursively mkdir, like `mkdir -p`.
- * This is a requirement fetched from express
- *
- * @link   https://npmjs.org/package/mkdirp
- */
-alchemy.use('mkdirp', 'mkdirp');
-
-/**
- * Base useragent library
- *
- * @link   https://npmjs.org/package/useragent
- */
-alchemy.use('useragent');
-
-/**
- * Enable the `satisfies` method in the `useragent` library
- *
- * @link   https://www.npmjs.com/package/useragent#adding-more-features-to-the-useragent
- */
+'use strict';
+
+/**
+ * The basic http module, used to create the server.
+ *
+ * @link   http://nodejs.org/api/http.html
+ */
+alchemy.use('http', 'http');
+
+/**
+ * This module contains utilities for handling and transforming file paths.
+ * Almost all these methods perform only string transformations.
+ * The file system is not consulted to check whether paths are valid.
+ *
+ * @link   http://nodejs.org/api/path.html
+ */
+alchemy.use('path', 'path');
+
+/**
+ * File I/O is provided by simple wrappers around standard POSIX functions.
+ *
+ * @link   http://nodejs.org/api/fs.html
+ */
+alchemy.use('graceful-fs', 'fs');
+
+/**
+ * Usefull utilities.
+ *
+ * @link   http://nodejs.org/api/util.html
+ */
+alchemy.use('util', 'util');
+
+/**
+ * The native mongodb library
+ *
+ * @link   https://npmjs.org/package/mongodb
+ */
+alchemy.use('mongodb', 'mongodb');
+
+/**
+ * The LESS interpreter.
+ *
+ * @link   https://npmjs.org/package/less
+ */
+alchemy.use('less', 'less');
+
+/**
+ * Hawkejs view engine
+ *
+ * @link   https://npmjs.org/package/hawkejs
+ */
+alchemy.use('hawkejs', 'hawkejs');
+alchemy.hawkejs = Classes.Hawkejs.Hawkejs.getInstance();
+
+/**
+ * The function to detect when everything is too busy
+ */
+alchemy.toobusy = alchemy.use('toobusy-js', 'toobusy');
+
+// If the config is a number, use that as the lag threshold
+if (typeof alchemy.settings.toobusy === 'number') {
+	alchemy.toobusy.maxLag(alchemy.settings.toobusy);
+}
+
+/**
+ * Load Sputnik, the stage-based launcher
+ */
+alchemy.sputnik = new (alchemy.use('sputnik', 'sputnik'))();
+
+/**
+ * Real-time apps made cross-browser & easy with a WebSocket-like API.
+ *
+ * @link   https://npmjs.org/package/socket.io
+ */
+alchemy.use('socket.io', 'io');
+
+/**
+ * Allow streams over a socket.io connection
+ */
+alchemy.use('@11ways/socket.io-stream', 'socket.io-stream');
+
+/**
+ * Recursively mkdir, like `mkdir -p`.
+ * This is a requirement fetched from express
+ *
+ * @link   https://npmjs.org/package/mkdirp
+ */
+alchemy.use('mkdirp', 'mkdirp');
+
+/**
+ * Base useragent library
+ *
+ * @link   https://npmjs.org/package/useragent
+ */
+alchemy.use('useragent');
+
+/**
+ * Enable the `satisfies` method in the `useragent` library
+ *
+ * @link   https://www.npmjs.com/package/useragent#adding-more-features-to-the-useragent
+ */
 require('useragent/features');

package/lib/stages.js

@@ -120,11 +120,19 @@ alchemy.sputnik.add(function datasources() {
  *
  * @author        Jelle De Loecker   <jelle@develry.be>
  * @since         0.0.1
- * @version       1.1.0
+ * @version       1.2.7
  */
 alchemy.sputnik.add(function plugins() {
 	// Load in the plugins
-	alchemy.startPlugins();
+	try {
+		alchemy.startPlugins();
+	} catch (err) {
+		// Constitutors sometimes throw errors during this stage.
+		// Not sure yet why they don't get caught by sputnik
+		// @TODO: refactor!
+		log.error('Caught error during "plugins" stage:', err);
+		throw err;
+	}
 });
 
 /**

package/package.json

@@ -1,75 +1,75 @@
-{
-	"name": "alchemymvc",
-	"description": "MVC framework for Node.js",
-	"version": "1.2.5",
-	"author": "Jelle De Loecker <jelle@elevenways.be>",
-	"keywords": [
-		"alchemy",
-		"alchemymvc",
-		"mvc"
-	],
-	"repository": {
-		"type" : "git",
-		"url"  : "git://github.com/11ways/alchemy.git"
-	},
-	"dependencies": {
-		"ansi-256-colors"  : "~1.1.0",
-		"autoprefixer"     : "~10.4.2",
-		"bcrypt"           : "~5.0.1",
-		"body"             : "~5.1.0",
-		"body-parser"      : "~1.19.2",
-		"bson"             : "~4.6.1",
-		"chokidar"         : "~3.5.3",
-		"formidable"       : "~1.2.2",
-		"graceful-fs"      : "~4.2.9",
-		"hawkejs"          : "~2.2.10",
-		"jsondiffpatch"    : "~0.4.1",
-		"mime"             : "~3.0.0",
-		"minimist"         : "~1.2.5",
-		"mkdirp"           : "~1.0.4",
-		"mmmagic"          : "~0.5.3",
-		"mongodb"          : "~3.6.6",
-		"ncp"              : "~2.0.0",
-		"postcss"          : "~8.4.6",
-		"protoblast"       : "~0.7.21",
-		"semver"           : "~7.3.5",
-		"socket.io"        : "~2.4.0",
-		"@11ways/socket.io-stream" : "~0.9.2",
-		"sputnik"          : "~0.1.0",
-		"terser"           : "~5.10.0",
-		"toobusy-js"       : "~0.5.1",
-		"useragent"        : "~2.3.0"
-	},
-	"files": [
-		"lib/",
-		"index.js"
-	],
-	"optionalDependencies": {
-		"janeway"          : "~0.3.5",
-		"less"             : "~4.1.1",
-		"sass"             : "~1.53.0",
-		"sass-embedded"    : "~1.53.0",
-		"nodent-compiler"  : "~3.2.13",
-		"socket.io-client" : "~2.4.0"
-	},
-	"devDependencies": {
-		"codecov"                 : "~3.8.1",
-		"istanbul-lib-instrument" : "~4.0.3",
-		"mocha"                   : "~8.3.2",
-		"mongo-unit"              : "~2.0.1",
-		"nyc"                     : "^15.1.0",
-		"puppeteer"               : "~9.0.0",
-		"source-map"              : "~0.7.3"
-	},
-	"scripts": {
-		"appveyor"        : "mocha --exit --reporter spec --bail --timeout 20000 --file test/00-init.js",
-		"coverage"        : "nyc --reporter=text --reporter=lcov mocha --exit --timeout 200000 --bail --file test/00-init.js",
-		"report-coverage" : "nyc report --reporter=lcov && cat ./coverage/lcov.info | codecov",
-		"test"            : "mocha --exit --reporter spec --bail --timeout 50000 --file test/00-init.js"
-	},
-	"main": "lib/bootstrap.js",
-	"license": "MIT",
-	"engines": {
-		"node" : ">=14.0.0"
-	}
+{
+	"name": "alchemymvc",
+	"description": "MVC framework for Node.js",
+	"version": "1.2.7",
+	"author": "Jelle De Loecker <jelle@elevenways.be>",
+	"keywords": [
+		"alchemy",
+		"alchemymvc",
+		"mvc"
+	],
+	"repository": {
+		"type" : "git",
+		"url"  : "git://github.com/11ways/alchemy.git"
+	},
+	"dependencies": {
+		"ansi-256-colors"  : "~1.1.0",
+		"autoprefixer"     : "~10.4.2",
+		"bcrypt"           : "~5.0.1",
+		"body"             : "~5.1.0",
+		"body-parser"      : "~1.19.2",
+		"bson"             : "~4.6.1",
+		"chokidar"         : "~3.5.3",
+		"formidable"       : "~2.0.1",
+		"graceful-fs"      : "~4.2.9",
+		"hawkejs"          : "~2.2.18",
+		"jsondiffpatch"    : "~0.4.1",
+		"mime"             : "~3.0.0",
+		"minimist"         : "~1.2.5",
+		"mkdirp"           : "~1.0.4",
+		"mmmagic"          : "~0.5.3",
+		"mongodb"          : "~3.6.6",
+		"ncp"              : "~2.0.0",
+		"postcss"          : "~8.4.6",
+		"protoblast"       : "~0.7.24",
+		"semver"           : "~7.3.5",
+		"socket.io"        : "~2.4.0",
+		"@11ways/socket.io-stream" : "~0.9.2",
+		"sputnik"          : "~0.1.0",
+		"terser"           : "~5.10.0",
+		"toobusy-js"       : "~0.5.1",
+		"useragent"        : "~2.3.0"
+	},
+	"files": [
+		"lib/",
+		"index.js"
+	],
+	"optionalDependencies": {
+		"janeway"          : "~0.3.6",
+		"less"             : "~4.1.1",
+		"sass"             : "~1.53.0",
+		"sass-embedded"    : "~1.53.0",
+		"nodent-compiler"  : "~3.2.13",
+		"socket.io-client" : "~2.4.0"
+	},
+	"devDependencies": {
+		"codecov"                 : "~3.8.1",
+		"istanbul-lib-instrument" : "~4.0.3",
+		"mocha"                   : "~8.3.2",
+		"mongo-unit"              : "~2.0.1",
+		"nyc"                     : "^15.1.0",
+		"puppeteer"               : "~9.0.0",
+		"source-map"              : "~0.7.3"
+	},
+	"scripts": {
+		"appveyor"        : "mocha --exit --reporter spec --bail --timeout 20000 --file test/00-init.js",
+		"coverage"        : "nyc --reporter=text --reporter=lcov mocha --exit --timeout 200000 --bail --file test/00-init.js",
+		"report-coverage" : "nyc report --reporter=lcov && cat ./coverage/lcov.info | codecov",
+		"test"            : "mocha --exit --reporter spec --bail --timeout 50000 --file test/00-init.js"
+	},
+	"main": "lib/bootstrap.js",
+	"license": "MIT",
+	"engines": {
+		"node" : ">=14.0.0"
+	}
 }