oipage 1.3.1-alpha.0 → 1.3.1

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

@@ -1,16 +1,16 @@
-exports.doIntercept = function (url, intercept, request, response) {
-    for (let item of intercept) {
-        if (item.test.test(url)) {
-            item.handler(request, response);
-            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) {
+    for (let item of intercept) {
+        if (item.test.test(url)) {
+            item.handler(request, response);
+            return true;
+        }
+    }
+}
+
+exports.testIntercept = function (url, intercept) {
+    for (let item of intercept) {
+        if (item.test.test(url)) {
+            return true;
+        }
+    }
 }

package/bin/run

@@ -1,97 +1,97 @@
-#!/usr/bin/env node
-
-'use strict';
-
-process.title = 'OIPage';
-
-const { exec } = require('child_process');
-const { join } = require("path");
-const { existsSync, lstatSync } = require("fs");
-const { mergeOption } = require("vislite");
-const { formatArgv } = require("./tools/format.js");
-
-// 开发服务器
-if (process.argv[2] === "serve") {
-
-    let argvObj = formatArgv(process.argv, {
-        "-p": "--port",
-        "-c": "--config"
-    });
-
-    let config = {
-        devServer: {
-            port: 8080,
-            baseUrl: "./",
-            intercept: []
-        },
-        module: {
-            rules: []
-        }
-    };
-
-    // 如果设置了配置文件
-    if (argvObj["--config"]) {
-        let configPath = join(process.cwd(), argvObj["--config"][0] || "./oipage.config.js");
-        if (existsSync(configPath) && !lstatSync(configPath).isDirectory()) {
-            let configValue = require(configPath);
-            mergeOption(config, configValue);
-        } else {
-            console.log("\x1b[0m\x1b[31m" + configPath + "\x1b[0m");
-            throw new Error("OIPage: The configuration file does not exist or is not a file.");
-        }
-    }
-
-    if ((argvObj["--port"] || [])[0]) config.devServer.port = (argvObj["--port"] || [])[0];
-    if ((argvObj["--baseUrl"] || [])[0]) config.devServer.baseUrl = (argvObj["--baseUrl"] || [])[0];
-
-    require("./serve.js")(config);
-}
-
-// 磁盘操作
-else if (process.argv[2] === "disk") {
-
-    let argvObj = formatArgv(process.argv, {
-        "-f": "--force",
-        "-d": "--delete",
-        "-m": "--move",
-        "-c": "--copy"
-    }, true);
-
-    require("./disk.js")(argvObj);
-}
-
-// 运行多命令
-else if (process.argv[2] === "run") {
-
-    let argvObj = formatArgv(process.argv, {});
-
-    for (let index = 0; index < argvObj.args.length; index++) {
-        const child = exec(argvObj.args[index]);
-
-        // 监听子线程的stdout
-        child.stdout.on('data', (data) => {
-            console.log(`[${index + 1}] log:${data}`);
-        });
-
-        // 监听子线程的stderr
-        child.stderr.on('data', (data) => {
-            console.error(`[${index + 1}] error:${data}`);
-        });
-
-        // 子线程结束处理
-        child.on('close', (code) => {
-            console.log(`[${index + 1}] 子线程结束，退出码 ${code}`);
-        });
-
-        // 子线程出错处理
-        child.on('error', (error) => {
-            console.error(`[${index + 1}] 子线程错误: ${error.message}`);
-        });
-    }
-
-}
-
-// 默认，帮助
-else {
-    require("./help.js")();
+#!/usr/bin/env node
+
+'use strict';
+
+process.title = 'OIPage';
+
+const { exec } = require('child_process');
+const { join } = require("path");
+const { existsSync, lstatSync } = require("fs");
+const { mergeOption } = require("vislite");
+const { formatArgv } = require("./tools/format.js");
+
+// 开发服务器
+if (process.argv[2] === "serve") {
+
+    let argvObj = formatArgv(process.argv, {
+        "-p": "--port",
+        "-c": "--config"
+    });
+
+    let config = {
+        devServer: {
+            port: 8080,
+            baseUrl: "./",
+            intercept: []
+        },
+        module: {
+            rules: []
+        }
+    };
+
+    // 如果设置了配置文件
+    if (argvObj["--config"]) {
+        let configPath = join(process.cwd(), argvObj["--config"][0] || "./oipage.config.js");
+        if (existsSync(configPath) && !lstatSync(configPath).isDirectory()) {
+            let configValue = require(configPath);
+            mergeOption(config, configValue);
+        } else {
+            console.log("\x1b[0m\x1b[31m" + configPath + "\x1b[0m");
+            throw new Error("OIPage: The configuration file does not exist or is not a file.");
+        }
+    }
+
+    if ((argvObj["--port"] || [])[0]) config.devServer.port = (argvObj["--port"] || [])[0];
+    if ((argvObj["--baseUrl"] || [])[0]) config.devServer.baseUrl = (argvObj["--baseUrl"] || [])[0];
+
+    require("./serve.js")(config);
+}
+
+// 磁盘操作
+else if (process.argv[2] === "disk") {
+
+    let argvObj = formatArgv(process.argv, {
+        "-f": "--force",
+        "-d": "--delete",
+        "-m": "--move",
+        "-c": "--copy"
+    }, true);
+
+    require("./disk.js")(argvObj);
+}
+
+// 运行多命令
+else if (process.argv[2] === "run") {
+
+    let argvObj = formatArgv(process.argv, {});
+
+    for (let index = 0; index < argvObj.args.length; index++) {
+        const child = exec(argvObj.args[index]);
+
+        // 监听子线程的stdout
+        child.stdout.on('data', (data) => {
+            console.log(`[${index + 1}] log:${data}`);
+        });
+
+        // 监听子线程的stderr
+        child.stderr.on('data', (data) => {
+            console.error(`[${index + 1}] error:${data}`);
+        });
+
+        // 子线程结束处理
+        child.on('close', (code) => {
+            console.log(`[${index + 1}] 子线程结束，退出码 ${code}`);
+        });
+
+        // 子线程出错处理
+        child.on('error', (error) => {
+            console.error(`[${index + 1}] 子线程错误: ${error.message}`);
+        });
+    }
+
+}
+
+// 默认，帮助
+else {
+    require("./help.js")();
 }

package/bin/serve.js

@@ -1,129 +1,129 @@
-const { join } = require("path");
-const { existsSync, lstatSync, statSync, createReadStream } = require("fs");
-const { createServer } = require('http');
-const packageValue = require("../package.json");
-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 { doIntercept } = require("./intercept.js");
-
-// 开发服务器
-module.exports = function (config) {
-    let startTime = new Date().valueOf();
-
-    const port = config.devServer.port; // 端口号
-    const basePath = (/^\./.test(config.devServer.baseUrl)) ? join(process.cwd(), config.devServer.baseUrl) : config.devServer.baseUrl; // 服务器根路径
-
-    let Server = createServer(function (request, response) {
-        let headers = request.headers;
-        let url = decodeURIComponent(request.url);
-
-        let urlArray = url.split("?");
-        url = urlArray[0];
-
-        // 请求的文件路径
-        let filePath = join(basePath, url == "/" ? "index.html" : url.replace(/^\//, ""));
-
-        // 请求拦截
-        if (doIntercept(url.replace(/^\/@modules\//, ""), config.devServer.intercept, request, response)) {
-            console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] intercept: " + url + '\x1b[0m ' + new Date().toLocaleString());
-        }
-
-        // 如果存在且是文件
-        else if (existsSync(filePath) && !lstatSync(filePath).isDirectory()) {
-
-            let dotName = /\./.test(filePath) ? filePath.match(/\.([^.]+)$/)[1] : "";
-            let fileType = mineTypes[dotName]; // 文件类型
-            let fileInfo = statSync(filePath);
-
-            let fileModifiedTime = new Date(fileInfo.mtime).toString();
-
-            let responseHeader = {
-                'Content-type': (fileType || "text/plain") + ";charset=utf-8",
-                'Access-Control-Allow-Origin': '*',
-                'Server': 'Powered by OIPage-dev-server@' + packageValue.version,
-                'Cache-Control': 'no-cache',
-                'Last-Modified': fileModifiedTime
-            };
-
-            if (headers["if-modified-since"]) {
-                let ifModifiedSince = new Date(headers["if-modified-since"]).valueOf()
-                let lastModified = new Date(fileModifiedTime).valueOf()
-                if (lastModified <= ifModifiedSince) {
-                    response.writeHead('304', responseHeader);
-                    response.end();
-                    console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Cache File: " + url + "\x1b[0m " + new Date().toLocaleString() + "\x1b[33m\x1b[1m 304\x1b[0m");
-                    return;
-                }
-            }
-
-            let sendType = "";
-            let entry = headers.accept !== "*/*";
-
-            // 如果文件小于10M，认为不大，直接读取
-            if (fileInfo.size < 10 * 1024 * 1024) {
-                let { source, resolveImport } = resolveImportFactory(basePath, filePath, entry, config.devServer.intercept, urlArray[1] === "download")
-
-                // 只处理非下载文件
-                // 过大的也不进行处理
-                if (urlArray[1] !== "download") {
-                    for (let i = 0; i < config.module.rules.length; i++) {
-                        if (config.module.rules[i].test.test(filePath)) {
-                            source = config.module.rules[i].use.call({
-                                root: basePath, // 服务器根路径
-                                path: filePath.replace(basePath, ""), // 文件相对路径
-                                entry, // 是否是浏览器地址栏直接访问
-                                setFileType(_fileType) { // 设置文件类型
-                                    fileType = _fileType;
-                                    responseHeader['Content-type'] = _fileType + ";charset=utf-8";
-                                }
-                            }, source);
-                            break;
-                        }
-                    }
-                }
-
-                sendType = "Read";
-                response.writeHead('200', responseHeader);
-                response.write(resolveImport(source, fileType !== "application/javascript"));
-                response.end();
-            }
-
-            // 对于大文件，使用流读取
-            else {
-                sendType = "Stream";
-                responseHeader["Content-Length"] = fileInfo.size;
-                response.writeHead('200', responseHeader);
-                createReadStream(filePath).pipe(response);
-            }
-
-            console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] " + sendType + " File: " + url + '\x1b[0m ' + new Date().toLocaleString());
-        }
-
-        // 否则就是404
-        else {
-            response.writeHead(404, {
-                'Content-type': "text/html;charset=utf-8",
-                'Access-Control-Allow-Origin': '*',
-                'Server': 'Powered by OIPage-dev-server@' + packageValue.version
-            });
-            response.write(resolve404(filePath, url));
-            response.end();
-        }
-
-    });
-
-    Server.listen(port);
-
-    // 获取网络信息
-    let networkValue = network();
-
-    // 打印成功提示
-    console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] Project is running at:\x1b[0m');
-    console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] Loopback: \x1b[36mhttp://localhost:' + port + '/\x1b[0m');
-    for (let ipv4Item of networkValue.IPv4) console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] 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[OIPage-dev-server] On Your Network (IPv6): \x1b[36mhttp://[' + ipv6Item.address + ']:' + port + '/\x1b[0m');
-    console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] Content not from OIPage is served from \x1b[36m"' + basePath + '" \x1b[0mdirectory');
-    console.log('\nOIPage ' + packageValue.version + ' compiled \x1b[1m\x1b[32msuccessfully\x1b[0m in ' + (new Date().valueOf() - startTime) + ' ms\n')
+const { join } = require("path");
+const { existsSync, lstatSync, statSync, createReadStream } = require("fs");
+const { createServer } = require('http');
+const packageValue = require("../package.json");
+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 { doIntercept } = require("./intercept.js");
+
+// 开发服务器
+module.exports = function (config) {
+    let startTime = new Date().valueOf();
+
+    const port = config.devServer.port; // 端口号
+    const basePath = (/^\./.test(config.devServer.baseUrl)) ? join(process.cwd(), config.devServer.baseUrl) : config.devServer.baseUrl; // 服务器根路径
+
+    let Server = createServer(function (request, response) {
+        let headers = request.headers;
+        let url = decodeURIComponent(request.url);
+
+        let urlArray = url.split("?");
+        url = urlArray[0];
+
+        // 请求的文件路径
+        let filePath = join(basePath, url == "/" ? "index.html" : url.replace(/^\//, ""));
+
+        // 请求拦截
+        if (doIntercept(url.replace(/^\/@modules\//, ""), config.devServer.intercept, request, response)) {
+            console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] intercept: " + url + '\x1b[0m ' + new Date().toLocaleString());
+        }
+
+        // 如果存在且是文件
+        else if (existsSync(filePath) && !lstatSync(filePath).isDirectory()) {
+
+            let dotName = /\./.test(filePath) ? filePath.match(/\.([^.]+)$/)[1] : "";
+            let fileType = mineTypes[dotName]; // 文件类型
+            let fileInfo = statSync(filePath);
+
+            let fileModifiedTime = new Date(fileInfo.mtime).toGMTString();
+
+            let responseHeader = {
+                'Content-type': (fileType || "text/plain") + ";charset=utf-8",
+                'Access-Control-Allow-Origin': '*',
+                'Server': 'Powered by OIPage-dev-server@' + packageValue.version,
+                'Cache-Control': 'no-cache',
+                'Last-Modified': fileModifiedTime
+            };
+
+            if (headers["if-modified-since"]) {
+                let ifModifiedSince = new Date(headers["if-modified-since"]).valueOf()
+                let lastModified = new Date(fileModifiedTime).valueOf()
+                if (lastModified <= ifModifiedSince) {
+                    response.writeHead('304', responseHeader);
+                    response.end();
+                    console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Cache File: " + url + "\x1b[0m " + new Date().toLocaleString() + "\x1b[33m\x1b[1m 304\x1b[0m");
+                    return;
+                }
+            }
+
+            let sendType = "";
+            let entry = headers.accept !== "*/*";
+
+            // 如果文件小于10M，认为不大，直接读取
+            if (fileInfo.size < 10 * 1024 * 1024) {
+                let { source, resolveImport } = resolveImportFactory(basePath, filePath, entry, config.devServer.intercept, urlArray[1] === "download")
+
+                // 只处理非下载文件
+                // 过大的也不进行处理
+                if (urlArray[1] !== "download") {
+                    for (let i = 0; i < config.module.rules.length; i++) {
+                        if (config.module.rules[i].test.test(filePath)) {
+                            source = config.module.rules[i].use.call({
+                                root: basePath, // 服务器根路径
+                                path: filePath.replace(basePath, ""), // 文件相对路径
+                                entry, // 是否是浏览器地址栏直接访问
+                                setFileType(_fileType) { // 设置文件类型
+                                    fileType = _fileType;
+                                    responseHeader['Content-type'] = _fileType + ";charset=utf-8";
+                                }
+                            }, source);
+                            break;
+                        }
+                    }
+                }
+
+                sendType = "Read";
+                response.writeHead('200', responseHeader);
+                response.write(resolveImport(source, fileType !== "application/javascript"));
+                response.end();
+            }
+
+            // 对于大文件，使用流读取
+            else {
+                sendType = "Stream";
+                responseHeader["Content-Length"] = fileInfo.size;
+                response.writeHead('200', responseHeader);
+                createReadStream(filePath).pipe(response);
+            }
+
+            console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] " + sendType + " File: " + url + '\x1b[0m ' + new Date().toLocaleString());
+        }
+
+        // 否则就是404
+        else {
+            response.writeHead(404, {
+                'Content-type': "text/html;charset=utf-8",
+                'Access-Control-Allow-Origin': '*',
+                'Server': 'Powered by OIPage-dev-server@' + packageValue.version
+            });
+            response.write(resolve404(filePath, url));
+            response.end();
+        }
+
+    });
+
+    Server.listen(port);
+
+    // 获取网络信息
+    let networkValue = network();
+
+    // 打印成功提示
+    console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] Project is running at:\x1b[0m');
+    console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] Loopback: \x1b[36mhttp://localhost:' + port + '/\x1b[0m');
+    for (let ipv4Item of networkValue.IPv4) console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] 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[OIPage-dev-server] On Your Network (IPv6): \x1b[36mhttp://[' + ipv6Item.address + ']:' + port + '/\x1b[0m');
+    console.log('<i> \x1b[1m\x1b[32m[OIPage-dev-server] Content not from OIPage is served from \x1b[36m"' + basePath + '" \x1b[0mdirectory');
+    console.log('\nOIPage ' + packageValue.version + ' compiled \x1b[1m\x1b[32msuccessfully\x1b[0m in ' + (new Date().valueOf() - startTime) + ' ms\n')
 };