publisher による構成に修正（Trying Test）

.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 6.6
+

commandRunner.js

@@ -1,99 +1,100 @@
-var EventEmitter = require("events").EventEmitter;
-var util = require("util");
+import ComponentBase from "./componentBase";
 
-function CommandRunner(key) {
-  EventEmitter.call(this);
+export default class CommandRunner extends ComponentBase {
+  constructor(name) {
+    super();
 
-  this.key = key;
-  this.commands = [];
-  this.baseSpeed = 0;
-  this.angle = 0;
-  this.loopTimeoutId = null;
-  this.customTimeoutIds = {};
-  this.backgroundTimeoutIds = {};
-  this.commandFunctions = {
-    rotate: (config, turn) => {
-      if (config.isBuiltIn) {
-        this.stopLoop();
-        this.clearCustomTimeoutIds();
+    this.name = name;
+    this.commands = [];
+    this.baseSpeed = 0;
+    this.angle = 0;
+    this.loopTimeoutId = null;
+    this.customTimeoutIds = {};
+    this.backgroundTimeoutIds = {};
+    this.commandFunctions = {
+      rotate: (config, turn) => {
+        if (config.isBuiltIn) {
+          this.stopLoop();
+          this.clearCustomTimeoutIds();
+        }
+        const rotateFunction = () => {
+          this.angle = (this.angle + turn) % 360;
+          this.publish("command", name, "roll", [0, this.angle]);
+          this.customTimeoutIds.rotate = setTimeout(rotateFunction, 500);
+        };
+        rotateFunction();
+      },
+      stop: config => {
+        if (config.isBuiltIn) {
+          this.stopLoop();
+          this.clearCustomTimeoutIds();
+        }
+        this.publish("command", name, "roll", [0, this.angle]);
+      },
+      dash: (config, baseSpeed, dashTime) => {
+        if (this.backgroundTimeoutIds.dash) {
+          clearTimeout(this.backgroundTimeoutIds.dash);
+        }
+        this.baseSpeed = baseSpeed;
+        this.backgroundTimeoutIds.dash = setTimeout(() => {
+          this.baseSpeed = 0;
+        }, dashTime * 1000);
+      },
+      roll: (config, speed, degree) => {
+        this.publish("command", name, "roll", [
+          this.baseSpeed + speed,
+          (360 + degree + this.angle) % 360
+        ]);
       }
-      const rotateFunction = () => {
-        this.angle = (this.angle + turn) % 360;
-        this.emit("command", "roll", [0, this.angle]);
-        this.customTimeoutIds.rotate = setTimeout(rotateFunction, 500);
-      };
-      rotateFunction();
-    },
-    stop: config => {
-      if (config.isBuiltIn) {
-        this.stopLoop();
-        this.clearCustomTimeoutIds();
-      }
-      this.emit("command", "roll", [0, this.angle]);
-    },
-    dash: (config, baseSpeed, dashTime) => {
-      if (this.backgroundTimeoutIds.dash !== null) {
-        clearTimeout(this.backgroundTimeoutIds.dash);
-      }
-      this.baseSpeed = baseSpeed;
-      this.backgroundTimeoutIds.dash = setTimeout(() => {
-        this.baseSpeed = 0;
-      }, dashTime * 1000);
-    },
-    roll: (config, speed, degree) => {
-      this.emit("command", "roll", [
-        this.baseSpeed + speed,
-        (360 + degree + this.angle) % 360
-      ]);
-    }
-  };
-}
-
-util.inherits(CommandRunner, EventEmitter);
+    };
+  }
 
-CommandRunner.prototype.setCommands = function(commands) {
-  if (commands.length === 1 && commands[0].time === -1) {
-    // built-in command
-    this.commandFunctions[commands[0].commandName].apply(this, [{
-      isBuiltIn: true
-    }].concat(processArguments(commands[0].args)));
-  } else {
-    this.commands = commands;
-    this.stopLoop();
-    this.clearCustomTimeoutIds();
-    this.loopMethod(0);
+  setCommands(commands) {
+    if (commands.length === 1 && commands[0].time === -1) {
+      // built-in command
+      this.commandFunctions[commands[0].commandName].apply(this, [{
+        isBuiltIn: true
+      }].concat(processArguments(commands[0].args)));
+    } else {
+      this.commands = commands;
+      this.stopLoop();
+      this.clearCustomTimeoutIds();
+      this.loopMethod(0);
+    }
   }
-};
 
-CommandRunner.prototype.stopLoop = function() {
-  if (this.loopTimeoutId !== null) {
-    clearTimeout(this.loopTimeoutId);
+  stopLoop() {
+    if (this.loopTimeoutId) {
+      clearTimeout(this.loopTimeoutId);
+      this.loopTimeoutId = null;
+    }
   }
-};
 
-CommandRunner.prototype.clearCustomTimeoutIds = function() {
-  Object.keys(this.customTimeoutIds).forEach(timeoutIdName => {
-    const timeoutId = this.customTimeoutIds[timeoutIdName];
-    if (timeoutId !== null) {
-      clearTimeout(timeoutId);
+  clearCustomTimeoutIds() {
+    for (let timeoutIdName in this.customTimeoutIds) {
+      const timeoutId = this.customTimeoutIds[timeoutIdName];
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+        delete this.customTimeoutIds[timeoutIdName];
+      }
     }
-  });
-}
+  }
 
-CommandRunner.prototype.loopMethod = function(index) {
-  if (this.commands.length === 0) {
-    throw new Error("実行しようとしたcommandsは空でした。: " + this.key);
+  loopMethod(index) {
+    if (this.commands.length === 0) {
+      throw new Error("実行しようとしたcommandsは空でした。: " + this.name);
+    }
+    this.clearCustomTimeoutIds();
+    const currentCommand = this.commands[index];
+    this.commandFunctions[currentCommand.commandName].apply(this, [{
+      isBuiltIn: false
+    }].concat(processArguments(currentCommand.args)));
+    var nextIndex = index + 1 >= this.commands.length ? 0 : index + 1;
+    this.loopTimeoutId = setTimeout(() => {
+      this.loopMethod(nextIndex);
+    }, currentCommand.time * 1000);
   }
-  this.clearCustomTimeoutIds();
-  const currentCommand = this.commands[index];
-  this.commandFunctions[currentCommand.commandName].apply(this, [{
-    isBuiltIn: false
-  }].concat(processArguments(currentCommand.args)));
-  var nextIndex = index + 1 >= this.commands.length ? 0 : index + 1;
-  this.loopTimeoutId = setTimeout(() => {
-    this.loopMethod(nextIndex);
-  }, currentCommand.time * 1000);
-};
+}
 
 // コマンドの引数にmotionSpecialDataがあった場合、それを実際の値に変更する
 function processArguments(args) {
@@ -111,5 +112,3 @@ function processArguments(args) {
   });
 }
 
-module.exports = CommandRunner;
-

componentBase.js

@@ -0,0 +1,24 @@
+import publisher from "./publisher";
+
+export default class ComponentBase {
+  constructor(models = {}) {
+    for (let modelName in models) {
+      this[modelName] = models[modelName];
+    }
+  }
+  publish(subjectName, ...data) {
+    publisher.publish(this, subjectName, ...data);
+  }
+  subscribeModel(subjectName, observeFunction) {
+    publisher.subscribeModel(subjectName, (author, ...data) => {
+      observeFunction.apply(this, data);
+    });
+  }
+  subscribe(subjectName, observeFunction) {
+    publisher.subscribe(subjectName, (author, ...data) => {
+      if (author !== this) {
+        observeFunction.apply(this, data);
+      }
+    });
+  }
+}

config.js

@@ -13,5 +13,17 @@ export default {
     wsPort: 8081
   },
   dashboardPort: 8082,
-  scoreboardPort: 8083
+  scoreboardPort: 8083,
+  defaultHp: 100,
+  damage: 10,
+  defaultColor: "white",
+  collision: {
+    meth: 0x01,
+    xt: 0x20,
+    xs: 0x20,
+    yt: 0x20,
+    ys: 0x20,
+    dead: 0x02
+  },
+  isUseNoble: false
 };

connector.js

@@ -1,6 +1,35 @@
-class Connector {
-  constructor() {
+import ComponentBase from "./componentBase";
+
+class Connector extends ComponentBase {
+  constructor(models) {
+    super(models);
+
     this.rawOrbs = {};
+
+    this.originalError = console.error;
+
+    console.error = (message) => {
+      const exec121Error = /Error: Opening (\\\\\.\\)?(.+): Unknown error code (121|1167)/.exec(message);
+      if (exec121Error) {
+        const port = exec121Error[2];
+        if (this.isConnecting(port)) {
+          this.publish("incrementError121Count");
+          if (this.appModel.error121Count < 5) {
+            this.publish("log", `Catched 121 error. Reconnecting... (${models.appModel.error121Count})`, "warning");
+            this.reconnect(port);
+          } else {
+            this.publish("resetError121Count")
+            this.publish("log", "Catched 121 error. But this is 5th try. Give up.", "warning");
+            this.giveUp(port);
+          }
+        } else {
+          this.publish("log", "Catched 121 error. But port is invalid.", "error");
+        }
+      } else {
+        this.publish("log", "Catched unknown error: \n" + message.toString(), "error");
+      }
+      this.originalError(message);
+    };
   }
   connect(port, rawOrb) {
     if (this.isConnecting(port)) {

controller.js

@@ -17,23 +17,23 @@ export default class Controller extends EventEmitter {
   }
   setHp(hp) {
     this.hp = hp;
-    if (this.client !== null) {
+    if (this.client) {
       this.client.sendCustomMessage("hp", this.hp);
     }
     this.emit("hp", this.hp);
   }
   setIsOni(isOni) {
     this.isOni = isOni;
-    if (this.client !== null) {
+    if (this.client) {
       this.client.sendCustomMessage("oni", this.isOni);
     }
     this.emit("oni", this.isOni);
   }
   setLink(orb) {
     // client も持っているが、それに左右されずにするため link は別に持つ必要がある
-    this.linkedOrb = orb !== null ? orb : null;
-    if (this.client !== null) {
-      if (orb === null) {
+    this.linkedOrb = orb;
+    if (this.client) {
+      if (!orb) {
         this.client.unlink();
       } else {
         this.client.setLinkedOrb(orb);
@@ -43,37 +43,37 @@ export default class Controller extends EventEmitter {
   }
   setClient(client) {
     this.client = client;
-    if (this.client !== null) {
+    if (this.client) {
       this.client.sendCustomMessage("hp", this.hp);
       this.client.sendCustomMessage("oni", this.isOni);
       this.client.sendCustomMessage("color", this.color);
-    }
-    if (this.linkedOrb !== null && this.client !== null) {
-      // HPなどの Orb -> Client への伝達で、
-      // client にも linkedOrb を入れておく必要がある。
-      this.client.setLinkedOrb(this.linkedOrb);
+      if (this.linkedOrb) {
+        // HPなどの Orb -> Client への伝達で、
+        // client にも linkedOrb を入れておく必要がある。
+        this.client.setLinkedOrb(this.linkedOrb);
+      }
     }
   }
   setColor(color) {
     this.color = color;
     updateColor.call(this);
-    if (this.client !== null) {
+    if (this.client) {
       this.client.sendCustomMessage("color", this.color);
     }
   }
   getStates() {
     return {
       hp: this.hp,
       isOni: this.isOni,
-      link: this.linkedOrb !== null ? this.linkedOrb.name : null,
-      key: this.client !== null ? this.client.key : null,
+      link: this.linkedOrb ? this.linkedOrb.name : null,
+      key: this.client ? this.client.key : null,
       color: this.color
     };
   }
 }
 
 function updateColor() {
-  if (this.linkedOrb !== null) {
+  if (this.linkedOrb) {
     this.linkedOrb.command("color", [this.color]);
   }
 }