aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package.json3
-rw-r--r--webcastor.js10
2 files changed, 5 insertions, 8 deletions
diff --git a/package.json b/package.json
index 9673fa6..7e07cc2 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,8 @@
20 "logfmt": "~1.1.2", 20 "logfmt": "~1.1.2",
21 "hogan-express": "~0.5.2", 21 "hogan-express": "~0.5.2",
22 "express": "~4.5.0", 22 "express": "~4.5.0",
23 "socket.io": "~1.0.6" 23 "socket.io": "~1.0.6",
24 "node-uuid": "~1.4.1"
24 }, 25 },
25 "engines": { 26 "engines": {
26 "node": "0.10.x" 27 "node": "0.10.x"
diff --git a/webcastor.js b/webcastor.js
index 8dabe52..39c37a9 100644
--- a/webcastor.js
+++ b/webcastor.js
@@ -29,6 +29,7 @@ var imports = {
29 redis : require('redis'), 29 redis : require('redis'),
30 30
31 passwordHash : require('password-hash'), 31 passwordHash : require('password-hash'),
32 uuid : require('node-uuid'),
32}; 33};
33 34
34var params = { 35var params = {
@@ -69,7 +70,7 @@ var Channel = {
69 }, 70 },
70 71
71 open : function(name, password) { 72 open : function(name, password) {
72 var hashedPassword 73 var hashedPassword;
73 if (password === '') { 74 if (password === '') {
74 hashedPassword = 'none'; 75 hashedPassword = 'none';
75 } else { 76 } else {
@@ -79,12 +80,7 @@ var Channel = {
79 }, 80 },
80 81
81 generateUniqueName : function() { 82 generateUniqueName : function() {
82 var uniqueName; 83 return imports.uuid.v1();
83 while (uniqueName === this.previousName) {
84 uniqueName = (+new Date()).toString(36).toUpperCase();
85 }
86 this.previousName = uniqueName;
87 return uniqueName;
88 }, 84 },
89 85
90 getPassword : function(name, callback) { 86 getPassword : function(name, callback) {