Use Fedify's NodeInfo client

package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.577.0",
     "@aws-sdk/credential-providers": "^3.577.0",
-    "@fedify/fedify": "^1.1.2",
+    "@fedify/fedify": "^1.2.0-dev.467",
     "@fedify/markdown-it-hashtag": "0.2.0",
     "@fedify/markdown-it-mention": "^0.1.1",
     "@fedify/postgres": "0.1.0",

src/federation/account.ts

@@ -6,9 +6,10 @@ import {
   Emoji,
   Link,
   PropertyValue,
-  type ResourceDescriptor,
+  formatSemVer,
   getActorHandle,
   getActorTypeName,
+  getNodeInfo,
   isActor,
   lookupObject,
 } from "@fedify/fedify";
@@ -101,7 +102,9 @@ export async function persistAccount(
       emojis[tag.name.toString()] = href;
     }
   }
-  const nodeInfo = await getNodeInfo(actor.id);
+  const nodeInfo = await getNodeInfo(actor.id, {
+    parse: "best-effort",
+  });
   const values: Omit<schema.NewAccount, "id" | "iri"> = {
     type: getActorTypeName(actor),
     name: actor?.name?.toString() ?? actor?.preferredUsername?.toString() ?? "",
@@ -122,8 +125,12 @@ export async function persistAccount(
     postsCount: (await actor.getOutbox(opts))?.totalItems ?? 0,
     successorId,
     aliases: actor?.aliasIds?.map((alias) => alias.href) ?? [],
-    software: nodeInfo?.software?.name ?? null,
-    softwareVersion: nodeInfo?.software?.version ?? null,
+    software: nodeInfo?.software.name ?? null,
+    softwareVersion:
+      nodeInfo?.software == null ||
+      formatSemVer(nodeInfo.software.version) === "0.0.0"
+        ? null
+        : formatSemVer(nodeInfo.software.version),
     fieldHtmls,
     published: toDate(actor.published),
   };
@@ -305,28 +312,3 @@ export async function updateAccountStats(
       ),
     );
 }
-
-interface NodeInfo {
-  software?: {
-    name?: string;
-    version?: string;
-  };
-}
-
-// TODO: Turn this logic into a utility function in Fedify:
-async function getNodeInfo(url: URL): Promise<NodeInfo | null> {
-  try {
-    const wellKnownUrl = new URL("/.well-known/nodeinfo", url);
-    const wkResponse = await fetch(wellKnownUrl);
-    const rd: ResourceDescriptor = await wkResponse.json();
-    const link = rd.links?.find(
-      (link) => link.rel === "http://nodeinfo.diaspora.software/ns/schema/2.0",
-    );
-    if (link == null) return null;
-    const nodeInfoUrl = link.href;
-    const niResponse = await fetch(nodeInfoUrl);
-    return await niResponse.json();
-  } catch {
-    return null;
-  }
-}