jj.js 0.18.0 → 0.20.0

package/lib/app.js

@@ -1,42 +1,79 @@
 const path = require('path');
 const Koa = require('koa');
 const {app: cfg_app, cookie: cfg_cookie} = require('./config');
+const loader = require('./loader');
 const Logger = require('./logger');
 const Response = require('./response');
 const router = require('./router');
+const mvc = require('./mvc');
 const storage = require('./storage');
 const pjson = require('../package.json');
 
+/**
+ * @typedef {import('../types').AppOptions} AppOptions
+ * @typedef {import('../types').KoaMiddleware} KoaMiddleware
+ */
+
 /**
  * @extends Koa
  */
 class App extends Koa
 {
     /**
-     * @override
-     * @param {...any} args - listen(port, ip, callback(err){})
+     * @param {AppOptions|KoaMiddleware|KoaMiddleware[]} [options] Application options
      */
-    listen(...args) {
+    constructor(options) {
+        if(typeof options == 'function') {
+            options = {
+                middleware: [options]
+            };
+        } else if(Array.isArray(options)) {
+            options = {
+                middleware: options
+            };
+        } else if(options && options.middleware && !Array.isArray(options.middleware)) {
+            options.middleware = [options.middleware]
+        }
+        super(options);
+        this._init(options);
+    }
+
+    /**
+     * @param {AppOptions} [options] - Application options
+     */
+    _init(options) {
         // storage
         this.use(async (ctx, next) => {
-            await storage.run({}, async() => {
+            ctx.APP_TIME = Date.now();
+            ctx.APP_VERSION = pjson.version;
+            await storage.run({
+                $: loader(__dirname, ctx),
+                _: loader(cfg_app.base_dir, ctx)
+            }, async() => {
                 await next();
             });
         });
 
+        // options.middleware
+        options && Array.isArray(options.middleware) && options.middleware.forEach(middleware => {
+            this.use(middleware);
+        });
+
         // exception
         this.use(async (ctx, next) => {
-            ctx.APP_TIME = Date.now();
-            ctx.APP_VERSION = pjson.version;
-
             try {
                 await next();
             } catch (err) {
-                Logger.error(...err.stack.split("\n"));
+                const errorMessage = err instanceof Error ? (err.stack || '') : String(err);
+                errorMessage.split("\n").forEach(line => {
+                    Logger.error(line);
+                });
                 if(cfg_app.app_debug) {
-                    new Response(ctx).exception(err);
+                    new Response(ctx).exception(err instanceof Error ? err : new Error(errorMessage));
                 } else {
-                    ctx.response.status = err.statusCode || err.status || 500;
+                    // @ts-ignore
+                    const errorStatus =  typeof err === 'object' && err && (err.statusCode || err.status) || 500;
+                    ctx.response.status = errorStatus;
                     ctx.body = 'Internal Server Error';
                 }
             }
@@ -54,18 +91,19 @@ class App extends Koa
         // router
         this.use(router.routes()).use(router.allowedMethods());
 
+        // mvc
+        this.use(mvc);
+
         // cookie
         cfg_cookie.keys && (this.keys = cfg_app.app_debug ? ['jj.js'] : cfg_cookie.keys);
 
-        // types
+        // create types
         if(cfg_app.app_debug) {
             const {isFileSync} = require('./utils/fs');
             const jsconfigFile = path.join(cfg_app.base_dir, 'jsconfig.json');
-            isFileSync(jsconfigFile) && require('./types')();
+            if(!isFileSync(jsconfigFile)) Logger.warning('jsconfig.json not found!');
+            require('./types').watch();
         }
-
-        // server
-        return super.listen(...args);
     }
 }
 

package/lib/cache.js

@@ -2,22 +2,35 @@ const {cache: cfg_cache} = require('./config');
 
 class Cache
 {
+    static cache = new Map();
+    static timer = null;
+
     /**
      * Creat a new `Cache` class
      * @public
+     * @param {Map.<any, any>} [store] - 缓存存储实例
      */
-    constructor() {
+    constructor(store) {
         if(new.target) {
             // @ts-ignore
-            class ChildCache extends this.constructor {}
-            ChildCache.cache = {};
-            ChildCache.timer = null;
-            // @ts-ignore
-            ChildCache.setIntervalTime(cfg_cache.clear_time);
+            class ChildCache extends this.constructor {
+                static cache = store || Cache.cache;
+            }
+            // 只有独立 cache 时才声明独立的 timer
+            if(store) {
+                // @ts-ignore
+                ChildCache.timer = null;
+                // @ts-ignore
+                ChildCache.setIntervalTime(cfg_cache.clear_time);
+            }
             return ChildCache;
         }
     }
 
+    static {
+        this.setIntervalTime(cfg_cache.clear_time);
+    }
+
     /**
      * 获取缓存
      * @public
@@ -29,9 +42,9 @@ class Cache
         if(key === undefined) {
             return this.cache;
         }
-        const now_time = Math.round(Date.now() / 1000);
-        if(this.cache[key] && this.cache[key].time > now_time) {
-            return this.cache[key].data;
+        const item = this.cache.get(key);
+        if(item && item.time > this.time()) {
+            return item.data;
         } else {
             this.delete(key);
             return undefined;
@@ -48,8 +61,7 @@ class Cache
      */
     static set(key, data, cache_time) {
         cache_time || (cache_time = cfg_cache.cache_time || 60 * 60 * 24 * 365 * 10);
-        const now_time = this.time();
-        this.cache[key] = {data: data, time: cache_time + now_time};
+        this.cache.set(key, {data: data, time: cache_time + this.time()});
     }
 
     /**
@@ -60,11 +72,69 @@ class Cache
      */
     static delete(key) {
         if(key) {
-            delete this.cache[key];
+            this.cache.delete(key);
         } else {
             // @ts-ignore
-            this.cache = {};
+            this.cache = new Map();
+        }
+    }
+
+    /**
+     * 检查缓存是否存在
+     * @public
+     * @static
+     * @param {string} key - 缓存键
+     * @returns {boolean}
+     */
+    static has(key) {
+        const item = this.cache.get(key);
+        if(item && item.time > this.time()) {
+            return true;
+        } else if(item) {
+            // 已过期，删除
+            this.delete(key);
+        }
+        return false;
+    }
+
+    /**
+     * 获取有效缓存数量（过滤已过期）
+     * @public
+     * @static
+     * @returns {number}
+     */
+    static size() {
+        let count = 0;
+        const now_time = this.time();
+        for(let [key, item] of this.cache) {
+            if(item.time > now_time) {
+                count++;
+            } else {
+                // 自动清理过期缓存
+                this.delete(key);
+            }
         }
+        return count;
+    }
+
+    /**
+     * 获取所有有效缓存的键（过滤已过期）
+     * @public
+     * @static
+     * @returns {string[]}
+     */
+    static keys() {
+        const keys = [];
+        const now_time = this.time();
+        for(let [key, item] of this.cache) {
+            if(item.time > now_time) {
+                keys.push(key);
+            } else {
+                // 自动清理过期缓存
+                this.delete(key);
+            }
+        }
+        return keys;
     }
 
     /**
@@ -79,8 +149,8 @@ class Cache
             // @ts-ignore
             this.timer = setInterval(() => {
                 const now_time = this.time();
-                for(let key in this.cache) {
-                    this.cache[key].time < now_time && this.delete(key);
+                for(let [key, item] of this.cache) {
+                    item.time < now_time && this.delete(key);
                 }
             }, time * 1000);
         } else {
@@ -90,6 +160,17 @@ class Cache
         }
     }
 
+    /**
+     * 设置缓存存储实例
+     * @public
+     * @static
+     * @param {Map.<any, any>} [store] - 缓存存储实例
+     */
+    static setStore(store) {
+        this.cache = store || new Map();
+        this.setIntervalTime(cfg_cache.clear_time);
+    }
+
     /**
      * 获取当前时间戳
      * @public
@@ -101,19 +182,4 @@ class Cache
     }
 }
 
-/**
- * 缓存store
- */
-// @ts-ignore
-Cache.cache = {};
-/**
- * 缓存自动清理定时器
- */
-// @ts-ignore
-Cache.timer = null;
-/**
- * 开启缓存自动清理
- */
-Cache.setIntervalTime(cfg_cache.clear_time);
-
 module.exports = Cache;

package/lib/config.js

@@ -3,7 +3,7 @@ const loader = require('./loader');
 const {format} = require('./utils/date');
 
 const app = {
-    app_debug: true, // 调试模式
+    app_debug: false, // 调试模式
     app_multi: false, // 是否开启多应用
 
     default_app: 'app', // 默认应用
@@ -34,19 +34,34 @@ const db = {
         user      : 'root', // 数据库用户名
         password  : '', // 数据库密码
         port      : '', // 数据库连接端口
-        charset   : 'utf8', // 数据库编码默认采用utf8
+        charset   : 'utf8mb4', // 数据库编码默认采用utf8mb4
         prefix    : 'jj_' // 数据库表前缀
-    }
+    },
+    sqlite: {
+        type      : 'sqlite', // 数据库类型
+        database  : ':memory:', // 数据库文件绝对地址，支持:memory:内存数据库
+        prefix    : 'jj_' // 数据库表前缀
+    },
+    mongodb: {
+        type      : 'mongodb', // 数据库类型
+        host      : '127.0.0.1', // 服务器地址
+        database  : 'jj', // 数据库名
+        user      : 'root', // 数据库用户名
+        password  : '', // 数据库密码
+        port      : 27017, // 数据库连接端口
+        prefix    : 'jj_' // 数据库表前缀
+    },
 }
 
 const log = {
     log_level: ['system', 'error'], // [system, error, warning, info, debug, http, sql]
+    // @ts-ignore
     log_handle: function(level, ...args) {console.log(`[${format('YY-mm-dd HH:ii:ss')}] [${level}]`, ...args.map(msg => typeof msg == 'object' ? JSON.stringify(msg) : String(msg)));}
 }
 
 const cache = {
     cache_time: 60 * 60 * 24, // 默认缓存时间（1天），为空或false则为10年
-    clear_time: undefined // (undefined: 清理一次, 0: 关闭自动清理, >0: 为自动清理周期)
+    clear_time: undefined // (undefined: 清理一次, 0: 关闭自动清理, >0: 为自动清理周期
 }
 
 const cookie = {
@@ -83,8 +98,8 @@ const tpl = {
     jump: require('./tpl/jump'),
     exception: require('./tpl/exception')
 }
-
-const base_dir = path.dirname(module.parent.parent.parent.filename);
+// @ts-ignore
+const base_dir = require.main.path;
 const base_config = loader(path.join(base_dir, './config'));
 
 /**

package/lib/context.js

@@ -1,23 +1,19 @@
-/**
- * 开发jj.js库本身时，可以设置为import('../types')
- * @type {typeof import('../../../types')}
- */
-const Ctx = require('./ctx');
-
-/**
- * @extends Ctx
- */
-class Context extends Ctx
-{
-    /**
-     * Initialize a new `Context`
-     * @public
-     * @param {import('../types').KoaCtx} [ctx]
-     */
-    constructor(ctx) {
-        super();
-        this.ctx = ctx;
-    }
-}
-
+const Ctx = require('./ctx');
+
+/**
+ * @extends Ctx
+ */
+class Context extends Ctx
+{
+    /**
+     * Initialize a new `Context`
+     * @public
+     * @param {import('../types').KoaCtx} ctx
+     */
+    constructor(ctx) {
+        super();
+        this.ctx = ctx;
+    }
+}
+
 module.exports = Context;

package/lib/controller.js

@@ -1,5 +1,9 @@
 const Middleware = require('./middleware');
 
+/**
+ * @typedef {import('../types').ViewInstance} ViewInstance
+ */
+
 /**
  * @extends Middleware
  */
@@ -13,7 +17,7 @@ class Controller extends Middleware
      * @returns {this}
      */
     $assign(name, value) {
-        this.$view.assign(name, value);
+        this._$view.assign(name, value);
         return this;
     }
 
@@ -24,7 +28,7 @@ class Controller extends Middleware
      * @returns {object}
      */
     $data(name) {
-        return this.$view.data(name);
+        return this._$view.data(name);
     }
 
     /**
@@ -33,7 +37,7 @@ class Controller extends Middleware
      * @param {string} [template]
      */
     async $load(template) {
-        const content = await this.$view.load(template);
+        const content = await this._$view.load(template);
         this.$show(content);
     }
 
@@ -43,7 +47,7 @@ class Controller extends Middleware
      * @param {string} content
      */
     async $render(content) {
-        const html = await this.$view.render(content);
+        const html = await this._$view.render(content);
         this.$show(html);
     }
 
@@ -53,9 +57,36 @@ class Controller extends Middleware
      * @param {string} [template]
      */
     async $fetch(template) {
-        const content = await this.$view.fetch(template);
+        const content = await this._$view.fetch(template);
         this.$show(content);
     }
+
+    /**
+     * @type {ViewInstance} View实例
+     * @private
+     */
+    // @ts-ignore
+    __view = null;
+
+    /**
+     * @type {ViewInstance} View实例
+     */
+    get _$view() {
+        if(this.__view === null) {
+            if(this.$view && this.$view.__ISCLASS__) {
+                this.__view = this.$view;
+            } else if(this.$ && this.$.view) {
+                this.__view = this.$.view;
+            } else {
+                this.__view = new (require('./view'))(this.ctx);
+            }
+        }
+        return this.__view;
+    }
+
+    set _$view(view) {
+        this.__view = view;
+    }
 }
 
 module.exports = Controller;

package/lib/cookie.js

@@ -22,39 +22,35 @@ class Cookie extends Context
     /**
      * 获取cookie
      * @public
-     * @param {string} [key] - 为空，则获取所有cookie
+     * @param {string} key - cookie键名
      * @param {import('cookies').GetOption} [options]
-     * @returns {string}
+     * @returns {any}
      */
     get(key, options) {
-        if(key === undefined) {
-            return this.all();
-        }
-        return this.ctx.cookies.get(key, {signed: cfg_cookie.signed, ...options});
+        return this.ctx.cookies.get(key, {signed: cfg_cookie.signed ? true : false, ...options});
     }
 
     /**
-     * 删除或清理cookie
+     * 删除cookie
      * @public
-     * @param {*} [key] - 为空则清理所有cookie
+     * @param {string} key - cookie键名
      * @param {import('cookies').GetOption} [options]
      * @returns {this}
      */
     delete(key, options) {
-        if(key === undefined) {
-            this.clear();
-        } else {
-            this.ctx.cookies.set(key, '', {...cfg_cookie, ...options, maxAge: 0});
-        }
+        this.ctx.cookies.set(key, null, {...cfg_cookie, ...options, maxAge: 0});
         return this;
     }
 
     /**
      * 获取所有cookie
      * @public
-     * @returns {object}
+     * @returns {Object.<string, string>}
      */
     all() {
+        /**
+         * @type {Object.<string, string>}
+         */
         const cookies = {};
         this.keys().forEach(key => cookies[key] = this.get(key));
         return cookies;
@@ -73,7 +69,7 @@ class Cookie extends Context
     /**
      * 获取所有cookie key
      * @public
-     * @returns {array}
+     * @returns {Array.<string>}
      */
     keys() {
         const cookie_header = this.ctx.request.headers.cookie || '';

package/lib/ctx.js

@@ -1,21 +1,22 @@
 // @ts-nocheck
 const storage = require('./storage');
+// 允许$访问的系统类库
+const libs = ['ctx', 'context', 'cache', 'cookie', 'db', 'logger', 'middleware', 'model', 'pagination', 'request', 'response', 'upload', 'url', 'view', 'utils', 'config'];
 
 /**
- * 开发jj.js库本身时，可以设置为import('../types')
+ * 开发jj.js库本身时，需改为import('../types')
+ * type {typeof import('../types')}
  * @type {typeof import('../../../types')}
  */
-const Ctx = new Proxy(class {}, {
+const Ctx = new Proxy(class Ctx {}, {
         construct() {
             return new Proxy({__proto__: arguments[2].prototype}, {
                 get: (target, $prop, receiver) => {
-                    if($prop in target || typeof $prop == 'symbol' || $prop == 'inspect') {
+                    if($prop in target || typeof $prop == 'symbol' || $prop == 'inspect' || $prop == 'ctx' || $prop == '$next') {
                         return Reflect.get(target, $prop, receiver);
                     }
 
                     const store = storage.getStore();
-                    const $ = store.$;
-                    const _ = store._;
                     if($prop == '$' || $prop == '_') {
                         return store[$prop];
                     }
@@ -23,33 +24,32 @@ const Ctx = new Proxy(class {}, {
                         return undefined;
                     }
 
+                    const {$, _, APP, COMMON} = store;
                     const prop = $prop.slice(1);
-                    const APP = store.APP;
-                    const COMMON = store.COMMON;
 
-                    // 缓存
-                    if(_[APP][$prop] === undefined) {
-                        if(_[APP][prop] && _[COMMON] && _[COMMON][prop]) {
-                            _[APP][$prop] = new Proxy({}, {
-                                get: (...args) => {
-                                    return _[APP][prop][args[1]] || _[COMMON][prop][args[1]];
-                                }
-                            });
-                        } else if(_[APP][prop]) {
-                            _[APP][$prop] = _[APP][prop];
-                        } else if(_[COMMON] && _[COMMON][prop]) {
-                            _[APP][$prop] = _[COMMON][prop];
-                        } else {
-                            _[APP][$prop] = null;
-                        }
-                        // lib内有调用，防止覆盖
-                        if(['logger', 'pagination', 'request', 'response', 'url', 'view'].includes(prop) && _[APP][$prop] && _[APP][$prop].__node && !_[APP][$prop].__node.isClass && $[prop]) {
-                            _[APP][$prop] = $[prop];
-                        }
+                    if(!_[APP]) {
+                        return libs.includes(prop) ? $[prop] : undefined;
+                    }
+
+                    if(!_[APP][prop] && !(_[COMMON] && _[COMMON][prop]) && !libs.includes(prop)) {
+                        return undefined;
                     }
 
-                    // 屏蔽部分lib
-                    return _[APP][$prop] || _[prop] || (!['app', 'loader', 'router', 'run', 'storage', 'types'].includes(prop) && $[prop]) || undefined;
+                    return _[APP][$prop] = new Proxy(function() {}, {
+                        construct(target, args, newTarget) {
+                            const node = _[APP][prop] && _[APP][prop].__ISCLASS__ && _[APP][prop]
+                            || _[COMMON] && _[COMMON][prop].__ISCLASS__ && _[COMMON][prop]
+                            || libs.includes(prop) && $[prop].__ISCLASS__ && $[prop]
+                            || undefined;
+                            return node ? Reflect.construct(node, args, newTarget) : undefined;
+                        },
+                        get: (...args) => {
+                            return res = _[APP][prop] && _[APP][prop][args[1]]
+                            || _[COMMON] && _[COMMON][prop][args[1]]
+                            || libs.includes(prop) && $[prop][args[1]]
+                            || undefined;
+                        }
+                    });
                 }
             });
         }