meodp 0.0.4 → 0.0.6

package/README.md

@@ -39,3 +39,7 @@ lychee 是一个使用 Rust 编写的快速检测链接的命令行。
 同时基于 Typescript 可以获得更好的开发灵活性，而使用 Playwright 则可以模拟浏览器以检测页面中的资源加载。
 
 如果可能，它未来也许可以支持插件或预置配置。
+
+## TODO
+
+- [ ] 文件下载

package/dist/cli/index.cjs

@@ -7,7 +7,7 @@ const utils = require('consola/utils');
 const yargs = require('yargs');
 const helpers = require('yargs/helpers');
 require('playwright');
-const config = require('../shared/meodp.e8cfff87.cjs');
+const config = require('../shared/meodp.c2959ba5.cjs');
 require('node:path');
 require('strip-ansi');
 require('winston');

package/dist/cli/index.mjs

@@ -5,7 +5,7 @@ import { colors } from 'consola/utils';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import 'playwright';
-import { h as defaultMEODPConfig, M as MEODP, r as runByConfig } from '../shared/meodp.f86a1a9f.mjs';
+import { h as defaultMEODPConfig, M as MEODP, r as runByConfig } from '../shared/meodp.9c5df07b.mjs';
 import 'node:path';
 import 'strip-ansi';
 import 'winston';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('./shared/meodp.e8cfff87.cjs');
+const config = require('./shared/meodp.c2959ba5.cjs');
 require('consola');
 require('p-queue');
 require('consola/utils');
@@ -57,6 +57,7 @@ exports.emojiMap = config.emojiMap;
 exports.formatArgs = config.formatArgs;
 exports.getBrowser = config.getBrowser;
 exports.getFormattedDataFromResponse = config.getFormattedDataFromResponse;
+exports.getFormattedDuration = config.getFormattedDuration;
 exports.getMEODPUrlItemInfo = config.getMEODPUrlItemInfo;
 exports.getSiteLinks = config.getSiteLinks;
 exports.isLink = config.isLink;

package/dist/index.d.cts

@@ -305,6 +305,7 @@ declare const progressBarMap: Map<string, cliProgress.SingleBar>;
 declare function registerPageEvents(page: Page, urlItem: MEODPUrlProps): Map<string, PageUrlEvent>;
 
 declare function formatArgs(args: any[]): string;
+declare function getFormattedDuration(duration: number): string;
 /**
  * get formatted data from response
  */
@@ -314,6 +315,7 @@ declare function getFormattedDataFromResponse(res: Response): {
     statusCode: number;
     statusText: string;
     statusInfo: string;
+    statusInfoText: string;
     linkText: string;
 };
 
@@ -357,4 +359,4 @@ declare function getMEODPUrlItemInfo(urlItem: MEODPUrlItem): {
     emoji: string;
 };
 
-export { type CheckSiteUrlOptions, LocalLog, type LocalLogOptions, type MEODPConfig, type MEODPUrlItem, type MEODPUrlProps, type MEODPUrlType, PQueueMap, type PageUrlEvent, type UrlCategoryInfo, type UrlMap, checkLink, checkMEODPUrl, checkSite, checkSiteMap, checkSiteUrl, checkUrlNomoduleAssets, createMEODPLogger, createWinstonLogger, defaultMEODPConfig, defineConfig, emojiMap, formatArgs, getBrowser, getFormattedDataFromResponse, getMEODPUrlItemInfo, getSiteLinks, isLink, localLog, logUrlItemInfo, multiBar, parseUrlMap, progressBarMap, registerPageEvents, runByConfig, siteUrlMap };
+export { type CheckSiteUrlOptions, LocalLog, type LocalLogOptions, type MEODPConfig, type MEODPUrlItem, type MEODPUrlProps, type MEODPUrlType, PQueueMap, type PageUrlEvent, type UrlCategoryInfo, type UrlMap, checkLink, checkMEODPUrl, checkSite, checkSiteMap, checkSiteUrl, checkUrlNomoduleAssets, createMEODPLogger, createWinstonLogger, defaultMEODPConfig, defineConfig, emojiMap, formatArgs, getBrowser, getFormattedDataFromResponse, getFormattedDuration, getMEODPUrlItemInfo, getSiteLinks, isLink, localLog, logUrlItemInfo, multiBar, parseUrlMap, progressBarMap, registerPageEvents, runByConfig, siteUrlMap };

package/dist/index.d.mts

@@ -305,6 +305,7 @@ declare const progressBarMap: Map<string, cliProgress.SingleBar>;
 declare function registerPageEvents(page: Page, urlItem: MEODPUrlProps): Map<string, PageUrlEvent>;
 
 declare function formatArgs(args: any[]): string;
+declare function getFormattedDuration(duration: number): string;
 /**
  * get formatted data from response
  */
@@ -314,6 +315,7 @@ declare function getFormattedDataFromResponse(res: Response): {
     statusCode: number;
     statusText: string;
     statusInfo: string;
+    statusInfoText: string;
     linkText: string;
 };
 
@@ -357,4 +359,4 @@ declare function getMEODPUrlItemInfo(urlItem: MEODPUrlItem): {
     emoji: string;
 };
 
-export { type CheckSiteUrlOptions, LocalLog, type LocalLogOptions, type MEODPConfig, type MEODPUrlItem, type MEODPUrlProps, type MEODPUrlType, PQueueMap, type PageUrlEvent, type UrlCategoryInfo, type UrlMap, checkLink, checkMEODPUrl, checkSite, checkSiteMap, checkSiteUrl, checkUrlNomoduleAssets, createMEODPLogger, createWinstonLogger, defaultMEODPConfig, defineConfig, emojiMap, formatArgs, getBrowser, getFormattedDataFromResponse, getMEODPUrlItemInfo, getSiteLinks, isLink, localLog, logUrlItemInfo, multiBar, parseUrlMap, progressBarMap, registerPageEvents, runByConfig, siteUrlMap };
+export { type CheckSiteUrlOptions, LocalLog, type LocalLogOptions, type MEODPConfig, type MEODPUrlItem, type MEODPUrlProps, type MEODPUrlType, PQueueMap, type PageUrlEvent, type UrlCategoryInfo, type UrlMap, checkLink, checkMEODPUrl, checkSite, checkSiteMap, checkSiteUrl, checkUrlNomoduleAssets, createMEODPLogger, createWinstonLogger, defaultMEODPConfig, defineConfig, emojiMap, formatArgs, getBrowser, getFormattedDataFromResponse, getFormattedDuration, getMEODPUrlItemInfo, getSiteLinks, isLink, localLog, logUrlItemInfo, multiBar, parseUrlMap, progressBarMap, registerPageEvents, runByConfig, siteUrlMap };

package/dist/index.d.ts

@@ -305,6 +305,7 @@ declare const progressBarMap: Map<string, cliProgress.SingleBar>;
 declare function registerPageEvents(page: Page, urlItem: MEODPUrlProps): Map<string, PageUrlEvent>;
 
 declare function formatArgs(args: any[]): string;
+declare function getFormattedDuration(duration: number): string;
 /**
  * get formatted data from response
  */
@@ -314,6 +315,7 @@ declare function getFormattedDataFromResponse(res: Response): {
     statusCode: number;
     statusText: string;
     statusInfo: string;
+    statusInfoText: string;
     linkText: string;
 };
 
@@ -357,4 +359,4 @@ declare function getMEODPUrlItemInfo(urlItem: MEODPUrlItem): {
     emoji: string;
 };
 
-export { type CheckSiteUrlOptions, LocalLog, type LocalLogOptions, type MEODPConfig, type MEODPUrlItem, type MEODPUrlProps, type MEODPUrlType, PQueueMap, type PageUrlEvent, type UrlCategoryInfo, type UrlMap, checkLink, checkMEODPUrl, checkSite, checkSiteMap, checkSiteUrl, checkUrlNomoduleAssets, createMEODPLogger, createWinstonLogger, defaultMEODPConfig, defineConfig, emojiMap, formatArgs, getBrowser, getFormattedDataFromResponse, getMEODPUrlItemInfo, getSiteLinks, isLink, localLog, logUrlItemInfo, multiBar, parseUrlMap, progressBarMap, registerPageEvents, runByConfig, siteUrlMap };
+export { type CheckSiteUrlOptions, LocalLog, type LocalLogOptions, type MEODPConfig, type MEODPUrlItem, type MEODPUrlProps, type MEODPUrlType, PQueueMap, type PageUrlEvent, type UrlCategoryInfo, type UrlMap, checkLink, checkMEODPUrl, checkSite, checkSiteMap, checkSiteUrl, checkUrlNomoduleAssets, createMEODPLogger, createWinstonLogger, defaultMEODPConfig, defineConfig, emojiMap, formatArgs, getBrowser, getFormattedDataFromResponse, getFormattedDuration, getMEODPUrlItemInfo, getSiteLinks, isLink, localLog, logUrlItemInfo, multiBar, parseUrlMap, progressBarMap, registerPageEvents, runByConfig, siteUrlMap };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { g as getBrowser, s as siteUrlMap } from './shared/meodp.f86a1a9f.mjs';
-export { L as LocalLog, P as PQueueMap, a as checkLink, c as checkMEODPUrl, f as checkSite, e as checkSiteUrl, d as checkUrlNomoduleAssets, k as createMEODPLogger, m as createWinstonLogger, h as defaultMEODPConfig, i as defineConfig, w as emojiMap, q as formatArgs, t as getFormattedDataFromResponse, x as getMEODPUrlItemInfo, b as getSiteLinks, u as isLink, j as localLog, l as logUrlItemInfo, n as multiBar, v as parseUrlMap, p as progressBarMap, o as registerPageEvents, r as runByConfig } from './shared/meodp.f86a1a9f.mjs';
+import { g as getBrowser, s as siteUrlMap } from './shared/meodp.9c5df07b.mjs';
+export { L as LocalLog, P as PQueueMap, a as checkLink, c as checkMEODPUrl, f as checkSite, e as checkSiteUrl, d as checkUrlNomoduleAssets, k as createMEODPLogger, m as createWinstonLogger, h as defaultMEODPConfig, i as defineConfig, x as emojiMap, q as formatArgs, u as getFormattedDataFromResponse, t as getFormattedDuration, y as getMEODPUrlItemInfo, b as getSiteLinks, v as isLink, j as localLog, l as logUrlItemInfo, n as multiBar, w as parseUrlMap, p as progressBarMap, o as registerPageEvents, r as runByConfig } from './shared/meodp.9c5df07b.mjs';
 import 'consola';
 import 'p-queue';
 import 'consola/utils';

package/dist/shared/{meodp.f86a1a9f.mjs → meodp.9c5df07b.mjs}

@@ -65,7 +65,11 @@ const _LocalLog = class _LocalLog {
    * @desc append log
    */
   static async SiteLog(urlItem, ...args) {
-    const logName = (urlItem.name || urlItem.url).replace("https://", "").replace("http://", "").replace(/\//g, "-");
+    let id = urlItem.name || urlItem.url;
+    if (id.endsWith("/")) {
+      id = id.slice(0, -1);
+    }
+    const logName = id.replace("https://", "").replace("http://", "").replace(/\//g, "-");
     const logPath = path.resolve(this.logFolder, urlItem.type, `${logName}.log`);
     await _LocalLog.log(logPath, ...args);
   }
@@ -182,19 +186,38 @@ const progressBarMap = /* @__PURE__ */ new Map();
 function formatArgs(args) {
   return args.join(" ");
 }
+const TIME_COLOR = {
+  fast: colors.green,
+  medium: colors.yellow,
+  slow: colors.red
+};
+function getFormattedDuration(duration) {
+  const durationText = `${(Math.round(duration) / 1e3).toString()}s`;
+  let type;
+  if (duration < 500) {
+    type = "fast";
+  } else if (duration < 3e3) {
+    type = "medium";
+  } else {
+    type = "slow";
+  }
+  return TIME_COLOR[type](durationText);
+}
 function getFormattedDataFromResponse(res) {
   const statusCode = res?.status();
   const statusText = res?.statusText();
   const statusInfo = statusText ? `${statusCode?.toString()} ${statusText}` : statusCode?.toString();
+  const statusInfoText = statusCode >= 400 ? colors.red(`[${statusInfo}]`) : colors.green(`[${statusInfo}]`);
   const req = res.request();
   const duration = req.timing().responseEnd - req.timing().requestStart;
-  const durationText = colors.dim(`\u2502${colors.blue(`${duration.toString().padStart(4, " ")}${colors.white("ms")}`)} \u2502`);
+  const durationText = `${COLORFUL_SYMBOLS.line} ${getFormattedDuration(duration)} ${COLORFUL_SYMBOLS.line}`;
   return {
     duration,
     durationText,
     statusCode,
     statusText,
     statusInfo,
+    statusInfoText,
     linkText: colors.dim(res.url())
   };
 }
@@ -585,17 +608,25 @@ async function checkSiteUrl(url, options) {
     }
     if (!res)
       return;
-    const statusCode = res?.status() || 0;
+    const {
+      statusCode,
+      statusInfoText,
+      durationText
+    } = getFormattedDataFromResponse(res);
     const checkStatus = statusCode < 400 ? "passed" : "failed";
     siteUrlMap.set(url, {
       response: res,
       statusCode,
       checkStatus
     });
-    MEODP.logger.log(COLORFUL_SYMBOLS.line, "  ", colors.green(`[${statusCode}]`), colors.cyan(url), colors.dim(`(in ${((Date.now() - startTime) / 1e3).toFixed(2)}s)`));
+    MEODP.logger.inner(statusInfoText, colors.cyan(url), durationText);
+    if (statusCode >= 400) {
+      MEODP.wLogger.error(`  ${statusInfoText} ${url} ${durationText}`);
+    }
     return;
   }
   const urlMap = registerPageEvents(page, options.urlItem);
+  const { success, failed, total, ignored, timeout } = parseUrlMap(urlMap);
   try {
     const res = await page.goto(url, {
       waitUntil: "networkidle"
@@ -606,7 +637,6 @@ async function checkSiteUrl(url, options) {
       statusCode,
       checkStatus: "goto"
     });
-    const { success, failed, total, ignored, timeout } = parseUrlMap(urlMap);
     const duration = (Date.now() - startTime) / 1e3;
     const statusText = res?.statusText();
     const logInfo = [
@@ -624,19 +654,22 @@ async function checkSiteUrl(url, options) {
     MEODP.logger.log(...logInfo);
     log(...logInfo);
     log();
+    if (failed.count > 0) {
+      MEODP.wLogger.error(logInfo.join(" "));
+    }
     if (MEODP.config.log?.type === "progress") {
       bar?.update(success.count, {
         value: colors.green(success.count),
         error_count: failed.count ? colors.red(failed.count) : 0
       });
-    } else {
     }
   } catch (e) {
     MEODP.logger.error(e);
   }
   for (const [url2, info] of urlMap) {
     if (!info.response && !info.ignored) {
-      MEODP.logger.log(COLORFUL_SYMBOLS.line, "    ", COLORFUL_SYMBOLS.error, `Timeout: ${colors.underline(url2)}`);
+      MEODP.logger.log(COLORFUL_SYMBOLS.line, "    ", COLORFUL_SYMBOLS.error, colors.red("Timeout:"), colors.underline(url2));
+      MEODP.wLogger.error(`  Timeout: ${url2}`);
     }
   }
   let noModuleAssetsPassed = true;
@@ -764,7 +797,7 @@ async function checkMEODPUrl(meodpUrl) {
   const duration = Date.now() - startTime;
   const bar = progressBarMap.get(meodpUrl.url);
   bar?.stop();
-  MEODP.logger.success(`Done in ${duration / 1e3}s.`);
+  MEODP.logger.success(`\u{1F577}\uFE0F  ${colors.greenBright("[DONE]")} ${colors.gray("in")} ${duration / 1e3}s.`);
 }
 
 const defaultMEODPConfig = {
@@ -815,4 +848,4 @@ async function runByConfig(config) {
   return true;
 }
 
-export { LocalLog as L, MEODP as M, PQueueMap as P, checkLink as a, getSiteLinks as b, checkMEODPUrl as c, checkUrlNomoduleAssets as d, checkSiteUrl as e, checkSite as f, getBrowser as g, defaultMEODPConfig as h, defineConfig as i, localLog as j, createMEODPLogger as k, logUrlItemInfo as l, createWinstonLogger as m, multiBar as n, registerPageEvents as o, progressBarMap as p, formatArgs as q, runByConfig as r, siteUrlMap as s, getFormattedDataFromResponse as t, isLink as u, parseUrlMap as v, emojiMap as w, getMEODPUrlItemInfo as x };
+export { LocalLog as L, MEODP as M, PQueueMap as P, checkLink as a, getSiteLinks as b, checkMEODPUrl as c, checkUrlNomoduleAssets as d, checkSiteUrl as e, checkSite as f, getBrowser as g, defaultMEODPConfig as h, defineConfig as i, localLog as j, createMEODPLogger as k, logUrlItemInfo as l, createWinstonLogger as m, multiBar as n, registerPageEvents as o, progressBarMap as p, formatArgs as q, runByConfig as r, siteUrlMap as s, getFormattedDuration as t, getFormattedDataFromResponse as u, isLink as v, parseUrlMap as w, emojiMap as x, getMEODPUrlItemInfo as y };

package/dist/shared/{meodp.e8cfff87.cjs → meodp.c2959ba5.cjs}

@@ -81,7 +81,11 @@ const _LocalLog = class _LocalLog {
    * @desc append log
    */
   static async SiteLog(urlItem, ...args) {
-    const logName = (urlItem.name || urlItem.url).replace("https://", "").replace("http://", "").replace(/\//g, "-");
+    let id = urlItem.name || urlItem.url;
+    if (id.endsWith("/")) {
+      id = id.slice(0, -1);
+    }
+    const logName = id.replace("https://", "").replace("http://", "").replace(/\//g, "-");
     const logPath = path__default.resolve(this.logFolder, urlItem.type, `${logName}.log`);
     await _LocalLog.log(logPath, ...args);
   }
@@ -198,19 +202,38 @@ const progressBarMap = /* @__PURE__ */ new Map();
 function formatArgs(args) {
   return args.join(" ");
 }
+const TIME_COLOR = {
+  fast: utils.colors.green,
+  medium: utils.colors.yellow,
+  slow: utils.colors.red
+};
+function getFormattedDuration(duration) {
+  const durationText = `${(Math.round(duration) / 1e3).toString()}s`;
+  let type;
+  if (duration < 500) {
+    type = "fast";
+  } else if (duration < 3e3) {
+    type = "medium";
+  } else {
+    type = "slow";
+  }
+  return TIME_COLOR[type](durationText);
+}
 function getFormattedDataFromResponse(res) {
   const statusCode = res?.status();
   const statusText = res?.statusText();
   const statusInfo = statusText ? `${statusCode?.toString()} ${statusText}` : statusCode?.toString();
+  const statusInfoText = statusCode >= 400 ? utils.colors.red(`[${statusInfo}]`) : utils.colors.green(`[${statusInfo}]`);
   const req = res.request();
   const duration = req.timing().responseEnd - req.timing().requestStart;
-  const durationText = utils.colors.dim(`\u2502${utils.colors.blue(`${duration.toString().padStart(4, " ")}${utils.colors.white("ms")}`)} \u2502`);
+  const durationText = `${COLORFUL_SYMBOLS.line} ${getFormattedDuration(duration)} ${COLORFUL_SYMBOLS.line}`;
   return {
     duration,
     durationText,
     statusCode,
     statusText,
     statusInfo,
+    statusInfoText,
     linkText: utils.colors.dim(res.url())
   };
 }
@@ -601,17 +624,25 @@ async function checkSiteUrl(url, options) {
     }
     if (!res)
       return;
-    const statusCode = res?.status() || 0;
+    const {
+      statusCode,
+      statusInfoText,
+      durationText
+    } = getFormattedDataFromResponse(res);
     const checkStatus = statusCode < 400 ? "passed" : "failed";
     siteUrlMap.set(url, {
       response: res,
       statusCode,
       checkStatus
     });
-    MEODP.logger.log(COLORFUL_SYMBOLS.line, "  ", utils.colors.green(`[${statusCode}]`), utils.colors.cyan(url), utils.colors.dim(`(in ${((Date.now() - startTime) / 1e3).toFixed(2)}s)`));
+    MEODP.logger.inner(statusInfoText, utils.colors.cyan(url), durationText);
+    if (statusCode >= 400) {
+      MEODP.wLogger.error(`  ${statusInfoText} ${url} ${durationText}`);
+    }
     return;
   }
   const urlMap = registerPageEvents(page, options.urlItem);
+  const { success, failed, total, ignored, timeout } = parseUrlMap(urlMap);
   try {
     const res = await page.goto(url, {
       waitUntil: "networkidle"
@@ -622,7 +653,6 @@ async function checkSiteUrl(url, options) {
       statusCode,
       checkStatus: "goto"
     });
-    const { success, failed, total, ignored, timeout } = parseUrlMap(urlMap);
     const duration = (Date.now() - startTime) / 1e3;
     const statusText = res?.statusText();
     const logInfo = [
@@ -640,19 +670,22 @@ async function checkSiteUrl(url, options) {
     MEODP.logger.log(...logInfo);
     log(...logInfo);
     log();
+    if (failed.count > 0) {
+      MEODP.wLogger.error(logInfo.join(" "));
+    }
     if (MEODP.config.log?.type === "progress") {
       bar?.update(success.count, {
         value: utils.colors.green(success.count),
         error_count: failed.count ? utils.colors.red(failed.count) : 0
       });
-    } else {
     }
   } catch (e) {
     MEODP.logger.error(e);
   }
   for (const [url2, info] of urlMap) {
     if (!info.response && !info.ignored) {
-      MEODP.logger.log(COLORFUL_SYMBOLS.line, "    ", COLORFUL_SYMBOLS.error, `Timeout: ${utils.colors.underline(url2)}`);
+      MEODP.logger.log(COLORFUL_SYMBOLS.line, "    ", COLORFUL_SYMBOLS.error, utils.colors.red("Timeout:"), utils.colors.underline(url2));
+      MEODP.wLogger.error(`  Timeout: ${url2}`);
     }
   }
   let noModuleAssetsPassed = true;
@@ -780,7 +813,7 @@ async function checkMEODPUrl(meodpUrl) {
   const duration = Date.now() - startTime;
   const bar = progressBarMap.get(meodpUrl.url);
   bar?.stop();
-  MEODP.logger.success(`Done in ${duration / 1e3}s.`);
+  MEODP.logger.success(`\u{1F577}\uFE0F  ${utils.colors.greenBright("[DONE]")} ${utils.colors.gray("in")} ${duration / 1e3}s.`);
 }
 
 const defaultMEODPConfig = {
@@ -847,6 +880,7 @@ exports.emojiMap = emojiMap;
 exports.formatArgs = formatArgs;
 exports.getBrowser = getBrowser;
 exports.getFormattedDataFromResponse = getFormattedDataFromResponse;
+exports.getFormattedDuration = getFormattedDuration;
 exports.getMEODPUrlItemInfo = getMEODPUrlItemInfo;
 exports.getSiteLinks = getSiteLinks;
 exports.isLink = isLink;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "meodp",
   "type": "module",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "packageManager": "pnpm@9.12.3",
   "description": "Mystic Eyes of Death Perception. Find out dead links in your site.",
   "keywords": [
@@ -20,7 +20,7 @@
   "types": "./dist/index.d.ts",
   "bin": {
     "meodp-ts": "bin/index.ts",
-    "meodp": "dist/index.mjs"
+    "meodp": "bin/index.mjs"
   },
   "files": [
     "bin",