oipage 1.4.0-alpha.1 → 1.4.1-alpha.0

package/bin/tools/format.js

@@ -1,76 +1,76 @@
-/**
- * 把字节转换成更可读的内容
- * @param {*} value 
- * @returns 
- */
-exports.formatByte = function (value) {
-    if (value < 1024) return value + "Byte";
-
-    let kb = value / 1024;
-    if (kb < 1024) return kb.toFixed(1) + "KB";
-
-    let mb = kb / 1024;
-    if (mb < 1024) return mb.toFixed(1) + "MB";
-
-    let gb = mb / 1024;
-    return gb.toFixed(1) + "GB";
-};
-
-/**
- * 把时间变成更可读的格式
- * @param {*} value 
- * @returns 
- */
-exports.formatTime = function (value) {
-    let year = value.getFullYear();
-    let month = value.getMonth() + 1;
-    let day = value.getDate();
-
-    let hour = value.getHours();
-    let minutes = value.getMinutes();
-
-    let today = new Date();
-    if (year == today.getFullYear() && month == today.getMonth() + 1 && day == today.getDate()) {
-        return "今天 " + hour + ":" + minutes;
-    } else {
-        return year + "年" + month + "月" + day + "日 " + hour + ":" + minutes;
-    }
-};
-
-/**
- * 命令行参数解析
- * @param {*} argvs 
- * @param {*} shorts 
- * @param {*} isArray 是否按序号记录
- * @returns 
- */
-exports.formatArgv = function (argvs, shorts, isArray) {
-    let result = {}, keyName = "args", value = [];
-    if (isArray) result["value"] = [];
-
-    let pushValue = function () {
-        if (isArray && keyName !== "args") {
-            result["value"].push({
-                name: keyName,
-                value
-            });
-        } else {
-            result[keyName] = value;
-        }
-    };
-
-    for (let index = 3; index < argvs.length; index++) {
-        let argv = argvs[index];
-
-        if (/^\-/.test(argv)) {
-            pushValue();
-            keyName = shorts[argv] || argv;
-            value = [];
-        } else {
-            value.push(argv);
-        }
-    }
-    pushValue();
-
-    return result;
+/**
+ * 把字节转换成更可读的内容
+ * @param {*} value 
+ * @returns 
+ */
+exports.formatByte = function (value) {
+    if (value < 1024) return value + "Byte";
+
+    let kb = value / 1024;
+    if (kb < 1024) return kb.toFixed(1) + "KB";
+
+    let mb = kb / 1024;
+    if (mb < 1024) return mb.toFixed(1) + "MB";
+
+    let gb = mb / 1024;
+    return gb.toFixed(1) + "GB";
+};
+
+/**
+ * 把时间变成更可读的格式
+ * @param {*} value 
+ * @returns 
+ */
+exports.formatTime = function (value) {
+    let year = value.getFullYear();
+    let month = value.getMonth() + 1;
+    let day = value.getDate();
+
+    let hour = value.getHours();
+    let minutes = value.getMinutes();
+
+    let today = new Date();
+    if (year == today.getFullYear() && month == today.getMonth() + 1 && day == today.getDate()) {
+        return "今天 " + hour + ":" + minutes;
+    } else {
+        return year + "年" + month + "月" + day + "日 " + hour + ":" + minutes;
+    }
+};
+
+/**
+ * 命令行参数解析
+ * @param {*} argvs 
+ * @param {*} shorts 
+ * @param {*} isArray 是否按序号记录
+ * @returns 
+ */
+exports.formatArgv = function (argvs, shorts, isArray) {
+    let result = {}, keyName = "args", value = [];
+    if (isArray) result["value"] = [];
+
+    let pushValue = function () {
+        if (isArray && keyName !== "args") {
+            result["value"].push({
+                name: keyName,
+                value
+            });
+        } else {
+            result[keyName] = value;
+        }
+    };
+
+    for (let index = 3; index < argvs.length; index++) {
+        let argv = argvs[index];
+
+        if (/^\-/.test(argv)) {
+            pushValue();
+            keyName = shorts[argv] || argv;
+            value = [];
+        } else {
+            value.push(argv);
+        }
+    }
+    pushValue();
+
+    return result;
 };

package/bin/tools/network.js

@@ -1,43 +1,43 @@
-const { networkInterfaces } = require("os");
-
-// 网络信息
-module.exports = function () {
-
-    let infomation = {
-        IPv4: [],
-        IPv6: []
-    };
-
-    let networks = networkInterfaces();
-
-    let IPv4Had = {}, IPv6Had = {};
-
-    for (let typeName in networks) {
-        let network = networks[typeName]
-        for (let index = 0; index < network.length; index++) {
-            if (network[index].mac != "00:00:00:00:00:00") {
-                if (network[index].family == 'IPv4' && network[index].address != '127.0.0.1') {
-                    if (!IPv4Had[network[index].mac]) {
-                        infomation.IPv4.push({
-                            address: network[index].address,
-                            mac: network[index].mac
-                        });
-
-                        IPv4Had[network[index].mac] = true;
-                    }
-                } else if (network[index].family == 'IPv6' && network[index].address != '::1') {
-                    if (!IPv6Had[network[index].mac]) {
-                        infomation.IPv6.push({
-                            address: network[index].address,
-                            mac: network[index].mac
-                        });
-
-                        IPv6Had[network[index].mac] = true;
-                    }
-                }
-            }
-        }
-    }
-
-    return infomation;
+const { networkInterfaces } = require("os");
+
+// 网络信息
+module.exports = function () {
+
+    let infomation = {
+        IPv4: [],
+        IPv6: []
+    };
+
+    let networks = networkInterfaces();
+
+    let IPv4Had = {}, IPv6Had = {};
+
+    for (let typeName in networks) {
+        let network = networks[typeName]
+        for (let index = 0; index < network.length; index++) {
+            if (network[index].mac != "00:00:00:00:00:00") {
+                if (network[index].family == 'IPv4' && network[index].address != '127.0.0.1') {
+                    if (!IPv4Had[network[index].mac]) {
+                        infomation.IPv4.push({
+                            address: network[index].address,
+                            mac: network[index].mac
+                        });
+
+                        IPv4Had[network[index].mac] = true;
+                    }
+                } else if (network[index].family == 'IPv6' && network[index].address != '::1') {
+                    if (!IPv6Had[network[index].mac]) {
+                        infomation.IPv6.push({
+                            address: network[index].address,
+                            mac: network[index].mac
+                        });
+
+                        IPv6Had[network[index].mac] = true;
+                    }
+                }
+            }
+        }
+    }
+
+    return infomation;
 };

package/bin/tools/resolve404.js

@@ -1,84 +1,84 @@
-const { readdirSync, lstatSync, readFileSync, statSync } = require("fs");
-const { join } = require("path");
-const { formatByte, formatTime } = require("./format");
-const mineTypes = require("../data/mineTypes.json");
-
-const img_folder = "data:image/png;base64," + readFileSync(join(__dirname, "../images/folder.png")).toString('base64');
-const img_file = "data:image/png;base64," + readFileSync(join(__dirname, "../images/file.png")).toString('base64');
-
-const template_404 = readFileSync(join(__dirname, "../template/404.html"), {
-    encoding: "utf8"
-})
-    .replace("${img_folder}", img_folder)
-    .replace("${img_file}", img_file);
-
-module.exports = function (filePath, url) {
-
-    let subItems = [];
-
-    try {
-        subItems = readdirSync(filePath);
-        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read Folder: " + url + '\x1b[0m ' + new Date().toLocaleString());
-    } catch (e) {
-        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read " + (/\/$/.test(url) ? "Folder" : "File") + ": \x1b[35m" + url + ' 404 Not Found\x1b[0m ' + new Date().toLocaleString());
-        try {
-            if (!/\/$/.test(url) || url === "/") {
-                filePath = join(filePath, "../");
-                subItems = readdirSync(filePath);
-            }
-        } catch (e) { }
-    }
-
-    let template = "";
-    for (let i in subItems) {
-        let isDirectory = lstatSync(join(filePath, subItems[i])).isDirectory();
-        let statObj = statSync(join(filePath, subItems[i]));
-
-        // 文件夹
-        if (isDirectory) {
-            template += `<tr class="folder">
-            <th class="name">
-                <a href='./${subItems[i]}/'>${subItems[i]}</a>
-            </th>
-            <th>
-                ${formatTime(statObj.mtime)}
-            </th>
-            <th>
-                文件夹
-            </th>
-            <th>
-                -
-            </th>
-            <th>
-                <a href='./${subItems[i]}/' class="btn">打开</a>
-            </th>
-        </tr>`;
-        }
-
-        // 文件
-        else {
-            let dotName = /\./.test(subItems[i]) ? subItems[i].match(/\.([^.]+)$/)[1] : "";
-
-            template += `<tr class="file">
-            <th class="name">
-                <a href='./${subItems[i]}'>${subItems[i]}</a>
-            </th>
-            <th>
-                ${formatTime(statObj.mtime)}
-            </th>
-            <th>
-                ${mineTypes[dotName] || "text/plain"}
-            </th>
-            <th>
-            ${formatByte(statObj.size)}
-        </th>
-            <th>
-                <a href='./${subItems[i]}' class="btn">访问</a>
-                <a href='./${subItems[i]}?download' class="btn" download='${subItems[i]}'>下载</a>
-            </th>
-        </tr>`;
-        }
-    }
-
-    return template_404.replace("${current}", filePath).replace("${template}", template);
+const { readdirSync, lstatSync, readFileSync, statSync } = require("fs");
+const { join } = require("path");
+const { formatByte, formatTime } = require("./format");
+const mineTypes = require("../data/mineTypes.json");
+
+const img_folder = "data:image/png;base64," + readFileSync(join(__dirname, "../images/folder.png")).toString('base64');
+const img_file = "data:image/png;base64," + readFileSync(join(__dirname, "../images/file.png")).toString('base64');
+
+const template_404 = readFileSync(join(__dirname, "../template/404.html"), {
+    encoding: "utf8"
+})
+    .replace("${img_folder}", img_folder)
+    .replace("${img_file}", img_file);
+
+module.exports = function (filePath, url) {
+
+    let subItems = [];
+
+    try {
+        subItems = readdirSync(filePath);
+        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read Folder: " + url + '\x1b[0m ' + new Date().toLocaleString());
+    } catch (e) {
+        console.log("<i> \x1b[1m\x1b[32m[OIPage-dev-server] Read " + (/\/$/.test(url) ? "Folder" : "File") + ": \x1b[35m" + url + ' 404 Not Found\x1b[0m ' + new Date().toLocaleString());
+        try {
+            if (!/\/$/.test(url) || url === "/") {
+                filePath = join(filePath, "../");
+                subItems = readdirSync(filePath);
+            }
+        } catch (e) { }
+    }
+
+    let template = "";
+    for (let i in subItems) {
+        let isDirectory = lstatSync(join(filePath, subItems[i])).isDirectory();
+        let statObj = statSync(join(filePath, subItems[i]));
+
+        // 文件夹
+        if (isDirectory) {
+            template += `<tr class="folder">
+            <th class="name">
+                <a href='./${subItems[i]}/'>${subItems[i]}</a>
+            </th>
+            <th>
+                ${formatTime(statObj.mtime)}
+            </th>
+            <th>
+                文件夹
+            </th>
+            <th>
+                -
+            </th>
+            <th>
+                <a href='./${subItems[i]}/' class="btn">打开</a>
+            </th>
+        </tr>`;
+        }
+
+        // 文件
+        else {
+            let dotName = /\./.test(subItems[i]) ? subItems[i].match(/\.([^.]+)$/)[1] : "";
+
+            template += `<tr class="file">
+            <th class="name">
+                <a href='./${subItems[i]}'>${subItems[i]}</a>
+            </th>
+            <th>
+                ${formatTime(statObj.mtime)}
+            </th>
+            <th>
+                ${mineTypes[dotName] || "text/plain"}
+            </th>
+            <th>
+            ${formatByte(statObj.size)}
+        </th>
+            <th>
+                <a href='./${subItems[i]}' class="btn">访问</a>
+                <a href='./${subItems[i]}?download' class="btn" download='${subItems[i]}'>下载</a>
+            </th>
+        </tr>`;
+        }
+    }
+
+    return template_404.replace("${current}", filePath).replace("${template}", template);
 };

package/bin/tools/resolveImport.js

@@ -1,89 +1,89 @@
-const { readFileSync, existsSync, lstatSync } = require("fs");
-const { join } = require("path");
-const { testIntercept } = require("../intercept.js");
-
-module.exports = function (basePath, filePath, entry, intercept, isDownload) {
-    basePath = join(basePath, "./");
-
-    let source = readFileSync(filePath);
-    let resolveImport = content => content;
-
-    let __resolveImport = function (content) {
-        return content.replace(/import [^'"]* from (['"])([^'"]*)['"]/sg, function (_importCode, _, _importUrl) {
-            if (/^[./]/.test(_importUrl)) {
-                return _importCode;
-            } else {
-                return _importCode.replace(_importUrl, _importUrl.replace(/([^/])+/s, function (npmName) {
-
-                    if (testIntercept(npmName, intercept)) {
-                        return "/@modules/" + npmName;
-                    } else {
-
-                        let node_modulesRootPath = join(filePath, "../");
-                        let prePath = "";
-                        while (true) {
-                            let npmBundlePath = join(node_modulesRootPath, "./node_modules/", npmName);
-
-                            // 如果存在
-                            if (existsSync(npmBundlePath) && lstatSync(npmBundlePath).isDirectory()) {
-                                let npmNameValue = npmName;
-
-                                // 对于类似 import VISLite from "vislite"
-                                // 需要把包名解析成具体的文件
-                                if (!/\//.test(_importUrl)) {
-                                    let bundlePackage = require(join(npmBundlePath, "./package.json"));
-                                    npmNameValue = npmName + "/" + bundlePackage.main;
-                                }
-
-                                return (prePath ? prePath : "./") + "node_modules/" + npmNameValue;
-                            }
-
-                            if (node_modulesRootPath === basePath) {
-
-                                // 如果命令行根目录是一个项目
-                                let packagePath = join(basePath, "./package.json");
-                                if (existsSync(packagePath) && !lstatSync(packagePath).isDirectory()) {
-                                    let bundlePackage = require(packagePath);
-                                    if (!/\//.test(_importUrl)) {
-                                        return "/" + bundlePackage.main;
-                                    } else {
-                                        return "/"
-                                    }
-                                }
-
-                                return npmName;
-                            } else {
-                                node_modulesRootPath = join(node_modulesRootPath, "../");
-                                prePath = "../" + prePath;
-                            }
-                        }
-
-                    }
-                }));
-            }
-        });
-    };
-
-    // 如果是下载
-    if (isDownload) {
-        // todo
-    }
-
-    // 如果不是直接访问的
-    else if (!entry) {
-        source += "";
-        resolveImport = (content, notResolve) => notResolve ? content : __resolveImport(content);
-    }
-
-    // 如果是.html或.htm结尾
-    else if (/\.html{0,1}$/.test(filePath)) {
-        source = (source + "").replace(/<script type="module">(.*)<\/script>/sg, function (_, _matchCode) {
-            return `<script type="module">${__resolveImport(_matchCode)}</script>`;
-        });
-    }
-
-    return {
-        source,
-        resolveImport
-    };
+const { readFileSync, existsSync, lstatSync } = require("fs");
+const { join } = require("path");
+const { testIntercept } = require("../intercept.js");
+
+module.exports = function (basePath, filePath, entry, intercept, isDownload, isWebsite) {
+    basePath = join(basePath, "./");
+
+    let source = readFileSync(filePath);
+    let resolveImport = content => content;
+
+    let __resolveImport = function (content) {
+        return content.replace(/import [^'"]* from (['"])([^'"]*)['"]/sg, function (_importCode, _, _importUrl) {
+            if (/^[./]/.test(_importUrl)) {
+                return _importCode;
+            } else {
+                return _importCode.replace(_importUrl, _importUrl.replace(/([^/])+/s, function (npmName) {
+
+                    if (testIntercept(npmName, intercept)) {
+                        return (isWebsite ? "/_oipage_website_/@modules/" : "/@modules/") + npmName;
+                    } else {
+
+                        let node_modulesRootPath = join(filePath, "../");
+                        let prePath = "";
+                        while (true) {
+                            let npmBundlePath = join(node_modulesRootPath, "./node_modules/", npmName);
+
+                            // 如果存在
+                            if (existsSync(npmBundlePath) && lstatSync(npmBundlePath).isDirectory()) {
+                                let npmNameValue = npmName;
+
+                                // 对于类似 import VISLite from "vislite"
+                                // 需要把包名解析成具体的文件
+                                if (!/\//.test(_importUrl)) {
+                                    let bundlePackage = require(join(npmBundlePath, "./package.json"));
+                                    npmNameValue = npmName + "/" + bundlePackage.main;
+                                }
+
+                                return (prePath ? prePath : "./") + "node_modules/" + npmNameValue;
+                            }
+
+                            if (node_modulesRootPath === basePath) {
+
+                                // 如果命令行根目录是一个项目
+                                let packagePath = join(basePath, "./package.json");
+                                if (existsSync(packagePath) && !lstatSync(packagePath).isDirectory()) {
+                                    let bundlePackage = require(packagePath);
+                                    if (!/\//.test(_importUrl)) {
+                                        return "/" + bundlePackage.main;
+                                    } else {
+                                        return "/"
+                                    }
+                                }
+
+                                return npmName;
+                            } else {
+                                node_modulesRootPath = join(node_modulesRootPath, "../");
+                                prePath = "../" + prePath;
+                            }
+                        }
+
+                    }
+                }));
+            }
+        });
+    };
+
+    // 如果是下载
+    if (isDownload) {
+        // todo
+    }
+
+    // 如果不是直接访问的
+    else if (!entry) {
+        source += "";
+        resolveImport = (content, notResolve) => notResolve ? content : __resolveImport(content);
+    }
+
+    // 如果是.html或.htm结尾
+    else if (/\.html{0,1}$/.test(filePath)) {
+        source = (source + "").replace(/<script type="module">(.*)<\/script>/sg, function (_, _matchCode) {
+            return `<script type="module">${__resolveImport(_matchCode)}</script>`;
+        });
+    }
+
+    return {
+        source,
+        resolveImport
+    };
 };

package/bin/website-htmls/dialogs/index.js

@@ -0,0 +1,43 @@
+import { createApp } from "zipaper"
+
+const dialogs = {
+
+    // xxx
+    xxx: () => import("./xxx/index.js")
+}
+
+let dialogsResolve = []
+export default {
+    install(Zipaper) {
+
+        // 打开弹框
+        Zipaper.prototype.$openDialog = function (dialogName, callback) {
+            let el = document.createElement("div")
+
+            dialogs[dialogName]().then(App => {
+
+                // 准备好挂载点
+                el.setAttribute("class", "content " + dialogName)
+
+                // 创建并挂载
+                document.getElementById("dialog-root").appendChild(el)
+                createApp(App.default).mount(el)
+                if (callback) callback()
+            })
+
+            return new Promise((resolve) => {
+                dialogsResolve.push({
+                    resolve,
+                    el
+                })
+            })
+        }
+
+        // 关闭弹框
+        Zipaper.prototype.$closeDialog = function (data) {
+            let dialog = dialogsResolve.pop()
+            dialog.el.parentNode.removeChild(dialog.el);
+            dialog.resolve(data)
+        }
+    }
+}

package/bin/website-htmls/index.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>OIPage 应用市场</title>
+    <link rel="shortcut icon" href="./logo.png">
+    <link rel="stylesheet" href="./styles/normalize.css">
+    <link rel="stylesheet" href="./styles/common.css">
+</head>
+
+<body>
+    <div id="root"></div>
+    <script type="module" src="./main.js"></script>
+</body>
+
+</html>

package/bin/website-htmls/main.js

@@ -0,0 +1,10 @@
+import { createApp } from "zipaper"
+
+import App from "./pages/App/index.js"
+import router from "./router.config.js"
+import dialogs from "./dialogs/index.js"
+
+createApp(App)
+    .use(router) // 路由
+    .use(dialogs) // 弹框
+    .mount(document.getElementById("root")) // 挂载到页面