},
max: {
major: 1,
- minor: 0,
- patch: 2,
+ minor: 1,
+ patch: 0,
},
};
this.db = new SQLite(dbFilename, sqliteOptions);
this.schemaVersionsSupported = schemaVersionsSupported;
this.changesSinceLastOptimize = BigInt(0);
- this.optimizeAfterChanges = options.db.connectionString.optimizeAfterChanges;
+ this.optimizeAfterChanges = options.db.optimizeAfterChanges;
this.db.pragma('foreign_keys = on'); // Enforce consistency.
this.db.pragma('journal_mode = WAL'); // Be faster, expect local filesystem.
this.db.defaultSafeIntegers(true); // This probably isn't necessary, but by using these BigInts we keep weird floats out of the query logs.
let metaExists = tableExists.get();
if (metaExists === undefined) {
const fPath = path.join(__dirname, 'sql', 'schema', 'init.sql');
- // eslint-disable-next-line security/detect-non-literal-fs-filename
+
const fSql = fs.readFileSync(fPath, { encoding: 'utf8' });
this.db.exec(fSql);
metaExists = tableExists.get();
};
};
- // eslint-disable-next-line security/detect-non-literal-fs-filename
+
for (const f of fs.readdirSync(sqlDir)) {
const fPath = path.join(sqlDir, f);
const { name: fName, ext: fExt } = path.parse(f);
'verification_in_progress',
'subscription',
'subscription_delivery_in_progress',
- ].map((table) => {
+ ].forEach((table) => {
const result = this.db.prepare(`DELETE FROM ${table}`).run();
this.logger.debug(_fileScope('_purgeTables'), 'success', { table, result });
});
}
- authenticationUpsert(dbCtx, identifier, credential) {
+ authenticationUpsert(dbCtx, identifier, credential, otpKey) {
const _scope = _fileScope('authenticationUpsert');
const scrubbedCredential = '*'.repeat((credential || '').length);
- this.logger.debug(_scope, 'called', { identifier, scrubbedCredential });
+ const scrubbedOTPKey = '*'.repeat((otpKey || '').length) || null;
+ this.logger.debug(_scope, 'called', { identifier, scrubbedCredential, scrubbedOTPKey });
let result;
try {
- result = this.statement.authenticationUpsert.run({ identifier, credential });
+ result = this.statement.authenticationUpsert.run({ identifier, credential, otpKey });
if (result.changes != 1) {
throw new DBErrors.UnexpectedResult('did not upsert authentication');
}
} catch (e) {
- this.logger.error(_scope, 'failed', { error: e, identifier, scrubbedCredential })
+ this.logger.error(_scope, 'failed', { error: e, identifier, scrubbedCredential, scrubbedOTPKey });
+ throw e;
+ }
+ }
+
+
+ authenticationUpdateOTPKey(dbCtx, identifier, otpKey) {
+ const _scope = _fileScope('authenticationUpdateOTPKey');
+ const scrubbedOTPKey = '*'.repeat((otpKey || '').length) || null;
+ this.logger.debug(_scope, 'called', { identifier, scrubbedOTPKey });
+
+ let result;
+ try {
+ result = this.statement.authenticationUpdateOtpKey.run({ identifier, otpKey });
+ if (result.changes != 1) {
+ throw new DBErrors.UnexpectedResult('did not update authentication otp key');
+ }
+ } catch (e) {
+ this.logger.error(_scope, 'failed', { error: e, identifier, scrubbedOTPKey });
+ throw e;
+ }
+ }
+
+
+ authenticationUpdateCredential(dbCtx, identifier, credential) {
+ const _scope = _fileScope('authenticationUpdateCredential');
+ const scrubbedCredential = '*'.repeat((credential || '').length);
+ this.logger.debug(_scope, 'called', { identifier, scrubbedCredential });
+
+ let result;
+ try {
+ result = this.statement.authenticationUpdateCredential.run({ identifier, credential });
+ if (result.changes != 1) {
+ throw new DBErrors.UnexpectedResult('did not update authentication credential');
+ }
+ } catch (e) {
+ this.logger.error(_scope, 'failed', { error: e, identifier, scrubbedCredential });
throw e;
}
}
/**
* Converts engine subscription fields to native types.
- * @param {Object} data
+ * @param {object} data subscription data
+ * @returns {object} data
*/
static _subscriptionDataToNative(data) {
if (data) {
httpRemoteAddr: null,
httpFrom: null,
...data,
- }
+ };
this._subscriptionUpsertDataValidate(subscriptionData);
let result;
/**
* Converts engine topic fields to native types.
- * @param {Object} data
+ * @param {object} data topic
+ * @returns {object} topic data
*/
static _topicDataToNative(data) {
if (data) {
}
- topicGetByUrl(dbCtx, topicUrl) {
+ topicGetByUrl(dbCtx, topicUrl, applyDefaults = true) {
const _scope = _fileScope('topicGetByUrl');
this.logger.debug(_scope, 'called', { topicUrl });
try {
topic = this.statement.topicGetByUrl.get({ topicUrl });
DatabaseSQLite._topicDataToNative(topic);
- return this._topicDefaults(topic);
+ if (applyDefaults) {
+ topic = this._topicDefaults(topic);
+ }
+ return topic;
} catch (e) {
this.logger.error(_scope, 'failed', { error: e, topic, topicUrl });
throw e;
}
+ topicPublishHistory(dbCtx, topicId, days) {
+ const _scope = _fileScope('topicPublishHistory');
+ this.logger.debug(_scope, 'called', { topicId, days });
+
+ const events = this.statement.topicPublishHistory.all({ topicId, daysAgo: days });
+ const history = Array.from({ length: days }, () => 0);
+ // eslint-disable-next-line security/detect-object-injection
+ events.forEach(({ daysAgo, contentUpdates }) => history[daysAgo] = Number(contentUpdates));
+
+ return history;
+ }
+
+
topicSet(dbCtx, data) {
const _scope = _fileScope('topicSet');
this.logger.debug(_scope, 'called', data);
const _scope = _fileScope('topicSetContent');
const topicSetContentData = {
contentType: null,
+ httpETag: null,
+ httpLastModified: null,
...data,
};
const logData = {
if (result.changes != 1) {
throw new DBErrors.UnexpectedResult('did not set topic content');
}
+ result = this.statement.topicSetContentHistory.run({
+ topicId: data.topicId,
+ contentHash: data.contentHash,
+ contentSize: data.content.length,
+ });
+ if (result.changes != 1) {
+ throw new DBErrors.UnexpectedResult('did not set topic content history');
+ }
return this._engineInfo(result);
} catch (e) {
this.logger.error(_scope, 'failed', { error: e, ...logData });
/**
* Converts engine verification fields to native types.
- * @param {Object} data
+ * @param {object} data verification
*/
static _verificationDataToNative(data) {
if (data) {
/**
* Convert native verification fields to engine types.
+ * @param {object} data verification
*/
static _verificationDataToEngine(data) {
if (data) {
}
-module.exports = DatabaseSQLite;
\ No newline at end of file
+module.exports = DatabaseSQLite;