markmap-cli 0.15.7 → 0.15.8

package/dist/index.js

@@ -1,22 +1,22 @@
 import { readFile, stat, mkdir, writeFile } from "fs/promises";
-import { resolve, extname, dirname } from "path";
+import { resolve, join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { Command } from "commander";
 import open from "open";
 import updateNotifier from "update-notifier";
-import { readPackageUp } from "read-pkg-up";
+import { readPackageUp } from "read-package-up";
 import { buildCSSItem, buildJSItem, defer } from "markmap-common";
 import { Transformer, baseJsPaths } from "markmap-lib";
 export * from "markmap-lib";
 import { packageDirectory } from "pkg-dir";
 import { createReadStream, createWriteStream } from "fs";
 import { EventEmitter } from "events";
-import http from "http";
-import Koa from "koa";
+import { serve } from "@hono/node-server";
+import { Hono } from "hono";
 import chokidar from "chokidar";
 import { Readable } from "stream";
 import { finished } from "stream/promises";
-const TOOLBAR_VERSION = "0.15.6";
+const TOOLBAR_VERSION = "0.15.8";
 const TOOLBAR_CSS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/style.css`;
 const TOOLBAR_JS = `markmap-toolbar@${TOOLBAR_VERSION}/dist/index.js`;
 const ASSETS_PREFIX = "/assets/";
@@ -60,6 +60,114 @@ const assetsDirPromise = rootDirPromise.then((rootDir) => {
     throw new Error("Could not find root dir");
   return resolve(rootDir, `.${ASSETS_PREFIX}`);
 });
+function createStreamBody(stream) {
+  const body = new ReadableStream({
+    start(controller) {
+      stream.on("data", (chunk) => {
+        controller.enqueue(chunk);
+      });
+      stream.on("end", () => {
+        controller.close();
+      });
+    },
+    cancel() {
+      stream.destroy();
+    }
+  });
+  return body;
+}
+var getMimeType = (filename) => {
+  const regexp = /\.([a-zA-Z0-9]+?)$/;
+  const match = filename.match(regexp);
+  if (!match)
+    return;
+  let mimeType = mimes[match[1]];
+  if (mimeType && mimeType.startsWith("text") || mimeType === "application/json") {
+    mimeType += "; charset=utf-8";
+  }
+  return mimeType;
+};
+var mimes = {
+  aac: "audio/aac",
+  abw: "application/x-abiword",
+  arc: "application/x-freearc",
+  avi: "video/x-msvideo",
+  avif: "image/avif",
+  av1: "video/av1",
+  azw: "application/vnd.amazon.ebook",
+  bin: "application/octet-stream",
+  bmp: "image/bmp",
+  bz: "application/x-bzip",
+  bz2: "application/x-bzip2",
+  csh: "application/x-csh",
+  css: "text/css",
+  csv: "text/csv",
+  doc: "application/msword",
+  docx: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  eot: "application/vnd.ms-fontobject",
+  epub: "application/epub+zip",
+  gif: "image/gif",
+  gz: "application/gzip",
+  htm: "text/html",
+  html: "text/html",
+  ico: "image/x-icon",
+  ics: "text/calendar",
+  jar: "application/java-archive",
+  jpeg: "image/jpeg",
+  jpg: "image/jpeg",
+  js: "text/javascript",
+  json: "application/json",
+  jsonld: "application/ld+json",
+  map: "application/json",
+  mid: "audio/x-midi",
+  midi: "audio/x-midi",
+  mjs: "text/javascript",
+  mp3: "audio/mpeg",
+  mp4: "video/mp4",
+  mpeg: "video/mpeg",
+  mpkg: "application/vnd.apple.installer+xml",
+  odp: "application/vnd.oasis.opendocument.presentation",
+  ods: "application/vnd.oasis.opendocument.spreadsheet",
+  odt: "application/vnd.oasis.opendocument.text",
+  oga: "audio/ogg",
+  ogv: "video/ogg",
+  ogx: "application/ogg",
+  opus: "audio/opus",
+  otf: "font/otf",
+  pdf: "application/pdf",
+  php: "application/php",
+  png: "image/png",
+  ppt: "application/vnd.ms-powerpoint",
+  pptx: "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  rtf: "application/rtf",
+  sh: "application/x-sh",
+  svg: "image/svg+xml",
+  swf: "application/x-shockwave-flash",
+  tar: "application/x-tar",
+  tif: "image/tiff",
+  tiff: "image/tiff",
+  ts: "video/mp2t",
+  ttf: "font/ttf",
+  txt: "text/plain",
+  vsd: "application/vnd.visio",
+  wasm: "application/wasm",
+  webm: "video/webm",
+  weba: "audio/webm",
+  webp: "image/webp",
+  woff: "font/woff",
+  woff2: "font/woff2",
+  xhtml: "application/xhtml+xml",
+  xls: "application/vnd.ms-excel",
+  xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  xml: "application/xml",
+  xul: "application/vnd.mozilla.xul+xml",
+  zip: "application/zip",
+  "3gp": "video/3gpp",
+  "3g2": "video/3gpp2",
+  "7z": "application/x-7z-compressed",
+  gltf: "model/gltf+json",
+  glb: "model/gltf-binary"
+};
 function sequence(fn) {
   let promise;
   return () => {
@@ -148,7 +256,7 @@ function startServer(paddingBottom) {
   const { mm, markmap } = window;
   refresh();
   function refresh() {
-    fetch(`/data?ts=${ts}`).then((res) => res.json()).then((res) => {
+    fetch(`/~data?ts=${ts}`).then((res) => res.json()).then((res) => {
       if (res.ts && res.ts > ts && res.result) {
         let frontmatter;
         ({ root, frontmatter, contentLineOffset: offset } = res.result);
@@ -183,7 +291,7 @@ function startServer(paddingBottom) {
     }
   }
 }
-function setUpServer(transformer, provider, options) {
+async function setUpServer(transformer, provider, options) {
   let assets = transformer.getAssets();
   if (options.toolbar)
     assets = addToolbar(transformer.urlBuilder, assets);
@@ -191,38 +299,48 @@ function setUpServer(transformer, provider, options) {
     null,
     assets
   )}<script>(${startServer.toString()})(${options.toolbar ? 60 : 0})<\/script>`;
-  const app = new Koa();
-  app.use(async (ctx, next) => {
-    if (ctx.path === "/") {
-      ctx.body = html;
-    } else if (ctx.path === "/data") {
-      const update = await provider.getUpdate(ctx.query.ts);
-      const result = update.content == null ? null : transformer.transform(update.content || "");
-      ctx.body = { ts: update.ts, result, line: update.line };
-    } else {
-      if (ctx.path.startsWith(ASSETS_PREFIX)) {
-        const relpath = ctx.path.slice(ASSETS_PREFIX.length);
-        const assetsDir = await assetsDirPromise;
-        try {
-          const realpath = resolve(assetsDir, relpath);
-          ctx.type = extname(relpath);
-          ctx.body = createReadStream(realpath);
-          return;
-        } catch (err) {
-          console.error(err);
-        }
-      }
-      await next();
-    }
+  const app = new Hono();
+  app.get("/", (c) => c.html(html));
+  app.get("/~data", async (c) => {
+    const update = await provider.getUpdate(+(c.req.query("ts") || 0));
+    const result = update.content == null ? null : transformer.transform(update.content || "");
+    return c.json({ ts: update.ts, result, line: update.line });
   });
-  const handle = app.callback();
-  const server = http.createServer(handle);
-  server.listen(() => {
-    const { port } = server.address();
-    console.info(`Listening at http://localhost:${port}`);
-    if (options.open)
-      open(`http://localhost:${port}`);
+  app.post("/~api", async (c) => {
+    var _a;
+    const { cmd, args } = await c.req.json();
+    await ((_a = provider[cmd]) == null ? void 0 : _a.call(provider, ...args));
+    return c.body(null, 204);
   });
+  const assetsDir = await assetsDirPromise;
+  app.get(`${ASSETS_PREFIX}*`, async (c) => {
+    const relpath = c.req.path.slice(ASSETS_PREFIX.length);
+    const realpath = join(assetsDir, relpath);
+    try {
+      const result = await stat(realpath);
+      if (!result.isFile())
+        throw new Error("File not found");
+    } catch {
+      return c.body("File not found", 404);
+    }
+    const stream = createReadStream(realpath);
+    const type = getMimeType(relpath);
+    if (type)
+      c.header("content-type", type);
+    return c.body(createStreamBody(stream));
+  });
+  const server = serve(
+    {
+      fetch: app.fetch,
+      port: options.port
+    },
+    (info) => {
+      const { port } = info;
+      console.info(`Listening at http://localhost:${port}`);
+      if (options.open)
+        open(`http://localhost:${port}`);
+    }
+  );
   let closing;
   return {
     provider,

package/dist/util.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import type { ReadStream } from 'fs';
 import { UrlBuilder } from 'markmap-common';
 import { IAssets } from 'markmap-lib';
 export declare const ASSETS_PREFIX = "/assets/";
@@ -15,8 +17,11 @@ export interface IDevelopOptions {
      * Ignored in watching mode.
      */
     offline: boolean;
+    /** Port number for the devServer to listen. */
+    port?: number;
 }
 export declare function addToolbar(urlBuilder: UrlBuilder, assets: IAssets): IAssets;
 export declare function localProvider(path: string): string;
 export declare const rootDirPromise: Promise<string | undefined>;
 export declare const assetsDirPromise: Promise<string>;
+export declare function createStreamBody(stream: ReadStream): ReadableStream<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markmap-cli",
-  "version": "0.15.7",
+  "version": "0.15.8",
   "description": "Create markmaps from CLI",
   "author": "Gerald <gera2ld@live.com>",
   "license": "MIT",
@@ -42,17 +42,18 @@
   ],
   "typings": "dist/index.d.ts",
   "dependencies": {
-    "@babel/runtime": "^7.22.6",
+    "@babel/runtime": "^7.23.6",
+    "@hono/node-server": "^1.3.3",
     "chokidar": "^3.5.3",
-    "commander": "^11.0.0",
-    "koa": "^2.14.2",
+    "commander": "^11.1.0",
+    "hono": "^3.11.8",
     "markmap-common": "0.15.6",
-    "markmap-lib": "0.15.7",
-    "markmap-toolbar": "0.15.6",
-    "open": "^9.1.0",
-    "pkg-dir": "^7.0.0",
-    "read-pkg-up": "^10.0.0",
-    "update-notifier": "^6.0.2"
+    "markmap-lib": "0.15.8",
+    "markmap-toolbar": "0.15.8",
+    "open": "^10.0.0",
+    "pkg-dir": "^8.0.0",
+    "read-package-up": "^11.0.0",
+    "update-notifier": "^7.0.0"
   },
-  "gitHead": "9d71c074d32c6912591dceb42c4381e27de05fbf"
+  "gitHead": "d5a29ab4064a5496f879de04d730d7192461d3c5"
 }