larvituser 0.19.0 → 0.20.4

package/README.md

@@ -9,17 +9,15 @@ User module for node.js
 First fire up the library connections like this:
 
 ```javascript
-const	UserLib	= require('larvituser'),
-	Intercom	= require('larvitamintercom'),
-	winston	= require('winston'),
-	log	= winston.createLogger({'transports': [new winston.transports.Console()]}),
+const UserLib = require('larvituser'),
+	Intercom = require('larvitamintercom'),
+	winston = require('winston'),
+	log = winston.createLogger({'transports': [new winston.transports.Console()]}),
 	userLib = new UserLib({
-		'db':	require('larvitdb'),
+		'db': require('larvitdb'),
 
 		// Optional parameters
-		'mode':	'noSync', // Other options are "master" or "slave"
-		'intercom':	new Intercom({'conStr': 'loopback interface', 'log': log}),
-		'log':	log
+		'log': log
 	});
 
 db.setup(...); // See https://github.com/larvit/larvitdb for configuration details
@@ -29,94 +27,77 @@ Create a new user in the database, do like this:
 
 ```javascript
 const userData = {
-	'firstname':	'Nisse',
-	'lastname':	'Nilsson',
+	'firstname': 'Nisse',
+	'lastname': 'Nilsson',
 	'role': [
 		'user',
 		'subscriber'
 	]
 }
 
-userLib.create('myUsername', 'myPassword', userData, function (err, user) {
-	console.log('New user UUID: ' + user.uuid);
-});
+const user = await userLib.create('myUsername', 'myPassword', userData);
+console.log('New user UUID: ' + user.uuid);
 ```
 
 When creating a new user you can also give the user a uuid of your choice:
 
 ```javascript
 
-const uuidLib	= require('uuid');
+const uuidLib = require('uuid');
 const uuid = uuidLib.v1();
 const userData = {
-	'firstname':	'Nisse',
-	'lastname':	'Nilsson',
+	'firstname': 'Nisse',
+	'lastname': 'Nilsson',
 	'role': [
 		'user',
 		'subscriber'
 	]
 }
-
-userLib.create('myUsername', 'myPassword', userData, uuid, function (err, user) {
-	console.log('New user UUID: ' + user.uuid);
-});
+const user = await userLib.create('myUsername', 'myPassword', userData, uuid);
+console.log('New user UUID: ' + user.uuid);
 ```
 
 To fetch a user from database based on username and password, do like this:
 
 ```javascript
-userLib.fromUserAndPass('myUsername', 'myPassword', function (err, user) {
-	if (err) {
-		throw err;
-	}
-
-	if ( ! user) {
-		// No match found, or other more serious error
-	} else {
-		console.log('Fetched user ID: ' + user.id);
-	}
-});
+const user = await userLib.fromUserAndPass('myUsername', 'myPassword');
+if ( ! user) {
+	// No match found, or other more serious error
+} else {
+	console.log('Fetched user ID: ' + user.id);
+}
 ```
 
 List multiple users
 
 ```javascript
-const	users	= new UserLib.Users({'db': db, 'log': log});
+const users = new UserLib.Users({'db': db, 'log': log});
 
-users.get(function (err, userList) {
-	if (err) throw err;
-
-	console.log(userList); // An array of objects
-});
+const result = await users.get();
+console.log(result.users); // An array of objects
 ```
 
 Get distinct values for field from all users
 
 ```javascript
-const	users	= new UserLib.Users({'db': db, 'log': log});
-
-users.getFieldData('fieldName', function (err, result) {
-	if (err) throw err;
+const users = new UserLib.Users({'db': db, 'log': log});
 
-	console.log(userList); // An array of strings
-});
+const result = await users.getFieldData('fieldName');
+console.log(result); // An array of strings
 ```
 
 List multiple users ordered by field
 
 ```javascript
-const	users	= new UserLib.Users({'db': db, 'log': log});
+const users = new UserLib.Users({'db': db, 'log': log});
 
 users.order = {
 	by: 'username', // Sorting by something else than uuid or username the field needs to be included in "returnFields"
 	direction: 'desc' // "asc" is default
 }
 
-users.get(function (err, userList) {
-	if (err) throw err;
-
-	console.log(userList); // An array of objects
-});
+const result = await users.get();
+console.log(result.users); // An array of objects
 ```
 
 ### Advanced usage
@@ -124,33 +105,26 @@ users.get(function (err, userList) {
 #### Add data to a user
 
 ```javascript
-userLib.addUserDataField(userUuid, fieldName, fieldValue, function (err) {
-	// Field have been added
-});
+await userLib.addUserDataField(userUuid, fieldName, fieldValue);
 ```
 
 #### Check a password for validity
 
 ```javascript
-userLib.checkPassword('passwordToTest', 'theHashToTestAgainst', function (err, result) {
-	// Result being either true or false
-});
+const isValid = await userLib.checkPassword('passwordToTest', 'theHashToTestAgainst');
 ```
 
 #### Create a new user
 
 ```javascript
-userLib.create('username', 'password', {'firstname': 'John', 'lastname': 'Smith'}, function (err, user) {
-	console.log(user.uuid); // 91f15599-c1fa-4051-9e0e-906cab9819fe (or rather, a random Uuid)
-});
+const user = await userLib.create('username', 'password', {'firstname': 'John', 'lastname': 'Smith'});console.log(user.uuid); // 91f15599-c1fa-4051-9e0e-906cab9819fe (or rather, a random Uuid)
 ```
 
 Or set an Uuid manually like this:
 
 ```javascript
-userLib.create('username', 'password', {'firstname': 'John', 'lastname': 'Smith'}, 'f9684592-b245-42fa-88c6-9f16b9236ac3', function (err, user) {
-	console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
-});
+const user = await userLib.create('username', 'password', {'firstname': 'John', 'lastname': 'Smith'}, 'f9684592-b245-42fa-88c6-9f16b9236ac3');
+console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
 ```
 
 #### Fetch a user based on a field
@@ -158,9 +132,8 @@ userLib.create('username', 'password', {'firstname': 'John', 'lastname': 'Smith'
 Will fetch the first occurance in the database with this field name and field value.
 
 ```javascript
-userLib.fromField('firstname', 'John', function (err, user) {
-	console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
-});
+const user = await userLib.fromField('firstname', 'John');
+console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
 ```
 
 #### Fetch a user based on several fields
@@ -168,33 +141,29 @@ userLib.fromField('firstname', 'John', function (err, user) {
 Will fetch the first occurance in the database that matches all these field names and field values
 
 ```javascript
-userLib.fromFields({'firstname': 'John', 'lastname': 'Smith'}, function (err, user) {
-	console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
-});
+const user = await userLib.fromFields({'firstname': 'John', 'lastname': 'Smith'});
+console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
 ```
 
 #### Fetch a user based on just username
 
 ```javascript
-userLib.fromUsername('username', function (err, user) {
-	console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3 or user will be false if no user is found
-});
+const user = await userLib.fromUsername('username');
+console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3 or user will be false if no user is found
 ```
 
 #### Fetch a user from Uuid
 
 ```javascript
-userLib.fromUuid('f9684592-b245-42fa-88c6-9f16b9236ac3', function (err, user) {
-	console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
-});
+const user = await userLib.fromUuid('f9684592-b245-42fa-88c6-9f16b9236ac3');
+console.log(user.uuid); // f9684592-b245-42fa-88c6-9f16b9236ac3
 ```
 
 #### Get field data from a user
 
 ```javascript
-userLib.getFieldData('f9684592-b245-42fa-88c6-9f16b9236ac3', 'firstname', function (err, data) {
-	console.log(data); // ['John'] - Observe this will always be an array with values, since a field can hold several values
-});
+const data = await userLib.getFieldData('f9684592-b245-42fa-88c6-9f16b9236ac3', 'firstname');
+console.log(data); // ['John'] - Observe this will always be an array with values, since a field can hold several values
 ```
 
 #### Replace user fields for a user
@@ -202,58 +171,64 @@ userLib.getFieldData('f9684592-b245-42fa-88c6-9f16b9236ac3', 'firstname', functi
 IMPORTANT!!! Will clear all data not given in the fields parameter
 
 ```javascript
-userLib.replaceUserFields('f9684592-b245-42fa-88c6-9f16b9236ac3', {'lastname': ['Smith', 'Johnsson']}, function (err) {
-	// The field "lastname" will now be replaced with the two values "Smith" and "Johnsson"
-	// And all other fields will be removed
+await userLib.replaceUserFields('f9684592-b245-42fa-88c6-9f16b9236ac3', {'lastname': ['Smith', 'Johnsson']});
+// The field "lastname" will now be replaced with the two values "Smith" and "Johnsson"
+// And all other fields will be removed
 
-	userLib.getFieldData('f9684592-b245-42fa-88c6-9f16b9236ac3', 'lastname', function (err, data) {
-		console.log(data); // ['Smith', 'Johnsson']
-	});
-});
+const data = await userLib.getFieldData('f9684592-b245-42fa-88c6-9f16b9236ac3', 'lastname');
+console.log(data); // ['Smith', 'Johnsson']
 ```
 
 #### Remove a field from a user
 
 ```javascript
-userLib.rmUserField('f9684592-b245-42fa-88c6-9f16b9236ac3', 'lastname', function (err) {
-	userLib.fromUuid('f9684592-b245-42fa-88c6-9f16b9236ac3', function (err, user) {
-		console.log(user.fields); // {'firstname': ['John']}
-	});
-});
+await userLib.rmUserField('f9684592-b245-42fa-88c6-9f16b9236ac3', 'lastname');
+const user = await userLib.fromUuid('f9684592-b245-42fa-88c6-9f16b9236ac3');
+console.log(user.fields); // {'firstname': ['John']}
 ```
 
 #### Set password for a user
 
 ```javascript
-userLib.setPassword('f9684592-b245-42fa-88c6-9f16b9236ac3', 'newSuperSecretPwd', function (err) {
-	// Now the users password is updated to "newSuperSecretPwd"
-});
+await userLib.setPassword('f9684592-b245-42fa-88c6-9f16b9236ac3', 'newSuperSecretPwd');
 ```
 
 To disable a login, use boolean false as the new password:
 
 ```javascript
-userLib.setPassword('f9684592-b245-42fa-88c6-9f16b9236ac3', false, function (err) {
-	// This user can no longer login
-});
+await userLib.setPassword('f9684592-b245-42fa-88c6-9f16b9236ac3', false);
 ```
 
 #### Set username for a user
 
 ```javascript
-userLib.setUsername('f9684592-b245-42fa-88c6-9f16b9236ac3', 'theNewUsername', function (err) {
-	// Now the users username is updated to "theNewUsername"
-});
+await userLib.setUsername('f9684592-b245-42fa-88c6-9f16b9236ac3', 'theNewUsername');
+```
+
+### Errors
+All functions in the API will throw an exception upon error.
+
+For instance:
+
+```javascript
+const user1 = await userLib.create('nisse', false);
+const user2 = await userLib.create('olle', false);
+
+try {
+	await user2.setUsername('nisse'); // Will throw since username "nisse" is already taken
+} catch (err) {
+	console.error(err);
+}
 ```
 
 ## Tests
 
-Run tests with mocha, make sure to have an empty database configured for tests to pass correctly!
+Run tests with ```npm test```, make sure to have an empty database configured for tests to pass correctly!
 
 The default config file will be _application path_/config/db_test.json
 
 Or a custom one can be used by running
 
 ```bash
-mocha test/test.js /path/to/config/db_another.json
+DBCONFFILE=/path/to/config/db_another.json mocha test/test.js
 ```

package/dbmigration/2.js

@@ -1,63 +1,24 @@
 'use strict';
 
-const	uuidLib	= require('uuid'),
-	async	= require('async'),
-	db	= require('larvitdb');
+const uuidLib = require('uuid');
 
-exports = module.exports = function (cb) {
-	const	tasks	= [];
-
-	/* Create example data to test this migration against existing data * /
-	let userUuid	= uuidLib.v1();
-	let username	= 'fomme';
-	tasks.push(function (cb) {
-		db.query('INSERT INTO user_data_fields (name) VALUES(\'foo\'),(\'bar\');', cb);
-	});
-	tasks.push(function (cb) {
-		db.query('INSERT INTO user_users (uuid, username, password) VALUES(UNHEX(?),?,?);', [userUuid.replace(/-/g, ''), username, 'false'], cb);
-	});
-	tasks.push(function (cb) {
-		const	sql	= 'INSERT INTO user_users_data (userUuid, fieldId, data) SELECT UNHEX(\'' + userUuid.replace(/-/g, '') + '\'), id, \'mepp\' FROM user_data_fields WHERE name = \'foo\';';
-
-		db.query(sql, cb);
-	});
-	tasks.push(function (cb) {
-		const	sql	= 'INSERT INTO user_users_data (userUuid, fieldId, data) SELECT UNHEX(\'' + userUuid.replace(/-/g, '') + '\'), id, \'waff\' FROM user_data_fields WHERE name = \'bar\';';
-
-		db.query(sql, cb);
-	});/**/
+exports = module.exports = async options => {
+	const {db} = options;
 
 	// Migrate stuff
-	tasks.push(function (cb) {
-		db.query('ALTER TABLE `user_data_fields` ADD `uuid` binary(16) NOT NULL FIRST;', cb);
-	});
-
-	tasks.push(function (cb) {
-		db.query('SELECT id, name FROM user_data_fields', function (err, rows) {
-			const	tasks	= [];
-
-			if (err) { cb(err); return; }
-
-			for (let i = 0; rows[i] !== undefined; i ++) {
-				const	row	= rows[i];
-
-				tasks.push(function (cb) {
-					db.query('UPDATE user_data_fields SET uuid = UNHEX(?) WHERE id = ?;', [uuidLib.v1().replace(/-/g, ''), row.id], cb);
-				});
-			}
-
-			async.parallel(tasks, cb);
-		});
-	});
-
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` ADD `fieldUuid` binary(16) NOT NULL AFTER `userUuid`;',	cb); });
-	tasks.push(function (cb) { db.query('UPDATE user_users_data uud SET fieldUuid = (SELECT uuid FROM user_data_fields WHERE id = uud.fieldId)',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` DROP FOREIGN KEY `user_users_data_ibfk_2`;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` DROP `id`, DROP `fieldId`;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_data_fields` DROP `id`;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_data_fields` ADD PRIMARY KEY `uuid` (`uuid`);',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` ADD FOREIGN KEY (`fieldUuid`) REFERENCES `user_data_fields` (`uuid`) ON DELETE NO ACTION ON UPDATE NO ACTION;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` DROP INDEX `userUuid_fieldId`;',	cb); });
-
-	async.series(tasks, cb);
+	await db.query('ALTER TABLE `user_data_fields` ADD `uuid` binary(16) NOT NULL FIRST;');
+
+	const {rows} = await db.query('SELECT id, name FROM user_data_fields');
+	for (const row of rows) {
+		await db.query('UPDATE user_data_fields SET uuid = UNHEX(?) WHERE id = ?;', [uuidLib.v1().replace(/-/g, ''), row.id]);
+	}
+
+	await db.query('ALTER TABLE `user_users_data` ADD `fieldUuid` binary(16) NOT NULL AFTER `userUuid`;');
+	await db.query('UPDATE user_users_data uud SET fieldUuid = (SELECT uuid FROM user_data_fields WHERE id = uud.fieldId)');
+	await db.query('ALTER TABLE `user_users_data` DROP FOREIGN KEY `user_users_data_ibfk_2`;');
+	await db.query('ALTER TABLE `user_users_data` DROP `id`, DROP `fieldId`;');
+	await db.query('ALTER TABLE `user_data_fields` DROP `id`;');
+	await db.query('ALTER TABLE `user_data_fields` ADD PRIMARY KEY `uuid` (`uuid`);');
+	await db.query('ALTER TABLE `user_users_data` ADD FOREIGN KEY (`fieldUuid`) REFERENCES `user_data_fields` (`uuid`) ON DELETE NO ACTION ON UPDATE NO ACTION;');
+	await db.query('ALTER TABLE `user_users_data` DROP INDEX `userUuid_fieldId`;');
 };

package/dist/dataWriter.d.ts

@@ -0,0 +1,27 @@
+import { LogInstance } from 'larvitutils';
+export declare type DataWriterOptions = {
+    log?: LogInstance;
+    db: any;
+};
+export declare class DataWriter {
+    private lUtils;
+    private helpers;
+    private log;
+    private db;
+    constructor(options: DataWriterOptions);
+    runDbMigrations(scriptPath?: string): Promise<void>;
+    addUserDataFields(userUuid: string, fields: Record<string, string | string[]>): Promise<void>;
+    addUserField(name: string): Promise<void>;
+    create(user: {
+        uuid: string;
+        username: string;
+        password: string;
+        fields: Record<string, string | string[]>;
+    }): Promise<void>;
+    replaceFields(userUuid: string, fields: Record<string, string | string[]> | null): Promise<void>;
+    rmUser(userUuid: string): Promise<void>;
+    rmUserField(userUuid: string, fieldName: string): Promise<void>;
+    setPassword(userUuid: string, password: string): Promise<void>;
+    setUsername(userUuid: string, username: string): Promise<void>;
+}
+//# sourceMappingURL=dataWriter.d.ts.map

package/dist/dataWriter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataWriter.d.ts","sourceRoot":"","sources":["../src/dataWriter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,WAAW,EAAS,MAAM,aAAa,CAAC;AAQtD,oBAAY,iBAAiB,GAAG;IAC/B,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;CACR,CAAC;AAEF,qBAAa,UAAU;IACtB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,EAAE,CAAM;gBAEJ,OAAO,EAAE,iBAAiB;IAahC,eAAe,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnD,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAChF,OAAO,CAAC,IAAI,CAAC;IA6BV,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAczC,MAAM,CAAC,IAAI,EAAE;QAClB,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAC3F,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBX,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,GACnF,OAAO,CAAC,IAAI,CAAC;IAwEV,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAavC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/D,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc9D,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUpE"}

package/dist/dataWriter.js

@@ -0,0 +1,204 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataWriter = void 0;
+const larvitutils_1 = require("larvitutils");
+const helpers_1 = require("./helpers");
+const larvitdbmigration_1 = require("larvitdbmigration");
+const uuidLib = __importStar(require("uuid"));
+const topLogPrefix = 'larvituser: dataWriter.ts -';
+class DataWriter {
+    constructor(options) {
+        if (!options.db)
+            throw new Error('Required option "db" not set');
+        this.db = options.db;
+        this.log = options.log ?? new larvitutils_1.Log();
+        this.lUtils = new larvitutils_1.Utils({ log: this.log });
+        this.helpers = new helpers_1.Helpers({
+            dataWriter: this,
+            log: this.log,
+            db: this.db,
+        });
+    }
+    async runDbMigrations(scriptPath) {
+        // Change tablename from larvituser_db_version to users_db_version
+        // In case larvituser_db_version exists, that is.
+        // This is due to a breaking change in 0.17.0 and this was added as
+        // a patch in 0.17.1 to make applications not crash
+        const { rows } = await this.db.query('SHOW TABLES LIKE \'larvituser_db_version\'');
+        /* istanbul ignore if */ // Nasty to test
+        if (rows.length) {
+            await this.db.query('RENAME TABLE larvituser_db_version TO users_db_version');
+        }
+        const dbMigration = new larvitdbmigration_1.DbMigration({
+            dbType: 'mariadb',
+            dbDriver: this.db,
+            tableName: 'users_db_version',
+            migrationScriptPath: scriptPath ?? `${__dirname}/../dbmigration`,
+            log: this.log,
+        });
+        await dbMigration.run();
+    }
+    async addUserDataFields(userUuid, fields) {
+        const { helpers, lUtils } = this;
+        const logPrefix = `${topLogPrefix} addUserDataFields() -`;
+        let sql = 'INSERT INTO user_users_data (userUuid, fieldUuid, data) VALUES';
+        if (!Object.keys(fields).length) {
+            this.log.verbose(`${logPrefix} No fields specifed`);
+            return;
+        }
+        const userUuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(userUuid), logPrefix, 'Invalid userUuid');
+        const dbValues = [];
+        for (const key in fields) {
+            const fieldUuid = helpers.valueOrThrow(await helpers.getFieldUuid(key), logPrefix, `Failed to get field uuid for: ${key}`);
+            const fieldUuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(fieldUuid), logPrefix, 'Invalid fieldUuid');
+            const values = (0, helpers_1.arrayify)(fields[key] ?? '');
+            for (const value of values) {
+                sql += '(?,?,?),';
+                dbValues.push(userUuidBuffer, fieldUuidBuffer, value);
+            }
+        }
+        sql = sql.substring(0, sql.length - 1) + ';';
+        await this.db.query(sql, dbValues);
+    }
+    async addUserField(name) {
+        const { lUtils, helpers } = this;
+        const logPrefix = `${topLogPrefix} addUserField() -`;
+        const sql = 'INSERT IGNORE INTO user_data_fields (uuid, name) VALUES(?,?)';
+        // Check if this is already set in the database
+        const { rows } = await this.db.query('SELECT uuid FROM user_data_fields WHERE name = ?', [name]);
+        const uuid = rows.length ? lUtils.formatUuid(rows[0].uuid) : uuidLib.v1();
+        const uuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(uuid), logPrefix, 'Invalid field uuid');
+        await this.db.query(sql, [uuidBuffer, name]);
+    }
+    async create(user) {
+        const { helpers, lUtils } = this;
+        const logPrefix = `${topLogPrefix} create() -`;
+        const dbFields = [];
+        const sql = 'INSERT IGNORE INTO user_users (uuid, username, password) VALUES(?,?,?);';
+        const uuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(user.uuid), logPrefix, `Invalid user uuid supplied: "${user.uuid}`);
+        dbFields.push(uuidBuffer);
+        dbFields.push(user.username);
+        dbFields.push(user.password);
+        const results = await this.db.query(sql, dbFields);
+        if (results.rows.affectedRows === 0) {
+            const err = new Error('No user created, duplicate key on uuid: "' + user.uuid + '" or username: "' + user.username + '"');
+            this.log.warn(`${logPrefix} ${err.message}`);
+            throw err;
+        }
+        await this.addUserDataFields(user.uuid, user.fields);
+    }
+    async replaceFields(userUuid, fields) {
+        const { helpers, lUtils } = this;
+        const logPrefix = `${topLogPrefix} replaceFields() -`;
+        const userUuidBuf = helpers.valueOrThrow(lUtils.uuidToBuffer(userUuid), logPrefix, `Invalid user uuid supplied: "${userUuid}`);
+        const dbConn = await this.db.getConnection();
+        async function commitAndRelease(dbConn) {
+            await dbConn.commit();
+            await dbConn.release();
+        }
+        // Check so the user uuid is valid
+        const { rows } = await dbConn.query('SELECT * FROM user_users WHERE uuid = ?', userUuidBuf);
+        if (!rows.length) {
+            const err = new Error(`Invalid user uuid: "${userUuid}", no records found in database of this user`);
+            this.log.warn(`${logPrefix} ${err.message}`);
+            await dbConn.release();
+            throw err;
+        }
+        // Begin transaction
+        await dbConn.beginTransaction();
+        try {
+            // Clean out previous data
+            await dbConn.query('DELETE FROM user_users_data WHERE userUuid = ?', [userUuidBuf]);
+            // Get field uuids
+            if (!fields) {
+                await commitAndRelease(dbConn);
+                return;
+            }
+            const fieldNamesToUuidBufs = {};
+            for (const fieldName of Object.keys(fields)) {
+                const fieldUuid = helpers.valueOrThrow(await helpers.getFieldUuid(fieldName, dbConn), logPrefix, `Invalid field uuid for field: ${fieldName}`);
+                const asBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(fieldUuid), logPrefix, `Failed to convert field uuid to buffer, uuid: ${fieldUuid}`);
+                fieldNamesToUuidBufs[fieldName] = asBuffer;
+            }
+            // Add new data
+            const dbFields = [];
+            let sql = 'INSERT INTO user_users_data (userUuid, fieldUuid, data) VALUES';
+            for (const fieldName of Object.keys(fields)) {
+                const fieldValues = (0, helpers_1.arrayify)(fields[fieldName]);
+                for (const fieldValue of fieldValues) {
+                    sql += '(?,?,?),';
+                    dbFields.push(userUuidBuf);
+                    dbFields.push(fieldNamesToUuidBufs[fieldName]);
+                    dbFields.push(fieldValue);
+                }
+            }
+            sql = sql.substring(0, sql.length - 1) + ';';
+            if (dbFields.length) {
+                await dbConn.query(sql, dbFields);
+            }
+            await commitAndRelease(dbConn);
+        }
+        catch (_err) {
+            await dbConn.rollback();
+            await dbConn.release();
+            throw _err;
+        }
+    }
+    async rmUser(userUuid) {
+        const { helpers, lUtils } = this;
+        const logPrefix = `${topLogPrefix} rmUser() -`;
+        const uuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(userUuid), logPrefix, 'Invalid user uuid');
+        let sql = 'DELETE FROM user_users_data WHERE userUuid = ?;';
+        await this.db.query(sql, [uuidBuffer]);
+        sql = 'DELETE FROM user_users WHERE uuid = ?;';
+        await this.db.query(sql, [uuidBuffer]);
+    }
+    async rmUserField(userUuid, fieldName) {
+        const { helpers, lUtils } = this;
+        const logPrefix = `${topLogPrefix} rmUserField() -`;
+        const userUuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(userUuid), logPrefix, 'Invalid user uuid');
+        const fieldUuid = helpers.valueOrThrow(await helpers.getFieldUuid(fieldName), logPrefix, `Could not get field uuid for field: ${fieldName}`);
+        const fieldUuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(fieldUuid), logPrefix, 'Invalid field uuid');
+        const sql = 'DELETE FROM user_users_data WHERE userUuid = ? AND fieldUuid = ?';
+        await this.db.query(sql, [userUuidBuffer, fieldUuidBuffer]);
+    }
+    async setPassword(userUuid, password) {
+        const { helpers, lUtils } = this;
+        const logPrefix = `${topLogPrefix} setPassword() -`;
+        const userUuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(userUuid), logPrefix, 'Invalid user uuid');
+        const dbFields = [];
+        dbFields.push(password);
+        dbFields.push(userUuidBuffer);
+        const sql = 'UPDATE user_users SET password = ? WHERE uuid = ?;';
+        await this.db.query(sql, dbFields);
+    }
+    async setUsername(userUuid, username) {
+        const { helpers, lUtils } = this;
+        const logPrefix = `${topLogPrefix} setUsername() -`;
+        const userUuidBuffer = helpers.valueOrThrow(lUtils.uuidToBuffer(userUuid), logPrefix, 'Invalid user uuid');
+        const sql = 'UPDATE user_users SET username = ? WHERE uuid = ?;';
+        const dbFields = [username, userUuidBuffer];
+        await this.db.query(sql, dbFields);
+    }
+}
+exports.DataWriter = DataWriter;
+//# sourceMappingURL=dataWriter.js.map

package/dist/dataWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataWriter.js","sourceRoot":"","sources":["../src/dataWriter.ts"],"names":[],"mappings":"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"}