dispatch onJoin signal if client already has 'colyseusid' cookie. col…

…yseus/colyseus#43
colyseus · Jun 16, 2017 · 7c81434 · 7c81434
1 parent f09ecde
commit 7c81434
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+dist/lib
 out.log
 node_modules
 npm-debug.log
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,2 @@
+/dist
+src
diff --git a/dist/colyseus.js b/dist/colyseus.js
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <style>
+      body { font-family: Tahoma, Geneva, sans-serif; }
+    </style>
+    <script src="colyseus.js"></script>
+  </head>
+  <body>
+    <strong>Messages</strong><br>
+
+    <form id="form">
+      <input type="text" id="input" value="" />
+      <input type="submit" value="send" />
+    </form>
+
+    <div id="messages"></div>
+
+    <script>
+      var host = window.document.location.host.replace(/:.*/, '');
+      var client = new Colyseus.Client('ws://' + host + ':8080');
+      var room;
+
+      // client.onopen = function() {
+      //     console.log('onopen!');
+      //     client.send("hey");
+      // }
+      //
+      // client.onmessage = function(data) {
+      //     console.log("onmessage", data)
+      // }
+
+      client.onOpen.add(function() {
+          console.log("onOpen")
+
+          room = client.join('chat');
+          room.onJoin.add(function() {
+              console.log('joined!');
+          })
+
+          room.onUpdate.add(function(data) {
+              console.log("chat update: ", data)
+          });
+      });
+
+      document.getElementById('form').onsubmit = function(e) {
+        e.preventDefault()
+
+        client.send(document.getElementById('input').value);
+
+        // room.send(document.getElementById('input').value);
+        document.getElementById('input').value = null
+      }
+    </script>
+
+  </body>
+</html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "colyseus.js",
-  "version": "0.7.0-alpha.1",
+  "version": "0.7.0-alpha.2",
   "description": "Multiplayer Game Client for the Browser",
   "keywords": [
     "multiplayer",
@@ -32,7 +32,7 @@
     "msgpack-lite": "^0.1.20",
     "signals.js": "^1.0.0",
     "tiny-emitter": "^1.1.0",
-    "websocket.js": "^0.1.10"
+    "websocket.js": "^0.1.12"
   },
   "devDependencies": {
     "@types/chai": "^3.4.34",

diff --git a/src/Client.ts b/src/Client.ts
@@ -20,15 +20,20 @@ export class Client {
     protected rooms: {[id: string]: Room} = {};
 
     constructor (url: string) {
-        let colyseusid = cookie.getItem('colyseusid');
-        if (colyseusid) {
-            this.id = colyseusid;
-        }
-
         this.connection = new Connection(url);
         this.connection.onmessage = this.onMessageCallback.bind(this);
         this.connection.onclose = (e) => this.onClose.dispatch();
         this.connection.onerror = (e) => this.onError.dispatch();
+
+        // check for id on cookie
+        this.connection.onopen = () => {
+            console.log("onopen!");
+            let colyseusid = cookie.getItem('colyseusid');
+            if (colyseusid) {
+                this.id = colyseusid;
+                this.onOpen.dispatch();
+            }
+        }
     }
 
     join<T> (roomName: string, options: any = {}): Room<T> {

diff --git a/src/Connection.ts b/src/Connection.ts
@@ -11,6 +11,8 @@ export class Connection extends WebSocketClient {
     }
 
     onOpenCallback (event) {
+        super.onOpenCallback();
+
         if (this._enqueuedCalls.length > 0) {
             for (let i=0; i<this._enqueuedCalls.length; i++) {
                 let [ method, args ] = this._enqueuedCalls[i];

diff --git a/yarn.lock b/yarn.lock
@@ -2826,9 +2826,9 @@ webpack@^2.1.0-beta.25:
     webpack-sources "^0.1.0"
     yargs "^6.0.0"
 
-websocket.js@^0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/websocket.js/-/websocket.js-0.1.10.tgz#6bad57a24d0210561018294b49234d21fa9fd7ee"
+websocket.js@^0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/websocket.js/-/websocket.js-0.1.12.tgz#46c980787c57ebc8edcf44a0263e5d639367b85b"
   dependencies:
     backoff "^2.4.1"