larvitfiles - npm Package Compare versions

Comparing version 3.1.0 to 3.1.1

dataWriter.js

@@ -239,7 +239,23 @@ 'use strict';
 	tasks.push(function (cb) {
-		db.query('DELETE FROM larvitfiles_files_metadata WHERE fileUuid = ?', [lUtils.uuidToBuffer(options.uuid)], cb);
+		const uuiBuffer = lUtils.uuidToBuffer(options.uuid);
+
+		if ( ! uuiBuffer) {
+			const err = new Error('Not a valid uuid: ' + options.uuid	);
+			log.info(logPrefix + err.message);
+			return cb(err);
+		}
+
+		db.query('DELETE FROM larvitfiles_files_metadata WHERE fileUuid = ?', [uuiBuffer], cb);
 	});
 
 	tasks.push(function (cb) {
-		db.query('DELETE FROM larvitfiles_files WHERE uuid = ?', [lUtils.uuidToBuffer(options.uuid)], cb);
+		const uuiBuffer = lUtils.uuidToBuffer(options.uuid);
+
+		if ( ! uuiBuffer) {
+			const err = new Error('Not a valid uuid: ' + options.uuid	);
+			log.info(logPrefix + err.message);
+			return cb(err);
+		}
+
+		db.query('DELETE FROM larvitfiles_files WHERE uuid = ?', [uuiBuffer], cb);
 	});
@@ -327,6 +343,11 @@
 	tasks.push(function (cb) {
-		const	dbFields	= [lUtils.uuidToBuffer(options.uuid), options.slug],
-			sql	= 'INSERT INTO larvitfiles_files VALUES(?,?) ON DUPLICATE KEY UPDATE slug = VALUES(slug);';
+		const	uuiBuffer = lUtils.uuidToBuffer(options.uuid);
 
-		db.query(sql, dbFields, cb);
+		if ( ! uuiBuffer) {
+			const err = new Error('Not a valid uuid: ' + options.uuid	);
+			log.info(logPrefix + err.message);
+			return cb(err);
+		}
+
+		db.query('INSERT INTO larvitfiles_files VALUES(?,?) ON DUPLICATE KEY UPDATE slug = VALUES(slug)', [uuiBuffer, options.slug], cb);
 	});
@@ -336,3 +357,11 @@
 	tasks.push(function (cb) {
-		db.query('DELETE FROM larvitfiles_files_metadata WHERE fileUuid = ?;', [lUtils.uuidToBuffer(options.uuid)], cb);
+		const	uuiBuffer = lUtils.uuidToBuffer(options.uuid);
+
+		if ( ! uuiBuffer) {
+			const err = new Error('Not a valid uuid: ' + options.uuid	);
+			log.info(logPrefix + err.message);
+			return cb(err);
+		}
+
+		db.query('DELETE FROM larvitfiles_files_metadata WHERE fileUuid = ?;', [uuiBuffer], cb);
 	});
@@ -351,7 +380,14 @@
 
+
 			for (let i = 0; options.metadata[name][i] !== undefined; i ++) {
-				sql += '(?,?,?),';
-				dbFields.push(lUtils.uuidToBuffer(options.uuid));
-				dbFields.push(name);
-				dbFields.push(options.metadata[name][i]);
+				const	uuiBuffer = lUtils.uuidToBuffer(options.uuid);
+
+				if (uuiBuffer) {
+					sql += '(?,?,?),';
+					dbFields.push(uuiBuffer);
+					dbFields.push(name);
+					dbFields.push(options.metadata[name][i]);
+				} else {
+					log.info(logPrefix + 'Invalid uuid, skipping');
+				}
 			}
@@ -358,0 +394,0 @@ }

index.js

@@ -121,3 +121,11 @@ 'use strict';
 	tasks.push(function (cb) {
-		db.query('SELECT uuid, slug FROM larvitfiles_files WHERE uuid = ?', [lUtils.uuidToBuffer(that.uuid)], function (err, rows) {
+		const uuiBuffer = lUtils.uuidToBuffer(that.uuid);
+
+		if ( ! uuiBuffer) {
+			const err = new Error('Not a valid uuid: ' + that.uuid	);
+			log.info(logPrefix + err.message);
+			return cb(err);
+		}
+
+		db.query('SELECT uuid, slug FROM larvitfiles_files WHERE uuid = ?', [uuiBuffer], function (err, rows) {
 			if (err) return cb(err);
@@ -138,2 +146,4 @@
 	tasks.push(function (cb) {
+		const uuiBuffer = lUtils.uuidToBuffer(that.uuid);
+
 		that.metadata	= {};
@@ -145,3 +155,9 @@
 
-		db.query('SELECT name, value FROM larvitfiles_files_metadata WHERE fileUuid = ?', [lUtils.uuidToBuffer(that.uuid)], function (err, rows) {
+		if ( ! uuiBuffer) {
+			const err = new Error('Not a valid uuid: ' + that.uuid	);
+			log.info(logPrefix + err.message);
+			return cb(err);
+		}
+
+		db.query('SELECT name, value FROM larvitfiles_files_metadata WHERE fileUuid = ?', [uuiBuffer], function (err, rows) {
 			if (err) return cb(err);
@@ -383,4 +399,7 @@
 			const	fileUuidBuf	= lUtils.uuidToBuffer(fileUuids[i]);
-			sql += '?,';
-			dbFields.push(fileUuidBuf);
+
+			if (fileUuidBuf) {
+				sql += '?,';
+				dbFields.push(fileUuidBuf);
+			}
 		}
@@ -387,0 +406,0 @@

package.json

 {
   "name": "larvitfiles",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Storage of files with an API and database to use in web environments",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

50861

increased by2.39%

Lines of code

1333

increased by3.17%

No dependency changes