oipage 1.6.0 → 1.7.0-alpha.1

package/bin/WebSocket/encodeWsFrame.js

@@ -1,28 +1,28 @@
-
-// 处理发出的数据
-module.exports = function encodeWsFrame(data) {
-    const isFinal = data.isFinal !== undefined ? data.isFinal : true,
-        opcode = data.opcode !== undefined ? data.opcode : 1,
-        payloadData = data.payloadData ? Buffer.from(data.payloadData) : null,
-        payloadLen = payloadData ? payloadData.length : 0;
-
-    let frame = [];
-
-    if (isFinal) frame.push((1 << 7) + opcode);
-    else frame.push(opcode);
-
-    if (payloadLen < 126) {
-        frame.push(payloadLen);
-    } else if (payloadLen < 65536) {
-        frame.push(126, payloadLen >> 8, payloadLen & 0xFF);
-    } else {
-        frame.push(127);
-        for (let i = 7; i >= 0; --i) {
-            frame.push((payloadLen & (0xFF << (i * 8))) >> (i * 8));
-        }
-    }
-
-    frame = payloadData ? Buffer.concat([Buffer.from(frame), payloadData]) : Buffer.from(frame);
-
-    return frame;
-};
+
+// 处理发出的数据
+module.exports = function encodeWsFrame(data) {
+    const isFinal = data.isFinal !== undefined ? data.isFinal : true,
+        opcode = data.opcode !== undefined ? data.opcode : 1,
+        payloadData = data.payloadData ? Buffer.from(data.payloadData) : null,
+        payloadLen = payloadData ? payloadData.length : 0;
+
+    let frame = [];
+
+    if (isFinal) frame.push((1 << 7) + opcode);
+    else frame.push(opcode);
+
+    if (payloadLen < 126) {
+        frame.push(payloadLen);
+    } else if (payloadLen < 65536) {
+        frame.push(126, payloadLen >> 8, payloadLen & 0xFF);
+    } else {
+        frame.push(127);
+        for (let i = 7; i >= 0; --i) {
+            frame.push((payloadLen & (0xFF << (i * 8))) >> (i * 8));
+        }
+    }
+
+    frame = payloadData ? Buffer.concat([Buffer.from(frame), payloadData]) : Buffer.from(frame);
+
+    return frame;
+};

package/bin/WebSocket/headersToJSON.js

@@ -1,26 +1,26 @@
-module.exports = function (headersStr) {
-
-    let headersArray = headersStr.split(/\r{0,1}\n/);
-    let headersJSON = {};
-
-    // 第一行的内容：GET / HTTP/1.1
-    let firstLine = headersArray.shift().split(' ');
-    headersJSON.method = firstLine[0];
-    headersJSON.url = firstLine[1];
-    headersJSON.protocol = firstLine[2];
-
-    for (let item of headersArray) {
-        let temp = item.split(':');
-
-        if (temp.length > 1) {
-
-            let key = temp.shift();
-            let value = temp.join(':');
-
-            headersJSON[key] = value.trim();
-
-        }
-    }
-
-    return headersJSON;
-};
+module.exports = function (headersStr) {
+
+    let headersArray = headersStr.split(/\r{0,1}\n/);
+    let headersJSON = {};
+
+    // 第一行的内容：GET / HTTP/1.1
+    let firstLine = headersArray.shift().split(' ');
+    headersJSON.method = firstLine[0];
+    headersJSON.url = firstLine[1];
+    headersJSON.protocol = firstLine[2];
+
+    for (let item of headersArray) {
+        let temp = item.split(':');
+
+        if (temp.length > 1) {
+
+            let key = temp.shift();
+            let value = temp.join(':');
+
+            headersJSON[key] = value.trim();
+
+        }
+    }
+
+    return headersJSON;
+};

package/bin/WebSocket/index.js

@@ -1,80 +1,80 @@
-const net = require('net');
-const crypto = require('crypto');
-
-const headersToJSON = require('./headersToJSON');
-const decodeWsFrame = require('./decodeWsFrame');
-const encodeWsFrame = require('./encodeWsFrame');
-
-module.exports = function (port, name, version) {
-    let sockets = [];
-
-    let handler = {
-        notifyBrowser: (msg) => {
-            for (let socket of sockets) {
-                socket.write(encodeWsFrame(msg));
-            }
-        }
-    };
-
-    const server = net.createServer(socket => {
-
-        // 错误
-        socket.on('error', (error) => {
-            console.log('Connection error:', error.message);
-        });
-
-        // 数据
-        socket.on('data', buffer => {
-            console.log('Connection data:' + (decodeWsFrame(buffer).payloadData?.toString() || "断开连接......"));
-        });
-
-        // 连接
-        socket.once('data', buffer => {
-
-            // 把请求头变成容易操作的json
-            const headers = headersToJSON(buffer.toString());
-
-            // 如果是ws请求
-            // 就需要建立连接
-            if (headers.Upgrade == 'websocket') {
-
-                if (headers['Sec-WebSocket-Version'] !== '13') {
-                    console.log('\r\n警告：当前WebSocket版本为' + headers['Sec-WebSocket-Version'] + "，可能存在兼容问题~\r\n");
-                }
-
-                // 开始连接
-                /*
-                    协议中规定的校验用GUID，可参考如下链接：
-                    https://tools.ietf.org/html/rfc6455#section-5.5.2
-                    https://stackoverflow.com/questions/13456017/what-does-258eafa5-e914-47da-95ca-c5ab0dc85b11-means-in-websocket-protocol
-                */
-                const GUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
-                const key = headers['Sec-WebSocket-Key'];
-                const hash = crypto.createHash('sha1');  // 创建一个签名算法为sha1的哈希对象
-
-                hash.update(`${key}${GUID}`);  // 将key和GUID连接后，更新到hash
-                const result = hash.digest('base64'); // 生成base64字符串
-                const header = `HTTP/1.1 101 Switching Protocols\r\nServer: Powered by ${name}@${version}\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-Websocket-Accept: ${result}\r\n\r\n`; // 生成供前端校验用的请求头
-
-                socket.write(header);  // 返回HTTP头，告知客户端校验结果，HTTP状态码101表示切换协议：https://httpstatuses.com/101。
-                // 若客户端校验结果正确，在控制台的Network模块可以看到HTTP请求的状态码变为101 Switching Protocols，同时客户端的ws.onopen事件被触发。
-
-                sockets.push(socket);
-            }
-
-            // 否则就普通的，
-            // 普通的由http服务器提供支持
-            else {
-                socket.end();
-
-            }
-        });
-    });
-
-    // 启动
-    server.listen(port);
-
-    console.log('<i> \x1b[1m\x1b[32m[' + name + '] Loopback: \x1b[36mws://localhost:' + port + '/\x1b[0m\n');
-
-    return handler;
-};
+const net = require('net');
+const crypto = require('crypto');
+
+const headersToJSON = require('./headersToJSON');
+const decodeWsFrame = require('./decodeWsFrame');
+const encodeWsFrame = require('./encodeWsFrame');
+
+module.exports = function (port, name, version) {
+    let sockets = [];
+
+    let handler = {
+        notifyBrowser: (msg) => {
+            for (let socket of sockets) {
+                socket.write(encodeWsFrame(msg));
+            }
+        }
+    };
+
+    const server = net.createServer(socket => {
+
+        // 错误
+        socket.on('error', (error) => {
+            console.log('Connection error:', error.message);
+        });
+
+        // 数据
+        socket.on('data', buffer => {
+            console.log('Connection data:' + (decodeWsFrame(buffer).payloadData?.toString() || "断开连接......"));
+        });
+
+        // 连接
+        socket.once('data', buffer => {
+
+            // 把请求头变成容易操作的json
+            const headers = headersToJSON(buffer.toString());
+
+            // 如果是ws请求
+            // 就需要建立连接
+            if (headers.Upgrade == 'websocket') {
+
+                if (headers['Sec-WebSocket-Version'] !== '13') {
+                    console.log('\r\n警告：当前WebSocket版本为' + headers['Sec-WebSocket-Version'] + "，可能存在兼容问题~\r\n");
+                }
+
+                // 开始连接
+                /*
+                    协议中规定的校验用GUID，可参考如下链接：
+                    https://tools.ietf.org/html/rfc6455#section-5.5.2
+                    https://stackoverflow.com/questions/13456017/what-does-258eafa5-e914-47da-95ca-c5ab0dc85b11-means-in-websocket-protocol
+                */
+                const GUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11';
+                const key = headers['Sec-WebSocket-Key'];
+                const hash = crypto.createHash('sha1');  // 创建一个签名算法为sha1的哈希对象
+
+                hash.update(`${key}${GUID}`);  // 将key和GUID连接后，更新到hash
+                const result = hash.digest('base64'); // 生成base64字符串
+                const header = `HTTP/1.1 101 Switching Protocols\r\nServer: Powered by ${name}@${version}\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-Websocket-Accept: ${result}\r\n\r\n`; // 生成供前端校验用的请求头
+
+                socket.write(header);  // 返回HTTP头，告知客户端校验结果，HTTP状态码101表示切换协议：https://httpstatuses.com/101。
+                // 若客户端校验结果正确，在控制台的Network模块可以看到HTTP请求的状态码变为101 Switching Protocols，同时客户端的ws.onopen事件被触发。
+
+                sockets.push(socket);
+            }
+
+            // 否则就普通的，
+            // 普通的由http服务器提供支持
+            else {
+                socket.end();
+
+            }
+        });
+    });
+
+    // 启动
+    server.listen(port);
+
+    console.log('<i> \x1b[1m\x1b[32m[' + name + '] Loopback: \x1b[36mws://localhost:' + port + '/\x1b[0m\n');
+
+    return handler;
+};

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

@@ -1,44 +1,44 @@
-const packageValue = require("../package.json");
-
-module.exports = function () {
-    console.log(`\x1b[36m
-OIPage@v${packageValue.version}
-
-可以使用的命令如下：
-
-【1】oipage-cli serve 开发服务器
-    --port|-p [端口号]
-        默认8080
-    --baseUrl [文件夹地址]
-        服务器根目录
-    --config|-c [配置文件地址]
-        设置配置文件，相对地址是相对当前命令行
-    --cache [true|false]
-        是否启用304（默认true表示开启）
-    （eg: oipage-cli serve -p 20000 ）
-
-【2】oipage-cli disk 磁盘操作
-    --force|-f 
-        强制执行，如果目标地址已有内容，会直接强制删除已有内容
-    --delete|-d [文件或文件夹地址]
-        删除文件或文件夹
-    --delempty [文件夹地址]
-        删除空文件夹
-    --move|-m [源地址] [软链接地址]
-        移动文件或文件夹
-    --copy|-c [源地址] [目标地址]
-        复制文件或文件夹
-    --link|-l [源地址] [软链接地址]
-        创建磁盘链接
-    （eg: oipage-cli disk -m ./test.js ~/test.js -f ）
-
-【3】oipage-cli run "任务一" "任务二" ... 运行多命令
-    ( 如果希望动态给任务传递参数，可以查看： https://github.com/oi-contrib/OIPage/issues/5 )
-
-【4】oipage-cli network 网络相关
-    --log 
-        打印网络信息
-    （eg: oipage-cli network --log ）
-\x1b[0m`);
-
+const packageValue = require("../package.json");
+
+module.exports = function () {
+    console.log(`\x1b[36m
+OIPage@v${packageValue.version}
+
+可以使用的命令如下：
+
+【1】oipage-cli serve 开发服务器
+    --port|-p [端口号]
+        默认8080
+    --baseUrl [文件夹地址]
+        服务器根目录
+    --config|-c [配置文件地址]
+        设置配置文件，相对地址是相对当前命令行
+    --cache [true|false]
+        是否启用304（默认true表示开启）
+    （eg: oipage-cli serve -p 20000 ）
+
+【2】oipage-cli disk 磁盘操作
+    --force|-f 
+        强制执行，如果目标地址已有内容，会直接强制删除已有内容
+    --delete|-d [文件或文件夹地址]
+        删除文件或文件夹
+    --delempty [文件夹地址]
+        删除空文件夹
+    --move|-m [源地址] [软链接地址]
+        移动文件或文件夹
+    --copy|-c [源地址] [目标地址]
+        复制文件或文件夹
+    --link|-l [源地址] [软链接地址]
+        创建磁盘链接
+    （eg: oipage-cli disk -m ./test.js ~/test.js -f ）
+
+【3】oipage-cli run "任务一" "任务二" ... 运行多命令
+    ( 如果希望动态给任务传递参数，可以查看： https://github.com/oi-contrib/OIPage/issues/5 )
+
+【4】oipage-cli network 网络相关
+    --log 
+        打印网络信息
+    （eg: oipage-cli network --log ）
+\x1b[0m`);
+
 };