WIP: working on the broken npm test command

Author: jshcrowthe

.gitignore

@@ -6,4 +6,5 @@ npm-debug.log
 /.nyc_output
 /tests/config
 /temp
-/.vscode
+/.vscode
+/.ts-node

gulp/tasks/test.js

@@ -67,6 +67,9 @@ function runBrowserUnitTests(dev) {
         // we don't want this file as it references files that only exist once compiled
         `./src/firebase-*.ts`,
 
+        // We don't want to load the node env
+        `./src/utils/nodePatches.ts`,
+
         // Don't include node test files
         './tests/**/node/**/*.test.ts',
 
@@ -114,7 +117,7 @@ function runAllKarmaTests(done) {
     // list of files to exclude from the included globs above
     exclude: [
       // we don't want this file as it references files that only exist once compiled
-      `./src/firebase.ts`,
+      `./src/firebase-*.ts`,
 
       // Don't include node test files
       './tests/**/node/**/*.test.ts',

package.json

@@ -39,6 +39,7 @@
     "babel-preset-env": "^1.2.1",
     "chai": "^3.5.0",
     "child-process-promise": "^2.2.1",
+    "cross-env": "^5.0.1",
     "cz-customizable": "^5.0.0",
     "filesize": "^3.5.6",
     "git-rev-sync": "^1.9.0",

src/database/core/util/util.ts

@@ -114,7 +114,7 @@ export const buildLogMessage_ = function(var_args) {
  * Use this for all debug messages in Firebase.
  * @type {?function(string)}
  */
-export var logger = null;
+export var logger = console.log.bind(console);
 
 
 /**

src/database/core/view/filter/RangedFilter.ts

@@ -1,6 +1,6 @@
 import { IndexedFilter } from "./IndexedFilter";
 import { PRIORITY_INDEX } from "../../../core/snap/indexes/PriorityIndex";
-import { NamedNode } from "../../../core/snap/Node";
+import { Node, NamedNode } from "../../../core/snap/Node";
 import { ChildrenNode } from "../../../core/snap/ChildrenNode";
 /**
  * Filters nodes by range and uses an IndexFilter to track any changes after filtering the node

src/database/realtime/BrowserPollConnection.ts

@@ -18,19 +18,19 @@ import { Transport } from './Transport';
 import { RepoInfo } from '../core/RepoInfo';
 
 // URL query parameters associated with longpolling
-const FIREBASE_LONGPOLL_START_PARAM = 'start';
-const FIREBASE_LONGPOLL_CLOSE_COMMAND = 'close';
-const FIREBASE_LONGPOLL_COMMAND_CB_NAME = 'pLPCommand';
-const FIREBASE_LONGPOLL_DATA_CB_NAME = 'pRTLPCB';
-const FIREBASE_LONGPOLL_ID_PARAM = 'id';
-const FIREBASE_LONGPOLL_PW_PARAM = 'pw';
-const FIREBASE_LONGPOLL_SERIAL_PARAM = 'ser';
-const FIREBASE_LONGPOLL_CALLBACK_ID_PARAM = 'cb';
-const FIREBASE_LONGPOLL_SEGMENT_NUM_PARAM = 'seg';
-const FIREBASE_LONGPOLL_SEGMENTS_IN_PACKET = 'ts';
-const FIREBASE_LONGPOLL_DATA_PARAM = 'd';
-const FIREBASE_LONGPOLL_DISCONN_FRAME_PARAM = 'disconn';
-const FIREBASE_LONGPOLL_DISCONN_FRAME_REQUEST_PARAM = 'dframe';
+export const FIREBASE_LONGPOLL_START_PARAM = 'start';
+export const FIREBASE_LONGPOLL_CLOSE_COMMAND = 'close';
+export const FIREBASE_LONGPOLL_COMMAND_CB_NAME = 'pLPCommand';
+export const FIREBASE_LONGPOLL_DATA_CB_NAME = 'pRTLPCB';
+export const FIREBASE_LONGPOLL_ID_PARAM = 'id';
+export const FIREBASE_LONGPOLL_PW_PARAM = 'pw';
+export const FIREBASE_LONGPOLL_SERIAL_PARAM = 'ser';
+export const FIREBASE_LONGPOLL_CALLBACK_ID_PARAM = 'cb';
+export const FIREBASE_LONGPOLL_SEGMENT_NUM_PARAM = 'seg';
+export const FIREBASE_LONGPOLL_SEGMENTS_IN_PACKET = 'ts';
+export const FIREBASE_LONGPOLL_DATA_PARAM = 'd';
+export const FIREBASE_LONGPOLL_DISCONN_FRAME_PARAM = 'disconn';
+export const FIREBASE_LONGPOLL_DISCONN_FRAME_REQUEST_PARAM = 'dframe';
 
 //Data size constants.
 //TODO: Perf: the maximum length actually differs from browser to browser.
@@ -340,7 +340,7 @@ export class BrowserPollConnection implements Transport {
   };
 }
 
-interface IFrameElement extends HTMLIFrameElement {
+export interface IFrameElement extends HTMLIFrameElement {
  doc: Document;
 }
 
@@ -352,7 +352,7 @@ interface IFrameElement extends HTMLIFrameElement {
  * @param onDisconnect - The callback to be triggered when this tag holder is closed
  * @param urlFn - A function that provides the URL of the endpoint to send data to.
  *********************************************************************************************/
-class FirebaseIFrameScriptHolder {
+export class FirebaseIFrameScriptHolder {
   //We maintain a count of all of the outstanding requests, because if we have too many active at once it can cause
   //problems in some browsers.
   /**
@@ -650,53 +650,3 @@ class FirebaseIFrameScriptHolder {
     }
   }
 }
-
-if (isNodeSdk()) {
-  /**
-   * @type {?function({url: string, forever: boolean}, function(Error, number, string))}
-   */
-  (FirebaseIFrameScriptHolder as any).request = null;
-
-  /**
-   * @param {{url: string, forever: boolean}} req
-   * @param {function(string)=} onComplete
-   */
-  (FirebaseIFrameScriptHolder as any).nodeRestRequest = function(req, onComplete) {
-    if (!(FirebaseIFrameScriptHolder as any).request)
-      (FirebaseIFrameScriptHolder as any).request =
-        /** @type {function({url: string, forever: boolean}, function(Error, number, string))} */ (require('request'));
-
-    (FirebaseIFrameScriptHolder as any).request(req, function(error, response, body) {
-      if (error)
-        throw 'Rest request for ' + req.url + ' failed.';
-
-      if (onComplete)
-        onComplete(body);
-    });
-  };
-
-  /**
-   * @param {!string} url
-   * @param {function()} loadCB
-   */
-  (<any>FirebaseIFrameScriptHolder.prototype).doNodeLongPoll = function(url, loadCB) {
-    var self = this;
-    (FirebaseIFrameScriptHolder as any).nodeRestRequest({ url: url, forever: true }, function(body) {
-      self.evalBody(body);
-      loadCB();
-    });
-  };
-
-  /**
-   * Evaluates the string contents of a jsonp response.
-   * @param {!string} body
-   */
-  (<any>FirebaseIFrameScriptHolder.prototype).evalBody = function(body) {
-    var jsonpCB;
-    //jsonpCB is externed in firebase-extern.js
-    eval('jsonpCB = function(' + FIREBASE_LONGPOLL_COMMAND_CB_NAME + ', ' + FIREBASE_LONGPOLL_DATA_CB_NAME + ') {' +
-      body +
-      '}');
-    jsonpCB(this.commandCB, this.onMessageCB);
-  };
-}

src/database/realtime/Connection.ts

@@ -107,7 +107,7 @@ export class Connection {
    */
   private start_() {
     const conn = this.transportManager_.initialTransport();
-    this.conn_ = new conn(this.nextTransportId_(), this.repoInfo_, /*transportSessionId=*/undefined, this.lastSessionId);
+    this.conn_ = new conn(this.nextTransportId_(), this.repoInfo_, undefined, this.lastSessionId);
 
     // For certain transports (WebSockets), we need to send and receive several messages back and forth before we
     // can consider the transport healthy.
@@ -120,37 +120,36 @@ export class Connection {
     this.secondaryConn_ = null;
     this.isHealthy_ = false;
 
-    const self = this;
     /*
      * Firefox doesn't like when code from one iframe tries to create another iframe by way of the parent frame.
      * This can occur in the case of a redirect, i.e. we guessed wrong on what server to connect to and received a reset.
      * Somehow, setTimeout seems to make this ok. That doesn't make sense from a security perspective, since you should
      * still have the context of your originating frame.
      */
-    setTimeout(function () {
+    setTimeout(() => {
       // self.conn_ gets set to null in some of the tests. Check to make sure it still exists before using it
-      self.conn_ && self.conn_.open(onMessageReceived, onConnectionLost);
+      this.conn_ && this.conn_.open(onMessageReceived, onConnectionLost);
     }, Math.floor(0));
 
 
     const healthyTimeout_ms = conn['healthyTimeout'] || 0;
     if (healthyTimeout_ms > 0) {
-      this.healthyTimeout_ = setTimeoutNonBlocking(function () {
-        self.healthyTimeout_ = null;
-        if (!self.isHealthy_) {
-          if (self.conn_ && self.conn_.bytesReceived > BYTES_RECEIVED_HEALTHY_OVERRIDE) {
-            self.log_('Connection exceeded healthy timeout but has received ' + self.conn_.bytesReceived +
+      this.healthyTimeout_ = setTimeoutNonBlocking(() => {
+        this.healthyTimeout_ = null;
+        if (!this.isHealthy_) {
+          if (this.conn_ && this.conn_.bytesReceived > BYTES_RECEIVED_HEALTHY_OVERRIDE) {
+            this.log_('Connection exceeded healthy timeout but has received ' + this.conn_.bytesReceived +
               ' bytes.  Marking connection healthy.');
-            self.isHealthy_ = true;
-            self.conn_.markConnectionHealthy();
-          } else if (self.conn_ && self.conn_.bytesSent > BYTES_SENT_HEALTHY_OVERRIDE) {
-            self.log_('Connection exceeded healthy timeout but has sent ' + self.conn_.bytesSent +
+            this.isHealthy_ = true;
+            this.conn_.markConnectionHealthy();
+          } else if (this.conn_ && this.conn_.bytesSent > BYTES_SENT_HEALTHY_OVERRIDE) {
+            this.log_('Connection exceeded healthy timeout but has sent ' + this.conn_.bytesSent +
               ' bytes.  Leaving connection alive.');
             // NOTE: We don't want to mark it healthy, since we have no guarantee that the bytes have made it to
             // the server.
           } else {
-            self.log_('Closing unhealthy connection after timeout.');
-            self.close();
+            this.log_('Closing unhealthy connection after timeout.');
+            this.close();
           }
         }
       }, Math.floor(healthyTimeout_ms));
@@ -166,29 +165,27 @@ export class Connection {
   };
 
   private disconnReceiver_(conn) {
-    const self = this;
-    return function (everConnected) {
-      if (conn === self.conn_) {
-        self.onConnectionLost_(everConnected);
-      } else if (conn === self.secondaryConn_) {
-        self.log_('Secondary connection lost.');
-        self.onSecondaryConnectionLost_();
+    return everConnected => {
+      if (conn === this.conn_) {
+        this.onConnectionLost_(everConnected);
+      } else if (conn === this.secondaryConn_) {
+        this.log_('Secondary connection lost.');
+        this.onSecondaryConnectionLost_();
       } else {
-        self.log_('closing an old connection');
+        this.log_('closing an old connection');
       }
     }
   };
 
   private connReceiver_(conn) {
-    const self = this;
-    return function (message) {
-      if (self.state_ != REALTIME_STATE_DISCONNECTED) {
-        if (conn === self.rx_) {
-          self.onPrimaryMessageReceived_(message);
-        } else if (conn === self.secondaryConn_) {
-          self.onSecondaryMessageReceived_(message);
+    return message => {
+      if (this.state_ != REALTIME_STATE_DISCONNECTED) {
+        if (conn === this.rx_) {
+          this.onPrimaryMessageReceived_(message);
+        } else if (conn === this.secondaryConn_) {
+          this.onSecondaryMessageReceived_(message);
         } else {
-          self.log_('message on old connection');
+          this.log_('message on old connection');
         }
       }
     };

src/database/realtime/WebSocketConnection.ts

@@ -16,14 +16,16 @@ const WEBSOCKET_MAX_FRAME_SIZE = 16384;
 const WEBSOCKET_KEEPALIVE_INTERVAL = 45000;
 
 let WebSocketImpl = null;
-if (isNodeSdk()) {
-  WebSocketImpl = require('faye-websocket')['Client'];
-} else if (typeof MozWebSocket !== 'undefined') {
+if (typeof MozWebSocket !== 'undefined') {
   WebSocketImpl = MozWebSocket;
 } else if (typeof WebSocket !== 'undefined') {
   WebSocketImpl = WebSocket;
 }
 
+export function setWebSocketImpl(impl) {
+  WebSocketImpl = impl;
+}
+
 /**
  * Create a new websocket connection with the given callbacks.
  * @constructor
@@ -122,11 +124,9 @@ export class WebSocketConnection implements Transport {
         }
 
         this.mySock = new WebSocketImpl(this.connURL, [], options);
-      }
-      else {
+      } else {
         this.mySock = new WebSocketImpl(this.connURL);
       }
-      this.mySock = new WebSocketImpl(this.connURL);
     } catch (e) {
       this.log_('Error instantiating WebSocket.');
       const error = e.message || e.data;

src/firebase-node.ts

@@ -17,7 +17,7 @@
 import firebase from "./app";
 import './auth';
 import './database';
-import './database/nodePatches';
+import './utils/nodePatches';
 
 
 var Storage = require('dom-storage');

src/utils/nodePatches.ts

@@ -1,8 +1,16 @@
 import { CONSTANTS } from "./constants";
+import { setWebSocketImpl } from "../../src/database/realtime/WebSocketConnection";
+import { 
+  FirebaseIFrameScriptHolder,
+  FIREBASE_LONGPOLL_COMMAND_CB_NAME,
+  FIREBASE_LONGPOLL_DATA_CB_NAME
+} from "../../src/database/realtime/BrowserPollConnection";
 
 // Overriding the constant (we should be the only ones doing this)
 CONSTANTS.NODE_CLIENT = true;
 
+setWebSocketImpl(require('faye-websocket').Client);
+
 /**
  * @suppress {es5Strict}
  */
@@ -120,3 +128,51 @@ CONSTANTS.NODE_CLIENT = true;
   var Duplex = require('_stream_duplex');
   Duplex['prototype']['write'] = Writable['prototype']['write'];
 })();
+
+/**
+ * @type {?function({url: string, forever: boolean}, function(Error, number, string))}
+ */
+(FirebaseIFrameScriptHolder as any).request = null;
+
+/**
+ * @param {{url: string, forever: boolean}} req
+ * @param {function(string)=} onComplete
+ */
+(FirebaseIFrameScriptHolder as any).nodeRestRequest = function(req, onComplete) {
+  if (!(FirebaseIFrameScriptHolder as any).request)
+    (FirebaseIFrameScriptHolder as any).request =
+      /** @type {function({url: string, forever: boolean}, function(Error, number, string))} */ (require('request'));
+
+  (FirebaseIFrameScriptHolder as any).request(req, function(error, response, body) {
+    if (error)
+      throw 'Rest request for ' + req.url + ' failed.';
+
+    if (onComplete)
+      onComplete(body);
+  });
+};
+
+/**
+ * @param {!string} url
+ * @param {function()} loadCB
+ */
+(<any>FirebaseIFrameScriptHolder.prototype).doNodeLongPoll = function(url, loadCB) {
+  var self = this;
+  (FirebaseIFrameScriptHolder as any).nodeRestRequest({ url: url, forever: true }, function(body) {
+    self.evalBody(body);
+    loadCB();
+  });
+};
+
+/**
+ * Evaluates the string contents of a jsonp response.
+ * @param {!string} body
+ */
+(<any>FirebaseIFrameScriptHolder.prototype).evalBody = function(body) {
+  var jsonpCB;
+  //jsonpCB is externed in firebase-extern.js
+  eval('jsonpCB = function(' + FIREBASE_LONGPOLL_COMMAND_CB_NAME + ', ' + FIREBASE_LONGPOLL_DATA_CB_NAME + ') {' +
+    body +
+    '}');
+  jsonpCB(this.commandCB, this.onMessageCB);
+};