factored out constants into lib/constants.js

pkrumins · Apr 28, 2011 · 58491ba · 58491ba
1 parent 791cd1b
commit 58491ba
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 32 deletions.
diff --git a/index.js b/index.js
@@ -2,22 +2,11 @@
 // http://www.realvnc.com/docs/rfbproto.pdf
 
 var EventEmitter = require('events').EventEmitter;
-
 var net = require('net');
-var des = require('des');
-
 var Put = require('put');
 
 var Parser = require('./lib/parser');
-
-var clientMsgTypes = {
-    setPixelFormat : 0,
-    setEncodings : 2,
-    fbUpdate : 3,
-    keyEvent : 4,
-    pointerEvent : 5,
-    cutText : 6
-};
+var constants = require('./lib/constants');
 
 module.exports = function (opts) {
     var self = new EventEmitter;
@@ -63,7 +52,7 @@ module.exports = function (opts) {
         };
     });
 
-    var parser = new Parser(self, stream);
+    var parser = new Parser(self, opts);
 
     self.write = function (buf) {
         if (Buffer.isBuffer(buf)) {
@@ -84,7 +73,7 @@ module.exports = function (opts) {
 
     self.sendKey = function (key, down) {
         Put()
-            .word8(clientMsgTypes.keyEvent)
+            .word8(constants.clientMsgTypes.keyEvent)
             .word8(!!down)
             .pad(2)
             .word32be(key)
@@ -103,7 +92,7 @@ module.exports = function (opts) {
 
     self.sendPointer = function (x, y, mask) {
         Put()
-            .word8(clientMsgTypes.pointerEvent)
+            .word8(constants.clientMsgTypes.pointerEvent)
             .word8(mask)
             .word16be(x)
             .word16be(y)
@@ -114,7 +103,7 @@ module.exports = function (opts) {
 
     self.requestUpdate = function (params) {
         Put()
-            .word8(clientMsgTypes.fbUpdate)
+            .word8(constants.clientMsgTypes.fbUpdate)
             .word8(params.subscribe)
             .word16be(params.x)
             .word16be(params.y)

diff --git a/lib/constants.js b/lib/constants.js
@@ -0,0 +1,25 @@
+exports.clientMsgTypes = {
+    setPixelFormat : 0,
+    setEncodings : 2,
+    fbUpdate : 3,
+    keyEvent : 4,
+    pointerEvent : 5,
+    cutText : 6,
+};
+
+exports.serverMsgTypes = {
+    fbUpdate : 0,
+    setColorMap : 1,
+    bell: 2,
+    cutText: 3,
+};
+
+exports.encodings = {
+    raw : 0,
+    copyRect : 1,
+    rre : 2,
+    hextile : 5,
+    zrle : 16,
+    pseudoCursor : -239,
+    pseudoDesktopSize : -223,
+};
diff --git a/lib/handshake.js b/lib/handshake.js
@@ -1,3 +1,10 @@
+var Put = require('put');
+var des = require('des');
+
+var constants = require('./constants');
+var clientMsgTypes = constants.clientMsgTypes;
+var encodings = constants.encodings;
+
 var exports = module.exports = function (rfb, opts) {
     [ 'version', 'security', 'init' ].forEach((function (x) {
         exports[x].call(this, rfb, opts);

diff --git a/lib/messages.js b/lib/messages.js
@@ -6,22 +6,9 @@ var exports = module.exports = function (rfb, opts) {
     });
 };
 
-var serverMsgTypes = {
-    fbUpdate : 0,
-    setColorMap : 1,
-    bell: 2,
-    cutText: 3
-};
-
-var encodings = {
-    raw : 0,
-    copyRect : 1,
-    rre : 2,
-    hextile : 5,
-    zrle : 16,
-    pseudoCursor : -239,
-    pseudoDesktopSize : -223
-};
+var constants = require('./constants');
+var serverMsgTypes = constants.serverMsgTypes;
+var encodings = constants.encodings;
 
 exports.message = function (rfb, opts) {
     this