oipage 1.7.0 → 1.8.0-alpha.0

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,43 +1,43 @@
-const { join } = require("path");
-const { deleteDisk, copyDisk, moveDisk, linkDisk } = require("../nodejs/disk");
-const deleteEmptyFolder = require("./tools/deleteEmptyFolder");
-
-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") {
-            moveDisk(config.value[i].value[0], config.value[i].value[1], isForce);
-        }
-
-        // 复制文件或文件夹
-        else if (config.value[i].name === "--copy") {
-            copyDisk(config.value[i].value[0], config.value[i].value[1], isForce);
-        }
-
-        // 创建磁盘链接
-        else if (config.value[i].name === "--link") {
-            linkDisk(config.value[i].value[0], config.value[i].value[1], isForce);
-        }
-
-        // 删除空文件夹
-        else if (config.value[i].name === "--delempty") {
-            deleteEmptyFolder(join(process.cwd(), config.value[i].value[0]));
-        }
-    }
+const { join } = require("path");
+const { deleteDisk, copyDisk, moveDisk, linkDisk } = require("../nodejs/disk");
+const deleteEmptyFolder = require("./tools/deleteEmptyFolder");
+
+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") {
+            moveDisk(config.value[i].value[0], config.value[i].value[1], isForce);
+        }
+
+        // 复制文件或文件夹
+        else if (config.value[i].name === "--copy") {
+            copyDisk(config.value[i].value[0], config.value[i].value[1], isForce);
+        }
+
+        // 创建磁盘链接
+        else if (config.value[i].name === "--link") {
+            linkDisk(config.value[i].value[0], config.value[i].value[1], isForce);
+        }
+
+        // 删除空文件夹
+        else if (config.value[i].name === "--delempty") {
+            deleteEmptyFolder(join(process.cwd(), config.value[i].value[0]));
+        }
+    }
 };

package/bin/help.js

@@ -11,6 +11,9 @@ OIPage@v${packageValue.version}
         默认8080
     --baseUrl [文件夹地址]
         服务器根目录
+    --open
+        自动打开浏览器
+    （也可以设置打开地址，比如 oipage-cli serve --open docs/index.html）
     --config|-c [配置文件地址]
         设置配置文件，相对地址是相对当前命令行
     --cache [true|false]

package/bin/intercept.js

@@ -1,16 +1,16 @@
-exports.doIntercept = function (url, intercept, request, response, wsHandler) {
-    for (let item of intercept) {
-        if (item.test.test(url)) {
-            item.handler(request, response, wsHandler);
-            return true;
-        }
-    }
-}
-
-exports.testIntercept = function (url, intercept) {
-    for (let item of intercept) {
-        if (item.test.test(url)) {
-            return true;
-        }
-    }
+exports.doIntercept = function (url, intercept, request, response, wsHandler) {
+    for (let item of intercept) {
+        if (item.test.test(url)) {
+            item.handler(request, response, wsHandler);
+            return true;
+        }
+    }
+}
+
+exports.testIntercept = function (url, intercept) {
+    for (let item of intercept) {
+        if (item.test.test(url)) {
+            return true;
+        }
+    }
 }

package/bin/network.js

@@ -1,22 +1,22 @@
-const networkInfo = require("./tools/network");
-
-module.exports = function (config) {
-    let info = networkInfo(true);
-
-    // 执行一个个任务
-    for (let i = 0; i < config.value.length; i++) {
-
-        // 打印信息
-        if (config.value[i].name === "--log") {
-
-            for (let iptype of ["IPv4", "IPv6"]) {
-                console.log("\n" + iptype);
-                for (let i = 0; i < info[iptype].length; i++) {
-                    console.log("  \x1b[1m\x1b[32m" + info[iptype][i].address + "\x1b[0m  " + info[iptype][i].mac);
-                }
-            }
-
-            console.log("");
-        }
-    }
+const networkInfo = require("./tools/network");
+
+module.exports = function (config) {
+    let info = networkInfo(true);
+
+    // 执行一个个任务
+    for (let i = 0; i < config.value.length; i++) {
+
+        // 打印信息
+        if (config.value[i].name === "--log") {
+
+            for (let iptype of ["IPv4", "IPv6"]) {
+                console.log("\n" + iptype);
+                for (let i = 0; i < info[iptype].length; i++) {
+                    console.log("  \x1b[1m\x1b[32m" + info[iptype][i].address + "\x1b[0m  " + info[iptype][i].mac);
+                }
+            }
+
+            console.log("");
+        }
+    }
 };

package/bin/run

@@ -22,6 +22,7 @@ if (process.argv[2] === "serve") {
         devServer: {
             port: 8080,
             baseUrl: "./",
+            open: false,
             cache: true,
             proxy: {},
             intercept: []
@@ -50,9 +51,10 @@ if (process.argv[2] === "serve") {
         }
     }
 
-    if ((argvObj["--port"] || [])[0]) config.devServer.port = (argvObj["--port"] || [])[0];
-    if ((argvObj["--baseUrl"] || [])[0]) config.devServer.baseUrl = (argvObj["--baseUrl"] || [])[0];
-    if ((argvObj["--cache"] || [])[0]) config.devServer.cache = (argvObj["--cache"] || [])[0] === "true";
+    if (argvObj["--port"]) config.devServer.port = argvObj["--port"][0];
+    if (argvObj["--baseUrl"]) config.devServer.baseUrl = argvObj["--baseUrl"][0];
+    if (argvObj["--cache"]) config.devServer.cache = argvObj["--cache"][0] === "true";
+    if (argvObj["--open"]) config.devServer.open = argvObj["--open"][0] || true;
 
     require("./serve.js")(config);
 }

package/bin/serve.d.ts

@@ -1,6 +1,13 @@
 
 interface DevServerType {
 
+    /**
+     * 是否自动打开浏览器，默认false，true表示打开
+     * 
+     * 也可以是一段地址，比如设置open=“docs/index.html”
+     */
+    open?: boolean | string
+
     /**
      * 服务器端口号
      */

package/bin/serve.js

@@ -6,6 +6,7 @@ const network = require("./tools/network.js");
 const mineTypes = require("./data/mineTypes.json");
 const resolve404 = require("./tools/resolve404.js");
 const resolveImportFactory = require("./tools/resolveImport.js");
+const openBrowser = require("./tools/openBrowser.js");
 const { doIntercept } = require("./intercept.js");
 const proxy = require("./proxy.js");
 
@@ -175,6 +176,13 @@ module.exports = function (config) {
     for (let ipv4Item of networkValue.IPv4) console.log('<i> \x1b[1m\x1b[32m[' + name + '] On Your Network (IPv4):\x1b[36m http://' + ipv4Item.address + ':' + port + '/\x1b[0m');
     for (let ipv6Item of networkValue.IPv6) console.log('<i> \x1b[1m\x1b[32m[' + name + '] On Your Network (IPv6): \x1b[36mhttp://[' + ipv6Item.address + ']:' + port + '/\x1b[0m');
     console.log('<i> \x1b[1m\x1b[32m[' + name + '] Content not from ' + (config.name || "OIPage") + ' is served from \x1b[36m"' + basePath + '" \x1b[0mdirectory');
+
+    if (typeof config.devServer.open === "string" || config.devServer.open) {
+        let url = 'http://localhost:' + port + "/" + (typeof config.devServer.open === "string" ? config.devServer.open : "");
+        openBrowser(url);
+        console.log('<i> \x1b[1m\x1b[32m[' + name + '] Open: \x1b[36m' + url + '\x1b[0m');
+    }
+
     if (!cache) console.log('<i> \x1b[1m\x1b[32m[' + name + '] Cancel 304 Cache!\x1b[0m');
-    console.log('\n' + (config.name || "OIPage") + ' ' + version + ' compiled \x1b[1m\x1b[32msuccessfully\x1b[0m in ' + (new Date().valueOf() - startTime) + ' ms\n')
+    console.log('\n' + (config.name || "OIPage") + ' ' + version + ' compiled \x1b[1m\x1b[32msuccessfully\x1b[0m in ' + (new Date().valueOf() - startTime) + ' ms\n');
 };