@kobalab/liulian 0.7.7 → 0.9.0

package/ChangeLog.md

@@ -1,3 +1,22 @@
+## v0.9.0 / 2022-04-03
+
+ - import モジュールで外部モジュールをインポートできるようにした
+ - pinyin モジュール(中国語のピンインを表示する)を追加
+ - paiga モジュール(麻雀の牌画像を表示する)を追加
+ - 脆弱性警告に対処(minimist 1.2.5 → 1.2.6)
+
+### v0.8.1 / 2022-01-24
+
+ - 脆弱性警告に対処(mocha 9.1.3 → 9.2.0)
+
+## v0.8.0 / 2021-12-30
+
+ - #4 自動バックアップの機能を追加
+ - redirect モジュールを追加
+ - アイコンを変更
+ - include モジュールの再帰的使用を検知できるようにした
+ - HEADとTAILを二重インクルードしないよう修正
+
 ### v0.7.7 / 2021-12-03
 
  - | のみの行があると異常終了するバグを修正

package/README.md

@@ -3,6 +3,9 @@
 <a href="https://kobalab.net/xiumai/"><img src="https://kobalab.net/xiumai/theme/xiumai.png" alt="XiuMai" height=24 valign=bottom></a>
 の後継。Node.jsで動作するWebサイト作成ツール。
 
+## デモ
+https://kobalab.net/liulian/
+
 ## インストール
 ```sh
 $ npm i -g @kobalab/liulian
@@ -33,6 +36,7 @@ $ liulian ~/Documents/LiuLian
  - [README と index](https://kobalab.net/liulian/man/readme&index)
  - [HEAD と TAIL](https://kobalab.net/liulian/man/head&tail)
  - [リバースプロキシを使う](https://kobalab.net/liulian/man/proxy-setting)
+ - [Gitで自動バックアップする](https://kobalab.net/liulian/man/git)
 
 ## ライセンス
 [MIT](https://github.com/kobalab/LiuLian/blob/master/LICENSE)

package/bin/liulian.js

@@ -17,6 +17,8 @@ const mount = argv.mount;
 
 require('../lib/setup')(home);
 
+const backup   = require('../lib/backup/git')(path.join(home, 'docs'));
+
 const locale   = require('../lib/util/locale')(
                             path.join(__dirname, '../locale'),
                             'en');
@@ -44,7 +46,8 @@ const liulian  = require('../lib/liulian')({
                             locale:   locale,
                             mount:    mount,
                             auth:     auth,
-                            passport: passport  });
+                            passport: passport,
+                            backup:   backup    });
 
 const app = express();
 

package/css/liulian.css

@@ -95,7 +95,7 @@ pre {
     background: #eee;
     overflow: auto;
     overflow-wrap: normal;
-    font-family: Osaka-Mono, "ＭＳ ゴシック", Courier, monospace;
+    font-family: Osaka-Mono, "HGｺﾞｼｯｸM", "ＭＳ ゴシック", Courier, monospace;
     font-size: 100%;
 }
 
@@ -151,7 +151,7 @@ input[disabled] {
 }
 textarea {
     padding: 4px;
-    font-family: Osaka-Mono, "ＭＳ ゴシック", Courier, monospace;
+    font-family: Osaka-Mono, "HGｺﾞｼｯｸM", "ＭＳ ゴシック", Courier, monospace;
     font-size: 100%;
     border: solid 1px #999;
     border-radius: 4px;
@@ -296,6 +296,38 @@ input[type="submit"] {
     width: 100%;
     height: 70vh;
 }
+#l-log .l-time {
+    text-align: right;
+}
+#l-diff {
+    border-radius: 0.2em;
+    border: solid 1px #080;
+    padding: 0;
+    background: #ddd;
+}
+#l-diff > * {
+    display: block;
+    padding: 2px 0.5em;
+    margin: 1px 0;
+    min-height: 1em;
+    font-family: Osaka-Mono, "ＭＳ ゴシック", Courier, monospace;
+    text-decoration: none;
+    white-space: pre-wrap;
+    color: #666;
+    background: #ffe;
+}
+#l-diff .l-head {
+    color: #999;
+    background: #cdf;
+}
+#l-diff ins {
+    color: #393;
+    background: #dfd;
+}
+#l-diff del {
+    color: #c33;
+    background: #fdd;
+}
 
 .l-error {
     color: red;

package/lib/backup/git.js

@@ -0,0 +1,96 @@
+/*
+ *  backup/git
+ */
+"use strict";
+
+const path     = require('path');
+const fs       = require('fs');
+const execSync = require('child_process').execFileSync;
+const exec     = require('util').promisify(require('child_process').execFile);
+const spawn    = require('child_process').spawn;
+
+class Git {
+
+    constructor(repodir) {
+        let git_dir   = path.join(repodir, '.git');
+        this._option  = [ '--git-dir=' + git_dir, '--work-tree=' + repodir ];
+        fs.statSync(git_dir);
+        execSync('git', this._option.concat('init'));
+        try {
+            execSync('git', this._option.concat('log'));
+        }
+        catch(e) {
+            execSync('git', this._option.concat([
+                                    'commit','--allow-empty','-m','.']));
+        }
+    }
+
+    async checkIn(location, time, user) {
+        let path = location.replace(/^\//,'');
+        let log  = await exec('git', this._option.concat([
+                                    'log','--oneline','--', path]));
+        let diff = await exec('git', this._option.concat(['diff','--', path]));
+        if (! log.stdout || diff.stdout) {
+            await exec('git', this._option.concat(['add', path]));
+            await exec('git', this._option.concat([
+                                    'commit','-m', `${time}:${user}`]));
+        }
+    }
+
+    async checkOut(location, rev) {
+        let path = location.replace(/^\//,'');
+        let rv = await exec('git', this._option.concat([
+                                        'show',`${rev}:${path}`]));
+        return rv.stdout;
+    }
+
+    checkOutStream(location, rev) {
+        let path = location.replace(/^\//,'');
+        let rv = spawn('git', this._option.concat([
+                                        'show',`${rev}:${path}`]));
+        return rv.stdout;
+    }
+
+    async log(location) {
+        let path = location.replace(/^\//,'');
+        let rv = await exec('git', this._option.concat([
+                            'log','--pretty=format:%h\t%s','--', path]));
+        let log = [];
+        if (! rv.stdout) return log;
+        for (let line of rv.stdout.split(/\n/)) {
+            let [rev, comment] = line.split(/\t/);
+            let [time, user] = comment.split(/:/);
+            log.push({ rev: rev, time: +time, user: user });
+        }
+        return log;
+    }
+
+    async diff(location, rev1, rev2) {
+        let rv;
+        let path = location.replace(/^\//,'');
+        if (rev2) {
+            rv = await exec('git', this._option.concat([
+                                    'diff',`${rev1}..${rev2}`,'--', path]));
+        }
+        else {
+            rv = await exec('git', this._option.concat([
+                                    'diff', rev1, '--', path]));
+        }
+        let diff = [], body;
+        for (let line of rv.stdout.split(/\n/)) {
+            if (line.match(/^@@/)) body = 1;
+            if (! body) continue;
+            diff.push(line);
+        }
+        return diff;
+    }
+}
+
+module.exports = function(repodir) {
+    try {
+        return new Git(repodir);
+    }
+    catch(e) {
+        return;
+    }
+}

package/lib/html/file.js

@@ -4,6 +4,7 @@
 "use strict";
 
 const { cdata, fixpath } = require('../util/html-escape');
+const { timeStr }        = require('../util/str-tool');
 
 const HTML = require('./');
 
@@ -15,19 +16,40 @@ module.exports = class File extends HTML {
     }
 
     _editmenu() {
+        let path = fixpath(this._r.location, this._req.baseUrl);
+        let rev  = this._req.param('rev');
+        let param = this._req.cmd == 'edit' ? ''
+                  : this._req.cmd == 'diff' ? '?cmd=edit'
+                  : rev                     ? `?cmd=edit&rev=${rev}`
+                  :                           '?cmd=edit';
+
+        return `<li><a href="${cdata(path + param)}" accesskey="e">`
+                    + cdata(this.msg('toolbar.edit'))
+                    + `</a></li>\n`;
+    }
+
+    _logmenu() {
+        if (! this._r._backup) return ''
         let path = fixpath(this._r.location, this._req.baseUrl);
         return '<li><a href="'
                         + cdata(path)
-                            + (this._req.cmd == 'edit' ? '' : '?cmd=edit')
-                    + '" accesskey="e">'
-                    + cdata(this.msg('toolbar.edit'))
+                            + (this._req.cmd == 'log' ? '' : '?cmd=log')
+                    + '">'
+                    + cdata(this.msg('toolbar.log'))
                     + `</a></li>\n`;
     }
 
     _title() {
-        this.title(this._r.name);
+        const req = this._req;
+        const msg = req.msg;
+
+        let title = this._r.name;
+        if      (req.cmd == 'log')  title = msg('log.title',  title);
+        else if (req.cmd == 'diff') title = msg('diff.title', title);
+
+        this.title(title);
         return `<h1 id="l-title"><a href="${cdata(this._r.name)}">`
-                    + `${cdata(this._r.name)}</a></h1>\n`;
+                    + `${cdata(title)}</a></h1>\n`;
     }
 
     _path() {
@@ -92,6 +114,50 @@ module.exports = class File extends HTML {
              + '</script>\n';
     }
 
+    _log() {
+
+        const msg = this._req.msg;
+
+        let html = '<table id="l-log">\n';
+        html += '<tr>'
+              + `<th>${cdata(msg('log.time'))}</th>`
+              + (this._r.text != null
+                   ? `<th colspan="2">${cdata(msg('log.diff'))}</th>`
+                   : '')
+              + '<th></th>'
+              + (this._r.text != null ? '<th></th>' : '')
+              + '</tr>\n'
+
+        for (let i = 0; i < this._r.log.length; i++) {
+
+            let log  = this._r.log[i];
+            let log2 = this._r.log[i + 1];
+
+            html += '<tr>'
+                  + `<td class="l-time">${timeStr(log.time)}</td>`
+                  + (this._r.text != null
+                      ? ((log2 ? (
+                          '<td class="l-diff">'
+                            + `<a href="${cdata(
+                                `?cmd=diff&rev=${log2.rev}&rev=${log.rev}`)}">`
+                            + `${cdata(msg('log.prev'))}</a></td>`
+                          ) : '<td></td>')
+                          + '<td class="l-diff">'
+                            + `<a href="${cdata(`?cmd=diff&rev=${log.rev}`)}">`
+                            + `${cdata(msg('log.curr'))}</a></td>`)
+                      : '')
+                  + `<td><a href="?rev=${log.rev}">`
+                        + `${cdata(msg('log.show'))}</a></td>`
+                  + (this._r.text != null
+                      ? `<td><a href="?cmd=edit&rev=${log.rev}">`
+                            + `${cdata(msg('log.edit'))}</a></td>`
+                      : '')
+                  + '</tr>\n';
+        }
+
+        return html += '</table>\n';
+    }
+
     edit() {
         return this.stringify(
               this._title()
@@ -99,4 +165,11 @@ module.exports = class File extends HTML {
             + this._form()
         );
     }
+
+    log() {
+        return this.stringify(
+              this._title()
+            + this._log()
+        );
+    }
 }

package/lib/html/folder.js

@@ -4,39 +4,8 @@
 "use strict";
 
 const File = require('./file');
-const { cdata, fixpath } = require('../util/html-escape');
-
-function timeStr(time) {
-
-    const now  = new Date().getTime();
-
-    const date = new Date(time);
-    const year = date.getFullYear();
-    const m    = date.getMonth() + 1;
-    const mm   = ('0' + m).substr(-2);
-    const d    = date.getDate();
-    const dd   = ('0' + d).substr(-2);
-    const hour = ('0' + date.getHours()).substr(-2);
-    const min  = ('0' + date.getMinutes()).substr(-2);
-
-    if      (now - time < 1000*60*60*12)    return `${hour}:${min}`;
-    else if (now - time < 1000*60*60*24*365/2)
-                                            return `${m}/${d} ${hour}:${min}`;
-    else                                    return `${year}/${mm}/${dd} `;
-}
-
-function sizeStr(size) {
-
-    if (size == null) return '-';
-
-    let str;
-    for (let unit of ['',' KB',' MB',' GB',' TB']) {
-        str = unit ? size.toFixed(1) + unit : size + unit;
-        if (size < 1024) return str;
-        size = size / 1024;
-    }
-    return str;
-}
+const { cdata, fixpath }   = require('../util/html-escape');
+const { timeStr, sizeStr } = require('../util/str-tool');
 
 function cmp(key) {
     return key == 'n' ? (x, y)=> ! x.type &&   y.type ? -1
@@ -94,6 +63,8 @@ function uc(c) { return c.toUpperCase() }
 
 module.exports = class Folder extends File {
 
+    _logmenu() { return '' }
+
     _table() {
 
         const req = this._req;

package/lib/html/index.js

@@ -18,6 +18,7 @@ module.exports = class HTML {
             style:  '',
             icon:   DEFAULT_ICON,
             script: [],
+            meta:   [],
         };
         this.msg = req.msg;
     }
@@ -58,6 +59,12 @@ module.exports = class HTML {
         return this;
     }
 
+    meta(attr) {
+        if (attr) this._.meta.push(attr);
+        else      return this._.meta;
+        return this;
+    }
+
     _head() {
         const req = this._req;
 
@@ -83,10 +90,17 @@ module.exports = class HTML {
             `<script>\n${opt.code}</script>\n`
         ).join('');
 
+        const meta = this._.meta.map(attr=>{
+            let attrs = Object.keys(attr).map(key=>
+                            `${cdata(key)}="${cdata(attr[key])}"`).join(' ');
+            return `<meta ${attrs}>\n`;
+        }).join('');
+
         return '<head>\n'
              + '<meta charset="utf-8">\n'
              + '<meta name="viewport" '
                 + 'content="width=device-width, initial-scale=1">\n'
+             + meta
              + `<title>${cref(this.title())}</title>\n`
              + scriptRef
              + icon
@@ -98,6 +112,8 @@ module.exports = class HTML {
 
     _editmenu() { return '' }
 
+    _logmenu()  { return '' }
+
     _toolbar() {
         const msg = this.msg;
         const req = this._req;
@@ -109,6 +125,7 @@ module.exports = class HTML {
                         + ` alt="${cdata(msg('toolbar.home'))}"></a>\n`
               + `<ul>\n`;
         if (this._req.user) {
+            html += this._logmenu();
             html += this._editmenu();
             const url = '?cmd=logout&session_id='
                             + encodeURIComponent(this._req.sessionID);

package/lib/html/text.js

@@ -20,4 +20,34 @@ module.exports = class Text extends File {
              + `<input type="submit" value="${cdata(msg('udtext.submit'))}">\n`
              + '</form>\n';
     }
+
+    _diff() {
+
+        if (! this._r.diff.length) return '';
+
+        let html = '<div id="l-diff">\n';
+
+        for (let line of this._r.diff) {
+
+            if (! line.length)   continue;
+            if (line[0] == '\\') continue;
+
+            html += line[0] == '@'
+                        ? `<span class="l-head">${cdata(line)}</span>\n`
+                  : line[0] == '+'
+                        ? `<ins>${cdata(line.substr(1))}</ins>\n`
+                  : line[0] == '-'
+                        ? `<del>${cdata(line.substr(1))}</del>\n`
+                  :       `<span>${cdata(line.substr(1))}</span>\n`;
+        }
+
+        return html += '</div>\n';
+    }
+
+    diff() {
+        return this.stringify(
+              this._title()
+            + this._diff()
+        );
+    }
 }

package/lib/http/request.js

@@ -15,6 +15,7 @@ module.exports = class Request {
         this._liulian = liulian;
         this._req = req;
         this.msg = liulian._.locale(req.acceptsLanguages());
+        this._n_open = 0;
     }
 
     get version()   { return this._liulian._version }
@@ -62,4 +63,9 @@ module.exports = class Request {
              : isAbsolute(path) ? base + path
              :                    base + join(this.pathDir, path);
     }
+
+    openFile() {
+        this._n_open++;
+        if (this._n_open > 1000) throw 508;
+    }
 }

package/lib/http/response.js

@@ -39,6 +39,12 @@ module.exports = class Response {
         }
     }
 
+    sendStream(stream, type) {
+        this._res.type(type)
+        stream.pipe(this._res);
+        this._cleanUp();
+    }
+
     sendText(text, type = 'text/html') {
         this._res.type(type).send(text);
         this._cleanUp();

package/lib/module/core.js

@@ -13,7 +13,7 @@ module.exports = class Core {
         this._req    = parser._r._req;
         this._inline = ['img','color','size','br','clear','class','lang'];
         this._block  = ['title','contents','footnote','include','img','clear',
-                        'class','style','icon','lang','script'];
+                        'class','style','icon','lang','redirect','script'];
         this._np     = ['style','script'];
     }
 
@@ -148,6 +148,17 @@ module.exports = class Core {
         return '';
     }
 
+    redirect(type, param, value) {
+        let [url, sec] = param.split(/,\s*/);
+        sec = sec || '0';
+        let attr = {
+            'http-equiv': 'refresh',
+            'content':    `${cdata(sec)}; URL=${cdata(url)}`
+        };
+        this._r.meta(attr);
+        return '';
+    }
+
     script(type, param, value) {
         this._r.script({ url: param, code: value });
         return '';

package/lib/module/index.js

@@ -15,16 +15,16 @@ module.exports = class Module {
         this.import('core');
     }
 
-    require(path) {
-        try        { return require(path) }
-        catch(err) { console.log(err) }
-    }
-
     import(module) {
-        if (! modules[module]) modules[module] = this.require('./' + module);
-        if (modules[module]) this._modules.push(
-                                        new modules[module](this._parser));
-        return modules[module];
+        try {
+            if (! modules[module]) modules[module] = require('./' + module);
+            this._modules.push(new modules[module](this._parser));
+            return modules[module];
+        }
+        catch(err) {
+            if (err.code) console.log(module, err.code);
+            else          console.log(err);
+        }
     }
 
     callInlineModule(str, name, param, value) {

package/lib/module/paiga.js

@@ -0,0 +1,124 @@
+/*
+ *  module/paiga
+ */
+"use strict";
+
+const imgbase = '//kobalab.github.io/paiga/';
+const img = {
+    _:  'ura.gif',
+
+    m0: 'man5red.gif',
+    m1: 'man1.gif', m2: 'man2.gif', m3: 'man3.gif',
+    m4: 'man4.gif', m5: 'man5.gif', m6: 'man6.gif',
+    m7: 'man7.gif', m8: 'man8.gif', m9: 'man9.gif',
+
+    p0: 'pin5red.gif',
+    p1: 'pin1.gif', p2: 'pin2.gif', p3: 'pin3.gif',
+    p4: 'pin4.gif', p5: 'pin5.gif', p6: 'pin6.gif',
+    p7: 'pin7.gif', p8: 'pin8.gif', p9: 'pin9.gif',
+
+    s0: 'sou5red.gif',
+    s1: 'sou1.gif', s2: 'sou2.gif', s3: 'sou3.gif',
+    s4: 'sou4.gif', s5: 'sou5.gif', s6: 'sou6.gif',
+    s7: 'sou7.gif', s8: 'sou8.gif', s9: 'sou9.gif',
+
+    z1: 'ton.gif',  z2: 'nan.gif',  z3: 'sha.gif',  z4: 'pei.gif',
+    z5: 'haku.gif', z6: 'hatu.gif', z7: 'tyun.gif',
+
+    m0_: 'yman5red.gif',
+    m1_: 'yman1.gif', m2_: 'yman2.gif', m3_: 'yman3.gif',
+    m4_: 'yman4.gif', m5_: 'yman5.gif', m6_: 'yman6.gif',
+    m7_: 'yman7.gif', m8_: 'yman8.gif', m9_: 'yman9.gif',
+
+    p0_: 'ypin5red.gif',
+    p1_: 'ypin1.gif', p2_: 'ypin2.gif', p3_: 'ypin3.gif',
+    p4_: 'ypin4.gif', p5_: 'ypin5.gif', p6_: 'ypin6.gif',
+    p7_: 'ypin7.gif', p8_: 'ypin8.gif', p9_: 'ypin9.gif',
+
+    s0_: 'ysou5red.gif',
+    s1_: 'ysou1.gif', s2_: 'ysou2.gif', s3_: 'ysou3.gif',
+    s4_: 'ysou4.gif', s5_: 'ysou5.gif', s6_: 'ysou6.gif',
+    s7_: 'ysou7.gif', s8_: 'ysou8.gif', s9_: 'ysou9.gif',
+
+    z1_: 'yton.gif',  z2_: 'ynan.gif',  z3_: 'ysha.gif',  z4_: 'ypei.gif',
+    z5_: 'yhaku.gif', z6_: 'yhatu.gif', z7_: 'ytyun.gif'
+};
+
+function markup(paistr, w, h) {
+
+    let url, v = 0;
+    let html = '<span class="l-mod-paiga" style="white-space:pre;">';
+
+    for (let pai of paistr.match(/[mpsz](?:\d+[\-\=]?)+|[ _]|.+/g)) {
+
+        if (pai == ' ') {
+            html += ' ';
+        }
+        else if (pai == '_') {
+            url = imgbase + img._;
+            html += `<img src="${url}" width="${w}" height="${h}"`
+                  + ` alt="${pai}">`;
+        }
+        else if (pai.match(/^[mpsz](?:\d+[\-\=]?)+/)) {
+            let s = pai[0];
+            for (let n of pai.match(/\d[\-\=]?/g)) {
+                let d = n[1]||''; n = n[0];
+                if (d == '=' && ! v) {
+                    html += `<span style="display:inline-block;width:${h}px">`;
+                    v = 1;
+                }
+                if (d || v) {
+                    url = imgbase + img[s+n+'_'];
+                    if (d == '=') {
+                        html += `<img src="${url}" width="${h}" height="${w}"`
+                              + ` style="vertical-align:bottom;display:block"`
+                              + ` alt="${s+n+'='}">`;
+                    }
+                    else {
+                        html += `<img src="${url}" width="${h}" height="${w}"`
+                              + ` alt="${s+n+'-'}">`;
+                    }
+                }
+                else {
+                    url = imgbase + img[s+n];
+                    html += `<img src="${url}" width="${w}" height="${h}"`
+                          + ` alt="${s+n}">`;
+                }
+                if (d != '=') {
+                    if (v) html += '</span>';
+                    v = 0;
+                }
+            }
+        }
+        else {
+            html += `<span style="color:red;">${pai}</span>`;
+        }
+    }
+    if (v) html += '</span>';
+    html += '</span>';
+    return html;
+}
+
+module.exports = class Paiga {
+
+    constructor(parser) {
+        this._parser = parser;
+        this._r      = parser._r;
+        this._req    = parser._r._req;
+        this._inline = ['paiga'];
+        this._block  = [];
+        this._np     = [];
+    }
+
+    paiga(type, param, value) {
+        let w = 24, h = 34;
+        if      (! param)      { w = 24; h = 34 }
+        else if (param == 'L') { w = 24; h = 34 }
+        else if (param == 'M') { w = 19; h = 24 }
+        else if (param == 'S') { w = 16; h = 23 }
+        else if (param.match(/^\d+x\d+$/)) {
+            [ w, h ] = param.split(/x/);
+        }
+        return markup(value, w, h);
+    }
+}

package/lib/module/pinyin.js

@@ -0,0 +1,51 @@
+/*
+ *  module/pinyin
+ */
+"use strict";
+
+const tone_letter = {
+    a: ['ā','á','ǎ','à'],
+    e: ['ē','é','ě','è'],
+    o: ['ō','ó','ǒ','ò'],
+    i: ['ī','í','ǐ','ì'],
+    u: ['ū','ú','ǔ','ù'],
+    v: ['ǖ','ǘ','ǚ','ǜ'],
+    n: ['n̄','ń','ň','ǹ'],
+    A: ['Ā','Á','Ǎ','À'],
+    E: ['Ē','É','Ě','È'],
+    O: ['Ō','Ó','Ǒ','Ò'],
+    I: ['Ī','Í','Ǐ','Ì'],
+    U: ['Ū','Ú','Ǔ','Ù'],
+    V: ['Ǖ','Ǘ','Ǚ','Ǜ'],
+    N: ['N̄','Ń','Ň','Ǹ'],
+};
+
+function mark(str) {
+    const code = (c)=>tone_letter[c][n-1];
+    let [ , s, n ] = str.match(/^(.*?)(\d)$/);
+    if (s.match(/[aeo]/i))  return s.replace(/[aeo]/i,  code);
+    if (s.match(/[iu]$/i))  return s.replace(/[iu]$/i,  code);
+    if (s.match(/^[iuv]/i)) return s.replace(/^[iuv]/i, code);
+    else                    return s.replace(/n/i,      code);
+}
+
+module.exports = class Pinyin {
+
+    constructor(parser) {
+        this._parser = parser;
+        this._r      = parser._r;
+        this._req    = parser._r._req;
+        this._inline = ['pinyin'];
+        this._block  = ['pinyin'];
+        this._np     = [];
+    }
+
+    pinyin(type, param, value) {
+        value = value.replace(/([aeouiv][1234])([aeo])/ig, '$1-$2');
+        value = value.replace(/[iuv]?[aeo]?(?:i|u|o|n|ng)?[1234]/ig, mark);
+        value = value.replace(/v/g, 'ü').replace(/V/g, 'Ü');
+        return type == '#'
+                    ? `<div class="l-mod-pinyin">${value}</div>`
+                    : `<span class="l-mod-pinyin">${value}</span>`;
+    }
+}

package/lib/resource/file.js

@@ -17,6 +17,7 @@ module.exports = class File {
         this._stat = stat;
         this._location = location;
         this.openFile = openFile;
+        this._backup  = req.config.backup;
     }
 
     get path() { return this._path }
@@ -34,20 +35,32 @@ module.exports = class File {
         return this._type;
     }
     get location() { return this._location }
-
     get redirect() { return this._redirect }
+    get log()      { return this._log      }
 
     async open() {
-        if (this._req.cmd == 'edit' && ! this._req.user) throw 403;
-
+        if (! this._req.user && (this._req.cmd == 'edit' ||
+                                 this._req.cmd == 'log'  ||
+                                 this._req.cmd == 'diff'    )) throw 403;
         try {
             const fh = await fs.open(this._path);
             fh.close();
-            return this;
         }
         catch(err) {
             throw 403;
         }
+        if (this._backup && (this._req.cmd == 'edit' ||
+                             this._req.cmd == 'log'))
+        {
+            if (Date.now() - this.time > 1000*60*60*24) {
+                await this._backup.checkIn(this.location,
+                                           this.time, this._req.user);
+            }
+        }
+        if (this._backup && this._req.cmd == 'log') {
+            this._log = await this._backup.log(this.location);
+        }
+        return this;
     }
 
     async update() {
@@ -66,8 +79,20 @@ module.exports = class File {
     }
 
     send(res) {
-        if (this._req.cmd == 'edit')
-                res.sendText(new HTML(this).edit());
-        else    res.sendFile(this._path, this.type);
+        if      (this._req.cmd == 'edit') res.sendText(new HTML(this).edit());
+        else if (this._req.cmd == 'log')  res.sendText(new HTML(this).log());
+        else {
+            try {
+                let rev = this._req.param('rev');
+                if (rev) {
+                    res.sendStream(
+                        this._backup.checkOutStream(this.location, rev),
+                        this.type);
+                    return;
+                }
+            }
+            catch (err) {}
+            res.sendFile(this._path, this.type);
+        }
     }
 }

package/lib/resource/index.js

@@ -21,7 +21,11 @@ async function resource(req, file) {
         else    location = decodeURIComponent(urljoin(req.pathDir, file));
     }
     else        location = decodeURIComponent(req.path);
+
+    if (location.match(/^\/\.git(?:\/.*)?$/)) throw 404;
+
     const path = join(req.config.home, '/docs/', location);
+    req.openFile();
 
     try {
         const stat = await fs.stat(path);

package/lib/resource/liulian.js

@@ -16,6 +16,7 @@ module.exports = class LiuLian extends Text {
     icon(url) { this._html.icon(url) }
     lang(lang) { this._html.lang(lang) }
     script(script) { this._html.script(script) }
+    meta(attr) { this._html.meta(attr) }
 
     async _seekToParent(filename) {
         let pathDir = this._req.pathDir;
@@ -41,10 +42,18 @@ module.exports = class LiuLian extends Text {
         if (this._req.cmd == 'edit') {
             res.sendText(new HTML(this).edit());
         }
+        else if (this._req.cmd == 'log') {
+            res.sendText(new HTML(this).log());
+        }
+        else if (this._req.cmd == 'diff') {
+            res.sendText(new HTML(this).diff());
+        }
         else {
-            this._text = await this._seekToParent('HEAD') + '\n'
+            this._text = (this.name != 'HEAD'
+                            ? await this._seekToParent('HEAD') + '\n' : '')
                        + this._text                       + '\n'
-                       + await this._seekToParent('TAIL');
+                       + (this.name != 'TAIL'
+                            ? await this._seekToParent('TAIL') : '');
             this._html = new HTML(this);
             res.sendText(this._html.stringify(await parse(this)));
         }

package/lib/resource/text.js

@@ -11,17 +11,32 @@ const File = require('./file');
 module.exports = class Text extends File {
 
     get text() { return this._text }
+    get diff() { return this._diff }
 
     async open() {
-        if (this._req.cmd == 'edit' && ! this._req.user) throw 403;
-
+        await super.open();
+        if (this._backup && this._req.cmd == 'diff') {
+            let rev = this._req.params('rev');
+            this._diff = await this._backup.diff(this.location, ...rev);
+            return this;
+        }
+        try {
+            let rev = this._req.param('rev');
+            if (rev) {
+                this._text = await this._backup.checkOut(this.location, rev);
+                return this;
+            }
+        }
+        catch(err) {
+            throw 404;
+        }
         try {
             this._text = await fs.readFile(this._path, 'utf-8');
-            return this;
         }
         catch(err) {
             throw 403;
         }
+        return this;
     }
 
     async update() {
@@ -39,8 +54,9 @@ module.exports = class Text extends File {
     }
 
     send(res) {
-        if (this._req.cmd == 'edit')
-                res.sendText(new HTML(this).edit());
-        else    res.sendFile(this._path, this.type);
+        if      (this._req.cmd == 'edit') res.sendText(new HTML(this).edit());
+        else if (this._req.cmd == 'log')  res.sendText(new HTML(this).log());
+        else if (this._req.cmd == 'diff') res.sendText(new HTML(this).diff());
+        else                              res.sendFile(this._path, this.type);
     }
 }

package/lib/text/liulian.js

@@ -381,6 +381,7 @@ class LiuLian {
         let [ , name, param, eod ]
                 = line.match(/^#(\w+)(?:\((.*?)\))?(?:<<(\S+))?$/);
         if (name == '_') return await this.tag(line, param, eod);
+        if (name == 'import') return this.import(line, param);
 
         return await this._module.callBlockModule(line, name, param, eod);
     }
@@ -402,6 +403,11 @@ class LiuLian {
         }
     }
 
+    import(line, param) {
+        if (this._module.import(param)) return '';
+        return '<div style="color:red">' + cdata(line) + '</div>\n\n';
+    }
+
     inlineModule(str, name, param, value) {
         return this._module.callInlineModule(str, name, param, value);
     }

package/lib/util/str-tool.js

@@ -0,0 +1,40 @@
+/*
+ *  util/str-tool
+ */
+
+function timeStr(time) {
+
+    const now  = new Date().getTime();
+
+    const date = new Date(time);
+    const year = date.getFullYear();
+    const m    = date.getMonth() + 1;
+    const mm   = ('0' + m).substr(-2);
+    const d    = date.getDate();
+    const dd   = ('0' + d).substr(-2);
+    const hour = ('0' + date.getHours()).substr(-2);
+    const min  = ('0' + date.getMinutes()).substr(-2);
+
+    if      (now - time < 1000*60*60*12)    return `${hour}:${min}`;
+    else if (now - time < 1000*60*60*24*365/2)
+                                            return `${m}/${d} ${hour}:${min}`;
+    else                                    return `${year}/${mm}/${dd}`;
+}
+
+function sizeStr(size) {
+
+    if (size == null) return '-';
+
+    let str;
+    for (let unit of ['',' KB',' MB',' GB',' TB']) {
+        str = unit ? size.toFixed(1) + unit : size + unit;
+        if (size < 1024) return str;
+        size = size / 1024;
+    }
+    return str;
+}
+
+module.exports = {
+    timeStr: timeStr,
+    sizeStr: sizeStr,
+};

package/locale/en

@@ -13,6 +13,7 @@ toolbar.home:Home
 toolbar.login:Login
 toolbar.logout:Logout
 toolbar.edit:Edit
+toolbar.log:History
 # -----------------------------------------------------------------------------
 adduser.title:Sign Up
 adduser.user:Login Name
@@ -45,3 +46,12 @@ rmdir.submit:REMOVE
 # -----------------------------------------------------------------------------
 udtext.submit:SAVE
 # -----------------------------------------------------------------------------
+log.title:Revision history of {$1}
+log.rev:Revision
+log.time:Modified
+log.diff:Difference
+log.prev:from previous
+log.curr:to current
+log.show:Show
+log.edit:Edit
+diff.title:Difference of {$1}

package/locale/ja

@@ -13,6 +13,7 @@ toolbar.home:ホーム
 toolbar.login:ログイン
 toolbar.logout:ログアウト
 toolbar.edit:編集
+toolbar.log:履歴
 # -----------------------------------------------------------------------------
 adduser.title:ユーザー登録
 adduser.user:ログイン名
@@ -45,3 +46,12 @@ rmdir.submit:削除
 # -----------------------------------------------------------------------------
 udtext.submit:保存
 # -----------------------------------------------------------------------------
+log.title:{$1} の変更履歴
+log.rev:リビジョン
+log.time:変更日
+log.diff:差分
+log.prev:前の版との差分
+log.curr:現在との差分
+log.show:表示
+log.edit:編集
+diff.title:{$1} の差分

package/locale/zh-CN

@@ -13,6 +13,7 @@ toolbar.home:主页
 toolbar.login:登录
 toolbar.logout:注销
 toolbar.edit:编辑
+toolbar.log:历史
 # -----------------------------------------------------------------------------
 adduser.title:注册
 adduser.user:账号
@@ -45,3 +46,12 @@ rmdir.submit:删除
 # -----------------------------------------------------------------------------
 udtext.submit:保存
 # -----------------------------------------------------------------------------
+log.title:{$1} 的历史纪录
+log.rev:版本
+log.time:修改日期
+log.diff:差别
+log.prev:从前版的
+log.curr:到现在的
+log.show:表示这版
+log.edit:编辑这版
+diff.title:{$1} 的差别

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kobalab/liulian",
-  "version": "0.7.7",
+  "version": "0.9.0",
   "description": "Node.jsで動作するWebサイト作成ツール",
   "publishConfig": {
     "access": "public"
@@ -27,7 +27,7 @@
   },
   "homepage": "https://kobalab.net/liulian/",
   "devDependencies": {
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.0",
     "nyc": "^15.1.0"
   },
   "dependencies": {