Fixed linting

Author: SamTV12345

lib/index.js

@@ -6,6 +6,17 @@ const AttributePool = require('./AttributePool');
 const assert = require('assert');
 const superagent = require('superagent');
 
+
+const randomString = (len = 10) => {
+  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+  let randomstring = '';
+  for (let i = 0; i < len; i++) {
+    const rnum = Math.floor(Math.random() * chars.length);
+    randomstring += chars.substring(rnum, rnum + 1);
+  }
+  return randomstring;
+};
+
 exports.connect = (host) => {
   // Create an event emitter
   const ee = new EventEmitter();
@@ -24,8 +35,8 @@ exports.connect = (host) => {
     const padIdParam = '/p/';
     const indexOfPadId = parsed.pathname.indexOf(padIdParam);
     if (indexOfPadId >= 0) {
-      padState.path = parsed.pathname.substring(0, indexOfPadId)
-      padState.padId = parsed.pathname.substring(indexOfPadId + padIdParam.length)
+      padState.path = parsed.pathname.substring(0, indexOfPadId);
+      padState.padId = parsed.pathname.substring(indexOfPadId + padIdParam.length);
     } else {
       padState.path = '';
       padState.padId = randomString();
@@ -63,10 +74,54 @@ exports.connect = (host) => {
       socket.json.send(msg);
     });
 
+
+    // sends a message to the server.
+    // Can be used without parameters to try sending outgoing message
+    const sendMessage = (optMsg) => {
+      // console.log("sending message: ",
+      //        optMsg && (optMsg.changeset + '[' + optMsg.baseRev + ']'),
+      //   '; inflight: ' + (padState.inFlight && (
+      // padState.inFlight.changeset + '[' + padState.inFlight.baseRev + ']')),
+      //   '; outgoing: ' + (padState.outgoing && (
+      // padState.outgoing.changeset + '[' + padState.outgoing.baseRev + ']'))
+      //   );
+      if (optMsg) {
+        if (padState.outgoing) {
+          assert(optMsg.baseRev === padState.outgoing.baseRev,
+              'should append to the same document version');
+
+          padState.outgoing.changeset = Changeset.compose(
+              padState.outgoing.changeset, optMsg.changeset, padState.apool);
+        } else {
+          padState.outgoing = optMsg;
+        }
+      }
+
+      if (!padState.inFlight && padState.outgoing) {
+        padState.inFlight = padState.outgoing;
+        padState.outgoing = null;
+        socket.json.send({
+          type: 'COLLABROOM',
+          component: 'pad',
+          data: JSON.parse(JSON.stringify(padState.inFlight)),
+        });
+      }
+    };
+
     socket.on('message', (obj) => {
     // message emitter sends all messages should they be required
       ee.emit('message', obj);
 
+      // Both server and client edited the document.
+      // We need to update local change with remote changes
+      // and visa versa
+      const transformX = (client, server) => {
+        const _c = Changeset.follow(server.changeset, client.changeset, false, padState.pool);
+        const _s = Changeset.follow(client.changeset, server.changeset, true, padState.pool);
+        client.changeset = _c;
+        server.changeset = _s;
+      };
+
 
       // Client is connected so we should start sending messages at the server
       if (obj.type === 'CLIENT_VARS') {
@@ -175,57 +230,6 @@ exports.connect = (host) => {
       };
       sendMessage(msg);
     };
-
-    // Both server and client edited the document.
-    // We need to update local change with remote changes
-    // and visa versa
-    const transformX = (client, server) => {
-      const _c = Changeset.follow(server.changeset, client.changeset, false, padState.pool);
-      const _s = Changeset.follow(client.changeset, server.changeset, true, padState.pool);
-      client.changeset = _c;
-      server.changeset = _s;
-    };
-
-    // sends a message to the server. Can be used without parameters to try sending outgoing message
-    const sendMessage = (optMsg) => {
-    // console.log("sending message: ", optMsg && (optMsg.changeset + '[' + optMsg.baseRev + ']'),
-    //   '; inflight: ' + (padState.inFlight && (
-    // padState.inFlight.changeset + '[' + padState.inFlight.baseRev + ']')),
-    //   '; outgoing: ' + (padState.outgoing && (
-    // padState.outgoing.changeset + '[' + padState.outgoing.baseRev + ']'))
-    //   );
-      if (optMsg) {
-        if (padState.outgoing) {
-          assert(optMsg.baseRev === padState.outgoing.baseRev,
-              'should append to the same document version');
-
-          padState.outgoing.changeset = Changeset.compose(
-              padState.outgoing.changeset, optMsg.changeset, padState.apool);
-        } else {
-          padState.outgoing = optMsg;
-        }
-      }
-
-      if (!padState.inFlight && padState.outgoing) {
-        padState.inFlight = padState.outgoing;
-        padState.outgoing = null;
-        socket.json.send({
-          type: 'COLLABROOM',
-          component: 'pad',
-          data: JSON.parse(JSON.stringify(padState.inFlight)),
-        });
-      }
-    };
   });
   return ee;
 };
-
-const randomString = (len = 10) => {
-  const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-  let randomstring = '';
-  for (let i = 0; i < len; i++) {
-    const rnum = Math.floor(Math.random() * chars.length);
-    randomstring += chars.substring(rnum, rnum + 1);
-  }
-  return randomstring;
-};

load.js

@@ -9,20 +9,6 @@ const host = 'http://127.0.0.1:9001/p/test';
 // For now let's create 5 lurking clients and 1 author.
 const c = ['a', 'a', 'a', 'a', 'l', 'a'];
 
-async.eachSeries(c, (type, callback) => {
-  setTimeout(() => {
-    if (type === 'l') {
-      newLurker();
-      callback();
-    }
-    if (type === 'a') {
-      newAuthor();
-      callback();
-    }
-  }, 1);
-}, (err) => {
-
-});
 
 const newAuthor = () => {
   const pad = etherpad.connect(host);
@@ -40,3 +26,19 @@ const newLurker = () => {
     console.log('Connected new lurker to', padState.host);
   });
 };
+
+
+async.eachSeries(c, (type, callback) => {
+  setTimeout(() => {
+    if (type === 'l') {
+      newLurker();
+      callback();
+    }
+    if (type === 'a') {
+      newAuthor();
+      callback();
+    }
+  }, 1);
+}, (err) => {
+
+});