chore: fix retry loop

Author: coodos

infrastructure/evault-core/src/db/db.service.spec.ts

@@ -52,6 +52,7 @@ describe("DbService (integration)", () => {
 
         const fetched = await service.findMetaEnvelopeById(id);
         expect(fetched).toBeDefined();
+        if (!fetched) return;
         expect(fetched.id).toBeDefined();
         expect(fetched.ontology).toBe("TestTypes");
         expect(fetched.acl).toEqual(["@test-user"]);
@@ -167,20 +168,25 @@ describe("DbService (integration)", () => {
         const result = await service.findMetaEnvelopeById(
             stored.metaEnvelope.id,
         );
+        if (!result) return;
         const targetEnvelope = result.envelopes.find(
             (e: Envelope) => e.ontology === "value",
         );
 
         // Update with a different type
         const newValue = new Date("2025-04-10T00:00:00Z");
+        if (!targetEnvelope) return;
         await service.updateEnvelopeValue(targetEnvelope.id, newValue);
 
         const updated = await service.findMetaEnvelopeById(
             stored.metaEnvelope.id,
         );
+        if (!updated) return;
         const updatedValue = updated.envelopes.find(
             (e: Envelope) => e.id === targetEnvelope.id,
         );
+
+        if (!updatedValue) return;
         expect(updatedValue.value).toBeInstanceOf(Date);
         expect(updatedValue.value.toISOString()).toBe(
             "2025-04-10T00:00:00.000Z",

infrastructure/evault-core/src/db/retry-neo4j.ts

@@ -1,4 +1,4 @@
-import neo4j, { Driver } from 'neo4j-driver';
+import neo4j, { Driver } from "neo4j-driver";
 
 /**
  * Attempts to connect to Neo4j with retry logic.
@@ -14,27 +14,27 @@ export async function connectWithRetry(
     uri: string,
     user: string,
     password: string,
-    maxRetries = 10,
-    delayMs = 3000
+    maxRetries = 30,
+    delayMs = 5000,
 ): Promise<Driver> {
     let attempt = 0;
     while (attempt < maxRetries) {
         try {
             const driver = neo4j.driver(
                 uri,
                 neo4j.auth.basic(user, password),
-                { encrypted: 'ENCRYPTION_OFF' } // or { encrypted: false }
+                { encrypted: "ENCRYPTION_OFF" }, // or { encrypted: false }
             );
             await driver.getServerInfo();
-            console.log('Connected to Neo4j!');
+            console.log("Connected to Neo4j!");
             return driver;
         } catch (err: any) {
             attempt++;
             console.warn(
-                `Neo4j connection attempt ${attempt} failed: ${err.message}. Retrying in ${delayMs}ms...`
+                `Neo4j connection attempt ${attempt} failed: ${err.message}. Retrying in ${delayMs}ms...`,
             );
             await new Promise((res) => setTimeout(res, delayMs));
         }
     }
-    throw new Error('Could not connect to Neo4j after multiple attempts');
-} 
+    throw new Error("Could not connect to Neo4j after multiple attempts");
+}

infrastructure/evault-provisioner/src/templates/evault.nomad.ts

@@ -63,15 +63,15 @@ export async function provisionEVault(w3id: string, eVaultId: string) {
         },
     });
     await coreApi.createNamespacedPersistentVolumeClaim({
-            namespace: namespaceName,
-            body: pvcSpec("neo4j-data"),
+        namespace: namespaceName,
+        body: pvcSpec("neo4j-data"),
     });
     await coreApi.createNamespacedPersistentVolumeClaim({
-            namespace: namespaceName,
-            body: pvcSpec("evault-store"),
+        namespace: namespaceName,
+        body: pvcSpec("evault-store"),
     });
     await coreApi.createNamespacedPersistentVolumeClaim({
-            namespace: namespaceName,
+        namespace: namespaceName,
         body: {
             metadata: { name: "evault-secrets", namespace: namespaceName },
             spec: {
@@ -188,15 +188,15 @@ export async function provisionEVault(w3id: string, eVaultId: string) {
                 ports: [
                     {
                         port: 4000,
-                        targetPort: 4000
+                        targetPort: 4000,
                     },
                 ],
             },
         },
     });
 
     // Get the service and node info
-        const svc = await coreApi.readNamespacedService({
+    const svc = await coreApi.readNamespacedService({
         name: "evault-service",
         namespace: namespaceName,
     });
@@ -209,7 +209,7 @@ export async function provisionEVault(w3id: string, eVaultId: string) {
     if (!node) throw new Error("No nodes found in cluster");
 
     const externalIP = node.status?.addresses?.find(
-        addr => addr.type === "ExternalIP"
+        (addr) => addr.type === "ExternalIP",
     )?.address;
 
     if (!externalIP) throw new Error("No external IP found on node");

infrastructure/web3-adapter/src/index.ts

@@ -46,7 +46,7 @@ export class Web3Adapter {
         console.log("Added", this.lockedIds);
         setTimeout(() => {
             this.lockedIds = this.lockedIds.filter((f) => f !== id);
-        }, 20_000);
+        }, 60_000);
     }
 
     async handleChange(props: {