log statements added
This commit is contained in:
parent
eba28e0919
commit
170dddfb78
2 changed files with 57 additions and 8 deletions
|
|
@ -32,22 +32,33 @@ export class taSpamReport {
|
||||||
}
|
}
|
||||||
|
|
||||||
async setProcessing(data_id) {
|
async setProcessing(data_id) {
|
||||||
|
this.taLog.log("[setProcessing] data_id: " + data_id);
|
||||||
const key = this._processing_prefix + data_id;
|
const key = this._processing_prefix + data_id;
|
||||||
await browser.storage.session.set({ [key]: true });
|
await browser.storage.session.set({ [key]: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
async isProcessing(data_id) {
|
async isProcessing(data_id) {
|
||||||
|
this.taLog.log("[isProcessing] data_id: " + data_id);
|
||||||
const key = this._processing_prefix + data_id;
|
const key = this._processing_prefix + data_id;
|
||||||
let output = await browser.storage.session.get(key);
|
let output = await browser.storage.session.get(key);
|
||||||
return output[key] || false;
|
let result = output[key] || false;
|
||||||
|
this.taLog.log("[isProcessing] result: " + result);
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
async saveReportData(data, data_id) {
|
async saveReportData(data, data_id) {
|
||||||
await this._storage.writeSpam(data_id, data, true);
|
this.taLog.log("[saveReportData] data_id: " + data_id);
|
||||||
await browser.storage.session.remove(this._processing_prefix + data_id);
|
try {
|
||||||
|
await this._storage.writeSpam(data_id, data, true);
|
||||||
|
await browser.storage.session.remove(this._processing_prefix + data_id);
|
||||||
|
} catch (e) {
|
||||||
|
this.taLog.error("[saveReportData] error: " + e);
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async saveError(data_id, error_message) {
|
async saveError(data_id, error_message) {
|
||||||
|
this.taLog.log("[saveError] data_id: " + data_id + ", error_message: " + error_message);
|
||||||
let data = {
|
let data = {
|
||||||
spamValue: -999,
|
spamValue: -999,
|
||||||
explanation: error_message,
|
explanation: error_message,
|
||||||
|
|
@ -59,8 +70,12 @@ export class taSpamReport {
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadReportData(data_id) {
|
async loadReportData(data_id) {
|
||||||
|
this.taLog.log("[loadReportData] data_id: " + data_id);
|
||||||
let record = await this._storage.getRecord(data_id);
|
let record = await this._storage.getRecord(data_id);
|
||||||
if (!record || !this._storage.hasField(record, 'spam')) return null;
|
if (!record || !this._storage.hasField(record, 'spam')) {
|
||||||
|
this.taLog.log("[loadReportData] no record found for data_id: " + data_id);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
let spam = record.spam;
|
let spam = record.spam;
|
||||||
return {
|
return {
|
||||||
headerMessageId: data_id,
|
headerMessageId: data_id,
|
||||||
|
|
@ -76,32 +91,42 @@ export class taSpamReport {
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeReportData(data_id) {
|
async removeReportData(data_id) {
|
||||||
|
this.taLog.log("[removeReportData] data_id: " + data_id);
|
||||||
await this._storage.deleteSpamField(data_id);
|
await this._storage.deleteSpamField(data_id);
|
||||||
await browser.storage.session.remove(this._processing_prefix + data_id);
|
await browser.storage.session.remove(this._processing_prefix + data_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAllReportData() {
|
async getAllReportData() {
|
||||||
|
this.taLog.log("[getAllReportData] loading all reports");
|
||||||
return await this._storage.getAllSpamRecords();
|
return await this._storage.getAllSpamRecords();
|
||||||
}
|
}
|
||||||
|
|
||||||
async clearReportData() {
|
async clearReportData() {
|
||||||
|
this.taLog.log("[clearReportData] clearing all report data");
|
||||||
let allSpam = await this._storage.getAllSpamRecords();
|
let allSpam = await this._storage.getAllSpamRecords();
|
||||||
for (let messageId of Object.keys(allSpam)) {
|
let spamKeys = Object.keys(allSpam);
|
||||||
|
this.taLog.log("[clearReportData] deleting " + spamKeys.length + " spam records");
|
||||||
|
for (let messageId of spamKeys) {
|
||||||
await this._storage.deleteSpamField(messageId);
|
await this._storage.deleteSpamField(messageId);
|
||||||
}
|
}
|
||||||
let allSession = await browser.storage.session.get(null);
|
let allSession = await browser.storage.session.get(null);
|
||||||
let keysToDelete = Object.keys(allSession).filter(k => k.startsWith(this._processing_prefix));
|
let keysToDelete = Object.keys(allSession).filter(k => k.startsWith(this._processing_prefix));
|
||||||
|
this.taLog.log("[clearReportData] deleting " + keysToDelete.length + " session keys");
|
||||||
for (let key of keysToDelete) {
|
for (let key of keysToDelete) {
|
||||||
await browser.storage.session.remove(key);
|
await browser.storage.session.remove(key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async truncReportData() {
|
async truncReportData() {
|
||||||
|
this.taLog.log("[truncReportData] checking report count");
|
||||||
let data = await this._storage.getAllSpamRecords();
|
let data = await this._storage.getAllSpamRecords();
|
||||||
let sortedData = this.sortReportsByDate(data);
|
let sortedData = this.sortReportsByDate(data);
|
||||||
let keys = Object.keys(sortedData);
|
let keys = Object.keys(sortedData);
|
||||||
|
this.taLog.log("[truncReportData] total reports: " + keys.length + ", max: " + this._max_reports);
|
||||||
|
|
||||||
if (keys.length > this._max_reports) {
|
if (keys.length > this._max_reports) {
|
||||||
|
let toDelete = keys.length - this._max_reports;
|
||||||
|
this.taLog.log("[truncReportData] truncating " + toDelete + " oldest reports");
|
||||||
for (let i = this._max_reports; i < keys.length; i++) {
|
for (let i = this._max_reports; i < keys.length; i++) {
|
||||||
await this._storage.deleteSpamField(keys[i]);
|
await this._storage.deleteSpamField(keys[i]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,10 +44,13 @@ export class taStorage {
|
||||||
* @returns {Promise<object|null>} The record object or null if not found.
|
* @returns {Promise<object|null>} The record object or null if not found.
|
||||||
*/
|
*/
|
||||||
async getRecord(messageId) {
|
async getRecord(messageId) {
|
||||||
|
this.taLog.log('[getRecord] messageId: ' + messageId);
|
||||||
try {
|
try {
|
||||||
let key = this._buildKey(messageId);
|
let key = this._buildKey(messageId);
|
||||||
let result = await messenger.storage.local.get(key);
|
let result = await messenger.storage.local.get(key);
|
||||||
return result[key] || null;
|
let record = result[key] || null;
|
||||||
|
this.taLog.log('[getRecord] record found: ' + (record !== null));
|
||||||
|
return record;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.taLog.error('getRecord error: ' + e);
|
this.taLog.error('getRecord error: ' + e);
|
||||||
return null;
|
return null;
|
||||||
|
|
@ -61,8 +64,11 @@ export class taStorage {
|
||||||
* @returns {boolean} True if the record exists and the field is present.
|
* @returns {boolean} True if the record exists and the field is present.
|
||||||
*/
|
*/
|
||||||
hasField(record, field) {
|
hasField(record, field) {
|
||||||
|
this.taLog.log('[hasField] field: ' + field);
|
||||||
try {
|
try {
|
||||||
return record !== null && record !== undefined && field in record;
|
let result = record !== null && record !== undefined && field in record;
|
||||||
|
this.taLog.log('[hasField] result: ' + result);
|
||||||
|
return result;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.taLog.error('hasField error: ' + e);
|
this.taLog.error('hasField error: ' + e);
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -77,10 +83,12 @@ export class taStorage {
|
||||||
* @param {boolean} [force=true] - If true, overwrite existing spam data.
|
* @param {boolean} [force=true] - If true, overwrite existing spam data.
|
||||||
*/
|
*/
|
||||||
async writeSpam(messageId, report_data, force = true) {
|
async writeSpam(messageId, report_data, force = true) {
|
||||||
|
this.taLog.log('[writeSpam] messageId: ' + messageId + ', force: ' + force);
|
||||||
try {
|
try {
|
||||||
let key = this._buildKey(messageId);
|
let key = this._buildKey(messageId);
|
||||||
let record = await this.getRecord(messageId) || { v: taStorage.SCHEMA_VERSION };
|
let record = await this.getRecord(messageId) || { v: taStorage.SCHEMA_VERSION };
|
||||||
if ('spam' in record && !force) {
|
if ('spam' in record && !force) {
|
||||||
|
this.taLog.log('[writeSpam] spam field already exists, skipping (force=false)');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let now = Date.now();
|
let now = Date.now();
|
||||||
|
|
@ -108,6 +116,7 @@ export class taStorage {
|
||||||
* @returns {Promise<object>} Map of messageId -> spam data object (legacy shape).
|
* @returns {Promise<object>} Map of messageId -> spam data object (legacy shape).
|
||||||
*/
|
*/
|
||||||
async getAllSpamRecords() {
|
async getAllSpamRecords() {
|
||||||
|
this.taLog.log('[getAllSpamRecords] loading all spam records');
|
||||||
try {
|
try {
|
||||||
let all = await messenger.storage.local.get(null);
|
let all = await messenger.storage.local.get(null);
|
||||||
let result = {};
|
let result = {};
|
||||||
|
|
@ -128,6 +137,7 @@ export class taStorage {
|
||||||
SpamThreshold: spam.SpamThreshold,
|
SpamThreshold: spam.SpamThreshold,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
this.taLog.log('[getAllSpamRecords] found ' + Object.keys(result).length + ' spam records');
|
||||||
return result;
|
return result;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
this.taLog.error('getAllSpamRecords error: ' + e);
|
this.taLog.error('getAllSpamRecords error: ' + e);
|
||||||
|
|
@ -141,15 +151,21 @@ export class taStorage {
|
||||||
* @param {string} messageId - The Message-ID header string.
|
* @param {string} messageId - The Message-ID header string.
|
||||||
*/
|
*/
|
||||||
async deleteSpamField(messageId) {
|
async deleteSpamField(messageId) {
|
||||||
|
this.taLog.log('[deleteSpamField] messageId: ' + messageId);
|
||||||
try {
|
try {
|
||||||
let key = this._buildKey(messageId);
|
let key = this._buildKey(messageId);
|
||||||
let record = await this.getRecord(messageId);
|
let record = await this.getRecord(messageId);
|
||||||
if (!record || !('spam' in record)) return;
|
if (!record || !('spam' in record)) {
|
||||||
|
this.taLog.log('[deleteSpamField] no spam field found for messageId: ' + messageId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
delete record.spam;
|
delete record.spam;
|
||||||
const remainingFields = Object.keys(record).filter(k => k !== 'v' && k !== 'ts');
|
const remainingFields = Object.keys(record).filter(k => k !== 'v' && k !== 'ts');
|
||||||
if (remainingFields.length === 0) {
|
if (remainingFields.length === 0) {
|
||||||
|
this.taLog.log('[deleteSpamField] no remaining fields, deleting entire record');
|
||||||
await messenger.storage.local.remove(key);
|
await messenger.storage.local.remove(key);
|
||||||
} else {
|
} else {
|
||||||
|
this.taLog.log('[deleteSpamField] remaining fields: ' + remainingFields.join(', '));
|
||||||
await messenger.storage.local.set({ [key]: record });
|
await messenger.storage.local.set({ [key]: record });
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
@ -164,10 +180,12 @@ export class taStorage {
|
||||||
* @param {boolean} [force=true] - If true, overwrite existing summary data.
|
* @param {boolean} [force=true] - If true, overwrite existing summary data.
|
||||||
*/
|
*/
|
||||||
async writeSummary(messageId, text, force = true) {
|
async writeSummary(messageId, text, force = true) {
|
||||||
|
this.taLog.log('[writeSummary] messageId: ' + messageId + ', force: ' + force);
|
||||||
try {
|
try {
|
||||||
let key = this._buildKey(messageId);
|
let key = this._buildKey(messageId);
|
||||||
let record = await this.getRecord(messageId) || { v: taStorage.SCHEMA_VERSION };
|
let record = await this.getRecord(messageId) || { v: taStorage.SCHEMA_VERSION };
|
||||||
if ('summary' in record && !force) {
|
if ('summary' in record && !force) {
|
||||||
|
this.taLog.log('[writeSummary] summary field already exists, skipping (force=false)');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let now = Date.now();
|
let now = Date.now();
|
||||||
|
|
@ -187,10 +205,12 @@ export class taStorage {
|
||||||
* @param {boolean} [force=true] - If true, overwrite existing translation data.
|
* @param {boolean} [force=true] - If true, overwrite existing translation data.
|
||||||
*/
|
*/
|
||||||
async writeTranslation(messageId, translated_text, lang, force = true) {
|
async writeTranslation(messageId, translated_text, lang, force = true) {
|
||||||
|
this.taLog.log('[writeTranslation] messageId: ' + messageId + ', lang: ' + lang + ', force: ' + force);
|
||||||
try {
|
try {
|
||||||
let key = this._buildKey(messageId);
|
let key = this._buildKey(messageId);
|
||||||
let record = await this.getRecord(messageId) || { v: taStorage.SCHEMA_VERSION };
|
let record = await this.getRecord(messageId) || { v: taStorage.SCHEMA_VERSION };
|
||||||
if ('translation' in record && !force) {
|
if ('translation' in record && !force) {
|
||||||
|
this.taLog.log('[writeTranslation] translation field already exists, skipping (force=false)');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let now = Date.now();
|
let now = Date.now();
|
||||||
|
|
@ -207,6 +227,7 @@ export class taStorage {
|
||||||
* @param {string} messageId - The Message-ID header string.
|
* @param {string} messageId - The Message-ID header string.
|
||||||
*/
|
*/
|
||||||
async deleteRecord(messageId) {
|
async deleteRecord(messageId) {
|
||||||
|
this.taLog.log('[deleteRecord] messageId: ' + messageId);
|
||||||
try {
|
try {
|
||||||
let key = this._buildKey(messageId);
|
let key = this._buildKey(messageId);
|
||||||
await messenger.storage.local.remove(key);
|
await messenger.storage.local.remove(key);
|
||||||
|
|
@ -221,7 +242,9 @@ export class taStorage {
|
||||||
* @returns {Promise<number>} The number of deleted records.
|
* @returns {Promise<number>} The number of deleted records.
|
||||||
*/
|
*/
|
||||||
async cleanup(maxAgeDays) {
|
async cleanup(maxAgeDays) {
|
||||||
|
this.taLog.log('[cleanup] maxAgeDays: ' + maxAgeDays);
|
||||||
if (maxAgeDays === 0) {
|
if (maxAgeDays === 0) {
|
||||||
|
this.taLog.log('[cleanup] maxAgeDays is 0, skipping cleanup');
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
|
@ -237,6 +260,7 @@ export class taStorage {
|
||||||
keysToDelete.push(key);
|
keysToDelete.push(key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this.taLog.log('[cleanup] found ' + keysToDelete.length + ' records older than ' + maxAgeDays + ' days');
|
||||||
if (keysToDelete.length > 0) {
|
if (keysToDelete.length > 0) {
|
||||||
await messenger.storage.local.remove(keysToDelete);
|
await messenger.storage.local.remove(keysToDelete);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue