fix: retry prefix registration

Currently only one attempt is made for prefix registration. If any Interest gets dropped the connection is closed. Unless the command indicates an explicit error, we should retry it.
UCLA-IRL · Nov 20, 2024 · 811c48f · 811c48f
1 parent d3d6ec5
commit 811c48f
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 108 deletions.
diff --git a/src/backend/main.ts b/src/backend/main.ts
@@ -111,10 +111,14 @@ async function reconnect() {
       connection?.face?.addEventListener(
         'up',
         async () => {
-          resolve()
-
-          // The sleep here is needed otherwise prefix registration fails
-          setTimeout(() => checkPrefixRegistration(false), 500)
+          try {
+            if (!(await checkPrefixRegistration(false))) {
+              throw new Error('Failed to register prefixes')
+            }
+            resolve()
+          } catch (e) {
+            reject(e)
+          }
         },
         { once: true },
       )
@@ -298,124 +302,125 @@ export async function stopWorkspace() {
   bootstrapping = false
 }
 
-async function checkPrefixRegistration(cancel: boolean) {
-  if (!connection || !workspace) {
-    return
+async function checkPrefixRegistration(cancel: boolean): Promise<boolean> {
+  if (!connection?.face?.running || !workspace) {
+    return false
   }
+
+  if (UseAutoAnnouncement) {
+    return true
+  }
+
   if (cancel) {
-    if (!UseAutoAnnouncement) {
-      // Unregister prefixes
-      try {
-        await nfdmgmt.invoke(
-          'rib/unregister',
-          {
-            name: nodeId!,
-            origin: 65, // client
-          },
-          {
-            cOpts: {
-              fw: forwarder,
-            },
-            prefix: connection.commandPrefix,
-            signer: connection.cmdSigner,
-          },
-        )
-        await nfdmgmt.invoke(
-          'rib/unregister',
-          {
-            name: appPrefix!,
-            origin: 65, // client
+    // Unregister prefixes
+    try {
+      await nfdmgmt.invoke(
+        'rib/unregister',
+        {
+          name: nodeId!,
+          origin: 65, // client
+        },
+        {
+          cOpts: {
+            fw: forwarder,
           },
-          {
-            cOpts: {
-              fw: forwarder,
-            },
-            prefix: connection.commandPrefix,
-            signer: connection.cmdSigner,
+          prefix: connection.commandPrefix,
+          signer: connection.cmdSigner,
+        },
+      )
+      await nfdmgmt.invoke(
+        'rib/unregister',
+        {
+          name: appPrefix!,
+          origin: 65, // client
+        },
+        {
+          cOpts: {
+            fw: forwarder,
           },
-        )
-      } catch {
-        // Ignore errors
-      }
+          prefix: connection.commandPrefix,
+          signer: connection.cmdSigner,
+        },
+      )
+    } catch {
+      // Ignore errors
+    }
 
-      // Stop serving certificate
-      nfdCertProducer?.close()
-      nfdCertProducer = undefined
+    // Stop serving certificate
+    nfdCertProducer?.close()
+    nfdCertProducer = undefined
 
-      toast.success('Unregistered routes successfully!')
-    }
+    toast.success('Unregistered routes successfully!')
+    return true
   } else {
     // Note: UseAutoAnnouncement works, the following code is kept for test.
     // Differences:
     // - UseAutoAnnouncement does not cut the connection and notify the user when he uses
     //   an invalid certificate to connect to a testbed node.
     // - UseAutoAnnouncement will announce sync prefixes
-    if (!UseAutoAnnouncement) {
-      // Serve the certificate back to the forwarder
-      if (nfdCertProducer) {
-        nfdCertProducer?.close()
-      }
-      if (connection.nfdCert) {
-        nfdCertProducer = produce(connection.nfdCert.name, async () => connection?.nfdCert?.data, { fw: forwarder })
-      }
 
-      // Register prefixes
-      try {
-        let cr = await nfdmgmt.invoke(
-          'rib/register',
-          {
-            name: appPrefix!,
-            origin: 65, // client
-            cost: 0,
-            flags: 0x02, // CAPTURE
-          },
-          {
-            cOpts: {
-              fw: forwarder,
-            },
-            prefix: connection.commandPrefix,
-            signer: connection.cmdSigner,
-          },
-        )
-        if (cr.statusCode !== 200) {
-          console.error(`Unable to register route: ${cr.statusCode} ${cr.statusText}`)
-          toast.error(`Unable to register route: ${cr.statusCode} ${cr.statusText}`)
-          // Cut connection
-          return await disconnect()
-        }
-
-        cr = await nfdmgmt.invoke(
-          'rib/register',
-          {
-            name: nodeId!,
-            origin: 65, // client
-            cost: 0,
-            flags: 0x02, // CAPTURE
+    // Serve the certificate back to the forwarder
+    if (nfdCertProducer) {
+      nfdCertProducer?.close()
+    }
+    if (connection.nfdCert) {
+      nfdCertProducer = produce(connection.nfdCert.name, async () => connection?.nfdCert?.data, { fw: forwarder })
+    }
+
+    const bail = async (cr: nfdmgmt.ControlResponse) => {
+      console.error(`Unable to register route: ${cr.statusCode} ${cr.statusText}`)
+      toast.error(`Unable to register route: ${cr.statusCode} ${cr.statusText}`)
+      await disconnect() // cut connection
+      return false
+    }
+
+    // Register prefixes
+    try {
+      let cr = await nfdmgmt.invoke(
+        'rib/register',
+        {
+          name: appPrefix!,
+          origin: 65, // client
+          cost: 0,
+          flags: 0x02, // CAPTURE
+        },
+        {
+          cOpts: {
+            fw: forwarder,
           },
-          {
-            cOpts: {
-              fw: forwarder,
-            },
-            prefix: connection.commandPrefix,
-            signer: connection.cmdSigner,
+          prefix: connection.commandPrefix,
+          signer: connection.cmdSigner,
+        },
+      )
+      if (cr.statusCode !== 200) return bail(cr)
+
+      cr = await nfdmgmt.invoke(
+        'rib/register',
+        {
+          name: nodeId!,
+          origin: 65, // client
+          cost: 0,
+          flags: 0x02, // CAPTURE
+        },
+        {
+          cOpts: {
+            fw: forwarder,
           },
-        )
-        if (cr.statusCode !== 200) {
-          console.error(`Unable to register route: ${cr.statusCode} ${cr.statusText}`)
-          toast.error(`Unable to register route: ${cr.statusCode} ${cr.statusText}`)
-          // Cut connection
-          return await disconnect()
-        }
-
-        toast.success('Registered routes successfully!')
-      } catch {
-        toast.error(
-          'Unable to register route with no response.' +
-            "Most likey because your certificate is not allowed to register this workspace's prefix",
-        )
-        // Cut connection
-        return await disconnect()
-      }
+          prefix: connection.commandPrefix,
+          signer: connection.cmdSigner,
+        },
+      )
+      if (cr.statusCode !== 200) return bail(cr)
+
+      toast.success('Registered routes successfully!')
+      return true
+    } catch (e) {
+      // This probably happens because the Interest expired, rather
+      // than an explicit failure. Log and retry infinitely.
+      // If the connection disconnects during a retry, this function
+      // will exit immediately.
+      console.error(e)
+      return checkPrefixRegistration(cancel)
     }
   }
 }

diff --git a/src/components/share-latex/rich-doc/index.tsx b/src/components/share-latex/rich-doc/index.tsx
@@ -203,7 +203,7 @@ export default function RichDoc(props: {
         </Stack>
       </CardContent>
       <Divider />
-      <CardContent sx={{ flex: 1, backgroundColor: "#FFFFFF" }}>
+      <CardContent sx={{ flex: 1, backgroundColor: '#FFFFFF' }}>
         <div id="editor" class={styles.editor} ref={setContainer} />
       </CardContent>
     </Card>