增加command和event装饰器

Author: caizhenxing

.babelrc

@@ -1,4 +1,4 @@
 {
   "presets": ["es2015", "stage-1"],
-  "plugins": ["transform-runtime"]
+  "plugins": ["transform-runtime", "transform-decorators-legacy"]
 }

README.md

@@ -40,7 +40,7 @@ cqrs.publishCommand('createAccount',
 
 ** App不要创建多个实例，整个系统都是单例的 **
 
-## 使用：
+## 开发：
 
 模块采用面向对象的开发
 
@@ -177,6 +177,24 @@ export default class AccountEventHandler extends EventHandler {
 }
 ```
 
+处理其他模块的事件可以用command或event装饰器实现
+
+```js
+import {command,event} from 'cqrs-fx';
+
+export default class AccountCommandHandler2 extends CommandHandler {
+  @command('module1/createAccount')
+  createAccount2(message) {
+    console.log('AccountCommandHandler2 createAccount2 ok');
+  }
+
+  @command('module1', 'createAccount')
+  createAccount3(message) {
+    console.log('AccountCommandHandler2 createAccount3 ok');
+  }
+}
+```
+
 ## 配置性 && 扩展性：
 
 可以通过构造App实例时配置系统

demo/module2/command/AccountCommandHandler2.js

@@ -0,0 +1,13 @@
+import {CommandHandler,command} from '../../../src';
+
+export default class AccountCommandHandler2 extends CommandHandler {
+  @command('module1/createAccount')
+  createAccount2(message) {
+    console.log('AccountCommandHandler2 createAccount2 ok');
+  }
+
+  @command('module1', 'createAccount')
+  createAccount3(message) {
+    console.log('AccountCommandHandler2 createAccount3 ok');
+  }
+}

demo/module2/command/BookCommandHandler.js

@@ -0,0 +1,8 @@
+import {CommandHandler, command} from '../../../src';
+
+export default class BookCommandHandler extends CommandHandler {
+  createBook(message) {
+    console.log('create book');
+  }
+
+}

package.json

@@ -34,6 +34,7 @@
     "babel-cli": "^6.24.1",
     "babel-core": "^6.24.1",
     "babel-loader": "^6.2.4",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-runtime": "^6.9.0",
     "babel-preset-es2015": "^6.5.0",
     "babel-preset-react": "^6.5.0",

src/bus/bus.js

@@ -1,9 +1,15 @@
-import {isString} from '../utils';
+import {isString, log} from '../utils';
 import i18n from '../i18n';
 
 export default class Bus {
   messageQueue = []
 
+  _committed = true;
+
+  get committed() {
+    return this._committed;
+  }
+
   constructor(type) {
     this.type = type;
   }
@@ -19,18 +25,16 @@ export default class Bus {
     }
     for (let msg of messages) {
       if (!msg) {
+        log(i18n.t('无效消息跳过'))
         continue;
       }
       this.messageQueue.push(msg);
+      this._committed = false;
     }
   }
 
   clear() {
     this.messageQueue.length = 0;
   }
 
-  async commit() {}
-
-  async rollback() {}
-
 }

src/bus/direct_bus.js

@@ -4,17 +4,26 @@ import {log} from '../utils';
 import i18n from '../i18n';
 
 export default class DirectBus extends Bus {
+
+  _backupMessageArray;
+
+
   async commit() {
-    log(i18n.t('提交分发'));
+    log(i18n.t('总线提交'));
     const dispatcher = getDispatcher(this.type);
+    this._backupMessageArray = [...this.messageQueue];
     this.messageQueue.forEach(async(msg) => {
       await dispatcher.dispatch({type: this.type, module: msg.module, name: msg.name, data: msg.data});
     });
+    this._committed = true;
     this.messageQueue.length = 0;
   }
 
   async rollback() {
-    await getRepository().rollback();
-    log(i18n.t('回滚存储'));
+    if (this._backupMessageArray && this._backupMessageArray.length > 0) {
+      this.messageQueue = [...this._backupMessageArray];
+    }
+    this._committed = false;
+    log(i18n.t('总线回滚'));
   }
 }

src/bus/index.js

@@ -31,6 +31,7 @@ export function getDispatcher(type) {
     if (!(dispatcher instanceof Dispatcher)) {
       throw new Error(err.configFailed, type + i18n.t('消息分发器未正确配置，可以在config/bus.js中指定'));
     }
+    dispatcher.createAndRegisterAlias();
     fxData.container[type + 'Dispatcher'] = dispatcher;
   }
 

src/bus/message_dispatcher.js

@@ -2,14 +2,79 @@ import {log, isFunction, isString} from '../utils';
 import {fxData, _require} from '../core';
 import i18n from '../i18n';
 import Dispatcher from './dispatcher';
+import {getDecoratorToken} from '../command/decorator';
+import assert from 'assert';
 
 export default class MessageDispatcher extends Dispatcher {
   _dispatchingListeners = []
   _dispatchFailedListeners = []
   _dispatchedListeners = []
 
-  getHandlers(module, name) {
-    return Object.keys(fxData.alias).filter(item => item.startsWith(`${module}/${this.type}/`)).map(alias => _require(alias)).filter(item => isFunction(item.prototype[name]));
+  _handlers = {};
+
+  createAndRegisterAlias() {
+    Object.keys(fxData.alias).filter(item => item.indexOf(`/${this.type}/`) > -1).map(alias => _require(alias)).forEach((type)=>this.registerHandler(type));
+  }
+
+  getHandlers(name, module) {
+    assert(name);
+    if (!module) {
+      const mn = name.split('/');
+      module = mn[0];
+      name = mn[1];
+    }
+    assert(module);
+    return this._handlers[`${module}/${name}`] || [];
+  }
+
+  registerHandler(handlerType) {
+    let ctoken = getDecoratorToken(handlerType);
+    if (!ctoken.name && !ctoken.module) {
+      ctoken = {
+        module: handlerType.prototype.__module,
+        name: handlerType.name
+      };
+    }
+    for (const p of Object.getOwnPropertyNames(handlerType.prototype)) {
+      if (p === 'constructor'){
+        continue;
+      }
+      if (!isFunction(handlerType.prototype[p])){
+        continue;
+      }
+      const {
+        module = ctoken.module,
+        name =p
+      } = getDecoratorToken(handlerType.prototype[p]);
+      if (module && name) {
+        let items = this._handlers[`${module}/${name}`];
+        if (!items) {
+          this._handlers[`${module}/${name}`] = items = [];
+        }
+        items.push({CLS: handlerType, method: p});
+      }
+    }
+  }
+
+  unregisterHandler(handler) {
+    const ctoken = getDecoratorToken(handlerType);
+    for (const p in handlerType.prototype) {
+      const {
+        module = ctoken.module,
+        name
+      } = getDecoratorToken(handlerType.prototype[p]);
+      if (module && name) {
+        let items = this._handlers[`${module}/${name}`];
+        if (!items) {
+          continue;
+        }
+        const item = items.find(item => item.CLS === handler);
+        if (!item) {
+          continue;
+        }
+        items.splice(items.indexOf(item), 1);
+      }
+    }
   }
 
   // message = {name,module,type,data}
@@ -48,35 +113,32 @@ export default class MessageDispatcher extends Dispatcher {
     if (!handlers || handlers.length <= 0) {
       log(i18n.t('无消息处理器'));
     }
-    let success = 0;
-    for (const type of handlers) {
-      var CLS = _require(type);
-      if (!CLS || !isFunction(CLS))
-        continue;
+    for (const {CLS, method}
+    of handlers) {
       var handler = new CLS();
-      if (!handler || !isFunction(handler[name]))
+      if (!isFunction(handler[method])) {
+        log(i18n.t('处理器无法执行命令'));
         continue;
+      }
       const evt = {
         type: message.type,
         data: message.data,
         module,
         name,
         handler
       };
-      log(i18n.t('开始分发') + this.type + ':' + `${module}/${name}`);
+      log(i18n.t('开始执行') + this.type + ':' + `${module}/${name}`);
       this._onDispatching(evt);
       try {
-        await handler[name].bind(handler)(message.data || {});
+        await handler[method].bind(handler)(message.data || {});
         this._onDispatched(evt);
-        success++;
-        log(i18n.t('完成分发') + this.type + ':' + `${module}/${name}`);
+        log(i18n.t('完成执行') + this.type + ':' + `${module}/${name}`);
       } catch (err) {
         evt.error = err;
-        log(i18n.t('失败分发') + this.type + ':' + `${module}/${name}` + ',' + err);
+        log(i18n.t('失败执行') + this.type + ':' + `${module}/${name}` + ',' + err);
         this._onDispatchFaild(evt);
       }
     }
-    return success;
   }
 
   clear() {

src/command/decorator.js

@@ -0,0 +1,65 @@
+import {log, isFunction} from '../utils'
+import i18n from '../i18n';
+
+export function getDecoratorToken(fn) {
+  if (!isFunction) {
+    log(i18n.t('不是有效的command'))
+    return;
+  }
+  return {name: fn.__commandName, module: fn.__commandModule};
+}
+
+export function module(module) {
+  return (fn) => {
+    if (!isFunction) {
+      log(i18n.t('无法定义command属性'));
+      return;
+    }
+    if (module) {
+      if (fn.__commandModule) {
+        log(i18n.t('command属性冲突'));
+      }
+      fn.__commandModule = module;
+    }
+    return fn;
+  }
+}
+
+export function command(...moduleOrNames) {
+  return (target, fnName, fn) => {
+    if (!isFunction) {
+      log(i18n.t('无法定义command属性'));
+      return;
+    }
+    let module,
+      name = fnName;
+    if (moduleOrNames.length === 1) {
+      const mn = moduleOrNames[0].split('/');
+      if (mn.length == 2) {
+        module = mn[0];
+        name = mn[1];
+      } else {
+        module = moduleOrNames[0];
+        name = null;
+      }
+    } else if (moduleOrNames.length == 2) {
+      module = moduleOrNames[0];
+      name = moduleOrNames[1];
+    } else {
+      log(i18n.t('command属性无效'));
+    }
+    if (module) {
+      if (fn.value.__commandModule) {
+        log(i18n.t('command属性冲突'));
+      }
+      fn.value.__commandModule = module;
+    }
+    if (name) {
+      if (fn.value.__commandModule) {
+        log(i18n.t('command属性冲突'));
+      }
+      fn.value.__commandName = name;
+    }
+    return fn;
+  }
+}