Merge pull request #5 from Zegnat/feature/switch-parser

Swap microformat-node for newer microformats-parser

Author: jalcine

index.js

@@ -1,18 +1,27 @@
 const express = require("express");
-const mf2 = require("microformat-node");
+const { mf2 } = require("microformats-parser");
 const undici = require("undici");
 const querystring = require("querystring");
 const pkg = require("./package.json");
 const app = express();
 const port = process.env.PORT || 9000;
 
+function getDependencyVersion(dependencyName) {
+  const fs = require('fs');
+  const lockfile = require('@yarnpkg/lockfile');
+  const parsed = lockfile.parse(fs.readFileSync("./yarn.lock", "utf-8"));
+  if (parsed.type !== "success") return "unknown";
+  const dependency = parsed.object[`${dependencyName}@${pkg.dependencies[dependencyName]}`];
+  if (dependency === undefined) return "unknown";
+  return dependency.version;
+}
+const mf2version = getDependencyVersion("microformats-parser");
+
 function htmlToMf2(url, html, res) {
-  mf2.get({ baseUrl: url, html }, (err, data) => {
-    const body = err || data;
-    res
-      .header("content-type", "application/json; charset=UTF-8")
-      .send(JSON.stringify(body, null, 2));
-  });
+  const body = mf2(html, { baseUrl: url });
+  res
+    .header("content-type", "application/json; charset=UTF-8")
+    .send(JSON.stringify(body, null, 2));
 }
 
 app.set("view engine", "ejs");
@@ -31,7 +40,7 @@ app.get("/", async (req, res) => {
     htmlToMf2(url, text, res);
   } else {
     res.render("index.html.ejs", {
-      version: `${pkg.version} (lib: ${mf2.version})`,
+      version: `${pkg.version} (lib: ${mf2version})`,
     });
   }
 });

package.json

@@ -10,9 +10,10 @@
     "start": "node index.js"
   },
   "dependencies": {
+    "@yarnpkg/lockfile": "^1.1.0",
     "ejs": "^3.1.8",
     "express": "^4.18.1",
-    "microformat-node": "^2.0.1",
+    "microformats-parser": "^1.4.1",
     "querystring": "^0.2.1",
     "undici": "^5.6.1"
   }

views/index.html.ejs

@@ -108,8 +108,8 @@
             >
           </li>
           <li>
-            <a href="https://github.com/microformats/microformat-node"
-              >Source code for the Microformats Node Parser</a
+            <a href="https://github.com/microformats/microformats-parser"
+              >Source code for the Microformats JavaScript Parser</a
             >
           </li>