oipage 1.2.1 → 1.3.0-alpha.1

package/CHANGELOG

@@ -48,4 +48,17 @@ v1.2.1:
     changes:
       - 修复bug
         1、开发服务器
-          * 修复路径不存在时未正确同步修改浏览器地址问题
+          * 修复路径不存在时未正确同步修改浏览器地址问题
+v1.3.0:
+    date:
+    changes:
+      - 修复bug
+        1、开发服务器
+          * 修复服务器根路径判断错误导致node_modules包查找错误问题
+      - 新增功能
+        1、API功能（浏览器）
+          * reader 文本分析读取器
+        2、API功能（Node.js）
+          * reader 文本分析读取器
+        3、开发服务器
+          * 新增 devServer.intercept 请求拦截

package/README.md

@@ -1,81 +1,81 @@
--   💘 开源不易，去 <i>[Github给个Star](https://github.com/oi-contrib/OIPage) </i>吧！
-
-<img src='https://oi-contrib.github.io/OIPage/images/logo.png' height='100px'/>
-
-<p>
-    <a href="https://zxl20070701.github.io/toolbox/#/npm-download?packages=oipage&interval=7">
-        <img src="https://img.shields.io/npm/dm/oipage.svg" alt="downloads">
-    </a>
-    <a href="https://www.npmjs.com/package/oipage">
-        <img src="https://img.shields.io/npm/v/oipage.svg" alt="npm">
-    </a>
-    <a href="https://github.com/oi-contrib/OIPage/issues">
-        <img src="https://img.shields.io/github/issues/oi-contrib/OIPage" alt="issue">
-    </a>
-    <a href="https://github.com/oi-contrib/OIPage" target='_blank'>
-        <img alt="GitHub repo stars" src="https://img.shields.io/github/stars/oi-contrib/OIPage?style=social">
-    </a>
-    <a href="https://github.com/oi-contrib/OIPage">
-        <img src="https://img.shields.io/github/forks/oi-contrib/OIPage" alt="forks">
-    </a>
-     <a href="https://gitee.com/oi-contrib/OIPage" target='_blank'>
-        <img alt="Gitee repo stars" src="https://gitee.com/oi-contrib/OIPage/badge/star.svg">
-    </a>
-    <a href="https://gitee.com/oi-contrib/OIPage">
-        <img src="https://gitee.com/oi-contrib/OIPage/badge/fork.svg" alt="forks">
-    </a>
-</p>
-
-<img src="https://nodei.co/npm/oipage.png?downloads=true&amp;downloadRank=true&amp;stars=true" alt="NPM">
-
-# [OIPage](https://github.com/oi-contrib/OIPage)
-前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等。官网地址：[https://oi-contrib.github.io/OIPage](https://oi-contrib.github.io/OIPage)
-
-## 如何使用？
-
-你可以作为一个命令行使用，那么你需要全局安装：
-
-```shell
-npm install -g oipage
-```
-
-也可以作为项目开发中的一个功能加强，在 package.json 中配置命令或nodejs文件中引入需要的模块使用，那么就在项目中执行安装命令：
-
-```shell
-npm install oipage --save
-```
-
-安装后，就可以直接作为命令行使用了。你可以打印帮助查看：
-
-```shell
-oipage-cli
-```
-
-比如会出现类似下列内容：
-
-```
-OIPage@v1.2.0
-
-可以使用的命令如下：
-
-【1】oipage-cli serve 开发服务器
-    --port|-p 端口号
-    --baseUrl 服务器根目录
-......
-```
-
-根据提示我们知道，比如第一个命令，其提供了一个快速访问本地资源服务器的功能，比如执行：
-
-```shell
-oipage-cli serve -p 8080
-```
-
-启动成功后，直接访问： http://localhost:8080/ 即可。
-
-如果你需要在项目中使用，我们也提供了一些有用的API，具体可以访问[ 在线文档 ](https://oi-contrib.github.io/OIPage)进行了解。
-
-## 版权
-
-MIT License
-
+-   💘 开源不易，去 <i>[Github给个Star](https://github.com/oi-contrib/OIPage) </i>吧！
+
+<img src='https://oi-contrib.github.io/OIPage/images/logo.png' height='100px'/>
+
+<p>
+    <a href="https://zxl20070701.github.io/toolbox/#/npm-download?packages=oipage&interval=7">
+        <img src="https://img.shields.io/npm/dm/oipage.svg" alt="downloads">
+    </a>
+    <a href="https://www.npmjs.com/package/oipage">
+        <img src="https://img.shields.io/npm/v/oipage.svg" alt="npm">
+    </a>
+    <a href="https://github.com/oi-contrib/OIPage/issues">
+        <img src="https://img.shields.io/github/issues/oi-contrib/OIPage" alt="issue">
+    </a>
+    <a href="https://github.com/oi-contrib/OIPage" target='_blank'>
+        <img alt="GitHub repo stars" src="https://img.shields.io/github/stars/oi-contrib/OIPage?style=social">
+    </a>
+    <a href="https://github.com/oi-contrib/OIPage">
+        <img src="https://img.shields.io/github/forks/oi-contrib/OIPage" alt="forks">
+    </a>
+     <a href="https://gitee.com/oi-contrib/OIPage" target='_blank'>
+        <img alt="Gitee repo stars" src="https://gitee.com/oi-contrib/OIPage/badge/star.svg">
+    </a>
+    <a href="https://gitee.com/oi-contrib/OIPage">
+        <img src="https://gitee.com/oi-contrib/OIPage/badge/fork.svg" alt="forks">
+    </a>
+</p>
+
+<img src="https://nodei.co/npm/oipage.png?downloads=true&amp;downloadRank=true&amp;stars=true" alt="NPM">
+
+# [OIPage](https://github.com/oi-contrib/OIPage)
+前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等。官网地址：[https://oi-contrib.github.io/OIPage](https://oi-contrib.github.io/OIPage)
+
+## 如何使用？
+
+你可以作为一个命令行使用，那么你需要全局安装：
+
+```shell
+npm install -g oipage
+```
+
+也可以作为项目开发中的一个功能加强，在 package.json 中配置命令或nodejs文件中引入需要的模块使用，那么就在项目中执行安装命令：
+
+```shell
+npm install oipage --save
+```
+
+安装后，就可以直接作为命令行使用了。你可以打印帮助查看：
+
+```shell
+oipage-cli
+```
+
+比如会出现类似下列内容：
+
+```
+OIPage@v1.2.0
+
+可以使用的命令如下：
+
+【1】oipage-cli serve 开发服务器
+    --port|-p 端口号
+    --baseUrl 服务器根目录
+......
+```
+
+根据提示我们知道，比如第一个命令，其提供了一个快速访问本地资源服务器的功能，比如执行：
+
+```shell
+oipage-cli serve -p 8080
+```
+
+启动成功后，直接访问： http://localhost:8080/ 即可。
+
+如果你需要在项目中使用，我们也提供了一些有用的API，具体可以访问[ 在线文档 ](https://oi-contrib.github.io/OIPage)进行了解。
+
+## 版权
+
+MIT License
+
 Copyright (c) [zxl20070701](https://zxl20070701.github.io/notebook/home.html) 走一步，再走一步

package/bin/data/mineTypes.json

@@ -1,105 +1,105 @@
-{
-    "html": "text/html",
-    "htm": "text/html",
-    "shtml": "text/html",
-    "css": "text/css",
-    "xml": "text/xml",
-    "gif": "image/gif",
-    "jpeg": "image/jpeg",
-    "jpg": "image/jpeg",
-    "js": "application/javascript",
-    "atom": "application/atom+xml",
-    "rss": "application/rss+xml",
-    "mml": "text/mathml",
-    "txt": "text/plain",
-    "jad": "text/vnd.sun.j2me.app-descriptor",
-    "wml": "text/vnd.wap.wml",
-    "htc": "text/x-component",
-    "png": "image/png",
-    "tif": "image/tiff",
-    "tiff": "image/tiff",
-    "wbmp": "image/vnd.wap.wbmp",
-    "ico": "image/x-icon",
-    "jng": "image/x-jng",
-    "bmp": "image/x-ms-bmp",
-    "svg": "image/svg+xml",
-    "svgz": "image/svg+xml",
-    "webp": "image/webp",
-    "woff": "application/font-woff",
-    "jar": "application/java-archive",
-    "war": "application/java-archive",
-    "ear": "application/java-archive",
-    "json": "application/json",
-    "hqx": "application/mac-binhex40",
-    "doc": "application/msword",
-    "pdf": "application/pdf",
-    "ps": "application/postscript",
-    "eps": "application/postscript",
-    "ai": "application/postscript",
-    "rtf": "application/rtf",
-    "m3u8": "application/vnd.apple.mpegurl",
-    "xls": "application/vnd.ms-excel",
-    "eot": "application/vnd.ms-fontobject",
-    "ppt": "application/vnd.ms-powerpoint",
-    "wmlc": "application/vnd.wap.wmlc",
-    "kml": "application/vnd.google-earth.kml+xml",
-    "kmz": "application/vnd.google-earth.kmz",
-    "7z": "application/x-7z-compressed",
-    "cco": "application/x-cocoa",
-    "jardiff": "application/x-java-archive-diff",
-    "jnlp": "application/x-java-jnlp-file",
-    "run": "application/x-makeself",
-    "pl": "application/x-perl",
-    "pm": "application/x-perl",
-    "prc": "application/x-pilot",
-    "pdb": "application/x-pilot",
-    "rar": "application/x-rar-compressed",
-    "rpm": "application/x-redhat-package-manager",
-    "sea": "application/x-sea",
-    "swf": "application/x-shockwave-flash",
-    "sit": "application/x-stuffit",
-    "tcl": "application/x-tcl",
-    "tk": "application/x-tcl",
-    "der": "application/x-x509-ca-cert",
-    "pem": "application/x-x509-ca-cert",
-    "crt": "application/x-x509-ca-cert",
-    "xpi": "application/x-xpinstall",
-    "xhtml": "application/xhtml+xml",
-    "xspf": "application/xspf+xml",
-    "zip": "application/zip",
-    "bin": "application/octet-stream",
-    "exe": "application/octet-stream",
-    "dll": "application/octet-stream",
-    "deb": "application/octet-stream",
-    "dmg": "application/octet-stream",
-    "iso": "application/octet-stream",
-    "img": "application/octet-stream",
-    "msi": "application/octet-stream",
-    "msp": "application/octet-stream",
-    "msm": "application/octet-stream",
-    "docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-    "xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-    "pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-    "mid": "audio/midi",
-    "midi": "audio/midi",
-    "kar": "audio/midi",
-    "mp3": "audio/mpeg",
-    "ogg": "audio/ogg",
-    "m4a": "audio/x-m4a",
-    "ra": "audio/x-realaudio",
-    "3gpp": "video/3gpp",
-    "3gp": "video/3gpp",
-    "ts": "video/mp2t",
-    "mp4": "video/mp4",
-    "mpeg": "video/mpeg",
-    "mpg": "video/mpeg",
-    "mov": "video/quicktime",
-    "webm": "video/webm",
-    "flv": "video/x-flv",
-    "m4v": "video/x-m4v",
-    "mng": "video/x-mng",
-    "asx": "video/x-ms-asf",
-    "asf": "video/x-ms-asf",
-    "wmv": "video/x-ms-wmv",
-    "avi": "video/x-msvideo"
+{
+    "html": "text/html",
+    "htm": "text/html",
+    "shtml": "text/html",
+    "css": "text/css",
+    "xml": "text/xml",
+    "gif": "image/gif",
+    "jpeg": "image/jpeg",
+    "jpg": "image/jpeg",
+    "js": "application/javascript",
+    "atom": "application/atom+xml",
+    "rss": "application/rss+xml",
+    "mml": "text/mathml",
+    "txt": "text/plain",
+    "jad": "text/vnd.sun.j2me.app-descriptor",
+    "wml": "text/vnd.wap.wml",
+    "htc": "text/x-component",
+    "png": "image/png",
+    "tif": "image/tiff",
+    "tiff": "image/tiff",
+    "wbmp": "image/vnd.wap.wbmp",
+    "ico": "image/x-icon",
+    "jng": "image/x-jng",
+    "bmp": "image/x-ms-bmp",
+    "svg": "image/svg+xml",
+    "svgz": "image/svg+xml",
+    "webp": "image/webp",
+    "woff": "application/font-woff",
+    "jar": "application/java-archive",
+    "war": "application/java-archive",
+    "ear": "application/java-archive",
+    "json": "application/json",
+    "hqx": "application/mac-binhex40",
+    "doc": "application/msword",
+    "pdf": "application/pdf",
+    "ps": "application/postscript",
+    "eps": "application/postscript",
+    "ai": "application/postscript",
+    "rtf": "application/rtf",
+    "m3u8": "application/vnd.apple.mpegurl",
+    "xls": "application/vnd.ms-excel",
+    "eot": "application/vnd.ms-fontobject",
+    "ppt": "application/vnd.ms-powerpoint",
+    "wmlc": "application/vnd.wap.wmlc",
+    "kml": "application/vnd.google-earth.kml+xml",
+    "kmz": "application/vnd.google-earth.kmz",
+    "7z": "application/x-7z-compressed",
+    "cco": "application/x-cocoa",
+    "jardiff": "application/x-java-archive-diff",
+    "jnlp": "application/x-java-jnlp-file",
+    "run": "application/x-makeself",
+    "pl": "application/x-perl",
+    "pm": "application/x-perl",
+    "prc": "application/x-pilot",
+    "pdb": "application/x-pilot",
+    "rar": "application/x-rar-compressed",
+    "rpm": "application/x-redhat-package-manager",
+    "sea": "application/x-sea",
+    "swf": "application/x-shockwave-flash",
+    "sit": "application/x-stuffit",
+    "tcl": "application/x-tcl",
+    "tk": "application/x-tcl",
+    "der": "application/x-x509-ca-cert",
+    "pem": "application/x-x509-ca-cert",
+    "crt": "application/x-x509-ca-cert",
+    "xpi": "application/x-xpinstall",
+    "xhtml": "application/xhtml+xml",
+    "xspf": "application/xspf+xml",
+    "zip": "application/zip",
+    "bin": "application/octet-stream",
+    "exe": "application/octet-stream",
+    "dll": "application/octet-stream",
+    "deb": "application/octet-stream",
+    "dmg": "application/octet-stream",
+    "iso": "application/octet-stream",
+    "img": "application/octet-stream",
+    "msi": "application/octet-stream",
+    "msp": "application/octet-stream",
+    "msm": "application/octet-stream",
+    "docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    "xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    "pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+    "mid": "audio/midi",
+    "midi": "audio/midi",
+    "kar": "audio/midi",
+    "mp3": "audio/mpeg",
+    "ogg": "audio/ogg",
+    "m4a": "audio/x-m4a",
+    "ra": "audio/x-realaudio",
+    "3gpp": "video/3gpp",
+    "3gp": "video/3gpp",
+    "ts": "video/mp2t",
+    "mp4": "video/mp4",
+    "mpeg": "video/mpeg",
+    "mpg": "video/mpeg",
+    "mov": "video/quicktime",
+    "webm": "video/webm",
+    "flv": "video/x-flv",
+    "m4v": "video/x-m4v",
+    "mng": "video/x-mng",
+    "asx": "video/x-ms-asf",
+    "asf": "video/x-ms-asf",
+    "wmv": "video/x-ms-wmv",
+    "avi": "video/x-msvideo"
 }

package/bin/disk.js

@@ -1,32 +1,32 @@
-const { deleteDisk, copyDisk } = require("../nodejs/disk");
-
-module.exports = function (config) {
-    let isForce = false;
-
-    // 判断是否开启强制执行
-    for (let i = 0; i < config.value.length; i++) {
-        if (config.value[i].name === "--force") isForce = true;
-    }
-
-    // 执行一个个任务
-    for (let i = 0; i < config.value.length; i++) {
-
-        // 删除文件或文件夹
-        if (config.value[i].name === "--delete") {
-            for (let j = 0; j < config.value[i].value.length; j++) {
-                deleteDisk(config.value[i].value[j]);
-            }
-        }
-
-        // 移动文件或文件夹
-        else if (config.value[i].name === "--move") {
-            copyDisk(config.value[i].value[0], config.value[i].value[1], isForce);
-            deleteDisk(config.value[i].value[0]);
-        }
-
-        // 复制文件或文件夹
-        else if (config.value[i].name === "--copy") {
-            copyDisk(config.value[i].value[0], config.value[i].value[1], isForce);
-        }
-    }
+const { deleteDisk, copyDisk } = require("../nodejs/disk");
+
+module.exports = function (config) {
+    let isForce = false;
+
+    // 判断是否开启强制执行
+    for (let i = 0; i < config.value.length; i++) {
+        if (config.value[i].name === "--force") isForce = true;
+    }
+
+    // 执行一个个任务
+    for (let i = 0; i < config.value.length; i++) {
+
+        // 删除文件或文件夹
+        if (config.value[i].name === "--delete") {
+            for (let j = 0; j < config.value[i].value.length; j++) {
+                deleteDisk(config.value[i].value[j]);
+            }
+        }
+
+        // 移动文件或文件夹
+        else if (config.value[i].name === "--move") {
+            copyDisk(config.value[i].value[0], config.value[i].value[1], isForce);
+            deleteDisk(config.value[i].value[0]);
+        }
+
+        // 复制文件或文件夹
+        else if (config.value[i].name === "--copy") {
+            copyDisk(config.value[i].value[0], config.value[i].value[1], isForce);
+        }
+    }
 };

package/bin/help.js

@@ -1,25 +1,25 @@
-const packageValue = require("../package.json");
-
-module.exports = function () {
-    console.log(`\x1b[36m
-OIPage@v${packageValue.version}
-
-可以使用的命令如下：
-
-【1】oipage-cli serve 开发服务器
-    --port|-p 端口号
-    --baseUrl 服务器根目录
-    --config|-c 设置配置文件
-
-【2】oipage-cli disk 磁盘操作
-    --force|-f 强制执行
-    --delete|-d 删除文件或文件夹
-    --move|m 移动文件或文件夹
-    --copy|-c 复制文件或文件夹
-
-【3】oipage-cli run "任务一" "任务二" ... 运行多命令
-
-Powered by https://github.com/zxl20070701
-\x1b[0m`);
-
+const packageValue = require("../package.json");
+
+module.exports = function () {
+    console.log(`\x1b[36m
+OIPage@v${packageValue.version}
+
+可以使用的命令如下：
+
+【1】oipage-cli serve 开发服务器
+    --port|-p 端口号
+    --baseUrl 服务器根目录
+    --config|-c 设置配置文件
+
+【2】oipage-cli disk 磁盘操作
+    --force|-f 强制执行
+    --delete|-d 删除文件或文件夹
+    --move|m 移动文件或文件夹
+    --copy|-c 复制文件或文件夹
+
+【3】oipage-cli run "任务一" "任务二" ... 运行多命令
+
+Powered by https://github.com/zxl20070701
+\x1b[0m`);
+
 };

package/bin/intercept.js

@@ -0,0 +1,8 @@
+module.exports = function (url, intercept, request, response) {
+    for (let item of intercept) {
+        if (item.test.test(url)) {
+            item.handler(request, response);
+            return true;
+        }
+    }
+}

package/bin/run

@@ -22,6 +22,7 @@ if (process.argv[2] === "serve") {
         devServer: {
             port: 8080,
             baseUrl: "./",
+            intercept: []
         },
         module: {
             rules: []

package/bin/serve.js

@@ -7,6 +7,7 @@ const mineTypes = require("./data/mineTypes.json");
 const resolve404 = require("./tools/resolve404.js");
 const resolveImportFactory = require("./tools/resolveImport.js");
 const { formatRawHeaders } = require("./tools/format.js");
+const intercept = require("./intercept.js");
 
 // 开发服务器
 module.exports = function (config) {
@@ -25,8 +26,13 @@ module.exports = function (config) {
         // 请求的文件路径
         let filePath = join(basePath, url == "/" ? "index.html" : url.replace(/^\//, ""));
 
+        // 请求拦截
+        if (intercept(url, config.devServer.intercept, request, response)) {
+            console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] intercept: " + url + '\x1b[0m ' + new Date().toLocaleString());
+        }
+
         // 如果存在且是文件
-        if (existsSync(filePath) && !lstatSync(filePath).isDirectory()) {
+        else if (existsSync(filePath) && !lstatSync(filePath).isDirectory()) {
 
             let dotName = /\./.test(filePath) ? filePath.match(/\.([^.]+)$/)[1] : "";
             let fileType = mineTypes[dotName]; // 文件类型