Merge remote-tracking branch 'origin/main' into add-readme

Author: aimee-gm

index.js

@@ -1,18 +1,26 @@
 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,13 +39,12 @@ 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})`,
     });
   }
 });
-app.post("/", (req, res) => {
-  const qsBody = querystring.parse(req.body);
-  htmlToMf2(qsBody.url, qsBody.html, res);
+app.post("/", express.urlencoded({ extended: false }), (req, res) => {
+  htmlToMf2(req.body.url, req.body.html, res);
 });
 
 app.listen(port, () => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "microformats-website-node",
   "description": "A website written using Node to demonstrate Microformats2 usage",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "engines": {
     "node": "17.x",
     "yarn": "1.x"
@@ -10,10 +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",
-    "querystring": "^0.2.1",
+    "microformats-parser": "^1.4.1",
     "undici": "^5.6.1"
   }
 }

views/index.html.ejs

@@ -98,6 +98,15 @@
         <button type="submit" class="btn btn-lg btn-success">Parse</button>
       </form>
 
+      <hr>
+
+      <p>
+        Drag this link to your bookmarks toolbar to parse a page with one click!<br>
+      </p>
+      <a class="btn btn-primary btn-sm" href="javascript:(function(){document.location.href='https://node.microformats.io/?url='+encodeURIComponent(document.location.href);}())">mf2 parser</a>
+      
+      <hr>
+
       <footer class="my-5">
         <ul>
           <li><a href="https://microformats.io">About Microformats</a></li>
@@ -108,8 +117,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>