fix: adding null check for undefined nameIds

silkroadnomad · Jan 21, 2025 · b1dd04c · b1dd04c
1 parent ff4606b
commit b1dd04c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/relay/package.json b/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libp2p-relay",
-  "version": "0.12.34",
+  "version": "0.12.35",
   "private": true,
   "scripts": {
     "start:no-restart": "node src/relay.js",

diff --git a/relay/src/pinner/nameOpsFileManager.js b/relay/src/pinner/nameOpsFileManager.js
@@ -99,18 +99,18 @@ class LevelDBInterface {
 }
 
 export async function getOrCreateDB(orbitdb) {
-  if (db && db.isOpen && db.isOpen()) {
-    return db;
+  if (this.db && this.db.isOpen && this.db.isOpen()) {
+    return this.db;
   }
 
   if (dbType === 'orbitdb') {
-    db = new OrbitDBInterface(orbitdb);
-    await db.open();
+    this.db = new OrbitDBInterface(orbitdb);
+    await this.db.open();
   } else if (dbType === 'leveldb') {
-    db = new LevelDBInterface();
+    this.db = new LevelDBInterface();
   }
 
-  return db;
+  return this.db;
 }
 
 export async function updateDailyNameOpsFile(
@@ -121,7 +121,10 @@ export async function updateDailyNameOpsFile(
 ) {
   try {
     db = await getOrCreateDB(orbitdb);
-
+    if(!db) {
+      db = await getOrCreateDB(orbitdb);
+
+    }
     for (const nameOp of nameOpUtxos) {
       const docId = nameOp.txid;
 
@@ -213,12 +216,13 @@ export async function closeDB() {
 function applyFilter(nameOp, selectedFilter) {
   console.log("applyFilter", nameOp, selectedFilter)
   const hasNameValue =
-    nameOp.nameValue &&
+    nameOp?.nameValue &&
     nameOp.nameValue !== '' &&
     nameOp.nameValue !== ' ' &&
     nameOp.nameValue !== 'empty';
 
   const isNotSpecialPrefix =
+    nameOp?.nameId &&
     !nameOp.nameId.startsWith('e/') &&
     !nameOp.nameId.startsWith('pe/') &&
     !nameOp.nameId.startsWith('poe/') &&
@@ -237,11 +241,11 @@ function applyFilter(nameOp, selectedFilter) {
     case 'bp':
       return nameOp.nameId.startsWith('bp/');
     case 'names':
-      return !hasNameValue && isNotSpecialPrefix;
+      return nameOp?.nameId && !hasNameValue && isNotSpecialPrefix;
     case 'nfc':
-      return nameOp.nameValue && nameOp.nameValue.startsWith('ipfs://');
+      return nameOp?.nameValue && nameOp.nameValue.startsWith('ipfs://');
     case 'collections':
-      return nameOp.nameValue && nameOp.nameValue.startsWith('ipfs://');
+      return nameOp?.nameValue && nameOp.nameValue.startsWith('ipfs://');
     default:
       return true; // No filter applied, include all nameOps
   }