@xiboplayer/stats 0.6.1 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiboplayer/stats",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "Proof of play tracking, stats reporting, and CMS logging",
   "type": "module",
   "main": "./src/index.js",
@@ -10,7 +10,7 @@
     "./collector": "./src/stats-collector.js"
   },
   "dependencies": {
-    "@xiboplayer/utils": "0.6.1"
+    "@xiboplayer/utils": "0.6.2"
   },
   "devDependencies": {
     "vitest": "^2.0.0",

package/src/log-reporter.js

@@ -271,6 +271,47 @@ export class LogReporter {
     return this.log('debug', message, category);
   }
 
+  /** Query records from an IndexedDB index with a cursor, up to a limit. */
+  _queryByIndex(storeName, indexName, keyValue, limit) {
+    return new Promise((resolve, reject) => {
+      const tx = this.db.transaction([storeName], 'readonly');
+      const index = tx.objectStore(storeName).index(indexName);
+      const request = index.openCursor(keyValue);
+      const results = [];
+
+      request.onsuccess = (event) => {
+        const cursor = event.target.result;
+        if (cursor && results.length < limit) {
+          results.push(cursor.value);
+          cursor.continue();
+        } else {
+          resolve(results);
+        }
+      };
+      request.onerror = () => reject(new Error(`Index query failed: ${request.error}`));
+    });
+  }
+
+  /** Delete records by ID from an IndexedDB object store. */
+  _deleteByIds(storeName, records) {
+    return new Promise((resolve, reject) => {
+      const tx = this.db.transaction([storeName], 'readwrite');
+      const store = tx.objectStore(storeName);
+      let deleted = 0;
+
+      for (const record of records) {
+        if (record.id) {
+          const req = store.delete(record.id);
+          req.onsuccess = () => { deleted++; };
+          req.onerror = () => { log.error(`Failed to delete ${record.id}:`, req.error); };
+        }
+      }
+
+      tx.oncomplete = () => resolve(deleted);
+      tx.onerror = () => reject(new Error(`Delete failed: ${tx.error}`));
+    });
+  }
+
   /**
    * Get logs ready for submission to CMS
    *
@@ -285,32 +326,9 @@ export class LogReporter {
       return [];
     }
 
-    return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction([LOGS_STORE], 'readonly');
-      const store = transaction.objectStore(LOGS_STORE);
-      const index = store.index('submitted');
-
-      // Query for unsubmitted logs (0 = false)
-      const request = index.openCursor(IDBKeyRange.only(0));
-      const logs = [];
-
-      request.onsuccess = (event) => {
-        const cursor = event.target.result;
-
-        if (cursor && logs.length < limit) {
-          logs.push(cursor.value);
-          cursor.continue();
-        } else {
-          log.debug(`Retrieved ${logs.length} unsubmitted logs (limit: ${limit})`);
-          resolve(logs);
-        }
-      };
-
-      request.onerror = () => {
-        log.error('Failed to retrieve logs:', request.error);
-        reject(new Error(`Failed to retrieve logs: ${request.error}`));
-      };
-    });
+    const logs = await this._queryByIndex(LOGS_STORE, 'submitted', IDBKeyRange.only(0), limit);
+    log.debug(`Retrieved ${logs.length} unsubmitted logs (limit: ${limit})`);
+    return logs;
   }
 
   /**
@@ -341,43 +359,9 @@ export class LogReporter {
    * @returns {Promise<void>}
    */
   async clearSubmittedLogs(logs) {
-    if (!this.db) {
-      log.warn('Logs database not initialized');
-      return;
-    }
-
-    if (!logs || logs.length === 0) {
-      return;
-    }
-
-    return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction([LOGS_STORE], 'readwrite');
-      const store = transaction.objectStore(LOGS_STORE);
-
-      let deletedCount = 0;
-
-      logs.forEach((logEntry) => {
-        if (logEntry.id) {
-          const request = store.delete(logEntry.id);
-          request.onsuccess = () => {
-            deletedCount++;
-          };
-          request.onerror = () => {
-            log.error(`Failed to delete log ${logEntry.id}:`, request.error);
-          };
-        }
-      });
-
-      transaction.oncomplete = () => {
-        log.debug(`Deleted ${deletedCount} submitted logs`);
-        resolve();
-      };
-
-      transaction.onerror = () => {
-        log.error('Failed to delete submitted logs:', transaction.error);
-        reject(new Error(`Failed to delete logs: ${transaction.error}`));
-      };
-    });
+    if (!this.db || !logs?.length) return;
+    const deleted = await this._deleteByIds(LOGS_STORE, logs);
+    log.debug(`Deleted ${deleted} submitted logs`);
   }
 
   /**

package/src/stats-collector.js

@@ -332,6 +332,59 @@ export class StatsCollector {
     }
   }
 
+  /**
+   * Query records from an IndexedDB index with a cursor, up to a limit.
+   * @param {string} storeName - Object store name
+   * @param {string} indexName - Index name
+   * @param {any} keyValue - Key to query (passed to openCursor)
+   * @param {number} limit - Maximum records to return
+   * @returns {Promise<Array>}
+   */
+  _queryByIndex(storeName, indexName, keyValue, limit) {
+    return new Promise((resolve, reject) => {
+      const tx = this.db.transaction([storeName], 'readonly');
+      const index = tx.objectStore(storeName).index(indexName);
+      const request = index.openCursor(keyValue);
+      const results = [];
+
+      request.onsuccess = (event) => {
+        const cursor = event.target.result;
+        if (cursor && results.length < limit) {
+          results.push(cursor.value);
+          cursor.continue();
+        } else {
+          resolve(results);
+        }
+      };
+      request.onerror = () => reject(new Error(`Index query failed: ${request.error}`));
+    });
+  }
+
+  /**
+   * Delete records by ID from an IndexedDB object store.
+   * @param {string} storeName - Object store name
+   * @param {Array} records - Records with .id property
+   * @returns {Promise<number>} Number of deleted records
+   */
+  _deleteByIds(storeName, records) {
+    return new Promise((resolve, reject) => {
+      const tx = this.db.transaction([storeName], 'readwrite');
+      const store = tx.objectStore(storeName);
+      let deleted = 0;
+
+      for (const record of records) {
+        if (record.id) {
+          const req = store.delete(record.id);
+          req.onsuccess = () => { deleted++; };
+          req.onerror = () => { log.error(`Failed to delete ${record.id}:`, req.error); };
+        }
+      }
+
+      tx.oncomplete = () => resolve(deleted);
+      tx.onerror = () => reject(new Error(`Delete failed: ${tx.error}`));
+    });
+  }
+
   /**
    * Get stats ready for submission to CMS
    *
@@ -347,32 +400,9 @@ export class StatsCollector {
       return [];
     }
 
-    return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction([STATS_STORE], 'readonly');
-      const store = transaction.objectStore(STATS_STORE);
-      const index = store.index('submitted');
-
-      // Query for unsubmitted stats (0 = false)
-      const request = index.openCursor(IDBKeyRange.only(0));
-      const stats = [];
-
-      request.onsuccess = (event) => {
-        const cursor = event.target.result;
-
-        if (cursor && stats.length < limit) {
-          stats.push(cursor.value);
-          cursor.continue();
-        } else {
-          log.debug(`Retrieved ${stats.length} unsubmitted stats`);
-          resolve(stats);
-        }
-      };
-
-      request.onerror = () => {
-        log.error('Failed to retrieve stats:', request.error);
-        reject(new Error(`Failed to retrieve stats: ${request.error}`));
-      };
-    });
+    const stats = await this._queryByIndex(STATS_STORE, 'submitted', IDBKeyRange.only(0), limit);
+    log.debug(`Retrieved ${stats.length} unsubmitted stats`);
+    return stats;
   }
 
   /**
@@ -384,43 +414,9 @@ export class StatsCollector {
    * @returns {Promise<void>}
    */
   async clearSubmittedStats(stats) {
-    if (!this.db) {
-      log.warn('Stats database not initialized');
-      return;
-    }
-
-    if (!stats || stats.length === 0) {
-      return;
-    }
-
-    return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction([STATS_STORE], 'readwrite');
-      const store = transaction.objectStore(STATS_STORE);
-
-      let deletedCount = 0;
-
-      stats.forEach((stat) => {
-        if (stat.id) {
-          const request = store.delete(stat.id);
-          request.onsuccess = () => {
-            deletedCount++;
-          };
-          request.onerror = () => {
-            log.error(`Failed to delete stat ${stat.id}:`, request.error);
-          };
-        }
-      });
-
-      transaction.oncomplete = () => {
-        log.debug(`Deleted ${deletedCount} submitted stats`);
-        resolve();
-      };
-
-      transaction.onerror = () => {
-        log.error('Failed to delete submitted stats:', transaction.error);
-        reject(new Error(`Failed to delete stats: ${transaction.error}`));
-      };
-    });
+    if (!this.db || !stats?.length) return;
+    const deleted = await this._deleteByIds(STATS_STORE, stats);
+    log.debug(`Deleted ${deleted} submitted stats`);
   }
 
   /**